Changeset 1331

Timestamp:

03/06/08 22:29:33 (7 months ago)

Author:

benoitg

Message:

• Fix #438. Not Node::getNumOnlineUsers() will count every users connected (once for every account), except the splash-only user + every mac adresses connecting as the splash-only user.
  
  • Network::getNumOnlineUsers() use the same counting method
    
  • Network.php: Reformat variables names according to coding standards.
    

Files:

• trunk/wifidog-auth/CHANGELOG (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Network.php (modified) (9 diffs)
• trunk/wifidog-auth/wifidog/classes/Node.php (modified) (4 diffs)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
-# $Id$
+2008-03-06 Benoit Grégoire  <bock@step.polymtl.ca>
+    * Fix #438.  Not Node::getNumOnlineUsers() will count every users connected (once for every account), except the splash-only user + every mac adresses connecting as the splash-only user.
+        * Network::getNumOnlineUsers() use the same counting method
+        * Network.php:  Reformat variables names according to coding standards.
+        
-2008-03-02 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Fix #431: Don't even display the Signup button if none of the networks allow signing up.  Allow Authenticators to define the signup URL themselves.

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

@@ -507 +507 @@
-
-        // Init values
-_
+
-
-        if ($value != $this->getCreationDate()) {
-            $value = $db->escapeString($value);
-_
+
-            $this->refresh();
-        }
-
-_
+
-    }
-
@@ -655 +655 @@
-    {
-        // Init values
-_
-_
-_
+
+
+
-
-        // Create new cache object with a lifetime of one week
-_
+
-
-        // Check if caching has been enabled.
-_
-_cachedData = $_
-
-_
+
+cachedData = $
+
+
-                // Return cached data.
-_
-_authenticators = $_
-
-
-
-_
-_
-_dirHandle = @ opendir($_
-
-_
+
+authenticators = $
+
+
+
+
+
+dirHandle = @ opendir($
+
+
-                // Loop over the directory
-_filename = readdir($_
+filename = readdir($
-                    // Loop through sub-directories of Content
-_filename != '.' && $_
-_
-
-_filename, $_
+filename != '.' && $
+
+
+filename, $
-                            // Only add files containing a corresponding Authenticator class
-_dir}/{$_
-_authenticators[] = $_
+dir}/{$
+authenticators[] = $
-                            }
-                        }
@@ -693 +693 @@
-                }
-
-_
+
-            }
-            else {
-_
+
-            }
-
-            // Sort the result array
-_
+
-
-            // Check if caching has been enabled.
-_
+
-                // Save results into cache, because it wasn't saved into cache before.
-_cache->saveCachedData($_
-
-
-
-_
+cache->saveCachedData($
+
+
+
+
-    }
-
@@ -730 +730 @@
-
-        // Init values
-_
-
-_
-_authenticators[] = array ($_authenticator, $_
-
-
-_
+
+
+
+authenticators[] = array ($authenticator, $
+
+
+
-
-        if ($pre_selected_authenticator) {
-_
+
-        }
-        else {
-_
-
-
-_html = FormSelectGenerator :: generateFromArray($_authenticators, $_selectedID, $_
-
-_
+
+
+
+html = FormSelectGenerator :: generateFromArray($authenticators, $selectedID, $
+
+
-    }
-
@@ -1026 +1026 @@
-
-        // Init values
-_
-
-_
+
+
+
-
-        if ($pre_selected_map_type) {
-_
+
-        }
-        else {
-_
-
-
-_html = FormSelectGenerator :: generateFromArray($_map_types, $_selectedID, $_
-
-_
+
+
+
+html = FormSelectGenerator :: generateFromArray($map_types, $selectedID, $
+
+
-    }
-
@@ -1078 +1078 @@
-
-        // Init values
-_
-_
-_
-_
+
+
+
+
-
-        // Create new cache objects (valid for 1 minute)
-_
+
-
-        // Check if caching has been enabled.
-_
-_cachedData = $_
-
-_
+
+cachedData = $
+
+
-                // Return cached data.
-_
-_retval = $_
-
-
-
-_
+
+retval = $
+
+
+
+
-            // Get number of users
-_
-_network_id'", $_
+
+network_id'", $
-
-            // String has been found
-_retval = $_
+retval = $
-
-            // Check if caching has been enabled.
-_
+
-                // Save data into cache, because it wasn't saved into cache before.
-_cache->saveCachedData($_
-
-
-
-_
+cache->saveCachedData($
+
+
+
+
-    }
-
@@ -1126 +1126 @@
-
-        // Init values
-_
-_
-_
-_
+
+
+
+
-
-        // Create new cache objects (valid for 1 minute)
-_
+
-
-        // Check if caching has been enabled.
-_
-_cachedData = $_
-
-_
+
+cachedData = $
+
+
-                // Return cached data.
-_
-_retval = $_
-
-
-
-_
+
+retval = $
+
+
+
+
-            // Get number of valid users
-_
-_network_id'", $_
+
+network_id'", $
-            // String has been found
-_retval = $_
+retval = $
-
-            // Check if caching has been enabled.
-_
+
-                // Save data into cache, because it wasn't saved into cache before.
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-     * @return int Number of online users
-     */
@@ -1174 +1173 @@
-
-        // Init values
-_
-_
-_
-_
+
+
+
+
-
-        // Create new cache objects (valid for 1 minute)
-_
+
-
-        // Check if caching has been enabled.
-_
-_cachedData = $_
-
-_
+
+cachedData = $
+
+
-                // Return cached data.
-_
-_retval = $_
-
-
-
-_
+
+retval = $
+
+
+
+
-            // Get number of online users
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            // String has been found
-_retval = $_
+retval = $
-
-            // Check if caching has been enabled.
-_
+
-                // Save data into cache, because it wasn't saved into cache before.
-_cache->saveCachedData($_
-
-
-
-_
-
-
-
-register
-
-
-
-
-
-
-
-
-
-_
-_
-_
-_
+cache->saveCachedData($
+
+
+
+
+
+
+
+deploy
+
+deployed 
+
+Deployed
+
+
+
+
+
+
+
+
+
-
-        // Create new cache objects (valid for 5 minutes)
-_cache = new Cache('network_'.$this->_id.'_num
+cache = new Cache('network_'.$this->_id.'_num_deployed
-
-        // Check if caching has been enabled.
-_
-_cachedData = $_
-
-_
+
+cachedData = $
+
+
-                // Return cached data.
-_
-_retval = $_
-
-
-
-_
-
-_
-_network_id'", $_
+
+retval = $
+
+
+
+
+deployed 
+
+network_id' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE')", $
-
-            // String has been found
-_retval = $_
+retval = $
-
-            // Check if caching has been enabled.
-_
+
-                // Save data into cache, because it wasn't saved into cache before.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    }
-
@@ -1320 +1320 @@
-
-        // Init values
-_
-_
-_
-_
+
+
+
+
-
-        // Create new cache objects (valid for 5 minutes)
-        if ($nonMonitoredOnly) {
-_
+
-        } else {
-_
+
-        }
-
-        // Check if caching has been enabled.
-_
-_cachedData = $_
-
-_
+
+cachedData = $
+
+
-                // Return cached data.
-_
-_retval = $_
-
-
-
-_
+
+retval = $
+
+
+
+
-            // Get number of online nodes
-_
+
-
-            if ($nonMonitoredOnly) {
-_network_id' AND node_deployment_status = 'NON_WIFIDOG_NODE' AND ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) >= interval '5 minutes')", $_
+network_id' AND node_deployment_status = 'NON_WIFIDOG_NODE' AND ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) >= interval '5 minutes')", $
-            } else {
-_network_id' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') AND ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes')", $_
+network_id' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') AND ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes')", $
-            }
-
-            // String has been found
-_retval = $_
+retval = $
-
-            // Check if caching has been enabled.
-_
+
-                // Save data into cache, because it wasn't saved into cache before.
-_cache->saveCachedData($_
-
-
-
-_
+cache->saveCachedData($
+
+
+
+
-    }
-

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

@@ -1105 +1105 @@
-        }
-        else {
-
+ 
-            $_data = $this->getName();
-            $_html_node_information[] = InterfaceElements::generateAdminSectionContainer("node_name", $_title, $_data);
@@ -1309 +1309 @@
-
-        // Creation date
-
+ 
-        $permArray[]=array(Permission::P('NETWORK_PERM_EDIT_ANY_NODE_CONFIG'), $network);
-        $permArray[]=array(Permission::P('NODE_PERM_EDIT_DEPLOYMENT_DATE'), $this);
@@ -1573 +1573 @@
-    /**
-     * Find out how many users are online this specific Node
-
+ Counts every user account connected (once for every account), except the splash-only user + every mac adresses connecting as the splash-only user
-     * @return int Number of online users
-     *
@@ -1580 +1580 @@
-    public function getNumOnlineUsers()
-    {
-         
-        $db = AbstractDb::getObject();
-
-        // Init values
-        $retval = array ();
-        $row = null;
-
-
-
-
-
-
+
+
+
-
-        return $row['count'];