Changeset 1350 for trunk/wifidog-auth/wifidog/classes/Network.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/Network.php (modified) (2 diffs)

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

@@ -1079 +1079 @@
     {
         $username = 'SPLASH_ONLY_USER';
-
-        $user = User :: getUserByUsernameAndOrigin($username, $this);
-        if (!$user) {
-            $user = User :: createUser(get_guid(), $username, $this, '', '');
-            $user->setAccountStatus(ACCOUNT_STATUS_ALLOWED);
+        if(!empty($this->splashOnlyUser)) {
+            $user = $this->splashOnlyUser;
+        }
+        else
+        {
+            $user = User :: getUserByUsernameAndOrigin($username, $this);
+            if (!$user) {
+                $user = User :: createUser(get_guid(), $username, $this, '', '');
+                $user->setAccountStatus(ACCOUNT_STATUS_ALLOWED);
+            }
+            $this->splashOnlyUser = $user;
         }
         return $user;
@@ -1217 +1223 @@
             $network_id = $db->escapeString($this->_id);
             $splashOnlyUserId = $this->getSplashOnlyUser()->getId();
-            $sql = "SELECT ((SELECT COUNT(DISTINCT users.user_id) as count FROM users,connections NATURAL JOIN nodes JOIN networks ON (nodes.network_id=networks.network_id AND networks.network_id='$network_id') WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND users.user_id!='{$splashOnlyUserId}') + (SELECT COUNT(DISTINCT connections.user_mac) as count FROM users,connections NATURAL JOIN nodes JOIN networks ON (nodes.network_id=networks.network_id AND networks.network_id='$network_id') WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_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) NATURAL JOIN nodes JOIN networks ON (nodes.network_id=networks.network_id AND networks.network_id='$network_id') WHERE tokens.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND users.user_id!='{$splashOnlyUserId}') + (SELECT COUNT(DISTINCT connections.user_mac) as count FROM users,connections JOIN tokens USING (token_id) NATURAL JOIN nodes JOIN networks ON (nodes.network_id=networks.network_id AND networks.network_id='$network_id') WHERE tokens.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND users.user_id='{$splashOnlyUserId}')) AS count";
             $db->execSqlUniqueRes($sql, $row, false);