From 89f3ecf3d30f903e874ae3ad7617c10c736db537 Mon Sep 17 00:00:00 2001 From: Ilya Tregubov Date: Mon, 5 Feb 2024 14:56:02 +0800 Subject: [PATCH] MDL-80599 enrol_self: Check group key regardless of policy used Password policy is not connected to using of group key enrolment --- enrol/self/lib.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/enrol/self/lib.php b/enrol/self/lib.php index 2001f77e97d..4a8a2c321dc 100644 --- a/enrol/self/lib.php +++ b/enrol/self/lib.php @@ -1015,18 +1015,19 @@ class enrol_self_plugin extends enrol_plugin { if ($checkpassword) { $require = $this->get_config('requirepassword'); - $policy = $this->get_config('usepasswordpolicy'); + $policy = $this->get_config('usepasswordpolicy'); if ($require and trim($data['password']) === '') { $errors['password'] = get_string('required'); - } else if (!empty($data['password']) && $policy) { - $errmsg = ''; - if (!check_password_policy($data['password'], $errmsg)) { - $errors['password'] = $errmsg; + } else if (!empty($data['password'])) { + if ($policy) { + $errmsg = ''; + if (!check_password_policy($data['password'], $errmsg)) { + $errors['password'] = $errmsg; + } + } + if ($data['customint1'] && enrol_self_check_group_enrolment_key($instance->courseid, $data['password'])) { + $errors['password'] = get_string('passwordmatchesgroupkey', 'enrol_self'); } - } else if (!empty($data['password']) && $data['customint1'] && - enrol_self_check_group_enrolment_key($data['courseid'], $data['password'])) { - - $errors['password'] = get_string('passwordmatchesgroupkey', 'enrol_self'); } } -- 2.11.4.GIT