Changeset 1391

Timestamp:

06/09/09 21:16:53 (4 years ago)

Author:

benoitg

Message:

* Commit slightly modified patch contributed by Zap Sherbrooke: Allow using the multiple account feature while keeping a common userbase. Enabled in server configuration.

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Authenticator.php (modified) (1 diff)
• wifidog/classes/FormSelectGenerator.php (modified) (1 diff)
• wifidog/classes/MainUI.php (modified) (1 diff)
• wifidog/classes/Network.php (modified) (3 diffs)
• wifidog/classes/Node.php (modified) (8 diffs)
• wifidog/classes/NodeList.php (modified) (2 diffs)
• wifidog/classes/NodeLists/NodeListHTML.php (modified) (5 diffs)
• wifidog/classes/Server.php (modified) (5 diffs)
• wifidog/hotspot_status.php (modified) (1 diff)
• wifidog/hotspots_map.php (modified) (1 diff)
• wifidog/include/schema_validate.php (modified) (6 diffs)
• wifidog/index.php (modified) (2 diffs)
• wifidog/lost_password.php (modified) (1 diff)
• wifidog/lost_username.php (modified) (1 diff)
• wifidog/node_list.php (modified) (2 diffs)
• wifidog/resend_validation.php (modified) (1 diff)
• wifidog/signup.php (modified) (3 diffs)
• wifidog/templates/node_list.html (modified) (1 diff)
• wifidog/templates/sites/hotspot_status.tpl (modified) (1 diff)
• wifidog/templates/sites/indexglobaluser.tpl (added)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 # $Id$
+2009-06-09 Benoit Grégoire <benoitg@coeus.ca>
+        * Commit slightly modified patch contributed by Zap Sherbrooke:  Allow using the multiple account feature while keeping a common userbase.  Enabled in server configuration.
+
+
 2008-10-13 Robin Jones
         * fixed #498 curley brace missing in portal.php

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

@@ -143 +143 @@
         $smarty=SmartyWiFiDog::getObject();
         // Set network selector
-        $smarty->assign('selectNetworkUI', Network::getSelectUI('auth_source', $networkUserData));
+        $network_array = Network::getAllNetworks();
+        $default_network = Network::getDefaultNetwork();
+ 
+        foreach ($network_array as $network) {
+                if ($network->getName() == $default_network)
+                        $default_network_param = $network->getId();
+        }
+        if (Server::getServer()->getUseGlobalUserAccounts())
+                $smarty->assign('selectNetworkUI', "<input type=\"hidden\" name=\"auth_source\" value='$default_network_param' />");
+        else
+                $smarty->assign('selectNetworkUI', Network::getSelectUI('auth_source', $networkUserData));
+
         // Set user details
         $smarty->assign('user_id', $selectedUser ? $selectedUser->getId() : "");

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

@@ -193 +193 @@
          * @return string The HTML SELECT element definition string For example: "onclick='submit();'
          */
-        public static function generateFromArray($array, $selectedPrimaryKey, $userPrefix, $objectPrefix, $allowNullValues, $nullCaptionString = ' - - - ', $additionalSelectAttribute = "", $max_length = -1)
-        {
+        public static function generateFromArray($array, $selectedPrimaryKey, $userPrefix, $objectPrefix, $allowNullValues, $nullCaptionString = null, $additionalSelectAttribute = "", $max_length = -1)
+        {
+        $nullCaptionString = $nullCaptionString===null?' - - - ':$nullCaptionString;
             $retval = "";
             $retval .= "<select id='{$userPrefix}{$objectPrefix}' name='{$userPrefix}{$objectPrefix}' {$additionalSelectAttribute}>\n";

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

@@ -229 +229 @@
 
         // Set default title
-        $this->title = Network :: getCurrentNetwork()->getName() . ' ' . _("authentication server");
+        if(Server::getServer()->getUseGlobalUserAccounts()) {
+            $this->title = _("authentication server");
+        } else {
+            $this->title = Network :: getCurrentNetwork()->getName() . ' ' . _("authentication server");
+        }
         // Init the content array
         $current_content_sql = "SELECT display_area FROM content_available_display_areas\n";

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

@@ -236 +236 @@
     public static function getSelectUI($user_prefix, $userData=null)
     {
+        $userData=$userData===null?array():$userData;
         $html = '';
         $name = $user_prefix;
         //pretty_print_r($userData);
-        !empty($userData['preSelectedObject'])?$selected_id=$userData['preSelectedObject']->getId():$selected_id=self::getDefaultNetwork()->getId();
+        array_key_exists('preSelectedObject',$userData)?(empty($userData['preSelectedObject'])?$selected_id=null:$selected_id=$userData['preSelectedObject']->getId()):$selected_id=self::getDefaultNetwork()->getId();
         !empty($userData['additionalWhere'])?$additional_where=$userData['additionalWhere']:$additional_where=null;
         !empty($userData['allowEmpty'])?$allow_empty=$userData['allowEmpty']:$allow_empty=false;
+        !empty($userData['nullCaptionString'])?$nullCaptionString=$userData['nullCaptionString']:$nullCaptionString=null;
+        !empty($userData['onChange'])?$onChangeString=$userData['onChange']:$onChangeString="";
 
         $db = AbstractDb::getObject();
@@ -260 +263 @@
             }
             $html .= _("Network:")." \n";
-            $html .= FormSelectGenerator :: generateFromArray($tab, $selected_id, $name, null, $allow_empty);
+            $html .= FormSelectGenerator :: generateFromArray($tab, $selected_id, $name, null, $allow_empty, $nullCaptionString, "onchange='$onChangeString'");
 
         } else {
@@ -355 +358 @@
         $db = AbstractDb::getObject();
         $network_id_str = $db->escapeString($p_network_id);
+        if ($network_id_str == "")
+            $network_id_str = $db->escapeString(self::getDefaultNetwork()->getId());
+
         $sql = "SELECT *, EXTRACT(EPOCH FROM validation_grace_time) as validation_grace_time_seconds FROM networks WHERE network_id='$network_id_str'";
         $row = null;

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

@@ -629 +629 @@
     }
 
+    /**
+     * Get the selected network ID
+     *
+     * @param string $user_prefix An identifier provided by the programmer to
+     *                            recognise it's generated form
+     *
+     * @return string The deployment status
+
+     */
+    public function processSelectNetworkId($user_prefix)
+    {
+        $object = null;
+        $name = "{$user_prefix}";
+        return $_REQUEST[$name];
+    }
+
     /** @param $id The id of the node
      * @param $idType 'NODE_ID' or 'GATEWAY_ID'*/
@@ -706 +722 @@
     }
 
+    
+    function setNetwork(Network $network)
+    {
+        $net = $this->mDb->escapeString($network->getId());
+        $this->mDb->execSqlUpdate("UPDATE nodes SET network_id = '{$net}' WHERE node_id = '{$this->getId()}'");
+        $this->refresh();
+    }
+    
+    
     /** Get a GisPoint object ; altide is not supported yet
      */
@@ -1020 +1045 @@
     }
 
-   /** redirect users to the original requested web page instead of portal 
-      Must be enabled in the Network configuration to have any effect 
-      @return a string */ 
-     function getPortalOriginalUrlAllowed() 
-     { 
-         return (($this->_row['allow_original_url_redirect'] == 't') ? true : false); 
-     } 
-  
-     /** redirect users to the original requested web page instead of portal 
-      Must be enabled in the Network configuration to have any effect 
-      @return true on success, false on failure */ 
-     function setPortalOriginalUrlAllowed($value) 
-     { 
-         $retval = true; 
-         if ($value != $this->getPortalOriginalUrlAllowed()) 
-         { 
-             $db = AbstractDb::getObject(); 
-             $value ? $value = 'TRUE' : $value = 'FALSE';
-             $retval = $db->execSqlUpdate("UPDATE nodes SET allow_original_url_redirect = '{$value}' WHERE node_id = '{$this->getId()}'", false); 
-             $this->refresh(); 
-         } 
-         return $retval; 
-     } 
+    /** redirect users to the original requested web page instead of portal
+     Must be enabled in the Network configuration to have any effect
+     @return a string */
+    function getPortalOriginalUrlAllowed()
+    {
+        return (($this->_row['allow_original_url_redirect'] == 't') ? true : false);
+    }
+
+    /** redirect users to the original requested web page instead of portal
+     Must be enabled in the Network configuration to have any effect
+     @return true on success, false on failure */
+    function setPortalOriginalUrlAllowed($value)
+    {
+        $retval = true;
+        if ($value != $this->getPortalOriginalUrlAllowed())
+        {
+            $db = AbstractDb::getObject();
+            $value ? $value = 'TRUE' : $value = 'FALSE';
+            $retval = $db->execSqlUpdate("UPDATE nodes SET allow_original_url_redirect = '{$value}' WHERE node_id = '{$this->getId()}'", false);
+            $this->refresh();
+        }
+        return $retval;
+    }
 
 
@@ -1071 +1096 @@
         // Get information about the network
         $network = $this->getNetwork();
-        
+
         $node_id = $this->getId();
 
@@ -1251 +1276 @@
         $_data = $this->getSelectDeploymentStatus("node_" . $node_id . "_deployment_status");
         $_html_node_config[] = InterfaceElements::generateAdminSectionContainer("node_deployment_status", $_title, $_data);
+
+        // Network selection
+        $_title = _("Node Network");
+        $_data = Network::getSelectUI("node_" . $node_id . "_network_id", array('preSelectedObject'=>$this->getNetwork()));
+        $_html_node_config[] = InterfaceElements::generateAdminSectionContainer("node_network", $_title, $_data);
 
         //  is_splash_only_node
@@ -1443 +1473 @@
         $this->setDeploymentStatus(self :: processSelectDeploymentStatus($name));
 
+        // Network selection
+        $name = "node_".$node_id."_network_id";
+        $new_network=Network :: processSelectUI($name);
+        if($new_network!=$this->getNetwork()) {
+            Security::requirePermission(Permission::P('NETWORK_PERM_ADD_NODE'), $new_network);
+            $this->setNetwork($new_network);
+        }
+
         //  is_splash_only_node
         if ($network->getSplashOnlyNodesAllowed())
@@ -1610 +1648 @@
     /**
      * 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
+     * Counts every user account connected (once for every connection)
      * @return int Number of online users
      *
@@ -1627 +1665 @@
         return $row['count'];
     }
+
 
     /** The list of all Technical officers of this node.

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

@@ -59 +59 @@
  * Directory of NodeList classes
  */   define ('NODE_LIST_CLASSES_DIR', WIFIDOG_ABS_FILE_PATH . "classes/NodeLists");
+
+interface AcceptsNullNetwork { }
 abstract class NodeList {
 
@@ -85 +87 @@
         $nodeList->setHeader();
         return $nodeList;
+    }
+
+    /**
+     * Indicates if the specified type of node list accepts null as the network
+     * argument in the constructor
+     *
+     * @param string $nodeListType Type of node list
+     *
+     * @return bool
+     */
+    public static function getAllowsNullNetwork($nodeListType)
+    {
+        // Check if node list type exists
+        if (in_array($nodeListType, self::getAvailableNodeListTypes())) {
+            require_once(NODE_LIST_CLASSES_DIR . "/NodeList" . $nodeListType . ".php");
+        } else {
+            return false;
+        }
+
+        $nodeListClass = "NodeList" . $nodeListType;
+        $ifaces = class_implements($nodeListClass);
+        return in_array("AcceptsNullNetwork", $ifaces);
     }
 

trunk/wifidog-auth/wifidog/classes/NodeLists/NodeListHTML.php

@@ -64 +64 @@
  * @copyright  2006 Max Horváth, Horvath Web Consulting
  */
-class NodeListHTML extends NodeList{
+class NodeListHTML extends NodeList implements AcceptsNullNetwork {
 
     /**
@@ -122 +122 @@
         // Init network
         $this->_network = $network;
-
+        
         // Init user
         $this->_currentUser = User::getCurrentUser();
@@ -129 +129 @@
         $this->_mainUI = MainUI::getObject();
 
+        $network_where_sql = $network === null?"":"network_id = '" . $db->escapeString($this->_network->getId()) . "' AND ";
+
         // Query the database, sorting by node name
-        $db->execSql("SELECT *, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, EXTRACT(epoch FROM creation_date) as creation_date_epoch, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up FROM nodes WHERE network_id = '" . $db->escapeString($this->_network->getId()) . "' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') ORDER BY lower(name)", $this->_nodes, false);
+        $db->execSql("SELECT *, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, EXTRACT(epoch FROM creation_date) as creation_date_epoch, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up FROM nodes WHERE $network_where_sql (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') ORDER BY lower(name)", $this->_nodes, false);
     }
 
@@ -166 +168 @@
         $this->_smarty->assign('num_deployed_nodes', 0);
         $this->_smarty->assign('PdfSupported', false);
+
+        $userData['preSelectedObject'] = $this->_network;
+        $userData['allowEmpty'] = true;
+        $userData['nullCaptionString'] = _("All");
+        $userData['onChange'] = "submit.click();";
+        $this->_smarty->assign('selectNetworkUI', Network::getSelectUI('network_id', $userData) . (count(Network::getAllNetworks()) > 1 ? '<input class="submit" type="submit" name="submit" value="' . _("Change network") . '">' : ""));
+        $this->_smarty->assign('selectedNetworkName', $this->_network === null?_("All networks"):$this->_network->getName());
+
 
         /**
@@ -209 +219 @@
          */
         $this->_mainUI->setTitle(_("Hotspot list"));
-        $this->_mainUI->appendHtmlHeadContent('<link rel="alternate" type="application/rss+xml" title="' . $this->_network->getName() . ": " . _("Newest Hotspots") . '" href="' . BASE_SSL_PATH . 'hotspot_status.php?format=RSS">');
+        $this->_mainUI->appendHtmlHeadContent('<link rel="alternate" type="application/rss+xml" title="' . ($this->_network === null?_("All networks"):$this->_network->getName()) . ": " . _("Newest Hotspots") . '" href="' . BASE_SSL_PATH . 'hotspot_status.php?format=RSS">');
         $this->_mainUI->addContent('left_area_middle', $_html);
         $this->_mainUI->addContent('main_area_middle', $_html_body);

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

@@ -265 +265 @@
         $html .= "</li>\n";
 
-
-
+        /*
+         * Authentication options
+         */
+        $title = _("Authentication");
+        $data = InterfaceElements::generateInputCheckbox("use_global_auth","", _("Use the users of default Virtual Host's network across all networks on the server."), $this->getUseGlobalUserAccounts(), "use_global_auth");
+
+        $html .= InterfaceElements::generateAdminSectionContainer("server_authentication_options",$title, $data);
+        
         /*
          * Access rights
@@ -275 +281 @@
             $html .= InterfaceElements::generateAdminSectionContainer("access_rights", _("Access rights"), $html_access_rights);
         }
-
+        
         $html .= "</ul>\n";
         $html .= "</fieldset>\n";
@@ -290 +296 @@
         require_once('classes/User.php');
         Security::requirePermission(Permission::P('SERVER_PERM_EDIT_SERVER_CONFIG'), $this);
+        // Authentication
+        if (isset($_REQUEST['use_global_auth']))
+                $this->setUseGlobalUserAccounts($_REQUEST['use_global_auth']);
+        else
+                $this->setUseGlobalUserAccounts(false);
         // Access rights
         require_once('classes/Stakeholder.php');
@@ -317 +328 @@
         {
             $items[] = array('path' => 'server/admin',
-            'title' => _("Server access control"),
+            'title' => _("Server configuration"),
             'url' => BASE_URL_PATH.htmlspecialchars("admin/generic_object_admin.php?object_class=Server&action=edit&object_id=".SERVER_ID."")
                 );
@@ -338 +349 @@
     }
 
+    /**
+     * Getter for UseGlobalUserAccounts
+     *
+     * @return bool
+     */
+    public function getUseGlobalUserAccounts()
+    {
+        if (array_key_exists('use_global_auth',$this->_row))
+                return $this->_row['use_global_auth']=='t';
+        else
+                return False;
+    } 
+
+    /**
+     * Setter for UseGlobalUserAccounts
+     *
+     * @param bool $value       New value
+     *
+     * @return bool True on success, false on failure
+     */
+    public function setUseGlobalUserAccounts($value)
+    {
+        $db = AbstractDb::getObject();
+        $value = $value? true:false;
+        // Init values
+        $retVal = true;
+
+        if ($value != $this->getUseGlobalUserAccounts()) {
+            $value = $value ? 'true' : 'false';
+            $retVal = $db->execSqlUpdate("UPDATE server SET use_global_auth = {$value} WHERE server_id = '{$this->getId()}'", false);
+            $this->refresh();
+        }
+
+        return $retVal;
+    } 
+
+    /**
+     * Find out how many users are online on the whole server
+     * Counts every user account connected (once for every connection)
+     * @return int Number of online users
+     *
+     * @access public
+     */
+    public function getTotalNumOnlineUsers()
+    {
+        $db = AbstractDb::getObject();
+        // Init values
+        $retval = array ();
+        $row = null;
+        $sql = "SELECT COUNT(*) FROM active_connections;";
+        $db->execSqlUniqueRes($sql, $row, false);
+
+        return $row['count'];
+    }
+
+    /**
+     * Find out how many users are valid in this server's database
+     *
+     * @return int Number of valid users
+     */
+    public function getTotalNumValidUsers()
+    {
+
+        $db = AbstractDb::getObject();
+
+        // Init values
+        $retval = 0;
+        $row = null;
+        $useCache = false;
+        $cachedData = null;
+
+        // Create new cache objects (valid for 1 minute)
+        $cache = new Cache('server_num_valid_users', "default", 60);
+
+        // Check if caching has been enabled.
+        if ($cache->isCachingEnabled) {
+            $cachedData = $cache->getCachedData();
+
+            if ($cachedData) {
+                // Return cached data.
+                $useCache = true;
+                $retval = $cachedData;
+            }
+        }
+
+        if (!$useCache) {
+            // Get number of valid users
+            $network_id = $db->escapeString($this->_id);
+            $db->execSqlUniqueRes("SELECT COUNT(user_id) FROM users WHERE account_status = ".ACCOUNT_STATUS_ALLOWED, $row, false);
+            // String has been found
+            $retval = $row['count'];
+
+            // Check if caching has been enabled.
+            if ($cache->isCachingEnabled) {
+                // Save data into cache, because it wasn't saved into cache before.
+                $cache->saveCachedData($retval);
+            }
+        }
+
+        return $retval;
+    }
+
+    /**
+     * Find out how many nodes are deployed in this server's database
+     *
+     * @return int Number of deployed nodes
+     */
+    public function getTotalNumDeployedNodes()
+    {
+
+        $db = AbstractDb::getObject();
+
+        // Init values
+        $retval = 0;
+        $row = null;
+        $useCache = false;
+        $cachedData = null;
+
+        // Create new cache objects (valid for 5 minutes)
+        $cache = new Cache('server_num_deployed_nodes', "default", 300);
+
+        // Check if caching has been enabled.
+        if ($cache->isCachingEnabled) {
+            $cachedData = $cache->getCachedData();
+
+            if ($cachedData) {
+                // Return cached data.
+                $useCache = true;
+                $retval = $cachedData;
+            }
+        }
+
+        if (!$useCache) {
+            // Get number of deployed nodes
+            $network_id = $db->escapeString($this->_id);
+            $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE')", $row, false);
+
+            // String has been found
+            $retval = $row['count'];
+
+            // Check if caching has been enabled.
+            if ($cache->isCachingEnabled) {
+                // Save data into cache, because it wasn't saved into cache before.
+                $cache->saveCachedData($retval);
+            }
+        }
+
+        return $retval;
+    }
+
+    /**
+     * Find out how many deployed nodes are online in this server's database
+     *
+     * @param bool $nonMonitoredOnly Return number of non-monitored nodes only
+     *
+     * @return int Number of deployed nodes which are online
+     */
+    public function getNumOnlineNodes($nonMonitoredOnly = false)
+    {
+
+        $db = AbstractDb::getObject();
+
+        // Init values
+        $retval = 0;
+        $row = null;
+        $useCache = false;
+        $cachedData = null;
+
+        // Create new cache objects (valid for 5 minutes)
+        if ($nonMonitoredOnly) {
+            $cache = new Cache('server_num_online_nodes_non_monitored', "default", 300);
+        } else {
+            $cache = new Cache('server_num_online_nodes', "default", 300);
+        }
+
+        // Check if caching has been enabled.
+        if ($cache->isCachingEnabled) {
+            $cachedData = $cache->getCachedData();
+
+            if ($cachedData) {
+                // Return cached data.
+                $useCache = true;
+                $retval = $cachedData;
+            }
+        }
+
+        if (!$useCache) {
+            // Get number of online nodes
+            $network_id = $db->escapeString($this->_id);
+
+            if ($nonMonitoredOnly) {
+                $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE node_deployment_status = 'NON_WIFIDOG_NODE' AND ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) >= interval '5 minutes')", $row, false);
+            } else {
+                $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') AND ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes')", $row, false);
+            }
+
+            // String has been found
+            $retval = $row['count'];
+
+            // Check if caching has been enabled.
+            if ($cache->isCachingEnabled) {
+                // Save data into cache, because it wasn't saved into cache before.
+                $cache->saveCachedData($retval);
+            }
+        }
+
+        return $retval;
+    }
 }
 

trunk/wifidog-auth/wifidog/hotspot_status.php

@@ -64 +64 @@
 }
 
-if (!empty ($_REQUEST['network_id'])) {
-    $network = Network::getObject($db->escapeString($_REQUEST['network_id']));
+if (isset ($_REQUEST["network_id"])) {
+        $network_id = $_REQUEST["network_id"];
+    if($network_id == ""){
+        $network = null;
+    } else {
+        try {
+            $network = Network::getObject($network_id);
+        } catch (Exception $e) {
+            $network = Network::getDefaultNetwork();
+        }
+    }
 } else {
-    $network = Network::getDefaultNetwork(true);
+        $network = Network::getDefaultNetwork();
 }
 
-if ($network) {
+if ($network or NodeList::getAllowsNullNetwork($format)) {
     // Init node list type
     $nodeList = NodeList::getObject($format, $network);

trunk/wifidog-auth/wifidog/hotspots_map.php

@@ -110 +110 @@
 // Set network selector
 $preSelectedObject = (!empty($_REQUEST['network_map']) ? Network::getObject($_REQUEST['network_map']) : Network::getCurrentNetwork());
-$selectNetworkUI = Network::getSelectUI('network_map', array('preSelectedObject' => $preSelectedObject));
+//$selectNetworkUI = Network::getSelectUI('network_map', array('preSelectedObject' => $preSelectedObject, 'onChange' => "javascript: document.lang_form.submit();"));
+$selectNetworkUI = Network::getSelectUI('network_map', array('preSelectedObject' => $preSelectedObject, 'onChange' => "submit.click();"));
 $smarty->assign('selectNetworkUI', $selectNetworkUI . (count(Network::getAllNetworks()) > 1 ? '<input class="submit" type="submit" name="submit" value="' . _("Change network") . '">' : ""));
 

trunk/wifidog-auth/wifidog/include/schema_validate.php

@@ -48 +48 @@
  * Define current database schema version
  */
-define('REQUIRED_SCHEMA_VERSION', 63);
+define('REQUIRED_SCHEMA_VERSION', 64);
 /** Used to test a new shecma version before modyfying the database */
 define('SCHEMA_UPDATE_TEST_MODE', false);
@@ -1367 +1367 @@
 
         $sql .= "INSERT INTO tokens (token_id, token_status, token_creation_date, token_issuer, token_owner) SELECT token AS token_id, token_status, timestamp_in AS token_creation_date, user_id AS token_issuer, user_id AS token_owner FROM connections; \n";
-        $sql .= "CREATE INDEX idx_token_status ON tokens (token_status);\n";   
+        $sql .= "CREATE INDEX idx_token_status ON tokens (token_status);\n";
         $sql .= "ALTER TABLE connections ADD CONSTRAINT fk_tokens FOREIGN KEY (token) REFERENCES tokens (token_id) ON UPDATE CASCADE ON DELETE RESTRICT; \n";
 
@@ -1381 +1381 @@
         $sql .= "ALTER TABLE connections ADD COLUMN logout_reason integer;\n";
         $sql .= "ALTER TABLE connections ALTER COLUMN logout_reason SET DEFAULT NULL;\n";
-        $sql .= "ALTER TABLE connections RENAME COLUMN token TO token_id;\n";     
+        $sql .= "ALTER TABLE connections RENAME COLUMN token TO token_id;\n";
     }
     $new_schema_version = 61;
@@ -1403 +1403 @@
         $sql .= "ALTER TABLE nodes ADD COLUMN connection_limit_node_max_usage_duration_override interval;\n";
         $sql .= "ALTER TABLE nodes ALTER COLUMN connection_limit_node_max_usage_duration_override SET DEFAULT NULL;\n";
-        
+
     }
     $new_schema_version = 62;
@@ -1414 +1414 @@
 
         $sql .= "ALTER TABLE nodes ALTER COLUMN connection_limit_node_max_total_bytes_override TYPE bigint;\n";
-        
+
     }
     $new_schema_version = 63;
     if ($schema_version < $new_schema_version && $new_schema_version <= $targetSchema) {
         printUpdateVersion($new_schema_version);
-     $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+        $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
 
         $sql .= "ALTER TABLE networks ADD column allow_original_url_redirect bool; \n";
@@ -1426 +1426 @@
         $sql .= "ALTER TABLE nodes ADD column allow_original_URL_redirect bool; \n";
         $sql .= "ALTER TABLE nodes ALTER COLUMN allow_original_URL_redirect SET DEFAULT FALSE;\n";
+    }
+    $new_schema_version = 64;
+    if ($schema_version < $new_schema_version && $new_schema_version <= $targetSchema) {
+        printUpdateVersion($new_schema_version);
+        $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+        $sql .= "ALTER TABLE server ADD use_global_auth bool NOT NULL DEFAULT FALSE;\n";
     }
     /*

trunk/wifidog-auth/wifidog/index.php

@@ -74 +74 @@
 $smarty->assign('googleMapsEnabled', defined('GMAPS_HOTSPOTS_MAP_ENABLED') && GMAPS_HOTSPOTS_MAP_ENABLED);
 
-$net = Network::getCurrentNetwork();
-$smarty->assign('networkNumValidUsers', $net ? $net->getNumValidUsers() : 0);
+if(Server::getServer()->getUseGlobalUserAccounts()) {
+    $server = Server::getServer();
+    $smarty->assign('serverNumValidUsers', $server ? $server->getTotalNumValidUsers() : 0);
+    $smarty->assign('serverNumOnlineUsers', $server ? $server->getTotalNumOnlineUsers() : 0);
+    $smarty->assign('serverNumDeployedNodes', $server ? $server->getTotalNumDeployedNodes() : 0);
+    $smarty->assign('serverNumOnlineNodes', $server ? $server->getNumOnlineNodes() : 0);
+    $smarty->assign('serverNumNonMonitoredNodes', $server ? $server->getNumOnlineNodes(true) : 0);
+    // Compile HTML code
+    $html_body = $smarty->fetch("templates/sites/indexglobaluser.tpl");
+} else {
+    $net = Network::getCurrentNetwork();
+    $smarty->assign('networkNumValidUsers', $net ? $net->getNumValidUsers() : 0);
+    // Compile HTML code
+    $html_body = $smarty->fetch("templates/sites/index.tpl");
+}
 
-// Compile HTML code
-$html_body = $smarty->fetch("templates/sites/index.tpl");
-
+/*
+ * Don't redirect on the index page
+ *
 $currentNode = Node::getCurrentRealNode();
 if($currentNode){
@@ -85 +98 @@
     exit();
 }
+*/
 /*
  * Render output

trunk/wifidog-auth/wifidog/lost_password.php

@@ -202 +202 @@
 }
 
-$smarty->assign('SelectNetworkUI', Network::getSelectUI('auth_source'));
+if (Server::getServer()->getUseGlobalUserAccounts()) {
+    $default_network_param = Network::getDefaultNetwork()->getId();
+    $smarty->assign('SelectNetworkUI', "<input type=\"hidden\" name=\"auth_source\" value='$default_network_param' />");
+} else {
+    $smarty->assign('SelectNetworkUI', Network::getSelectUI('auth_source'));
+}
 
 // Compile HTML code

trunk/wifidog-auth/wifidog/lost_username.php

@@ -185 +185 @@
 }
 
-$smarty->assign('SelectNetworkUI', Network::getSelectUI('auth_source'));
+if (Server::getServer()->getUseGlobalUserAccounts()) {
+    $default_network_param = Network::getDefaultNetwork()->getId();
+    $smarty->assign('SelectNetworkUI', "<input type=\"hidden\" name=\"auth_source\" value='$default_network_param' />");
+} else {
+    $smarty->assign('SelectNetworkUI', Network::getSelectUI('auth_source'));
+}
 
 // Compile HTML code

trunk/wifidog-auth/wifidog/node_list.php

@@ -98 +98 @@
         $sort_by_param_sql = $sort_by_param;
     }
-    $sql = "SELECT node_id, gw_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status, last_heartbeat_wifidog_uptime, last_heartbeat_sys_uptime FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' ORDER BY {$sort_by_param_sql}";
+} else {
+        $sort_by_param_sql = DEFAULT_SORT_BY_PARAM;
 }
-else {
-    $sql = "SELECT node_id, gw_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status, last_heartbeat_wifidog_uptime, last_heartbeat_sys_uptime FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' ORDER BY " . DEFAULT_SORT_BY_PARAM;
+
+if (isset ($_REQUEST["network_id"])) {
+        $network_id = $_REQUEST["network_id"];
+    if($network_id == ""){
+        $network = null;
+    } else {
+        try {
+            $network = Network::getObject($network_id);
+        } catch (Exception $e) {
+            $network = Network::getDefaultNetwork();
+        }
+    }
+} else {
+        $network = Network::getDefaultNetwork();
 }
+$network_id_sql = $network===null?"":"AND network_id = '{$network->getId()}'";
+
+$sql = "SELECT node_id, gw_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status, last_heartbeat_wifidog_uptime, last_heartbeat_sys_uptime FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' $network_id_sql ORDER BY {$sort_by_param_sql}";
 $nodes_results = null;
 $db->execSql($sql, $nodes_results, false);
 
-if ($nodes_results == null)
-throw new Exception(_("No nodes could not be found in the database"));
+//Possible to select empty networks, not an error
+if ($nodes_results === null)
+    $nodes_results = array();
+//throw new Exception(_("No nodes could not be found in the database"));
+
 
 $deploymentStatuses = array (
@@ -148 +167 @@
 
 // Pass values to Smarty
+$smarty->assign('selectNetworkUI', Network::getSelectUI('network_id', array('preSelectedObject' => $network, 'allowEmpty' => true, 'nullCaptionString' => _("All"), 'onChange' => "submit.click();") ) . (count(Network::getAllNetworks()) > 1 ? '<input class="submit" type="submit" name="submit" value="' . _("Change network") . '">' : ""));
+if ($network !== null ) {
+    $smarty->assign('selectedNetwork', $network->getName());
+} else {
+    $smarty->assign('allNetworks', _("All networks"));
+}
 $smarty->assign("nodes", $nodes_list);
 $smarty->assign("sort_by_param", $sort_by_param);

trunk/wifidog-auth/wifidog/resend_validation.php

@@ -184 +184 @@
 }
 
-$smarty->assign('SelectNetworkUI', Network::getSelectUI('auth_source'));
+if (Server::getServer()->getUseGlobalUserAccounts()) {
+    $default_network_param = Network::getDefaultNetwork()->getId();
+    $smarty->assign('SelectNetworkUI', "<input type=\"hidden\" name=\"auth_source\" value='$default_network_param' />");
+} else {
+    $smarty->assign('SelectNetworkUI', Network::getSelectUI('auth_source'));
+}
 
 // Compile HTML code

trunk/wifidog-auth/wifidog/signup.php

@@ -320 +320 @@
 // Preserve keys
 $network_array = Network::getAllNetworks();
+$default_network = Network::getDefaultNetwork();
+
 
 foreach ($network_array as $network) {
@@ -325 +327 @@
         $sources[$network->getId()] = $network->getName();
     }
+     if ($network->getName() == $default_network)
+        $default_network_param = $network->getId();
+        //$default_network_param = $network->getAuthenticatorConstructorParams();
+
 }
 
@@ -336 +342 @@
 }
 
-$smarty->assign('SelectNetworkUI', Network::getSelectUI('auth_source'));
+if (Server::getServer()->getUseGlobalUserAccounts())
+        $smarty->assign('SelectNetworkUI', "<input type=\"hidden\" name=\"auth_source\" value='$default_network_param' />");
+else
+        $smarty->assign('SelectNetworkUI', Network::getSelectUI('network_id', array('preSelectedObject' => $network)) );
 
 // Compile HTML code

trunk/wifidog-auth/wifidog/templates/node_list.html

@@ +1 @@
+{if $selectNetworkUI}
+<form name="hotspots_form" method="post">
+        {$selectNetworkUI}
+</form>
+{/if}
 <div id="node_list">
-        <h3>{"Status of all nodes of the"|_} {$networkName} {"network"|_}</h3>
+    {if $allNetworks }
+        <h3>{"Status of all nodes on "|_} {$allNetworks}</h3>
+    {else}
+        {if $selectedNetwork}
+            <h3>{"Status of all nodes of the "|_} {$selectedNetwork} {"network"|_}</h3>
+        {else}
+            <h3>{"Status of all nodes of the"|_} {$networkName} {"network"|_}</h3>
+        {/if}
+    {/if}
         <table>
                 <thead>

trunk/wifidog-auth/wifidog/templates/sites/hotspot_status.tpl

@@ -51 +51 @@
     BEGIN section MAINCONTENT
 *}
+
+    <form name="hotspots_form" method="post">
+        <input type="hidden" name="format" value="HTML" />
+        {$selectNetworkUI}
+    </form>
+    <br />
+
     <div id="hotspot_status">
         <table>
             <thead>
                 <tr>
-                    <th colspan="6">{"Status of the %d open %s Hotspots"|_|sprintf:$num_deployed_nodes:$networkName}</th>
+                        <th colspan="6">{"Status of the %d open %s Hotspots"|_|sprintf:$num_deployed_nodes:$selectedNetworkName}</th>
                 </tr>
                 <tr>