Permalink
Browse files

Merge branch 'w09_MDL-26564_20_uploadusers' of git://github.com/skoda…

…k/moodle
  • Loading branch information...
2 parents 431ac39 + 2197b64 commit 5eb1e14aa47ddb2e3046348c584482141afcc9fe @stronk7 stronk7 committed Mar 1, 2011
Showing with 3 additions and 2 deletions.
  1. +3 −2 admin/uploaduser.php
View
@@ -538,7 +538,7 @@
} 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 @@
}
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 @@
}
} 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++;

0 comments on commit 5eb1e14

Please sign in to comment.