Changeset 8475

Timestamp:

01/05/11 10:45:18 (2 years ago)

Author:

LucMorizur

Message:

Ambiguous accounts are logged in only when properly typed in; but not ambiguous accounts will benefit of LCAS.

Files:

• extensions/LCAS/trunk/include/functions.inc.php (modified) (2 diffs)

extensions/LCAS/trunk/include/functions.inc.php

@@ -825 +825 @@
   global $conf;
 
-  $u_d1 = $username;
-  $username = LCAS_change_case($username, $rule);
-  $u_d2 = $username;
+  $username_c = LCAS_change_case($username, $rule);
 
   if (isset($username))
@@ -839 +837 @@
     while ($r = pwg_db_fetch_assoc($q))
      $LCAS_users[$r['username']] = LCAS_change_case($r['username'], $rule);
-     // $LCAS_users est maintenant un tableau associatif où la clé est le compte tel qu'enregistré en DB,
-     // et la valeur est ce même compte, écrit selon LCAS_change_case() pour la règle en cours
-     
-    $user_found = array_search($username, $LCAS_users);
-    // $user_found vaut false si le username actuellement testé ne fait pas partie des valeurs de $LCAS_users ;
-    // sinon $user_found vaut la clé dans $LCAS_users, correspondant au compte trouvé.
-    // Donc le compte tel qu'écrit en DB, mais reconnu tel qu'écrit selon LCAS_change_case() pour la règle en cours 
-    
-    $username = ($user_found === false) ? $username : $user_found;
-
-    return isset($username) ? $username : '';
+     // $LCAS_users is now an associative table where the key is the account as
+     // registered in the DB, and the value is this same account, in lower case
+
+    $users_found = array_keys($LCAS_users, $username_c);
+    // $users_found is now a table of which the values are all the accounts
+    // which can be written in lowercase the same way as $username
+    if (count($users_found) != 1) // If ambiguous, don't allow lowercase writing
+     return $username;            // but normal writing will work
+    else
+     return $users_found[0];
   }
 }