Changeset 1446 for branches/newtoken/wifidog/auth/index.php

Timestamp:

02/11/10 17:34:27 (2 years ago)

Author:

gbastien

Message:

* Merged recent changes in the trunk into this branch
* New token architecture not yet fully functional, nor tested, but ...

• can now edit token templates for different context of tokens (from the edit netork interface at the bottom of page)
• Users connected through a wifidog gateway can view their connection token information

Files:

• branches/newtoken/wifidog/auth/index.php (modified) (2 diffs)

branches/newtoken/wifidog/auth/index.php

@@ -52 +52 @@
 require_once('classes/Network.php');
 require_once('classes/User.php');
+require_once('classes/Connection.php');
 $db = AbstractDb::getObject();
 $auth_response = ACCOUNT_STATUS_DENIED;
@@ -60 +61 @@
 {
     $token = $db->escapeString($_REQUEST['token']);
-    $dbRetval = $db->execSqlUniqueRes("SELECT CURRENT_TIMESTAMP, *, CASE WHEN ((CURRENT_TIMESTAMP - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired FROM connections JOIN tokens USING (token_id) JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.token_id='$token'", $info, false);
+    try {
+        $connection  = Connection::getObject($token);
+        $info = $connection->getRow();
+    } catch (Exception $e) {
+        $auth_message .= "| Error: couldn't retrieve the requested token: $token because of a SQL error. ";
+        $auth_response = ACCOUNT_STATUS_ERROR;
+    }
+    /* $dbRetval = $db->execSqlUniqueRes("SELECT CURRENT_TIMESTAMP, *, CASE WHEN ((CURRENT_TIMESTAMP - reg_date) > networks.validation_grace_time) THEN true ELSE false END AS validation_grace_time_expired 
+                FROM connections 
+                JOIN tokens USING (token_id) 
+                JOIN users ON (users.user_id=connections.user_id) 
+                JOIN networks ON (users.account_origin = networks.network_id) 
+                WHERE connections.token_id='$token' ORDER BY conn_id DESC LIMIT 1", $info, false);
+    
     if($dbRetval==false){
         $auth_message .= "| Error: couldn't retrieve the requested token: $token because of a SQL error. ";
         $auth_response = ACCOUNT_STATUS_ERROR;
-    }
+    }*/
 }
 else {