Changeset 8197

Timestamp:

Dec 19, 2010, 9:16:30 PM (13 years ago)

Author:

Eric

Message:

bug 2069 : First step to heaven ! ;-) Thanks to Luc who drives me to the solution. This is not fully functional and some tests are still under progress.

Location:

extensions/LCAS/trunk

Files:

• include/functions.inc.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)

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

@@ -851 +851 @@
 }
 
+/**
+ * Function called from main.inc.php - Returns exiting lowercase username in database
+ * 
+ * @param : $username typed in by user for identification
+ * 
+ * @return : lowercase $username found in database
+ * 
+ */
+function LCAS_SearchUsername($username)
+{
+  global $conf;
+  
+  if (isset($username))
+  {
+    $query = "
+SELECT ".$conf['user_fields']['username']."
+FROM ".USERS_TABLE."
+WHERE LOWER(".$conf['user_fields']['username'].") = '".strtolower($username)."'
+LIMIT 1;";
+
+    list($username) = pwg_db_fetch_assoc(pwg_query($query));;
+
+    return isset($username) ? $username : '';
+  }
+}
+
 
 // DebugLog function

extensions/LCAS/trunk/main.inc.php

@@ -47 +47 @@
 }
 
-// Trigger sensitivity on user identification
-if (script_basename() == 'identification')
+add_event_handler('init', 'LCAS_InitPage');
+ 
+function LCAS_InitPage()
 {
   global $conf;
-  
+
   $conf_LCAS= unserialize($conf['LoginCaseAccentsSensitivity']);
-  
-  /* Username non case sensitive */
-  //if (isset($conf_LCAS[1]) and $conf_LCAS[1] == 'false')
-  //{
-    // This does not work - Unable to invalidate try_log_user() function
-    add_event_handler('login_success', 'LCAS_action');
-    add_event_handler('login_failure', 'LCAS_action');
-    
-    function LCAS_action()
+ 
+/* User identification */
+  if (script_basename() == 'identification')
+  {
+    if (isset($_POST['username']))
     {
-  global $conf;
-  // retrieving the encrypted password of the login submitted
-  $query = '
-SELECT '.$conf['user_fields']['id'].' AS id,
-       '.$conf['user_fields']['password'].' AS password
-  FROM '.USERS_TABLE.'
-  WHERE LOWER('.$conf['user_fields']['username'].') = \''.pwg_db_real_escape_string(strtolower($_POST['username'])).'\'
-;';
-  $row = pwg_db_fetch_assoc(pwg_query($query));
-  if ($row['password'] == $conf['pass_convert']($_POST['password']))
-  {
-    //log_user($row['id'], $remember_me);
-    //trigger_action('login_success', stripslashes($_POST['username']));
-    //return true;
-$var1 = 'Typed login : '.$_POST['username'];
-$var2 = 'Typed login lowercase : '.strtolower($_POST['username']);
-$var3 = 'Typed pwd hash : '.$conf['pass_convert'] ($_POST['password']);
-$var4 = 'Pwd hash in DB : '.$row['password'];
-$var5 = 'User ID in DB : '.$row['id'];
-/* ********************** */
-DebugLog($var1,$var2,$var3,$var4,$var5);
-/* ********************** */
-
+      /* User non case sensitive */
+      if (isset($conf_LCAS[0]) and $conf_LCAS[0] == 'false')
+      {
+        $new_username =  LCAS_SearchUsername($_POST['username']); // Testing still under progress - This is not fully functionnal !
+        $_POST['username'] = $new_username == '' ? $_POST['username'] : $new_username;
+      }
+    }
   }
-  //trigger_action('login_failure', stripslashes($_POST['username']));
-  return false;
-    }
-  //}
 }
 ?>