diff options
| author | Michael Tänzer <neo@nhng.de> | 2011-08-01 03:20:04 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2011-08-01 03:20:04 +0200 |
| commit | 4230707947899c893fda70cd9addd592580a477e (patch) | |
| tree | ee53bebccdbecbfaa27a83e905f0b7c5953622d9 /includes | |
| parent | d378e1f64b257c431f4f76986a123715e46ea888 (diff) | |
| parent | e7368868ba88433956ad034fb7883d2dcd9566be (diff) | |
| download | cacert-devel-4230707947899c893fda70cd9addd592580a477e.tar.gz cacert-devel-4230707947899c893fda70cd9addd592580a477e.tar.xz cacert-devel-4230707947899c893fda70cd9addd592580a477e.zip | |
Merge branch 'bug-637' into release
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/general.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/includes/general.php b/includes/general.php index 16b75e4..cb17e63 100644 --- a/includes/general.php +++ b/includes/general.php @@ -248,8 +248,7 @@ } } - function checkpw($pwd, $email, $fname, $mname, $lname, $suffix) - { + function checkpwlight($pwd) { $points = 0; if(strlen($pwd) > 15) @@ -279,7 +278,19 @@ $points++; //echo "Points due to length and charset: $points<br/>"; + + // check for historical password proposal + if ($pwd === "Fr3d Sm|7h") { + return 0; + } + + return $points; + } + function checkpw($pwd, $email, $fname, $mname, $lname, $suffix) + { + $points = checkpwlight($pwd); + if(@strstr(strtolower($pwd), strtolower($email))) $points--; |