Browse files

Merge branch 'MDL-29893-m20' of git://github.com/ankitagarwal/moodle …

…into MOODLE_20_STABLE
  • Loading branch information...
2 parents 96b7f2d + 6eaf677 commit 5174eeebe3bac77c9dd4e92cf8dc4dda220cd4b1 Sam Hemelryk committed Nov 17, 2011
Showing with 7 additions and 2 deletions.
  1. +7 −2 lib/moodlelib.php
View
9 lib/moodlelib.php
@@ -8311,12 +8311,17 @@ function generate_password($maxlen=10) {
$filler1 = $fillers[rand(0, strlen($fillers) - 1)];
$password = $word1 . $filler1 . $word2;
} else {
- $maxlen = !empty($CFG->minpasswordlength) ? $CFG->minpasswordlength : 0;
+ $minlen = !empty($CFG->minpasswordlength) ? $CFG->minpasswordlength : 0;
$digits = $CFG->minpassworddigits;
$lower = $CFG->minpasswordlower;
$upper = $CFG->minpasswordupper;
$nonalphanum = $CFG->minpasswordnonalphanum;
- $additional = $maxlen - ($lower + $upper + $digits + $nonalphanum);
+ $total = $lower + $upper + $digits + $nonalphanum;
+ // minlength should be the greater one of the two ( $minlen and $total )
+ $minlen = $minlen < $total ? $total : $minlen;
+ // maxlen can never be smaller than minlen
+ $maxlen = $minlen > $maxlen ? $minlen : $maxlen;
+ $additional = $maxlen - $total;
// Make sure we have enough characters to fulfill
// complexity requirements

0 comments on commit 5174eee

Please sign in to comment.