Resolve "Fehler bei der Anmeldeset-Verwaltung"

Closes #5086

Merge request studip/studip!3823

20 files changed, 7 insertions, 178 deletions

diff --git a/lib/admissionrules/conditionaladmission/ConditionalAdmission.php b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
index 10bcb99..55aa317 100644
--- a/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
+++ b/lib/admissionrules/conditionaladmission/ConditionalAdmission.php
@@ -198,24 +198,6 @@ class ConditionalAdmission extends AdmissionRule
     }
 
     /**
-     * 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.
      */
@@ -371,7 +353,7 @@ class ConditionalAdmission extends AdmissionRule
                 $obj->setValue($field['attributes']['value']);
                 $condition->addField($obj);
             }
-            $this->addCondition($condition, $data['conditiongroup_'.$condition->getId()], $data['quota_'.$data['conditiongroup_'.$condition->getId()]] ?? 0);
+            $this->addCondition($condition);
         }
 
         foreach ($data['grouped-conditions'] as $group) {
diff --git a/lib/admissionrules/conditionaladmission/templates/configure.php b/lib/admissionrules/conditionaladmission/templates/configure.php
deleted file mode 100644
index d4e7a14..0000000
--- a/lib/admissionrules/conditionaladmission/templates/configure.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-admission-rule="ConditionalAdmission">
-    <conditional-admission></conditional-admission>
-</div>
diff --git a/lib/admissionrules/connectedcourseadmission/ConnectedcourseAdmission.class.php b/lib/admissionrules/connectedcourseadmission/ConnectedcourseAdmission.class.php
index 40f32ac..2bc8557 100644
--- a/lib/admissionrules/connectedcourseadmission/ConnectedcourseAdmission.class.php
+++ b/lib/admissionrules/connectedcourseadmission/ConnectedcourseAdmission.class.php
@@ -47,20 +47,6 @@ class ConnectedcourseAdmission extends AdmissionRule
     }
 
     /**
-     * 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()
diff --git a/lib/admissionrules/connectedcourseadmission/templates/configure.php b/lib/admissionrules/connectedcourseadmission/templates/configure.php
deleted file mode 100644
index 4a60973..0000000
--- a/lib/admissionrules/connectedcourseadmission/templates/configure.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<h3><?= $rule->getName() ?></h3>
-<label for="message" class="caption">
-    <?= _('Nachricht bei fehlgeschlagener Anmeldung') ?>:
-</label>
-<textarea name="message" rows="4" cols="50"><?= $rule->getMessage() ?></textarea>
\ No newline at end of file
diff --git a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
index 00bccee..c1a4cb0 100644
--- a/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
+++ b/lib/admissionrules/coursememberadmission/CourseMemberAdmission.php
@@ -78,27 +78,6 @@ class CourseMemberAdmission extends AdmissionRule
     }
 
     /**
-     * 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);
-
-        $search = new StandardSearch('Seminar_id');
-
-        return $this->getTemplateFactory()->render('configure', [
-            'rule'    => $this,
-            'tpl'     => $tpl->render(),
-            'courses' => $this->getDecodedCourses(),
-            'search'  => $search
-        ]);
-    }
-
-    /**
      * Helper function for loading rule definition from database.
      */
     public function load()
diff --git a/lib/admissionrules/coursememberadmission/templates/configure.php b/lib/admissionrules/coursememberadmission/templates/configure.php
deleted file mode 100644
index a86150b..0000000
--- a/lib/admissionrules/coursememberadmission/templates/configure.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-admission-rule="CourseMemberAdmission">
-    <course-member-admission></course-member-admission>
-</div>
diff --git a/lib/admissionrules/limitedadmission/LimitedAdmission.php b/lib/admissionrules/limitedadmission/LimitedAdmission.php
index c0339cc..20893d7 100644
--- a/lib/admissionrules/limitedadmission/LimitedAdmission.php
+++ b/lib/admissionrules/limitedadmission/LimitedAdmission.php
@@ -118,23 +118,6 @@ class LimitedAdmission extends AdmissionRule
     }
 
     /**
-     * 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() {
diff --git a/lib/admissionrules/limitedadmission/templates/configure.php b/lib/admissionrules/limitedadmission/templates/configure.php
deleted file mode 100644
index 5a2e0a9..0000000
--- a/lib/admissionrules/limitedadmission/templates/configure.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-admission-rule="LimitedAdmission">
-    <limited-admission></limited-admission>
-</div>
diff --git a/lib/admissionrules/lockedadmission/LockedAdmission.php b/lib/admissionrules/lockedadmission/LockedAdmission.php
index afef13a..4330220 100644
--- a/lib/admissionrules/lockedadmission/LockedAdmission.php
+++ b/lib/admissionrules/lockedadmission/LockedAdmission.php
@@ -67,19 +67,6 @@ class LockedAdmission extends AdmissionRule
     }
 
     /**
-     * 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() {
diff --git a/lib/admissionrules/lockedadmission/templates/configure.php b/lib/admissionrules/lockedadmission/templates/configure.php
deleted file mode 100644
index 5be3f66..0000000
--- a/lib/admissionrules/lockedadmission/templates/configure.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-admission-rule="LockedAdmission">
-    <locked-admission></locked-admission>
-</div>
diff --git a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
index 2954602..924ce4f 100644
--- a/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
+++ b/lib/admissionrules/participantrestrictedadmission/ParticipantRestrictedAdmission.php
@@ -101,20 +101,6 @@ class ParticipantRestrictedAdmission extends AdmissionRule
     }
 
     /**
-     * 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()
diff --git a/lib/admissionrules/participantrestrictedadmission/templates/configure.php b/lib/admissionrules/participantrestrictedadmission/templates/configure.php
deleted file mode 100644
index c2b50f3..0000000
--- a/lib/admissionrules/participantrestrictedadmission/templates/configure.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<div data-admission-rule="ParticipantRestrictedAdmission">
-    <participant-restricted-admission :distribution="<?= $rule->getDistributionTime() ?>"
-                                      :fcfs="<?= $rule->isFCFSAllowed() ? 'true' : 'false'?>"
-                                      :hasPrios="false"></participant-restricted-admission>
-</div>
diff --git a/lib/admissionrules/passwordadmission/PasswordAdmission.php b/lib/admissionrules/passwordadmission/PasswordAdmission.php
index 85c6e2d..f94f1b4 100644
--- a/lib/admissionrules/passwordadmission/PasswordAdmission.php
+++ b/lib/admissionrules/passwordadmission/PasswordAdmission.php
@@ -175,10 +175,11 @@ class PasswordAdmission extends AdmissionRule
      * @param Array $data
      * @return AdmissionRule This object.
      */
-    public function setAllData($data) {
+    public function setAllData($data)
+    {
         parent::setAllData($data);
-        if ($this->new || $data['password1'] !== '') {
-            $this->setPassword($data['password1']);
+        if ($this->new || $data['password'] !== '') {
+            $this->setPassword($data['password']);
         }
         return $this;
     }
@@ -189,7 +190,8 @@ class PasswordAdmission extends AdmissionRule
      * @param  String $clearText The clear text password to be set.
      * @return PasswordAdmission
      */
-    public function setPassword($clearText) {
+    public function setPassword($clearText)
+    {
         $this->password = $this->hasher->HashPassword($clearText);
         return $this;
     }
diff --git a/lib/admissionrules/passwordadmission/templates/configure.php b/lib/admissionrules/passwordadmission/templates/configure.php
deleted file mode 100644
index 5a95b85..0000000
--- a/lib/admissionrules/passwordadmission/templates/configure.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-admission-rule="PasswordAdmission">
-    <password-admission></password-admission>
-</div>
diff --git a/lib/admissionrules/preferentialadmission/PreferentialAdmission.php b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
index 9617f2b..c92677a 100644
--- a/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
+++ b/lib/admissionrules/preferentialadmission/PreferentialAdmission.php
@@ -329,20 +329,6 @@ class PreferentialAdmission extends AdmissionRule
     }
 
     /**
-     * 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.
      */
diff --git a/lib/admissionrules/preferentialadmission/templates/configure.php b/lib/admissionrules/preferentialadmission/templates/configure.php
deleted file mode 100644
index 240e12c..0000000
--- a/lib/admissionrules/preferentialadmission/templates/configure.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-admission-rule="PreferentialAdmission">
-    <preferential-admission></preferential-admission>
-</div>
diff --git a/lib/admissionrules/termsadmission/TermsAdmission.php b/lib/admissionrules/termsadmission/TermsAdmission.php
index 5e98513..3fda619 100644
--- a/lib/admissionrules/termsadmission/TermsAdmission.php
+++ b/lib/admissionrules/termsadmission/TermsAdmission.php
@@ -79,21 +79,6 @@ class TermsAdmission extends AdmissionRule
     }
 
     /**
-     * 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?
      *
diff --git a/lib/admissionrules/termsadmission/templates/configure.php b/lib/admissionrules/termsadmission/templates/configure.php
deleted file mode 100644
index 48d4dfd..0000000
--- a/lib/admissionrules/termsadmission/templates/configure.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div data-admission-rule="TermsAdmission">
-    <terms-admission terms="<?= htmlReady($rule->terms) ?>" id="<?= htmlReady($rule->getId()) ?>"></terms-admission>
-</div>
diff --git a/lib/admissionrules/timedadmission/TimedAdmission.php b/lib/admissionrules/timedadmission/TimedAdmission.php
index 69a828e..dad423f 100644
--- a/lib/admissionrules/timedadmission/TimedAdmission.php
+++ b/lib/admissionrules/timedadmission/TimedAdmission.php
@@ -96,19 +96,6 @@ class TimedAdmission extends AdmissionRule
     }
 
     /**
-     * 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() {
diff --git a/lib/admissionrules/timedadmission/templates/configure.php b/lib/admissionrules/timedadmission/templates/configure.php
deleted file mode 100644
index d39f6ab..0000000
--- a/lib/admissionrules/timedadmission/templates/configure.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="admission-rule" data-admission-rule="TimedAdmission">
-    <timed-admission :start="<?= $startTime ?: time() ?>" :end="<?= $endTime ?: (time() + 3600) ?>"></timed-admission>
-</div>