Changeset 18890

Timestamp:

Nov 2, 2012, 3:39:01 PM (11 years ago)

Author:

plg

Message:

feature 2727: improved backward compatibility with pass_convert

File:

• trunk/include/functions_user.inc.php (modified) (1 diff)

trunk/include/functions_user.inc.php

@@ -1134 +1134 @@
   global $conf, $pwg_hasher;
 
-  // If the hash is still md5...
-  if (strlen($hash) <= 32)
-  {
-    $check = ($hash == md5($password));
+  // If the password has not been hashed with the current algorithm.
+  if (strpos('$P', $hash) !== 0)
+  {
+    if (!empty($conf['pass_convert']))
+    {
+      $check = ($hash == $conf['pass_convert']($password));
+    }
+    else
+    {
+      $check = ($hash == md5($password));
+    }
     
     if ($check and isset($user_id) and !$conf['external_authentification'])