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

Timestamp:

10/30/09 14:21:05 (4 years ago)

Author:

gbastien

Message:

* Network can now be set as case insensitive. Emails are now never case sensitive and usernames' case sensitivity is consistent with network settings (#616)
* Yet again some tab alignment

Files:

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

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

@@ -119 +119 @@
         }
         else{
+            /* gbastien: this is not reusable!!, why not use password directly? */
+            //$password_hash = User::passwordHash($_REQUEST['password']);
+            $password_hash = User::passwordHash($password);
             $password = $db->escapeString($password);
-            $password_hash = User::passwordHash($_REQUEST['password']);
-
-            $sql = "SELECT user_id FROM users WHERE (username='$username' OR email='$username') AND account_origin='".$this->getNetwork()->getId()."' AND pass='$password_hash'";
+            
+            $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'";
             $db->execSqlUniqueRes($sql, $user_info, false);
 
@@ -141 +144 @@
                  */
                 $user_info = null;
-                $db->execSqlUniqueRes("SELECT * FROM users WHERE (username='$username' OR email='$username') AND account_origin='".$this->getNetwork()->getId()."'", $user_info, false);
+                $db->execSqlUniqueRes("SELECT * FROM users WHERE (username$comparison'$username' OR email$comparison'$username') AND account_origin='".$this->getNetwork()->getId()."'", $user_info, false);
 
                 if ($user_info == null) {