moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-71068-protectusername-confirmed-MOODLE_39_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_39_STABLE

Browse source
This commit is contained in:
Adrian Greeve 2021-03-18 09:26:13 +08:00
commit 841fd94499
3 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lang/en/moodle.php
View file

@ -674,7 +674,7 @@ line at the top of your web browser window.
If you need help, please contact the site administrator, If you need help, please contact the site administrator,
{$a->admin}'; {$a->admin}';
$string['emailpasswordconfirmationsubject'] = '{$a}: Change password confirmation'; $string['emailpasswordconfirmationsubject'] = '{$a}: Change password confirmation';
$string['emailpasswordconfirmmaybesent'] = '<p>If you supplied a correct username or email address then an email should have been sent to you.</p> $string['emailpasswordconfirmmaybesent'] = '<p>If you supplied a correct username or unique email address then an email should have been sent to you.</p>
<p>It contains easy instructions to confirm and complete this password change. <p>It contains easy instructions to confirm and complete this password change.
If you continue to have difficulty, please contact the site administrator.</p>'; If you continue to have difficulty, please contact the site administrator.</p>';
$string['emailpasswordconfirmnoemail'] = '<p>The user account you specified does not have a recorded email address.</p> $string['emailpasswordconfirmnoemail'] = '<p>The user account you specified does not have a recorded email address.</p>

12
login/lib.php
View file

@ -387,7 +387,9 @@ function core_login_validate_forgot_password_data($data) {
$user = get_complete_user_data('email', $data['email'], null, true); $user = get_complete_user_data('email', $data['email'], null, true);
if (empty($user->confirmed)) { if (empty($user->confirmed)) {
send_confirmation_email($user); send_confirmation_email($user);
$errors['email'] = get_string('confirmednot'); if (empty($CFG->protectusernames)) {
$errors['email'] = get_string('confirmednot');
}
} }
} catch (dml_missing_record_exception $missingexception) { } catch (dml_missing_record_exception $missingexception) {
// User not found. Show error when $CFG->protectusernames is turned off. // User not found. Show error when $CFG->protectusernames is turned off.
@ -396,7 +398,9 @@ function core_login_validate_forgot_password_data($data) {
} }
} catch (dml_multiple_records_exception $multipleexception) { } catch (dml_multiple_records_exception $multipleexception) {
// Multiple records found. Ask the user to enter a username instead. // Multiple records found. Ask the user to enter a username instead.
$errors['email'] = get_string('forgottenduplicate'); if (empty($CFG->protectusernames)) {
$errors['email'] = get_string('forgottenduplicate');
}
} }
} }
@ -404,7 +408,9 @@ function core_login_validate_forgot_password_data($data) {
if ($user = get_complete_user_data('username', $data['username'])) { if ($user = get_complete_user_data('username', $data['username'])) {
if (empty($user->confirmed)) { if (empty($user->confirmed)) {
send_confirmation_email($user); send_confirmation_email($user);
$errors['email'] = get_string('confirmednot'); if (empty($CFG->protectusernames)) {
$errors['username'] = get_string('confirmednot');
}
} }
} }
if (!$user and empty($CFG->protectusernames)) { if (!$user and empty($CFG->protectusernames)) {

31
login/tests/lib_test.php
View file

@ -257,24 +257,34 @@ class core_login_lib_testcase extends advanced_testcase {
['username' => get_string('usernamenotfound')], ['username' => get_string('usernamenotfound')],
['protectusernames' => 0] ['protectusernames' => 0]
], ],
'Valid username, unconfirmed username' => [ 'Valid username, unconfirmed username, username protection on' => [
['username' => 's1'], ['username' => 's1'],
['email' => get_string('confirmednot')], [],
['confirmed' => 0] ['confirmed' => 0]
], ],
'Invalid email' => [ 'Invalid email' => [
['email' => 's1-example.com'], ['email' => 's1-example.com'],
['email' => get_string('invalidemail')] ['email' => get_string('invalidemail')]
], ],
'Multiple accounts with the same email' => [ 'Multiple accounts with the same email, username protection on' => [
['email' => 's1@example.com'], ['email' => 's1@example.com'],
['email' => get_string('forgottenduplicate')], [],
['allowaccountssameemail' => 1] ['allowaccountssameemail' => 1]
], ],
'Multiple accounts with the same email but with different case' => [ 'Multiple accounts with the same email, username protection off' => [
['email' => 's1@example.com'],
['email' => get_string('forgottenduplicate')],
['allowaccountssameemail' => 1, 'protectusernames' => 0]
],
'Multiple accounts with the same email but with different case, username protection is on' => [
['email' => 'S1@EXAMPLE.COM'],
[],
['allowaccountssameemail' => 1]
],
'Multiple accounts with the same email but with different case, username protection is off' => [
['email' => 'S1@EXAMPLE.COM'], ['email' => 'S1@EXAMPLE.COM'],
['email' => get_string('forgottenduplicate')], ['email' => get_string('forgottenduplicate')],
['allowaccountssameemail' => 1] ['allowaccountssameemail' => 1, 'protectusernames' => 0]
], ],
'Non-existent email, username protection on' => [ 'Non-existent email, username protection on' => [
['email' => 's2@example.com'] ['email' => 's2@example.com']
@ -290,10 +300,15 @@ class core_login_lib_testcase extends advanced_testcase {
'Valid email, different case' => [ 'Valid email, different case' => [
['email' => 'S1@EXAMPLE.COM'] ['email' => 'S1@EXAMPLE.COM']
], ],
'Valid email, unconfirmed user' => [ 'Valid email, unconfirmed user, username protection is on' => [
['email' => 's1@example.com'],
[],
['confirmed' => 0]
],
'Valid email, unconfirmed user, username protection is off' => [
['email' => 's1@example.com'], ['email' => 's1@example.com'],
['email' => get_string('confirmednot')], ['email' => get_string('confirmednot')],
['confirmed' => 0] ['confirmed' => 0, 'protectusernames' => 0]
], ],
]; ];
} }