mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-30674 enrol_guest: Respect

Browse Source
This commit is contained in:
Andrew Nicols 2015-10-23 10:39:03 +08:00
parent 0c93dda8af
commit 5164b76e75
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
enrol/guest/classes/enrol_guest_edit_form.php
View File

@ -58,6 +58,10 @@ class enrol_guest_edit_form extends moodleform {
$mform->addElement('passwordunmask', 'password', get_string('password', 'enrol_guest'));
$mform->addHelpButton('password', 'password', 'enrol_guest');
if ($plugin->get_config('requirepassword')) {
$mform->addRule('password', get_string('required'), 'required', null);
}
$mform->addElement('hidden', 'id');
$mform->setType('id', PARAM_INT);
$mform->addElement('hidden', 'courseid');
@ -92,11 +96,8 @@ class enrol_guest_edit_form extends moodleform {
}
if ($checkpassword) {
$require = $plugin->get_config('requirepassword');
$policy = $plugin->get_config('usepasswordpolicy');
if ($require && empty($data['password'])) {
$errors['password'] = get_string('required');
} else if ($policy) {
if ($policy) {
$errmsg = '';
if (!check_password_policy($data['password'], $errmsg)) {
$errors['password'] = $errmsg;

22
enrol/guest/lib.php
View File

@ -358,7 +358,27 @@ class enrol_guest_plugin extends enrol_plugin {
*/
public function can_hide_show_instance($instance) {
$context = context_course::instance($instance->courseid);
return has_capability('enrol/guest:config', $context);
if (!has_capability('enrol/guest:config', $context)) {
return false;
}
// If the instance is currently disabled, before it can be enabled, we must check whether the password meets the
// password policies.
if ($instance->status == ENROL_INSTANCE_DISABLED) {
if ($this->get_config('requirepassword')) {
if (empty($instance->password)) {
return false;
}
}
if ($this->get_config('usepasswordpolicy')) {
if (!check_password_policy($instance->password, $errmsg)) {
return false;
}
}
}
return true;
}
/**