MDL-29824 improve notification of max number of enrolled users

moodle · Oct 30, 2011 · 78c5042 · 78c5042
1 parent 38e9a1c
commit 78c5042
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/enrol/index.php b/enrol/index.php
@@ -82,6 +82,7 @@
 $PAGE->navbar->add(get_string('enrolmentoptions','enrol'));
 
 echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string('enrolmentoptions','enrol'));
 
 //TODO: find if future enrolments present and display some info
 

diff --git a/enrol/self/lang/en/enrol_self.php b/enrol/self/lang/en/enrol_self.php
@@ -47,6 +47,7 @@
 $string['maxenrolled'] = 'Max enrolled users';
 $string['maxenrolled_help'] = 'Specifies the maximum number of users that can self enrol. 0 means no limit.';
 $string['maxenrolledreached'] = 'Maximum number of users allowed to self-enrol was already reached.';
+$string['nopassword'] = 'No enrolment key required.';
 $string['password'] = 'Enrolment key';
 $string['password_help'] = 'An enrolment key enables access to the course to be restricted to only those who know the key.
 

diff --git a/enrol/self/lib.php b/enrol/self/lib.php
@@ -189,15 +189,6 @@ public function enrol_page_hook(stdClass $instance) {
             return null;
         }
 
-        if ($instance->customint3 > 0) {
-            // max enrol limit specified
-            $count = $DB->count_records('user_enrolments', array('enrolid'=>$instance->id));
-            if ($count >= $instance->customint3) {
-                // bad luck, no more self enrolments here
-                return $OUTPUT->notification(get_string('maxenrolledreached', 'enrol_self'));
-            }
-        }
-
         require_once("$CFG->dirroot/enrol/self/locallib.php");
         require_once("$CFG->dirroot/group/lib.php");
 

diff --git a/enrol/self/locallib.php b/enrol/self/locallib.php
@@ -30,6 +30,7 @@
 
 class enrol_self_enrol_form extends moodleform {
     protected $instance;
+    protected $toomany = false;
 
     /**
      * Overriding this function to get unique form id for multiple self enrolments
@@ -42,19 +43,33 @@ protected function get_form_identifier() {
     }
 
     public function definition() {
+        global $DB;
+
         $mform = $this->_form;
         $instance = $this->_customdata;
         $this->instance = $instance;
         $plugin = enrol_get_plugin('self');
 
+        $heading = $plugin->get_instance_name($instance);
+        $mform->addElement('header', 'selfheader', $heading);
+
+        if ($instance->customint3 > 0) {
+            // max enrol limit specified
+            $count = $DB->count_records('user_enrolments', array('enrolid'=>$instance->id));
+            if ($count >= $instance->customint3) {
+                // bad luck, no more self enrolments here
+                $this->toomany = true;
+                $mform->addElement('static', 'notice', '', get_string('maxenrolledreached', 'enrol_self'));
+                return;
+            }
+        }
+
         if ($instance->password) {
-            $heading = $plugin->get_instance_name($instance);
-            $mform->addElement('header', 'selfheader', $heading);
             //change the id of self enrolment key input as there can be multiple self enrolment methods
             $mform->addElement('passwordunmask', 'enrolpassword', get_string('password', 'enrol_self'),
                     array('id' => $instance->id."_enrolpassword"));
         } else {
-            // nothing?
+            $mform->addElement('static', 'nokey', '', get_string('nopassword', 'enrol_self'));
         }
 
         $this->add_action_buttons(false, get_string('enrolme', 'enrol_self'));
@@ -74,6 +89,11 @@ public function validation($data, $files) {
         $errors = parent::validation($data, $files);
         $instance = $this->instance;
 
+        if ($this->toomany) {
+            $errors['notice'] = get_string('error');
+            return $errors;
+        }
+
         if ($instance->password) {
             if ($data['enrolpassword'] !== $instance->password) {
                 if ($instance->customint1) {