Changeset 8207

Timestamp:

Dec 21, 2010, 12:55:53 AM (14 years ago)

Author:

LucMorizur

Message:

Each of four cases should now work at identification

File:

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

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

@@ -354 +354 @@
   );
 
-  $LCAS_lang['char_replacement_set'][2] = array(
-  // 2 : case insensitive, accents insensitive
+  $LCAS_lang['char_replacement_set'][3] = array(
+  // 3 : case insensitive, accents insensitive
     
   // Latin
@@ -477 +477 @@
   );
 
-  $LCAS_lang['char_replacement_set'][3] = array(
-  // 3 : case sensitive, accents insensitive
+  $LCAS_lang['char_replacement_set'][2] = array(
+  // 2 : case sensitive, accents insensitive
     
   // Latin
@@ -864 +864 @@
   global $conf;
 
+  $u_d1 = $username;
   $username = LCAS_change_case($username, $rule);
+  $u_d2 = $username;
 
   if (isset($username))
-  {
+  { /*
     $query = "
 SELECT ".$conf['user_fields']['username']."
@@ -874 +876 @@
 LIMIT 1;";
 
-    list($username) = pwg_db_fetch_row(pwg_query($query));
+    list($username) = pwg_db_fetch_row(pwg_query($query)); */
+    
+    $LCAS_users = array();
+    $q = pwg_query("
+      SELECT ".$conf['user_fields']['username']." AS username
+      FROM `".USERS_TABLE."`;
+    ");
+    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;
+
+  
+   $fo=fopen (LCAS_PATH."admin/debuglog.txt","a") ;
+   fwrite($fo,"======================LG\r\n") ;
+   fwrite($fo,"u_d1 : ".$u_d1. "\r\n") ;
+   fwrite($fo,"u_d2 : ".$u_d2. "\r\n") ;
+   fwrite($fo,str_from_var3($LCAS_users). "\r\n") ;
+   fwrite($fo,"user_found : ".$user_found. "\r\n") ;
+   fwrite($fo,"username : ".$username. "\r\n") ;
+   fwrite($fo,"rule : ".$rule. "\r\n") ;
+   fclose($fo) ;
 
     return isset($username) ? $username : '';
@@ -880 +910 @@
 }
 
+
+/*
+ * str_from_var3($var)
+ * returns a string easing array var informations displaying in Piwigo :
+ *   _ the string return value starts with"<p style = "text-align:left;">" ;
+ *   _ all "TAB" characters (chr(10)) are replaced by "<br>" ;
+ *   _ all spaces are replaced by "&nbsp;".
+ *
+ * @param
+ *   $var : variable to display
+ * @return
+ *   string easy to display in Piwigo
+ */
+function str_from_var3($var) {
+  return
+   '<p style = "text-align:left;">'.
+   str_replace(
+    chr(10),'<br>',
+    str_replace(' ','&nbsp;', print_r /* var_dump */ ($var,true))
+   ).
+   '</p>';
+}
 
 // DebugLog function