L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging from HEAD:

Browse Source 
Fix for bug 4371 (also SC#199):

Now manually created users with admin privileges and force change password
cannot change their username with impunity.
This commit is contained in:
defacer
2005-11-26 01:01:56 +00:00
parent 68e8fb7df0
commit 482bad4e8b
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
login/change_password.php
+13 -5
View File
@@ -14,9 +14,8 @@
if (empty($USER->preference['auth_forcepasswordchange'])) { // Don't redirect if they just got sent here
require_login($id);
}
if ($frm = data_submitted()) {
if ($frm = data_submitted()) {
validate_form($frm, $err);
check_for_restricted_user($frm->username);
@@ -144,9 +143,18 @@ function validate_form($frm, &$err) {
if (!isadmin() and empty($frm->password)){
$err->password = get_string('missingpassword');
} else {
//require non adminusers to give valid password
if (!isadmin() && !authenticate_user_login($frm->username, $frm->password)){
$err->password = get_string('wrongpassword');
if (!isadmin()) {
//require non adminusers to give valid password
if(!authenticate_user_login($frm->username, $frm->password)) {
$err->password = get_string('wrongpassword');
}
}
else {
// don't allow anyone to change the primary admin's password
$mainadmin = get_admin();
if($frm->username == $mainadmin->username) {
$err->password = get_string('adminprimarynoedit');
}
}
}
}