Changeset 1455 for branches/newtoken/wifidog/classes/Token.php

Timestamp:

03/03/10 19:27:35 (2 years ago)

Author:

gbastien

Message:

* Modifs on the token architecture: some corrections to connection and token deletions and garbage collection because token are now reusable

Files:

• branches/newtoken/wifidog/classes/Token.php (modified) (2 diffs)

branches/newtoken/wifidog/classes/Token.php

@@ -96 +96 @@
                  * Delete all unused tokens for this user, so we don't fill the database
                  * with them
+                 * But make sure the unused token is not associated with previous successful connections, so when the incoming field is null
                  */
-                $sql = "DELETE FROM connections USING tokens "."WHERE tokens.token_id=connections.token_id AND token_status='".TOKEN_UNUSED."' AND user_id = '".$user->getId()."';\n";
+                $sql = "DELETE FROM connections USING tokens "."WHERE tokens.token_id=connections.token_id AND token_status='".TOKEN_UNUSED."' AND incoming is null AND user_id = '".$user->getId()."';\n";
                 $db->execSqlUpdate($sql, false);
 
@@ -116 +117 @@
                     // look for an existing token that can be reused
                     // get all unexpired tokens ordered by first used time
+                    // TODO: The token may be owned by someone but be unused and have no connection associated with it
                     $sql =  "SELECT t.token_id, tt.token_max_total_data, tt.token_max_incoming_data, tt.token_max_outgoing_data, 
                                                                 LEAST((c.first_used_time + tt.token_max_usage_duration - c.total_connection_duration),