Changeset 877 for trunk/wifidog-auth/wifidog/classes/Authenticator.php

Timestamp:

12/29/05 16:29:35 (7 years ago)

Author:

fproulx

Message:

2005-12-29 Fran�ois Proulx <francois.proulx@…>

• Added Aidan's file_exists_incpath function to Dependencies class
• Translated and standardized most of PostgreSQL abstraction class.
• Removed blank lines at end of many files
• Tested the new Phlickr package, which fixes URL on Flickr

Files:

• trunk/wifidog-auth/wifidog/classes/Authenticator.php (modified) (7 diffs)

trunk/wifidog-auth/wifidog/classes/Authenticator.php

@@ -77 +77 @@
         if (!empty ($conn_id))
         {
-            $db->ExecSqlUniqueRes("SELECT NOW(), *, CASE WHEN ((NOW() - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired FROM connections JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.conn_id='$conn_id'", $info, false);
+            $db->execSqlUniqueRes("SELECT NOW(), *, CASE WHEN ((NOW() - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired FROM connections JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.conn_id='$conn_id'", $info, false);
 
             $user = User :: getObject($info['user_id']);
@@ -94 +94 @@
                 $sql = "SELECT conn_id FROM connections WHERE user_id = '{$user->getId()}' AND node_id='{$node->getId()}' AND token_status='".TOKEN_INUSE."';\n";
                 $conn_rows = null;
-                $db->ExecSql($sql, $conn_rows, false);
+                $db->execSql($sql, $conn_rows, false);
                 if ($conn_rows)
                 {
@@ -111 +111 @@
             $sql = "SELECT conn_id FROM connections WHERE user_id = '{$user->getId()}' AND token_status='".TOKEN_INUSE."';\n";
             $conn_rows = null;
-            $db->ExecSql($sql, $conn_rows, false);
+            $db->execSql($sql, $conn_rows, false);
             if ($conn_rows)
             {
@@ -131 +131 @@
         global $db;
         $conn_id = $db->escapeString($conn_id);
-        $db->ExecSqlUniqueRes("SELECT NOW(), *, CASE WHEN ((NOW() - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired FROM connections JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.conn_id='$conn_id'", $info, false);
+        $db->execSqlUniqueRes("SELECT NOW(), *, CASE WHEN ((NOW() - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired FROM connections JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.conn_id='$conn_id'", $info, false);
         $network = Network :: getObject($info['network_id']);
         $splash_user_id = $network->getSplashOnlyUser()->getId();
         $auth_response = $info['account_status'];
         /* Login the user */
-        $mac = $db->EscapeString($_REQUEST['mac']);
-        $ip = $db->EscapeString($_REQUEST['ip']);
+        $mac = $db->escapeString($_REQUEST['mac']);
+        $ip = $db->escapeString($_REQUEST['ip']);
         $sql = "UPDATE connections SET "."token_status='".TOKEN_INUSE."',"."user_mac='$mac',"."user_ip='$ip',"."last_updated=NOW()"."WHERE conn_id='{$conn_id}';\n";
-        $db->ExecSqlUpdate($sql, false);
+        $db->execSqlUpdate($sql, false);
         if ($splash_user_id != $info['user_id'] && $network->getMultipleLoginAllowed() == false)
         {
             /* The user isn't the splash_only user and the network config does not allow multiple logins.
              * Logging in with a new token implies that all other active tokens should expire */
-            $token = $db->EscapeString($_REQUEST['token']);
+            $token = $db->escapeString($_REQUEST['token']);
             $sql = "SELECT * FROM connections WHERE user_id = '{$info['user_id']}' AND token_status='".TOKEN_INUSE."' AND token!='$token';\n";
             $conn_rows = array ();
-            $db->ExecSql($sql, $conn_rows, false);
+            $db->execSql($sql, $conn_rows, false);
             if (isset ($conn_rows))
             {
@@ -159 +159 @@
         /* Delete all unused tokens for this user, so we don't fill the database with them */
         $sql = "DELETE FROM connections "."WHERE token_status='".TOKEN_UNUSED."' AND user_id = '{$info['user_id']}';\n";
-        $db->ExecSqlUpdate($sql, false);
+        $db->execSqlUpdate($sql, false);
     }
 
@@ -169 +169 @@
         global $db;
         $conn_id = $db->escapeString($conn_id);
-        $db->ExecSqlUpdate("UPDATE connections SET "."incoming='$incoming',"."outgoing='$outgoing',"."last_updated=NOW() "."WHERE conn_id='{$conn_id}'");
+        $db->execSqlUpdate("UPDATE connections SET "."incoming='$incoming',"."outgoing='$outgoing',"."last_updated=NOW() "."WHERE conn_id='{$conn_id}'");
     }
 
@@ -180 +180 @@
         global $db;
         $conn_id = $db->escapeString($conn_id);
-        $db->ExecSqlUpdate("UPDATE connections SET "."timestamp_out=NOW(),"."token_status='".TOKEN_USED."' "."WHERE conn_id='{$conn_id}';\n", false);
+        $db->execSqlUpdate("UPDATE connections SET "."timestamp_out=NOW(),"."token_status='".TOKEN_USED."' "."WHERE conn_id='{$conn_id}';\n", false);
     }