Changeset 1350 for trunk/wifidog-auth/wifidog/classes/Node.php

Timestamp:

06/10/08 00:25:06 (4 years ago)

Author:

benoitg

Message:

• Begin implementing http://dev.wifidog.org/wiki/doc/developer/TokenArchitecture. This is a first step: necessary SQL schema changes, and adapt the current functionnality to the new schema to have a baseline. Everything should work as before, please notify me if you notice anything strange...

Files:

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

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

@@ -1543 +1543 @@
 
     private function getOnlineUsersSql() {
-        return "SELECT users.user_id FROM users,connections WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}'";
+        return "SELECT users.user_id FROM users,connections JOIN tokens USING (token_id) WHERE tokens.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}'";
     }
     /**
@@ -1585 +1585 @@
         $row = null;
         $splashOnlyUserId = $this->getNetwork()->getSplashOnlyUser()->getId();
-        $sql = "SELECT ((SELECT COUNT(DISTINCT users.user_id) as count FROM users,connections WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}' AND users.user_id!='{$splashOnlyUserId}') + (SELECT COUNT(DISTINCT connections.user_mac) as count FROM users,connections WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}' AND users.user_id='{$splashOnlyUserId}')) AS count";
+        $sql = "SELECT ((SELECT COUNT(DISTINCT users.user_id) as count FROM users,connections JOIN tokens USING (token_id) WHERE tokens.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}' AND users.user_id!='{$splashOnlyUserId}') + (SELECT COUNT(DISTINCT connections.user_mac) as count FROM users,connections JOIN tokens USING (token_id) WHERE tokens.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}' AND users.user_id='{$splashOnlyUserId}')) AS count";
         $db->execSqlUniqueRes($sql, $row, false);