Merge branch 'main' into issue-3911issue-3911

23 files changed, 33 insertions, 54 deletions

diff --git a/lib/plugins/core/AdminCourseAction.class.php b/lib/plugins/core/AdminCourseAction.php
index 046502c..046502c 100644
--- a/lib/plugins/core/AdminCourseAction.class.php
+++ b/lib/plugins/core/AdminCourseAction.php
diff --git a/lib/plugins/core/AdminCourseContents.class.php b/lib/plugins/core/AdminCourseContents.php
index 065cc9e..0e07b58 100644
--- a/lib/plugins/core/AdminCourseContents.class.php
+++ b/lib/plugins/core/AdminCourseContents.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/AdminCourseWidgetPlugin.class.php b/lib/plugins/core/AdminCourseWidgetPlugin.php
index c554626..c554626 100644
--- a/lib/plugins/core/AdminCourseWidgetPlugin.class.php
+++ b/lib/plugins/core/AdminCourseWidgetPlugin.php
diff --git a/lib/plugins/core/AdministrationPlugin.class.php b/lib/plugins/core/AdministrationPlugin.php
index c9aa8da..6856e6a 100644
--- a/lib/plugins/core/AdministrationPlugin.class.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 7f1aaed..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
@@ -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'];
diff --git a/lib/plugins/core/DetailspagePlugin.class.php b/lib/plugins/core/DetailspagePlugin.php
index 15eda09..3cc3b57 100644
--- a/lib/plugins/core/DetailspagePlugin.class.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>
  *
@@ -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/FileUploadHook.class.php b/lib/plugins/core/FileUploadHook.php
index 27323fd..27323fd 100644
--- a/lib/plugins/core/FileUploadHook.class.php
+++ b/lib/plugins/core/FileUploadHook.php
diff --git a/lib/plugins/core/FilesystemPlugin.class.php b/lib/plugins/core/FilesystemPlugin.php
index 6d4c46c..31b4b5b 100644
--- a/lib/plugins/core/FilesystemPlugin.class.php
+++ b/lib/plugins/core/FilesystemPlugin.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/ForumModule.class.php b/lib/plugins/core/ForumModule.php
index 33784db..e72ffc2 100644
--- a/lib/plugins/core/ForumModule.class.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.class.php b/lib/plugins/core/HomepagePlugin.php
index 74d0204..b0dbd65 100644
--- a/lib/plugins/core/HomepagePlugin.class.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
@@ -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/LibraryPlugin.class.php b/lib/plugins/core/LibraryPlugin.php
index a7fb873..3c1a751 100644
--- a/lib/plugins/core/LibraryPlugin.class.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/MetricsPlugin.class.php b/lib/plugins/core/MetricsPlugin.php
index 95edaf1..95edaf1 100644
--- a/lib/plugins/core/MetricsPlugin.class.php
+++ b/lib/plugins/core/MetricsPlugin.php
diff --git a/lib/plugins/core/PortalPlugin.class.php b/lib/plugins/core/PortalPlugin.php
index dce5774..826e410 100644
--- a/lib/plugins/core/PortalPlugin.class.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
@@ -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/PrivacyPlugin.class.php b/lib/plugins/core/PrivacyPlugin.php
index 73a971d..73a971d 100644
--- a/lib/plugins/core/PrivacyPlugin.class.php
+++ b/lib/plugins/core/PrivacyPlugin.php
diff --git a/lib/plugins/core/QuestionnaireAssignmentPlugin.class.php b/lib/plugins/core/QuestionnaireAssignmentPlugin.php
index 6892f8a..cadaf52 100644
--- a/lib/plugins/core/QuestionnaireAssignmentPlugin.class.php
+++ b/lib/plugins/core/QuestionnaireAssignmentPlugin.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/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/Role.class.php b/lib/plugins/core/Role.php
index 3ca8a11..91e00e8 100644
--- a/lib/plugins/core/Role.class.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/ScorePlugin.class.php b/lib/plugins/core/ScorePlugin.php
index 064ddc3..064ddc3 100644
--- a/lib/plugins/core/ScorePlugin.class.php
+++ b/lib/plugins/core/ScorePlugin.php
diff --git a/lib/plugins/core/StandardPlugin.class.php b/lib/plugins/core/StandardPlugin.php
index 960ffd0..5180891 100644
--- a/lib/plugins/core/StandardPlugin.class.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.class.php b/lib/plugins/core/StudIPPlugin.php
index be2c776..6642dbd 100644
--- a/lib/plugins/core/StudIPPlugin.class.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
@@ -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'];
@@ -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/plugins/core/SystemPlugin.class.php b/lib/plugins/core/SystemPlugin.php
index c204567..0ffd16f 100644
--- a/lib/plugins/core/SystemPlugin.class.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/core/WebServicePlugin.class.php b/lib/plugins/core/WebServicePlugin.php
index ff3e757..ff3e757 100644
--- a/lib/plugins/core/WebServicePlugin.class.php
+++ b/lib/plugins/core/WebServicePlugin.php