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

Merge branch 'w09_MDL-26564_20_uploadusers' of git://github.com/skodak/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-03-01 19:02:04 +01:00
parent 431ac39634 2197b642b3
commit 5eb1e14aa4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/uploaduser.php
+3 -2
View File
@@ -538,7 +538,7 @@ if ($formdata = $mform2->is_cancelled()) {
} else if (!empty($user->password)) {
if ($updatepasswords) {
$errmsg = null;
$weak = check_password_policy($user->password, $errmsg);
$weak = !check_password_policy($user->password, $errmsg);
if ($resetpasswords == UU_PWRESET_ALL or ($resetpasswords == UU_PWRESET_WEAK and $weak)) {
if ($weak) {
$weakpasswords++;
@@ -550,6 +550,7 @@ if ($formdata = $mform2->is_cancelled()) {
}
unset_user_preference('create_password', $existinguser); // no need to create password any more
$existinguser->password = hash_internal_user_password($user->password);
$upt->track('password', $user->password, 'normal', false);
} else {
// do not print password when not changed
$upt->track('password', '', 'normal', false);
@@ -644,7 +645,7 @@ if ($formdata = $mform2->is_cancelled()) {
}
} else {
$errmsg = null;
$weak = check_password_policy($user->password, $errmsg);
$weak = !check_password_policy($user->password, $errmsg);
if ($resetpasswords == UU_PWRESET_ALL or ($resetpasswords == UU_PWRESET_WEAK and $weak)) {
if ($weak) {
$weakpasswords++;