Changeset 1456 for trunk/wifidog-auth/wifidog/classes/Authenticators/AuthenticatorLocalUser.php

Timestamp:

03/14/10 18:42:49 (3 years ago)

Author:

gbastien

Message:

Performance enhancement: better queries and indexes for case-insensitivity. One connection/request to server, content logging can now be turned off if desired.

Files:

• trunk/wifidog-auth/wifidog/classes/Authenticators/AuthenticatorLocalUser.php (modified) (2 diffs)

trunk/wifidog-auth/wifidog/classes/Authenticators/AuthenticatorLocalUser.php

@@ -126 +126 @@
             $password = $db->escapeString($password);
             
-            $comparison = ($this->getNetwork()->getUsernamesCaseSensitive()? ' = ': ' ILike ');
-            $sql = "SELECT user_id FROM users WHERE (username$comparison'$username' OR email$comparison'$username') AND account_origin='".$this->getNetwork()->getId()."' AND pass='$password_hash'";
+            $username = ($this->getNetwork()->getUsernamesCaseSensitive()? $username: strtolower($username));
+            $compareto = ($this->getNetwork()->getUsernamesCaseSensitive()? 'username' : 'lower(username)');
+            $sql = "SELECT user_id FROM users WHERE ($compareto = '$username' OR lower(email) = '$username') AND account_origin='".$this->getNetwork()->getId()."' AND pass='$password_hash'";
             $db->execSqlUniqueRes($sql, $user_info, false);
 
@@ -146 +147 @@
                  */
                 $user_info = null;
-                $db->execSqlUniqueRes("SELECT * FROM users WHERE (username$comparison'$username' OR email$comparison'$username') AND account_origin='".$this->getNetwork()->getId()."'", $user_info, false);
+                $db->execSqlUniqueRes("SELECT * FROM users WHERE ($compareto = '$username' OR lower(email) = '$username') AND account_origin='".$this->getNetwork()->getId()."'", $user_info, false);
 
                 if ($user_info == null) {