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

27 files changed, 12 insertions, 52 deletions

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/modules/Blubber.class.php b/lib/modules/Blubber.php
index 4dd2f99..4dd2f99 100644
--- a/lib/modules/Blubber.class.php
+++ b/lib/modules/Blubber.php
diff --git a/lib/modules/ConsultationModule.class.php b/lib/modules/ConsultationModule.php
index c68f8ca..c68f8ca 100644
--- a/lib/modules/ConsultationModule.class.php
+++ b/lib/modules/ConsultationModule.php
diff --git a/lib/modules/CoreAdmin.class.php b/lib/modules/CoreAdmin.php
index 948809c..4bf1880 100644
--- a/lib/modules/CoreAdmin.class.php
+++ b/lib/modules/CoreAdmin.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/CoreCalendar.class.php b/lib/modules/CoreCalendar.php
index 318a2ba..318a2ba 100644
--- a/lib/modules/CoreCalendar.class.php
+++ b/lib/modules/CoreCalendar.php
diff --git a/lib/modules/CoreDocuments.class.php b/lib/modules/CoreDocuments.php
index 2acfeef..2acfeef 100644
--- a/lib/modules/CoreDocuments.class.php
+++ b/lib/modules/CoreDocuments.php
diff --git a/lib/modules/CoreElearningInterface.class.php b/lib/modules/CoreElearningInterface.php
index a5f7119..a5f7119 100644
--- a/lib/modules/CoreElearningInterface.class.php
+++ b/lib/modules/CoreElearningInterface.php
diff --git a/lib/modules/CoreForum.class.php b/lib/modules/CoreForum.php
index 3a43372..0283a09 100644
--- a/lib/modules/CoreForum.class.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/CoreOverview.class.php b/lib/modules/CoreOverview.php
index 94005da..94005da 100644
--- a/lib/modules/CoreOverview.class.php
+++ b/lib/modules/CoreOverview.php
diff --git a/lib/modules/CoreParticipants.class.php b/lib/modules/CoreParticipants.php
index b2f1948..b2f1948 100644
--- a/lib/modules/CoreParticipants.class.php
+++ b/lib/modules/CoreParticipants.php
diff --git a/lib/modules/CorePersonal.class.php b/lib/modules/CorePersonal.php
index 71aaa6b..71aaa6b 100644
--- a/lib/modules/CorePersonal.class.php
+++ b/lib/modules/CorePersonal.php
diff --git a/lib/modules/CoreSchedule.class.php b/lib/modules/CoreSchedule.php
index 601b618..601b618 100644
--- a/lib/modules/CoreSchedule.class.php
+++ b/lib/modules/CoreSchedule.php
diff --git a/lib/modules/CoreScm.class.php b/lib/modules/CoreScm.php
index d37023b..d37023b 100644
--- a/lib/modules/CoreScm.class.php
+++ b/lib/modules/CoreScm.php
diff --git a/lib/modules/CoreStudygroupAdmin.class.php b/lib/modules/CoreStudygroupAdmin.php
index d311390..d299adf 100644
--- a/lib/modules/CoreStudygroupAdmin.class.php
+++ b/lib/modules/CoreStudygroupAdmin.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/CoreStudygroupParticipants.class.php b/lib/modules/CoreStudygroupParticipants.php
index 334f84a..334f84a 100644
--- a/lib/modules/CoreStudygroupParticipants.class.php
+++ b/lib/modules/CoreStudygroupParticipants.php
diff --git a/lib/modules/CoreWiki.class.php b/lib/modules/CoreWiki.php
index a447451..a447451 100644
--- a/lib/modules/CoreWiki.class.php
+++ b/lib/modules/CoreWiki.php
diff --git a/lib/modules/CoursewareModule.class.php b/lib/modules/CoursewareModule.php
index 8deeda7..8deeda7 100644
--- a/lib/modules/CoursewareModule.class.php
+++ b/lib/modules/CoursewareModule.php
diff --git a/lib/modules/EvaluationsWidget.php b/lib/modules/EvaluationsWidget.php
index 64458d9..21410e2 100644
--- a/lib/modules/EvaluationsWidget.php
+++ b/lib/modules/EvaluationsWidget.php
@@ -43,15 +43,9 @@ 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;
-
-        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/modules/FeedbackModule.class.php b/lib/modules/FeedbackModule.php
index 8674f62..2fc657d 100644
--- a/lib/modules/FeedbackModule.class.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.class.php b/lib/modules/GradebookModule.php
index 66886a2..45cd93e 100644
--- a/lib/modules/GradebookModule.class.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/IliasInterfaceModule.class.php b/lib/modules/IliasInterfaceModule.php
index a8cafbf..a8cafbf 100644
--- a/lib/modules/IliasInterfaceModule.class.php
+++ b/lib/modules/IliasInterfaceModule.php
diff --git a/lib/modules/LtiToolModule.class.php b/lib/modules/LtiToolModule.php
index 033f5e8..74fd70a 100644
--- a/lib/modules/LtiToolModule.class.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/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/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.php
index 6cbcaf9..c281d29 100644
--- a/lib/modules/StudipModule.class.php
+++ b/lib/modules/StudipModule.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/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;