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

10 files changed, 36 insertions, 41 deletions

diff --git a/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.php b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
index 63275f0..640e800 100644
--- a/lib/admissionrules/conditionaladmission/ConditionalAdmission.class.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.
@@ -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.php
index a502971..139c360 100644
--- a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.class.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.
  *
@@ -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.php
index b0cb1ca..d7f53c1 100644
--- a/lib/admissionrules/limitedadmission/LimitedAdmission.class.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.
  *
@@ -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.php
index c313d55..92ef513 100644
--- a/lib/admissionrules/lockedadmission/LockedAdmission.class.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.
  *
@@ -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.php
index a64b88a..586f82f 100644
--- a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.class.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.
  *
@@ -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.php
index 6a99066..8715021 100644
--- a/lib/admissionrules/passwordadmission/PasswordAdmission.class.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.
  *
@@ -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.php
index 6bb6ceb..2f57a44 100644
--- a/lib/admissionrules/preferentialadmission/PreferentialAdmission.class.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.
  *
@@ -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 ---
@@ -338,7 +335,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 +500,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.php
index 112a12e..eb83dfc 100644
--- a/lib/admissionrules/termsadmission/TermsAdmission.class.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.
  *
@@ -14,8 +14,6 @@
  * @category    Stud.IP
  */
 
-require_once 'lib/classes/admission/AdmissionRule.class.php';
-
 class TermsAdmission extends AdmissionRule
 {
     // Terms of admission
@@ -61,16 +59,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 +82,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 +156,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/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/admissionrules/timedadmission/TimedAdmission.class.php b/lib/admissionrules/timedadmission/TimedAdmission.php
index 735fdee..5f5e885 100644
--- a/lib/admissionrules/timedadmission/TimedAdmission.class.php
+++ b/lib/admissionrules/timedadmission/TimedAdmission.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * TimedAdmission.class.php
+ * TimedAdmission.php
  *
  * Specifies a time frame for course admission.
  *
@@ -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();