Changeset 1089

Timestamp:

09/03/06 18:54:01 (5 years ago)

Author:

max-horvath

Message:

"2006-09-03 Max Horvath <max.horvath@…>

• The term SPLASH_ONLY_USER displayed to people visiting the portal has been replaced by the more meaningful term \"anonymous user\" (fixes #106)
• When creating a new node and choosing an existing node_id there will be shown an error message (fixes #223)
• If one or more nodes aren't monitored they now will be announced on the front page (instead of just showing the number of monitored online nodes) (fixes #100)
• Display more meaningful error messages if required user permissions are missing (fixes #242)
• Refactored Network->getAdminUI() to match look and feel of Node->getAdminUI (fixes #140)
• Show descriptive status of node (fixes #241)"

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/admin/generic_object_admin.php (modified) (1 diff)
• wifidog/classes/Content.php (modified) (11 diffs)
• wifidog/classes/Network.php (modified) (57 diffs)
• wifidog/classes/Node.php (modified) (13 diffs)
• wifidog/classes/Server.php (modified) (3 diffs)
• wifidog/classes/Statistics.php (modified) (2 diffs)
• wifidog/node_list.php (modified) (2 diffs)
• wifidog/templates/sites/index.tpl (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-09-03 Max Horváth <max.horvath@maxspot.de>
+        * The term SPLASH_ONLY_USER displayed to people visiting the portal has been
+          replaced by the more meaningful term "anonymous user" (fixes #106)
+        * When creating a new node and choosing an existing node_id there will be
+          shown an error message (fixes #223)
+        * If one or more nodes aren't monitored they now will be announced on the
+          front page (instead of just showing the number of monitored online nodes)
+          (fixes #100)
+        * Display more meaningful error messages if required user permissions are
+          missing (fixes #242)
+        * Refactored Network->getAdminUI() to match look and feel of
+          Node->getAdminUI (fixes #140)
+        * Show descriptive status of node (fixes #241)
+
 2006-09-02 Max Horváth <max.horvath@maxspot.de>
         * Installation script checks for PHP session extension (fixes #139)

trunk/wifidog-auth/wifidog/admin/generic_object_admin.php

@@ -68 +68 @@
 require_once('classes/InterfaceElements.php');
 
+// Check user permissions
+try {
+    $user = User::getCurrentUser();
+
+    if (!isset($user)) {
+        throw new Exception(_('Access denied!'));
+    } else if ((!$user->isSuperAdmin() && !$user->isOwner()) || $user->isNobody()) {
+        throw new Exception(_('Access denied!'));
+    }
+} catch (Exception $e) {
+    $ui = new MainUI();
+    $ui->setToolSection('ADMIN');
+    $ui->displayError($e->getMessage(), false);
+    exit;
+}
+
 // Init values
 $html = "";

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

@@ -51 +51 @@
 require_once ('classes/Cache.php');
 require_once ('classes/HyperLink.php');
+require_once ('classes/MainUI.php');
+
 /**
  * Defines any type of content
@@ -104 +106 @@
      */
     private $is_logging_enabled;
-    
+
     /** Log as part of this other content */
     private $log_as_content;
@@ -712 +714 @@
      * @access public
      */
-    public static function getSelectExistingContentUI($user_prefix, $sql_additional_where = null, $show_persistant_content = true, $order = "creation_timestamp", $type_interface = "select") {
-            // Define globals
-    global $db;
+    public static function getSelectExistingContentUI($user_prefix, $sql_additional_where = null, $show_persistant_content = true, $order = "creation_timestamp", $type_interface = "select")
+    {
+        // Define globals
+        global $db;
 
         // Init values
@@ -721 +724 @@
         $contentRows = null;
 
-        if (!User :: getCurrentUser()) {
-            throw new Exception(_('Access denied!'));
+        try {
+            if (!User :: getCurrentUser()) {
+                throw new Exception(_('Access denied!'));
+            }
+        } catch (Exception $e) {
+            $ui = new MainUI();
+            $ui->setToolSection('ADMIN');
+            $ui->displayError($e->getMessage(), false);
+            exit;
         }
 
         if ($type_interface != "table") {
-                    $html .= "<fieldset class='admin_container Content'>\n";
-        if(!empty($title)){
-                $html .= "<legend>$title</legend>\n";
-                }
+            $html .= "<fieldset class='admin_container Content'>\n";
+
+            if (!empty($title)) {
+                $html .= "<legend>$title</legend>\n";
+            }
+
             $html .= _("Add existing content").": ";
         }
@@ -752 +764 @@
 
             foreach ($contentRows as $contentRow) {
-                $content = Content :: getObject($contentRow['content_id']);
-
-                if (User :: getCurrentUser()->isSuperAdmin() || $content->isOwner(User :: getCurrentUser())) {
+                $content = Content::getObject($contentRow['content_id']);
+
+                if (User::getCurrentUser()->isSuperAdmin() || $content->isOwner(User::getCurrentUser())) {
                     if ($type_interface != "table") {
                         $tab[$i][0] = $content->getId();
@@ -1088 +1100 @@
 
 
-/** Allow logging as part of another content (usually the parent for metadata).  
+/** Allow logging as part of another content (usually the parent for metadata).
  * Redirects clickthrough logging to the parent's content id, and does not log
  * display */
@@ -1180 +1192 @@
                 $this->titleShouldDisplay() ? $checked = 'CHECKED' : $checked = '';
                 $html_title_is_displayed .= "<input type='checkbox' name='$name' $checked>\n";
-                
+
                 /* title */
                 $html .= "<li class='admin_element_item_container admin_section_edit_title'>\n";
-                $html .= "<div class='admin_element_data'>\n";  
+                $html .= "<div class='admin_element_data'>\n";
                 if (empty ($this->content_row['title'])) {
-                    $html .= self :: getNewContentUI("title_{$this->id}_new", null, _("Title:"));                
+                    $html .= self :: getNewContentUI("title_{$this->id}_new", null, _("Title:"));
                     $html .= "</div>\n";
                 } else {
-                    $html .= $html_title_is_displayed; 
+                    $html .= $html_title_is_displayed;
                     $title = self :: getObject($this->content_row['title']);
                     $html .= $title->getAdminUI(null, _("Title:"));
@@ -1199 +1211 @@
                 $html .= "</li>\n";
             }
-            
+
             if ($this->is_trivial_content == false) {
                 /* description */
@@ -1252 +1264 @@
                 $html .= "</li>\n";
             }
-            
+
             //End content medatada
                         if ($this->is_trivial_content == false || $this->isPersistent()) {
                         $html .= "</fieldset>\n";
                         }
-            if ($this->is_trivial_content == false || $this->isPersistent()) {                  
+            if ($this->is_trivial_content == false || $this->isPersistent()) {
                 $html .= "<fieldset class='admin_element_group'>\n";
                                 $html .= "<legend>".sprintf(_("%s access control"),get_class($this))."</legend>\n";
@@ -1330 +1342 @@
             {//Content medatada
 
-                
+
                             if ($this->is_trivial_content == false || $this->isPersistent()) {
                                             /* title_is_displayed */
@@ -1515 +1527 @@
         return $retval;
     }
-    
+
     /** Set if the content group is persistent
      * @param $is_locative_content true or false

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

@@ -1 +1 @@
 <?php
-
 
 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
@@ -48 +47 @@
  * Load required classes
  */
-require_once ('classes/GenericObject.php');
-require_once ('classes/Content.php');
-require_once ('classes/User.php');
-require_once ('classes/Node.php');
-require_once ('classes/GisPoint.php');
-require_once ('classes/Cache.php');
-require_once ('classes/ThemePack.php');
+require_once('classes/GenericObject.php');
+require_once('classes/Content.php');
+require_once('classes/User.php');
+require_once('classes/Node.php');
+require_once('classes/GisPoint.php');
+require_once('classes/Cache.php');
+require_once('classes/ThemePack.php');
+require_once('classes/InterfaceElements.php');
+require_once('classes/MainUI.php');
 
 /**
@@ -67 +68 @@
  * @copyright  2006 Max Horvath, maxspot GmbH
  */
-class Network implements GenericObject {
-    private $id; /**< The network id */
+class Network implements GenericObject
+{
+    /**
+     * The network Id
+     *
+     * @var string
+     *
+     * @access private
+     */
+    private $id;
+
     private $mRow;
 
-    /** Get an instance of the object
-    * @see GenericObject
-    * @param $id The object id
-    * @return the Content object, or null if there was an error (an exception is also thrown)
-    */
-    static public function getObject($id) {
+    /**
+     * Get an instance of the object
+     *
+     * @param string $id The object id
+     *
+     * @return mixed The Content object, or null if there was an error
+     *               (an exception is also thrown)
+     *
+     * @see GenericObject
+     * @static
+     * @access public
+     */
+    public static function getObject($id)
+    {
         return new self($id);
     }
 
-    /** Get all the Networks configured on this server
-     * @return an array of Network objects.  The default network is returned
-     * first
-     */
-    static function getAllNetworks() {
+    /**
+     * Get all the Networks configured on this server
+     *
+     * @return array An array of Network objects.  The default network is
+     *               returned first
+     *
+     * @static
+     * @access public
+     */
+    public static function getAllNetworks()
+    {
         $retval = array ();
         global $db;
@@ -99 +123 @@
     }
 
-    /** Get the default network
-     * @return a Network object, NEVER returns null.
-     */
-    static function getDefaultNetwork($real_network_only = false) {
+    /**
+     * Get the default network
+     *
+     * @param bool $real_network_only Return a real network only?
+     *
+     * @return object A Network object, NEVER returns null.
+     *
+     * @static
+     * @access public
+     */
+    public static function getDefaultNetwork($real_network_only = false)
+    {
         $retval = null;
         global $db;
@@ -115 +147 @@
     }
 
-    /** Get the current network for which the portal is displayed or to which a user is physically connected.
-     * @param $real_network_only NOT IMPLEMENTED YET true or false.  If true,
-     * the real physical network where the user is connected is returned, and
-     * the node set by setCurrentNode is ignored.
-     * @return a Network object, NEVER returns null.
-     */
-    static function getCurrentNetwork($real_network_only = false) {
+    /**
+     * Get the current network for which the portal is displayed or to which a
+     * user is physically connected.
+     *
+     * @param bool $real_network_only NOT IMPLEMENTED YET true or false.  If
+     *                                true, the real physical network where the
+     *                                user is connected is returned, and
+     *                                the node set by setCurrentNode is ignored.
+     *
+     * @return objetc A Network object, NEVER returns null.
+     *
+     * @static
+     * @access public
+     */
+    public static function getCurrentNetwork($real_network_only = false)
+    {
         $retval = null;
         $current_node = Node :: getCurrentNode();
+
         if ($current_node != null) {
             $retval = $current_node->getNetwork();
-        }
-        else {
+        } else {
             $retval = Network :: getDefaultNetwork();
         }
+
         return $retval;
     }
 
-    /** Create a new Content object in the database
+    /**
+     * Create a new Content object in the database
+     *
+     * @param string $network_id The network id of the new network.  If absent,
+     *                           will be assigned a guid.
+     *
+     * @return mixed The newly created object, or null if there was an error
+     *
      * @see GenericObject
-     * @param $network_id The network id of the new network.  If absent, will be
-     * assigned a guid.
-     * @return the newly created object, or null if there was an error
-     */
-    static function createNewObject($network_id = null) {
+     * @static
+     * @access public
+     */
+    public static function createNewObject($network_id = null)
+    {
         global $db;
         if (empty ($network_id)) {
@@ -174 +223 @@
      * @access public
      */
-    public static function getSelectNetworkUI($user_prefix, $pre_selected_network = null, $additional_where = null) {
+    public static function getSelectNetworkUI($user_prefix, $pre_selected_network = null, $additional_where = null)
+    {
         $html = '';
         $name = $user_prefix;
@@ -180 +230 @@
         if ($pre_selected_network) {
             $selected_id = $pre_selected_network->getId();
-        }
-        else {
+        } else {
             $selected_id = null;
         }
+
         global $db;
         $additional_where = $db->escapeString($additional_where);
@@ -204 +254 @@
             $html .= FormSelectGenerator :: generateFromArray($tab, $selected_id, $name, null, false);
 
-        }
-        else {
+        } else {
             foreach ($network_rows as $network_row) //iterates only once...
                 {
@@ -228 +277 @@
      * @access public
      */
-    public static function processSelectNetworkUI($user_prefix) {
+    public static function processSelectNetworkUI($user_prefix)
+    {
         $name = "{$user_prefix}";
-        if (!empty ($_REQUEST[$name]))
+
+        if (!empty ($_REQUEST[$name])) {
             return new self($_REQUEST[$name]);
-        else
+        } else {
             throw new exception(sprintf(_("Unable to retrieve the selected network, the %s REQUEST parameter does not exist"), $name));
-    }
-
-    /** Get an interface to create a new network.
-    * @return html markup
-    */
-    public static function getCreateNewObjectUI() {
+        }
+    }
+
+    /**
+     * Get an interface to create a new network.
+     *
+     * @return string HTML markup
+     *
+     * @static
+     * @access public
+     */
+    public static function getCreateNewObjectUI()
+    {
+        // Init values
         $html = '';
+
         $html .= _("Create a new network with ID")." \n";
         $name = "new_network_id";
         $html .= "<input type='text' size='10' name='{$name}'>\n";
+
         return $html;
-
-    }
-
-    /** Process the new object interface.
-     *  Will return the new object if the user has the credentials and the form was fully filled.
-     * @return the Network object or null if no new Network was created.
-     */
-    static function processCreateNewObjectUI() {
+    }
+
+    /**
+     * Process the new object interface.
+     *
+     * Will return the new object if the user has the credentials and the form
+     * was fully filled.
+     *
+     * @return mixed The Network object or null if no new Network was created.
+     *
+     * @static
+     * @access public
+     */
+    public static function processCreateNewObjectUI()
+    {
+        // Init values
         $retval = null;
         $name = "new_network_id";
-        if (!empty ($_REQUEST[$name])) {
+
+        if (!empty($_REQUEST[$name])) {
             $network_id = $_REQUEST[$name];
+
             if ($network_id) {
-                if (!User :: getCurrentUser()->isSuperAdmin()) {
-                    throw new Exception(_("Access denied"));
+                try {
+                    if (!User::getCurrentUser()->isSuperAdmin()) {
+                        throw new Exception(_("Access denied"));
+                    }
+                } catch (Exception $e) {
+                    $ui = new MainUI();
+                    $ui->setToolSection('ADMIN');
+                    $ui->displayError($e->getMessage(), false);
+                    exit;
                 }
-                $retval = self :: createNewObject($network_id);
-            }
-        }
+
+                $retval = self::createNewObject($network_id);
+            }
+        }
+
         return $retval;
     }
 
-    private function __construct($p_network_id) {
+    /**
+     * Constructor
+     *
+     * @param string $p_network_id
+     *
+     * @return void
+     *
+     * @access private
+     */
+    private function __construct($p_network_id)
+    {
+        // Define globals
         global $db;
 
@@ -281 +372 @@
     }
 
-    /** Retreives the id of the object
-     * @return The id */
-    public function getId() {
+    /**
+     * Retreives the id of the object
+     *
+     * @return string The id
+     *
+     * @access public
+     */
+    public function getId()
+    {
         return $this->id;
     }
 
-    /** Retreives the network name
-     * @return The id */
-    public function getTechSupportEmail() {
+    /**
+     * Retreives the network name
+     *
+     * @return string The id
+     *
+     * @access public
+     */
+    public function getTechSupportEmail()
+    {
         return $this->mRow['tech_support_email'];
     }
 
-    /** Set the network's tech support and information email address
-     * @param $value The new value
-     * @return true on success, false on failure */
-    function setTechSupportEmail($value) {
+    /**
+     * Set the network's tech support and information email address
+     *
+     * @param string $value The new value
+     *
+     * @return bool True on success, false on failure
+     *
+     * @access public
+     */
+    public function setTechSupportEmail($value)
+    {
+        // Init values
         $retval = true;
+
         if ($value != $this->getName()) {
             global $db;
@@ -304 +416 @@
             $this->refresh();
         }
+
         return $retval;
     }
@@ -309 +422 @@
     /**
      * Retrieves the network name
-     * @return A string
-     */
-    public function getName() {
+     *
+     * @return string A string
+     *
+     * @access public
+     */
+    public function getName()
+    {
         return $this->mRow['name'];
     }
 
-    /** Set the network's name
-     * @param $value The new value
-     * @return true on success, false on failure
-     */
-    function setName($value) {
+    /**
+     * Set the network's name
+     *
+     * @param string $value The new value
+     *
+     * @return bool True on success, false on failure
+     *
+     * @access public
+     */
+    public function setName($value)
+    {
+        // Init values
         $retval = true;
+
         if ($value != $this->getName()) {
             global $db;
@@ -327 +452 @@
             $this->refresh();
         }
+
         return $retval;
     }
@@ -332 +458 @@
     /**
      * Retrieves the network's theme pack
-     * @return ThemePack or null
-     */
-    public function getThemePack() {
+     *
+     * @return mixed ThemePack or null
+     *
+     * @access public
+     */
+    public function getThemePack()
+    {
         if (!empty ($this->mRow['theme_pack'])) {
             return ThemePack::getObject($this->mRow['theme_pack']);
-        }
-        else {
+        } else {
             return null;
         }
     }
 
-    /** Set the network's name
-     * @param $value The new ThemePack, or null
-     * @return true on success, false on failure
-     */
-    function setThemePack($value) {
+    /**
+     * Set the network's name
+     *
+     * @param string $value The new ThemePack, or null
+     *
+     * @return bool True on success, false on failure
+     *
+     * @access public
+     */
+    public function setThemePack($value)
+    {
+        // Init values
         $retval = true;
+
         if ($value != $this->getThemePack()) {
             global $db;
@@ -355 +492 @@
             $this->refresh();
         }
+
         return $retval;
     }
+
     /**
      * Retrieves the network's creation date
      *
      * @return string Network's creation date
-     */
-    public function getCreationDate() {
+     *
+     * @access public
+     */
+    public function getCreationDate()
+    {
         return $this->mRow['creation_date'];
     }
@@ -375 +517 @@
      * @access public
      */
-    public function setCreationDate($value) {
+    public function setCreationDate($value)
+    {
         // Define globals
         global $db;
@@ -391 +534 @@
     }
 
-    /** Retreives the network's homepage url
-     * @return The id */
-    public function getHomepageURL() {
+    /**
+     * Retreives the network's homepage url
+     *
+     * @return string The id
+     *
+     * @access public
+     */
+    public function getHomepageURL()
+    {
         return $this->mRow['homepage_url'];
     }
 
-    /** Set the network's homepage url
-     * @param $value The new value
-     * @return true on success, false on failure */
-    function setHomepageURL($value) {
+    /**
+     * Set the network's homepage url
+     *
+     * @param string $value The new value
+     *
+     * @return bool True on success, false on failure
+     *
+     * @access public
+     */
+    public function setHomepageURL($value)
+    {
+        // Init values
         $retval = true;
+
         if ($value != $this->getName()) {
             global $db;
@@ -408 +566 @@
             $this->refresh();
         }
+
         return $retval;
     }
@@ -418 +577 @@
      * @access public
      */
-    public function getAuthenticatorClassName() {
+    public function getAuthenticatorClassName()
+    {
         return $this->mRow['network_authenticator_class'];
     }
@@ -434 +594 @@
      * @access public
      */
-    public function setAuthenticatorClassName($value) {
+    public function setAuthenticatorClassName($value)
+    {
         // Define globals
         global $db;
@@ -457 +618 @@
      * @access public
      */
-    public function getAuthenticatorConstructorParams() {
+    public function getAuthenticatorConstructorParams()
+    {
         return $this->mRow['network_authenticator_params'];
     }
@@ -472 +634 @@
      * @access public
      */
-    public function setAuthenticatorConstructorParams($value) {
+    public function setAuthenticatorConstructorParams($value)
+    {
         // Define globals
         global $db;
@@ -495 +658 @@
      * @access public
      */
-    public function getAuthenticator() {
+    public function getAuthenticator()
+    {
         require_once ('classes/Authenticator.php');
 
@@ -516 +680 @@
      * @access public
      */
-    public static function getAvailableAuthenticators() {
+    public static function getAvailableAuthenticators()
+    {
         // Init values
         $_authenticators = array ();
@@ -589 +754 @@
      * @access public
      */
-    public static function getSelectAuthenticator($user_prefix, $pre_selected_authenticator = null) {
-            // Define globals
-    global $db;
+    public static function getSelectAuthenticator($user_prefix, $pre_selected_authenticator = null)
+    {
+        // Define globals
+        global $db;
 
         // Init values
@@ -617 +783 @@
      * Is the network the default network?
      *
-     * @return true or false
-     */
-    public function isDefaultNetwork() {
+     * @return bool True or false
+     *
+     * @access public
+     */
+    public function isDefaultNetwork()
+    {
         ($this->mRow['is_default_network'] == 't') ? $retval = true : $retval = false;
         return $retval;
     }
 
-    /** Set as the default network.  The can only be one default network, so this method will unset is_default_network for all other network
-     * @return true on success, false on failure */
-    function setAsDefaultNetwork() {
+    /**
+     * Set as the default network.
+     *
+     * The can only be one default network, so this method will unset
+     * is_default_network for all other network
+     *
+     * @return bool True on success, false on failure
+     *
+     * @access public
+     */
+    public function setAsDefaultNetwork()
+    {
+        // Init values
         $retval = true;
+
         if (!$this->isDefaultNetwork()) {
             global $db;
@@ -635 +815 @@
             $this->refresh();
         }
+
         return $retval;
     }
 
-    /** Retreives the network's validation grace period
-     * @return An integer (seconds) */
-    public function getValidationGraceTime() {
+    /**
+     * Retreives the network's validation grace period
+     *
+     * @return int Network's validation grace period in seconds
+     *
+     * @access public
+     */
+    public function getValidationGraceTime()
+    {
         return $this->mRow['validation_grace_time_seconds'];
     }
 
-    /** Set the network's validation grace period in seconds.  A new user is granted Internet access for this period check his email and validate his account.
-     * @param $value The new value
-     * @return true on success, false on failure */
-    function setValidationGraceTime($value) {
+    /**
+     * Set the network's validation grace period in seconds.
+     *
+     * A new user is granted Internet access for this period check his email
+     * and validate his account.
+     *
+     * @param int $value The new value
+     *
+     * @return bool True on success, false on failure
+     *
+     * @access public
+     */
+    public function setValidationGraceTime($value)
+    {
+        // Init values
         $retval = true;
+
         if ($value != $this->getValidationGraceTime()) {
             global $db;
@@ -655 +854 @@
             $this->refresh();
         }
+
         return $retval;
     }
 
-    /** Retreives the FROM adress of the validation email
-     * @return A string */
-    public function getValidationEmailFromAddress() {
+    /**
+     * Retreives the FROM adress of the validation email
+     *
+     * @return string A string
+     *
+     * @access public
+     */
+    public function getValidationEmailFromAddress()
+    {
         return $this->mRow['validation_email_from_address'];
     }
 
-    /** Set the FROM adress of the validation email
-     * @param $value The new value
-     * @return true on success, false on failure */
-    function setValidationEmailFromAddress($value) {
+    /**
+     * Set the FROM adress of the validation email
+     *
+     * @param string $value The new value
+     *
+     * @return bool True on success, false on failure
+     *
+     * @access public
+     */
+    public function setValidationEmailFromAddress($value)
+    {
+        // Init values
         $retval = true;
+
         if ($value != $this->getValidationEmailFromAddress()) {
             global $db;
@@ -675 +890 @@
             $this->refresh();
         }
+
         return $retval;
     }
 
-    /** Can an account be connected more than once at the same time?
-     * @return true or false */
-    public function getMultipleLoginAllowed() {
+    /**
+     * Can an account be connected more than once at the same time?
+     *
+     * @return bool True or false
+     *
+     * @access public
+     */
+    public function getMultipleLoginAllowed()
+    {
         return ($this->mRow['allow_multiple_login'] == 't') ? true : false;
     }
 
-    /** Set if a account be connected more than once at the same time?
-     * @param $value The new value, true or false
-     * @return true on success, false on failure */
-    function setMultipleLoginAllowed($value) {
+    /**
+     * Set if a account be connected more than once at the same time
+     *
+     * @param bool $value The new value, true or false
+     *
+     * @return bool true on success, false on failure
+     *
+     * @access public
+     */
+    public function setMultipleLoginAllowed($value)
+    {
+        // Init values
         $retval = true;
+
         if ($value != $this->getMultipleLoginAllowed()) {
             global $db;
@@ -695 +926 @@
             $this->refresh();
         }
+
         return $retval;
     }
 
-    /** Are nodes allowed to be set as splash-only (no login)?
-     * @return true or false */
-    public function getSplashOnlyNodesAllowed() {
+    /**
+     * Are nodes allowed to be set as splash-only (no login)?
+     *
+     * @return bool True or false
+     *
+     * @access public
+     */
+    public function getSplashOnlyNodesAllowed()
+    {
         return (($this->mRow['allow_splash_only_nodes'] == 't') ? true : false);
     }
 
-    /** Set if nodes are allowed to be set as splash-only (no login)
-     * @param $value The new value, true or false
-     * @return true on success, false on failure */
-    function setSplashOnlyNodesAllowed($value) {
+    /**
+     * Set if nodes are allowed to be set as splash-only (no login)
+     *
+     * @param bool $value The new value, true or false
+     *
+     * @return bool True on success, false on failure
+     *
+     * @access public
+     */
+    public function setSplashOnlyNodesAllowed($value)
+    {
+        // Init values
         $retval = true;
+
         if ($value != $this->getSplashOnlyNodesAllowed()) {
             global $db;
@@ -715 +962 @@
             $this->refresh();
         }
+
         return $retval;
     }
@@ -725 +973 @@
      * @access public
      */
-    public function getGisLocation() {
+    public function getGisLocation()
+    {
         return new GisPoint($this->mRow['gmaps_initial_latitude'], $this->mRow['gmaps_initial_longitude'], $this->mRow['gmaps_initial_zoom_level']);
     }
@@ -738 +987 @@
      * @access public
      */
-    public function setGisLocation($pt) {
+    public function setGisLocation($pt)
+    {
         // Define globals
         global $db;
@@ -765 +1015 @@
      * @access public
      */
-    public function getGisMapType() {
+    public function getGisMapType()
+    {
         return $this->mRow['gmaps_map_type'];
     }
@@ -778 +1029 @@
      * @access public
      */
-    public function setGisMapType($value) {
+    public function setGisMapType($value)
+    {
         // Define globals
         global $db;
@@ -807 +1059 @@
      * @access public
      */
-    public static function getSelectGisMapType($user_prefix, $pre_selected_map_type = "G_NORMAL_MAP") {
-            // Define globals
-    global $db;
+    public static function getSelectGisMapType($user_prefix, $pre_selected_map_type = "G_NORMAL_MAP")
+    {
+        // Define globals
+        global $db;
 
         // Init values
@@ -828 +1081 @@
     }
 
-    /** Get's the splash-only user.  This is the user that people logged-in at a splash-only hotspot will show up as.  This user always has multiple-login capabilities.
-    * @param $username The username of the user
-    * @param $account_origin The account origin
-    * @return a User object
-    */
-    public function getSplashOnlyUser() {
+    /**
+     * Get's the splash-only user.
+     *
+     * This is the user that people logged-in at a splash-only hotspot will
+     * show up as.  This user always has multiple-login capabilities.
+     *
+     * @param string $username The username of the user
+     * @param string $account_origin The account origin
+     *
+     * @return object A User object
+     *
+     * @access public
+     */
+    public function getSplashOnlyUser()
+    {
         $username = 'SPLASH_ONLY_USER';
 
@@ -851 +1113 @@
      * @access public
      */
-    public function getNumUsers() {
+    public function getNumUsers()
+    {
         // Define globals
         global $db;
@@ -900 +1163 @@
      * @access public
      */
-    public function getNumValidUsers() {
+    public function getNumValidUsers()
+    {
         // Define globals
         global $db;
@@ -950 +1214 @@
      * @access public
      */
-    public function getNumOnlineUsers() {
+    public function getNumOnlineUsers()
+    {
         // Define globals
         global $db;
@@ -999 +1264 @@
      * @access public
      */
-    public function getNumNodes() {
+    public function getNumNodes()
+    {
         // Define globals
         global $db;
@@ -1048 +1314 @@
      * @access public
      */
-    public function getNumDeployedNodes() {
+    public function getNumDeployedNodes()
+    {
         // Define globals
         global $db;
@@ -1093 +1360 @@
      * Find out how many deployed nodes are online in this networks's database
      *
+     * @param bool $nonMonitoredOnly Return number of non-monitored nodes only
+     *
      * @return int Number of deployed nodes which are online
      *
      * @access public
      */
-    public function getNumOnlineNodes() {
+    public function getNumOnlineNodes($nonMonitoredOnly = false)
+    {
         // Define globals
         global $db;
@@ -1108 +1378 @@
 
         // Create new cache objects (valid for 5 minutes)
-        $_cache = new Cache('network_'.$this->id.'_num_online_nodes', $this->id, 300);
+        if ($nonMonitoredOnly) {
+            $_cache = new Cache('network_'.$this->id.'_num_online_nodes_non_monitored', $this->id, 300);
+        } else {
+            $_cache = new Cache('network_'.$this->id.'_num_online_nodes', $this->id, 300);
+        }
 
         // Check if caching has been enabled.
@@ -1124 +1398 @@
             // Get number of online nodes
             $_network_id = $db->escapeString($this->id);
-            $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE network_id = '$_network_id' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') AND ((NOW()-last_heartbeat_timestamp) < interval '5 minutes')", $_row, false);
+
+            if ($nonMonitoredOnly) {
+                $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE network_id = '$_network_id' AND node_deployment_status = 'NON_WIFIDOG_NODE' AND ((NOW()-last_heartbeat_timestamp) >= interval '5 minutes')", $_row, false);
+            } else {
+                $db->execSqlUniqueRes("SELECT COUNT(node_id) FROM nodes WHERE network_id = '$_network_id' AND (node_deployment_status = 'DEPLOYED' OR node_deployment_status = 'NON_WIFIDOG_NODE') AND ((NOW()-last_heartbeat_timestamp) < interval '5 minutes')", $_row, false);
+            }
 
             // String has been found
@@ -1139 +1418 @@
     }
 
-    /** Are nodes allowed to redirect users to an arbitrary web page instead of the portal?
-     * @return true or false */
-    public function getCustomPortalRedirectAllowed() {
+    /**
+     * Are nodes allowed to redirect users to an arbitrary web page instead of
+     * the portal?
+     *
+     * @return bool True or false
+     *
+     * @access public
+     */
+    public function getCustomPortalRedirectAllowed()
+    {
         return (($this->mRow['allow_custom_portal_redirect'] == 't') ? true : false);
     }
 
-    /** Set if nodes are allowed to redirect users to an arbitrary web page instead of the portal?
-     * @param $value The new value, true or false
-     * @return true on success, false on failure */
-    function setCustomPortalRedirectAllowed($value) {
+    /**
+     * Set if nodes are allowed to redirect users to an arbitrary web page
+     * instead of the portal?
+     *
+     * @param bool $value The new value, true or false
+     *
+     * @return bool True on success, false on failure
+     *
+     * @access public
+     */
+    public function setCustomPortalRedirectAllowed($value)
+    {
+        // Init values
         $retval = true;
+
         if ($value != $this->getCustomPortalRedirectAllowed()) {
             global $db;
@@ -1156 +1452 @@
             $this->refresh();
         }
+
         return $retval;
     }
@@ -1161 +1458 @@
     /**
      * Does the user have admin access to this network?
-     * @return boolean true our false
-     */
-    function hasAdminAccess(User $user) {
+     *
+     * @return bool true our false
+     *
+     * @access public
+     */
+    public function hasAdminAccess(User $user)
+    {
         // Define globals
         global $db;
@@ -1203 +1504 @@
         // Define globals
         global $db;
-    
+
         // Init values
         $content_rows = null;
         $retval = array ();
-    
+
         // Get all network, but exclude user subscribed content if asked
         if ($exclude_subscribed_content == true && $subscriber) {
@@ -1214 +1515 @@
                 $sql = "SELECT content_id FROM network_has_content WHERE network_id='$this->id' ORDER BY subscribe_timestamp DESC";
         }
-    
+
         $db->execSql($sql, $content_rows, false);
-    
+
         if ($content_rows != null) {
                 foreach ($content_rows as $content_row) {
@@ -1222 +1523 @@
                 }
         }
-    
+
         return $retval;
     }
     */
+
     /**
      * Retreives the admin interface of this object
@@ -1233 +1535 @@
      * @access public
      */
-    public function getAdminUI() {
+    public function getAdminUI()
+    {
+        // Init values
         $html = '';
+
+                /*
+                 * Begin with admin interface
+                 */
         $html .= "<fieldset class='admin_container ".get_class($this)."'>\n";
         $html .= "<legend>"._("Network management")."</legend>\n";
         $html .= "<ul class='admin_element_list'>\n";
 
-        // Content management
+        /*
+         * Content management
+         */
         $title = _("Network content");
         $name = "network_".$this->id."_content";
-        $data = Content :: getLinkedContentUI($name, "network_has_content", "network_id", $this->id, $display_page = "portal");
-        $html .= InterfaceElements :: generateAdminSectionContainer("network_content", $title, $data);
+        $data = Content::getLinkedContentUI($name, "network_has_content", "network_id", $this->id, $display_page = "portal");
+        $html .= InterfaceElements::generateAdminSectionContainer("network_content", $title, $data);
+
+        /*
+         * Network information
+         */
+                $html_network_information = array();
 
         // network_id
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Network ID")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $value = htmlspecialchars($this->getId(), ENT_QUOTES);
-        $html .= $value;
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+                $title = _("Network ID");
+        $data = htmlspecialchars($this->getId(), ENT_QUOTES);
+                $html_network_information[] = InterfaceElements::generateAdminSectionContainer("network_id", $title, $data);
 
         // name
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Network name")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_name";
-        $value = htmlspecialchars($this->getName(), ENT_QUOTES);
-        $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+                $title = _("Network name");
+                $data = InterfaceElements::generateInputText("network_" . $this->getId() . "_name", $this->getName(), "network_name_input");
+                $html_network_information[] = InterfaceElements::generateAdminSectionContainer("network_name", $title, $data);
 
         // creation_date
-        $name = "network_".$this->getId()."_creation_date";
-        $value = htmlspecialchars($this->getCreationDate(), ENT_QUOTES);
-
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Network creation date").":</div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-        
+                $title = _("Network creation date");
+        $data = DateTime::getSelectDateTimeUI(new DateTime($this->getCreationDate()), "network_" . $this->getId() . "_creation_date", DateTime::INTERFACE_DATETIME_FIELD, "network_creation_date_input");
+                $html_network_information[] = InterfaceElements::generateAdminSectionContainer("network_creation_date", $title, $data);
+
         // homepage_url
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Network's web site")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_homepage_url";
-        $value = htmlspecialchars($this->getHomepageURL(), ENT_QUOTES);
-        $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+                $title = _("Network's web site");
+                $data = InterfaceElements::generateInputText("network_" . $this->getId() . "_homepage_url", $this->getHomepageURL(), "network_homepage_url_input");
+                $html_network_information[] = InterfaceElements::generateAdminSectionContainer("network_homepage_url", $title, $data);
 
         // tech_support_email
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Technical support email")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_tech_support_email";
-        $value = htmlspecialchars($this->getTechSupportEmail(), ENT_QUOTES);
-        $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+                $title = _("Technical support email");
+                $data = InterfaceElements::generateInputText("network_" . $this->getId() . "_tech_support_email", $this->getTechSupportEmail(), "network_tech_support_email_input");
+                $html_network_information[] = InterfaceElements::generateAdminSectionContainer("network_tech_support_email", $title, $data);
+
+                // Build section
+                $html .= InterfaceElements::generateAdminSectionContainer("network_information", _("Information about the network"), implode(null, $html_network_information));
+
+        /*
+         * Network authentication
+         */
+                $html_network_authentication = array();
 
         //  network_authenticator_class
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Network authenticator class.  The subclass of Authenticator to be used for user authentication (ex: AuthenticatorRadius)")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_network_authenticator_class";
+                $title = _("Network authenticator class");
+                $help = _("The subclass of Authenticator to be used for user authentication. Example: AuthenticatorRadius");
+        $name = "network_" . $this->getId() . "_network_authenticator_class";
         $value = htmlspecialchars($this->getAuthenticatorClassName(), ENT_QUOTES);
-        $html .= $this->getSelectAuthenticator($name, $value);
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+        $data = $this->getSelectAuthenticator($name, $value);
+                $html_network_authentication[] = InterfaceElements::generateAdminSectionContainer("network_network_authenticator_class", $title, $data, $help);
 
         //  network_authenticator_params
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("The explicit parameters to be passed to the authenticator (ex: 'my_network_id', '192.168.0.11', 1812, 1813, 'secret_key', 'CHAP_MD5')")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_network_authenticator_params";
-        $value = htmlspecialchars($this->getAuthenticatorConstructorParams(), ENT_QUOTES);
-        $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+                $title = _("Authenticator parameters");
+        $help = _("The explicit parameters to be passed to the authenticator. Example: 'my_network_id', '192.168.0.11', 1812, 1813, 'secret_key', 'CHAP_MD5'");
+                $data = InterfaceElements::generateInputText("network_" . $this->getId() . "_network_authenticator_params", $this->getAuthenticatorConstructorParams(), "network_network_authenticator_params_input");
+                $html_network_authentication[] = InterfaceElements::generateAdminSectionContainer("network_network_authenticator_params", $title, $data, $help);
+
+                // Build section
+                $html .= InterfaceElements::generateAdminSectionContainer("network_authentication", _("Network Authentication"), implode(null, $html_network_authentication));
+
+        /*
+         * Network properties
+         */
+                $html_network_properties = array();
 
         //  is_default_network
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Is this network the default network?")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_is_default_network";
-        $this->isDefaultNetwork() ? $checked = 'CHECKED' : $checked = '';
-        $html .= "<input type='checkbox' name='$name' $checked>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+                $title = _("Is this network the default network?");
+                $data = InterfaceElements::generateInputCheckbox("network_" . $this->getId() . "_is_default_network", "", _("Yes"), $this->isDefaultNetwork(), "network_is_default_network_radio");
+                $html_network_properties[] = InterfaceElements::generateAdminSectionContainer("network_is_default_network", $title, $data);
+
+        //  theme_pack
+                $title = _("Selected theme pack for this network");
+        $data = ThemePack::getSelectUI("network_" . $this->getId() . "_theme_pack", $this->getThemePack());
+                $html_network_properties[] = InterfaceElements::generateAdminSectionContainer("network_theme_pack", $title, $data);
+
+                // Build section
+                $html .= InterfaceElements::generateAdminSectionContainer("network_properties", _("Network properties"), implode(null, $html_network_properties));
+
+        /*
+         * Network's node properties
+         */
+                $html_network_node_properties = array();
+
+        //  allow_splash_only_nodes
+                $title = _("Splash-only nodes");
+                $help = _("Are nodes allowed to be set as splash-only (no login)?");
+                $data = InterfaceElements::generateInputCheckbox("network_" . $this->getId() . "_allow_splash_only_nodes", "", _("Yes"), $this->getSplashOnlyNodesAllowed(), "network_allow_splash_only_nodes_radio");
+                $html_network_node_properties[] = InterfaceElements::generateAdminSectionContainer("network_allow_splash_only_nodes", $title, $data, $help);
+
+        //  allow_custom_portal_redirect
+                $title = _("Portal page redirection");
+                $help = _("Are nodes allowed to redirect users to an arbitrary web page instead of the portal?");
+                $data = InterfaceElements::generateInputCheckbox("network_" . $this->getId() . "_allow_custom_portal_redirect", "", _("Yes"), $this->getCustomPortalRedirectAllowed(), "network_allow_custom_portal_redirect_radio");
+                $html_network_node_properties[] = InterfaceElements::generateAdminSectionContainer("network_allow_custom_portal_redirect", $title, $data, $help);
+
+                // Build section
+                $html .= InterfaceElements::generateAdminSectionContainer("network_node_properties", _("Network's node properties"), implode(null, $html_network_node_properties));
+
+        /*
+         * Network's user verification
+         */
+                $html_network_user_verification = array();
 
         //  validation_grace_time
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("The length of the validation grace period in seconds.  A new user is granted Internet access for this period check his email and validate his account.")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_validation_grace_time";
-        $value = htmlspecialchars($this->getValidationGraceTime(), ENT_QUOTES);
-        $html .= "<input type='text' size ='5' value='$value' name='$name'>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+                $title = _("Validation grace period");
+        $help = _("The length of the validation grace period in seconds.  A new user is granted Internet access for this period check his email and validate his account.");
+                $data = InterfaceElements::generateInputText("network_" . $this->getId() . "_validation_grace_time", $this->getValidationGraceTime(), "network_validation_grace_time_input");
+                $html_network_user_verification[] = InterfaceElements::generateAdminSectionContainer("network_validation_grace_time", $title, $data, $help);
 
         //  validation_email_from_address
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("This will be the from adress of the validation email")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_validation_email_from_address";
-        $value = htmlspecialchars($this->getValidationEmailFromAddress(), ENT_QUOTES);
-        $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-
-        //  theme_pack
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Selected theme pack for this network")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_theme_pack";
-        $html .= ThemePack :: getSelectUI($name, $this->getThemePack());
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+                $title = _("This will be the from adress of the validation email");
+                $data = InterfaceElements::generateInputText("network_" . $this->getId() . "_validation_email_from_address", $this->getValidationEmailFromAddress(), "network_validation_email_from_address_input");
+                $html_network_user_verification[] = InterfaceElements::generateAdminSectionContainer("network_validation_email_from_address", $title, $data);
 
         //  allow_multiple_login
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Can an account be connected more than once at the same time?")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_allow_multiple_login";
-        $this->getMultipleLoginAllowed() ? $checked = 'CHECKED' : $checked = '';
-        $html .= "<input type='checkbox' name='$name' $checked>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-
-        //  allow_splash_only_nodes
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Are nodes allowed to be set as splash-only (no login)?")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_allow_splash_only_nodes";
-        $this->getSplashOnlyNodesAllowed() ? $checked = 'CHECKED' : $checked = '';
-        $html .= "<input type='checkbox' name='$name' $checked>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-
-        //  allow_custom_portal_redirect
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Are nodes allowed to redirect users to an arbitrary web page instead of the portal?")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        $name = "network_".$this->getId()."_allow_custom_portal_redirect";
-        $this->getCustomPortalRedirectAllowed() ? $checked = 'CHECKED' : $checked = '';
-        $html .= "<input type='checkbox' name='$name' $checked>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+                $title = _("Multiple connections");
+                $help = _("Can an account be connected more than once at the same time?");
+                $data = InterfaceElements::generateInputCheckbox("network_" . $this->getId() . "_allow_multiple_login", "", _("Yes"), $this->getMultipleLoginAllowed(), "network_allow_multiple_login_radio");
+                $html_network_user_verification[] = InterfaceElements::generateAdminSectionContainer("network_allow_multiple_login", $title, $data, $help);
+
+                // Build section
+                $html .= InterfaceElements::generateAdminSectionContainer("network_user_verification", _("Network's user verification"), implode(null, $html_network_user_verification));
+
+                /*
+                 * Access management
+                 */
+                $html_access_rights = array();
 
         //      network_stakeholders
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("Network stakeholders")." : </div>\n";
-        $html .= "<div class='admin_element_data'>\n";
-        //$name = "network_".$this->getId()."_allow_custom_portal_redirect";
-        //$this->getCustomPortalRedirectAllowed()? $checked='CHECKED': $checked='';
-        //$html .= "<input type='checkbox' name='$name' $checked>\n";
-        $html .= "WRITEME!";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
-
-        // Build HTML form fields names & values
+                $title = _("Network stakeholders");
+        $data = "WRITEME!";
+                $html_access_rights[] = InterfaceElements::generateAdminSectionContainer("network_stakeholders", $title, $data);
+
+                // Build section
+                $html .= InterfaceElements::generateAdminSectionContainer("network_access_rights", _("Access rights"), implode(null, $html_access_rights));
+
+                /*
+                 * Network GIS data
+                 */
         if (defined('GMAPS_HOTSPOTS_MAP_ENABLED') && GMAPS_HOTSPOTS_MAP_ENABLED == true) {
+                $html_network_gis_data = array();
+
             $gis_point = $this->getGisLocation();
-            $gis_lat_name = "network_".$this->getId()."_gis_latitude";
+            $gis_lat_name = "network_" . $this->getId() . "_gis_latitude";
             $gis_lat_value = htmlspecialchars($gis_point->getLatitude(), ENT_QUOTES);
-            $gis_long_name = "network_".$this->getId()."_gis_longitude";
+            $gis_long_name = "network_" . $this->getId() . "_gis_longitude";
             $gis_long_value = htmlspecialchars($gis_point->getLongitude(), ENT_QUOTES);
-            $gis_alt_name = "network_".$this->getId()."_gis_altitude";
+            $gis_alt_name = "network_" . $this->getId() . "_gis_altitude";
             $gis_alt_value = htmlspecialchars($gis_point->getAltitude(), ENT_QUOTES);
 
-            $html .= "<li class='admin_element_item_container'>\n";
-            $html .= "<div class='admin_element_label'>"._("Center latitude for your the area of your wireless network")." : </div>\n";
-            $html .= "<div class='admin_element_data'>\n";
-            $html .= "<input type='text' size ='15' value='$gis_lat_value' id='$gis_lat_name' name='$gis_lat_name'>\n";
-            $html .= "</div>\n";
-            $html .= "</li>\n";
-
-            $html .= "<li class='admin_element_item_container'>\n";
-            $html .= "<div class='admin_element_label'>"._("Center longitude for your the area of your wireless network")." : </div>\n";
-            $html .= "<div class='admin_element_data'>\n";
-            $html .= "<input type='text' size ='15' value='$gis_long_value' id='$gis_long_name' name='$gis_long_name'>\n";
-            $html .= "</div>\n";
-            $html .= "</li>\n";
-
-            $html .= "<li class='admin_element_item_container'>\n";
-            $html .= "<div class='admin_element_label'>"._("Zoomlevel of the Google Map for your the area of your wireless network")." : </div>\n";
-            $html .= "<div class='admin_element_data'>\n";
-            $html .= "<input type='text' size ='15' value='$gis_alt_value' id='$gis_alt_name' name='$gis_alt_name'>\n";
-            $html .= "</div>\n";
-            $html .= "</li>\n";
-
-            $html .= "<li class='admin_element_item_container'>\n";
-            $html .= "<div class='admin_element_label'>"._("Default Google Map type for your the area of your wireless network")." : </div>\n";
-            $html .= "<div class='admin_element_data'>\n";
-            $html .= $this->getSelectGisMapType("network_".$this->getId()."_gmaps_map_type", $this->getGisMapType());
-            $html .= "</div>\n";
-            $html .= "</li>\n";
-        }
-
-        // Create new nodes
-        $html .= "<li class='admin_element_item_container'>\n";
-        $html .= "<div class='admin_element_label'>"._("New node ID")." : </div>\n";
-
-        $html .= "<div class='admin_element_data'>\n";
-
-        $html .= Node :: getCreateNewObjectUI($this);
-        $html .= "</div>\n";
-                $html .= "<div class='admin_element_tools'>\n";
-        $name = "network_{$this->getId()}_create_node";
-        $html .= "<input type='submit' name='{$name}' value='"._("Create a new node")."'>\n";
-        $html .= "</div>\n";
-        $html .= "</li>\n";
+                $title = _("Latitude");
+                $help = _("Center latitude for your the area of your wireless network");
+                $data = InterfaceElements::generateInputText($gis_lat_name, $gis_lat_value, "network_gis_latitude_input");
+                $html_network_gis_data[] = InterfaceElements::generateAdminSectionContainer("network_gis_latitude", $title, $data, $help);
+
+                $title = _("Longitude");
+                $help = _("Center longitude for your the area of your wireless network");
+                $data = InterfaceElements::generateInputText($gis_long_name, $gis_long_value, "network_gis_longitude_input");
+                $html_network_gis_data[] = InterfaceElements::generateAdminSectionContainer("network_gis_longitude", $title, $data, $help);
+
+                $title = _("Zoomlevel");
+                $help = _("Zoomlevel of the Google Map for your the area of your wireless network");
+                $data = InterfaceElements::generateInputText($gis_alt_name, $gis_alt_value, "network_gis_altitude_input");
+                $html_network_gis_data[] = InterfaceElements::generateAdminSectionContainer("network_gis_altitude", $title, $data, $help);
+
+                $title = _("Map type");
+                $help = _("Default Google Map type for your the area of your wireless network");
+                $data = $this->getSelectGisMapType("network_" . $this->getId() . "_gmaps_map_type", $this->getGisMapType());
+                $html_network_gis_data[] = InterfaceElements::generateAdminSectionContainer("network_gmaps_map_type", $title, $data, $help);
+
+                // Build section
+                $html .= InterfaceElements::generateAdminSectionContainer("network_gis_data", _("GIS data"), implode(null, $html_network_gis_data));
+        }
 
         $html .= "</ul>\n";
-        $html .= "</fieldset>\n";
+        $html .= "</fieldset>";
+
         return $html;
     }
 
-    /** Process admin interface of this object.
-    */
-    public function processAdminUI() {
-        //pretty_print_r($_REQUEST);
-        $user = User :: getCurrentUser();
-        if (!$this->hasAdminAccess($user)) {
-            throw new Exception(_('Access denied!'));
-        }
-        
+    /**
+     * Process admin interface of this object.
+     *
+     * @return void
+     *
+     * @access public
+     */
+    public function processAdminUI()
+    {
+        $user = User::getCurrentUser();
+
+        try {
+            if (!$this->hasAdminAccess($user)) {
+                throw new Exception(_('Access denied!'));
+            }
+        } catch (Exception $e) {
+            $ui = new MainUI();
+            $ui->setToolSection('ADMIN');
+            $ui->displayError($e->getMessage(), false);
+            exit;
+        }
+
         // Content management
         $name = "network_".$this->id."_content";
@@ -1469 +1759 @@
         $name = "network_".$this->getId()."_name";
         $this->setName($_REQUEST[$name]);
-        
+
         // creation_date
         $name = "network_".$this->getId()."_creation_date";
@@ -1544 +1834 @@
     }
 
-    /** Add network-wide content to this network */
-    public function addContent(Content $content) {
-        global $db;
+    /**
+     * Add network-wide content to this network
+     *
+     * @param object Content object
+     *
+     * @return void
+     *
+     * @access public
+     */
+    public function addContent(Content $content)
+    {
+        // Define globals
+        global $db;
+
         $content_id = $db->escapeString($content->getId());
         $sql = "INSERT INTO network_has_content (network_id, content_id) VALUES ('$this->id','$content_id')";
@@ -1552 +1853 @@
     }
 
-    /** Remove network-wide content from this network */
-    public function removeContent(Content $content) {
-        global $db;
+    /**
+     * Remove network-wide content from this network
+     *
+     * @param object Content object
+     *
+     * @return void
+     *
+     * @access public
+     */
+    public function removeContent(Content $content)
+    {
+        // Define globals
+        global $db;
+
         $content_id = $db->escapeString($content->getId());
         $sql = "DELETE FROM network_has_content WHERE network_id='$this->id' AND content_id='$content_id'";
@@ -1560 +1872 @@
     }
 
-    /** Delete this Object form the it's storage mechanism
-     * @param &$errmsg Returns an explanation of the error on failure
-     * @return true on success, false on failure or access denied */
-    public function delete(& $errmsg) {
+    /**
+     * Delete this Object form the it's storage mechanism
+     *
+     * @param string &$errmsg Returns an explanation of the error on failure
+     *
+     * @return bool true on success, false on failure or access denied
+     *
+     * @access public
+     */
+    public function delete(& $errmsg)
+    {
+        // Init values
         $retval = false;
+
         $user = User :: getCurrentUser();
         if (!$user->isSuperAdmin()) {
             $errmsg = _('Access denied (must have super admin access)');
-        }
-        else {
-            if ($this->isDefaultNetwork() === true)
+        } else {
+            if ($this->isDefaultNetwork() === true) {
                 $errmsg = _('Cannot delete default network, create another one and select it before remove this one.');
-            else {
+            } else {
                 global $db;
                 $id = $db->escapeString($this->getId());
                 if (!$db->execSqlUpdate("DELETE FROM networks WHERE network_id='{$id}'", false)) {
                     $errmsg = _('Could not delete network!');
-                }
-                else {
+                } else {
                     $retval = true;
                 }
             }
         }
+
         return $retval;
     }
-    /** Reloads the object from the database.  Should normally be called after a set operation */
-    protected function refresh() {
+    /**
+     * Reloads the object from the database.
+     *
+     * Should normally be called after a set operation
+     *
+     * @return void
+     *
+     * @access protected
+     */
+    protected function refresh()
+    {
         $this->__construct($this->id);
     }
 
-    public static function assignSmartyValues($smarty, $net = null) {
-        if (!$net)
-            $net = Network :: getCurrentNetwork();
-
+    /**
+     * Assigns values about network to be processed by the Smarty engine.
+     *
+     * @param object $smarty Smarty object
+     * @param object $net    Network object
+     *
+     * @return void
+     *
+     * @static
+     * @access public
+     */
+    public static function assignSmartyValues($smarty, $net = null)
+    {
+        if (!$net) {
+            $net = Network::getCurrentNetwork();
+        }
+
+        // Set network details
         $smarty->assign('networkName', $net ? $net->getName() : '');
         $smarty->assign('networkHomepageURL', $net ? $net->getHomepageURL() : '');
+
         // Set networks usage information
         $smarty->assign('networkNumValidUsers', $net ? $net->getNumValidUsers() : 0);
@@ -1603 +1947 @@
         $smarty->assign('networkNumDeployedNodes', $net ? $net->getNumDeployedNodes() : 0);
         $smarty->assign('networkNumOnlineNodes', $net ? $net->getNumOnlineNodes() : 0);
+        $smarty->assign('networkNumNonMonitoredNodes', $net ? $net->getNumOnlineNodes(true) : 0);
     }
 }

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

@@ -51 +51 @@
 require_once('classes/DateTime.php');
 require_once('classes/InterfaceElements.php');
+require_once('classes/MainUI.php');
 
 /**
@@ -68 +69 @@
         private $id;
         private static $current_node_id = null;
+
+        /**
+         * List of deployment statuses
+         *
+         * @var array
+         * @access private
+         */
+        private $_deploymentStatuses = array();
 
         /**
@@ -187 +196 @@
         }
 
-        /** Create a new Node in the database
-         * @param $node_id The id to be given to the new node.  If not present, a
-         * guid will be assigned.
-         * @param $network Network object.  The node's network.  If not present,
-         * the current Network will be assigned
-         *
-         * @return the newly created Node object, or null if there was an error
-         */
-        static function createNewObject($node_id = null, $network = null)
-        {
-                global $db;
-                if (empty ($node_id))
-                {
+        /**
+         * Create a new Node in the database
+         *
+         * @param string $node_id The Id to be given to the new node.  If not
+         *                        present, guid will be assigned.
+         * @param object $network Network object.  The node's network.  If not
+         *                        present, the current Network will be assigned
+         *
+         * @return mixed The newly created Node object, or null if there was
+         *               an error
+         *
+         * @static
+         * @access public
+         */
+        public static function createNewObject($node_id = null, $network = null)
+        {
+            // Define globals
+                global $db;
+
+                if (empty ($node_id)) {
                         $node_id = get_guid();
                 }
+
                 $node_id = $db->escapeString($node_id);
 
-                if (empty ($network))
-                {
-                        $network = Network :: getCurrentNetwork();
-                }
+                if (empty ($network)) {
+                        $network = Network::getCurrentNetwork();
+                }
+
                 $network_id = $db->escapeString($network->getId());
 
                 $node_deployment_status = $db->escapeString("IN_PLANNING");
                 $node_name = _("New node");
-                if (Node :: nodeExists($node_id))
-                        throw new Exception(_('This node already exists.'));
-
-                $sql = "INSERT INTO nodes (node_id, network_id, creation_date, node_deployment_status, name) VALUES ('$node_id', '$network_id', NOW(),'$node_deployment_status', '$node_name')";
-
-                if (!$db->execSqlUpdate($sql, false))
-                {
-                        throw new Exception(_('Unable to insert new node into database!'));
-                }
-                $object = new self($node_id);
-                return $object;
+
+                try {
+            if (Node::nodeExists($node_id)) {
+                throw new Exception(_('This node already exists.'));
+            }
+
+            $sql = "INSERT INTO nodes (node_id, network_id, creation_date, node_deployment_status, name) VALUES ('$node_id', '$network_id', NOW(),'$node_deployment_status', '$node_name')";
+
+            if (!$db->execSqlUpdate($sql, false)) {
+                throw new Exception(_('Unable to insert new node into database!'));
+            }
+
+            $object = new self($node_id);
+
+            return $object;
+        } catch (Exception $e) {
+            $ui = new MainUI();
+            $ui->setToolSection('ADMIN');
+            $ui->displayError($e->getMessage(), false);
+            exit;
+        }
         }
 
@@ -235 +262 @@
                 $html = '';
                 $name = "{$user_prefix}";
+
+        $_deploymentStatuses = array(
+            "DEPLOYED" => _("Deployed"),
+            "IN_PLANNING" => _("In planning"),
+            "IN_TESTING" => _("In testing"),
+            "NON_WIFIDOG_NODE" => _("Non-Wifidog node"),
+            "PERMANENTLY_CLOSED" => _("Permanently closed"),
+            "TEMPORARILY_CLOSED" => _("Temporarily closed")
+            );
+
                 $sql = "SELECT node_id, name, node_deployment_status, is_splash_only_node from nodes WHERE 1=1 $sql_additional_where ORDER BY lower(node_id)";
                 $node_rows = null;
                 $db->execSql($sql, $node_rows, false);
-                if ($node_rows != null)
-                {
+
+                if ($node_rows != null) {
                         Utils :: natsort2d($node_rows, "node_id");
                         if ($type_interface != "table") {
@@ -267 +304 @@
                                 {
                                         $href = GENERIC_OBJECT_ADMIN_ABS_HREF."?object_id={$node_row['node_id']}&object_class=Node&action=edit";
-                                        $html .= "\t\t\t\t<tr class='row' onclick=\"javascript:location.href='{$href}'\">\n\t\t\t\t\t<td>{$node_row['name']}<noscript>(<a href='{$href}'>edit</a>)</noscript></td>\n\t\t\t\t\t<td>{$node_row['node_id']}</td>\n\t\t\t\t\t<td>{$node_row['node_deployment_status']}</td>\n\t\t\t\t</tr>\n";
+                                        $_deployStatusNode = $node_row['node_deployment_status'];
+                                        $html .= "\t\t\t\t<tr class='row' onclick=\"javascript:location.href='{$href}'\">\n\t\t\t\t\t<td>{$node_row['name']}<noscript>(<a href='{$href}'>edit</a>)</noscript></td>\n\t\t\t\t\t<td>{$node_row['node_id']}</td>\n\t\t\t\t\t<td>{$_deploymentStatuses[$_deployStatusNode]}</td>\n\t\t\t\t</tr>\n";
                                 }
                                 $html .= "\t\t\t</tbody>\n\t\t</table>\n";
@@ -317 +355 @@
         }
 
-        /** Process the new object interface.
-         *  Will return the new object if the user has the credentials and the form was fully filled.
+        /**
+         * Process the new object interface.
+         *
+         * Will return the new object if the user has the credentials and the form was fully filled.
          * @return the node object or null if no new node was created.
          */
-        static function processCreateNewObjectUI()
-        {
+        public static function processCreateNewObjectUI()
+        {
+            // Init values
                 $retval = null;
                 $name = "new_node_id";
-                if (!empty ($_REQUEST[$name]))
-                {
+
+                if (!empty ($_REQUEST[$name])) {
                         $node_id = $_REQUEST[$name];
                         $name = "new_node_network_id";
-                        if (!empty ($_REQUEST[$name]))
-                        {
-                                $network = Network :: getObject($_REQUEST[$name]);
+
+                        if (!empty ($_REQUEST[$name])) {
+                                $network = Network::getObject($_REQUEST[$name]);
+                        } else {
+                                $network = Network::processSelectNetworkUI('new_node');
                         }
-                        else
-                        {
-                                $network = Network :: processSelectNetworkUI('new_node');
+
+                        if ($node_id && $network) {
+                            try {
+                                if (!$network->hasAdminAccess(User :: getCurrentUser())) {
+                                        throw new Exception(_("Access denied"));
+                                }
+                } catch (Exception $e) {
+                    $ui = new MainUI();
+                    $ui->setToolSection('ADMIN');
+                    $ui->displayError($e->getMessage(), false);
+                    exit;
+                }
+
+                                $retval = self::createNewObject($node_id, $network);
                         }
-                        if ($node_id && $network)
-                        {
-                                if (!$network->hasAdminAccess(User :: getCurrentUser()))
-                                {
-                                        throw new Exception(_("Access denied"));
-                                }
-                                $retval = self :: createNewObject($node_id, $network);
-                        }
-                }
+                }
+
                 return $retval;
         }
@@ -377 +424 @@
 
                 foreach ($status_list as $status) {
-                        $tab[] = array($status['node_deployment_status'], $status['node_deployment_status']);
+                    $_statusvalue = $status['node_deployment_status'];
+                        $tab[] = array($_statusvalue, $this->_deploymentStatuses["$_statusvalue"]);
                 }
 
@@ -385 +433 @@
         }
 
-        /** Get the selected deployment status
-         * @param $user_prefix A identifier provided by the programmer to recognise it's generated form
-         * @return the deployment status
+        /**
+         * Get the selected deployment status
+         *
+         * @param string $user_prefix An identifier provided by the programmer to
+         *                            recognise it's generated form
+         *
+         * @return string The deployment status
+         *
+         * @access public
          */
         public function processSelectDeploymentStatus($user_prefix)
@@ -410 +464 @@
                         throw new Exception(sprintf(_("The node %s could not be found in the database!"), $node_id_str));
                 }
+
+        $this->_deploymentStatuses = array(
+            "DEPLOYED" => _("Deployed"),
+            "IN_PLANNING" => _("In planning"),
+            "IN_TESTING" => _("In testing"),
+            "NON_WIFIDOG_NODE" => _("Non-Wifidog node"),
+            "PERMANENTLY_CLOSED" => _("Permanently closed"),
+            "TEMPORARILY_CLOSED" => _("Temporarily closed")
+            );
+
                 $this->mRow = $row;
                 $this->id = $row['node_id'];
@@ -744 +808 @@
          * Retrieves the admin interface of this object
          *
-         * @return The HTML fragment for this interface
+         * @return string The HTML fragment for this interface
          *
          * @access public
@@ -756 +820 @@
                 $html = '';
 
-                if (!User::getCurrentUser()) {
-                        throw new Exception(_('Access denied!'));
-                }
+                try {
+                if (!User::getCurrentUser()) {
+                        throw new Exception(_('Access denied!'));
+                }
+        } catch (Exception $e) {
+            $ui = new MainUI();
+            $ui->setToolSection('ADMIN');
+            $ui->displayError($e->getMessage(), false);
+            exit;
+        }
 
                 // Get information about the network
@@ -996 +1067 @@
         }
 
-        /** Process admin interface of this object.
-        */
+        /**
+         * Process admin interface of this object.
+         *
+         * @return void
+         *
+         * @access public
+         */
         public function processAdminUI()
         {
-                $user = User :: getCurrentUser();
-
-                if (!$this->isOwner($user) && !$user->isSuperAdmin())
-                {
-                        throw new Exception(_('Access denied!'));
-                }
+                $user = User::getCurrentUser();
+
+                try {
+                if (!$this->isOwner($user) && !$user->isSuperAdmin()) {
+                        throw new Exception(_('Access denied!'));
+                }
+        } catch (Exception $e) {
+            $ui = new MainUI();
+            $ui->setToolSection('ADMIN');
+            $ui->displayError($e->getMessage(), false);
+            exit;
+        }
 
                 // Check if user is a admin
@@ -1288 +1370 @@
         }
 
-        /** The list of users online at this node
-         * @return An array of User object, or en empty array */
-        function getOnlineUsers()
-        {
-                global $db;
-                $retval = array ();
+        /**
+         * The list of users online at this node
+         *
+         * @return array An array of User object, or an empty array
+         *
+         * @access public
+         */
+        public function getOnlineUsers()
+        {
+            // Define globals
+                global $db;
+
+                // Init values
+                $retval = array();
                 $users = null;
+                $anonUsers = 0;
+
                 $db->execSql("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}'", $users, false);
-                if ($users != null)
-                {
-                        foreach ($users as $user_row)
-                        {
-                                $retval[] = User :: getObject($user_row['user_id']);
+
+                if ($users != null) {
+                        foreach ($users as $user_row) {
+                            if ($this->isConfiguredSplashOnly()) {
+                                if (User::getObject($user_row['user_id']) == "SPLASH_ONLY_USER") {
+                                    $anonUsers++;
+                                } else {
+                                        $retval[] = User::getObject($user_row['user_id']);
+                                }
+                            } else {
+                                    $retval[] = User::getObject($user_row['user_id']);
+                            }
                         }
-                }
+
+                    if ($this->isConfiguredSplashOnly() && $anonUsers == 1) {
+                            $retval[] = "One anonymous user";
+                    } else if ($this->isConfiguredSplashOnly() && $anonUsers > 1) {
+                            $retval[] = sprintf("%d anonymous users", $anonUsers);
+                    }
+                }
+
                 return $retval;
         }
 
-        /** Find out how many users are online this specific Node
-         * @return Number of online users
-         */
-        function getNumOnlineUsers()
-        {
-                global $db;
+        /**
+         * Find out how many users are online this specific Node
+         *
+         * @return int Number of online users
+         *
+         * @access public
+         */
+        public function getNumOnlineUsers()
+        {
+            // Define globals
+                global $db;
+
+                // Init values
                 $retval = array ();
                 $row = null;
-                if(!$this->isConfiguredSplashOnly())
+
+                if (!$this->isConfiguredSplashOnly()) {
                         $db->execSqlUniqueRes("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}'", $row, false);
-                else
+                } else {
                         $db->execSqlUniqueRes("SELECT COUNT(DISTINCT connections.user_mac) as count FROM connections WHERE connections.token_status='".TOKEN_INUSE."' AND connections.node_id='{$this->id}'", $row, false);
+                }
+
                 return $row['count'];
         }

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

@@ -403 +403 @@
 
                         if ($_serverId) {
-                                if (!User::getCurrentUser()->isSuperAdmin()) {
-                                        throw new Exception(_("Access denied"));
-                                }
+                            try {
+                                if (!User::getCurrentUser()->isSuperAdmin()) {
+                                        throw new Exception(_("Access denied"));
+                                }
+                } catch (Exception $e) {
+                    require_once('classes/MainUI.php');
+
+                    $ui = new MainUI();
+                    $ui->setToolSection('ADMIN');
+                    $ui->displayError($e->getMessage(), false);
+                    exit;
+                }
 
                                 $_retVal = self::createNewObject($_serverId);
@@ -780 +789 @@
         {
         require_once('classes/User.php');
-                if (!User::getCurrentUser()->isSuperAdmin()) {
-                        throw new Exception(_('Access denied!'));
-                }
+
+        try {
+                if (!User::getCurrentUser()->isSuperAdmin()) {
+                        throw new Exception(_('Access denied!'));
+                }
+        } catch (Exception $e) {
+            $ui = new MainUI();
+            $ui->setToolSection('ADMIN');
+            $ui->displayError($e->getMessage(), false);
+            exit;
+        }
 
                 // creation_date
@@ -877 +894 @@
  * End:
  */
-

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

@@ -47 +47 @@
  */
 require_once('include/common.php');
+require_once('classes/MainUI.php');
 
 /**
@@ -378 +379 @@
      *
      * @return string HTML markup
+     *
+     * @access private
      */
     private function getSelectedNodesUI()
     {
+        // Define globals
         global $db;
+
+        // Init values
         $html = '';
+
         $name = "statistics_selected_nodes[]";
-        $user = User :: getCurrentUser();
-        if ($user->isSuperAdmin())
-        {
-            $sql_join = '';
-        }
-        else
-        {
-            $user_id = $db->escapeString($user->getId());
-            $sql_join = " JOIN node_stakeholders ON (nodes.node_id=node_stakeholders.node_id AND user_id='$user_id') ";
-        }
-        $sql = "SELECT nodes.node_id, nodes.name from nodes $sql_join WHERE 1=1 ORDER BY lower(node_id)";
-        $node_rows = null;
-        $db->execSql($sql, $node_rows, false);
-        $html .= "<select multiple size = 6 name='$name'>\n";
-
-        /*count($this->report_selected_nodes)==0?$selected=' SELECTED ':$selected='';
-                    $html.= "<option value='' $selected>"._("Statistics for all nodes")."</option>\n";
-        */
-        if ($node_rows != null)
-        {
-            foreach ($node_rows as $node_row)
-            {
-                $html .= "<option ";
-                if (array_key_exists($node_row['node_id'], $this->report_selected_nodes))
-                {
-                    $html .= " SELECTED ";
+        $user = User::getCurrentUser();
+
+        try {
+            if (!isset($user)) {
+                throw new Exception(_('Access denied!'));
+            } else if ((!$user->isSuperAdmin() && !$user->isOwner()) || $user->isNobody()) {
+                throw new Exception(_('Access denied!'));
+            }
+
+            if ($user->isSuperAdmin()) {
+                $sql_join = '';
+            } else {
+                $user_id = $db->escapeString($user->getId());
+                $sql_join = " JOIN node_stakeholders ON (nodes.node_id=node_stakeholders.node_id AND user_id='$user_id') ";
+            }
+
+            $sql = "SELECT nodes.node_id, nodes.name from nodes $sql_join WHERE 1=1 ORDER BY lower(node_id)";
+            $node_rows = null;
+            $db->execSql($sql, $node_rows, false);
+            $html .= "<select multiple size = 6 name='$name'>\n";
+
+            if ($node_rows != null) {
+                foreach ($node_rows as $node_row) {
+                    $html .= "<option ";
+
+                    if (array_key_exists($node_row['node_id'], $this->report_selected_nodes)) {
+                        $html .= " SELECTED ";
+                    }
+
+                    $nom = $node_row['node_id'].": ".$node_row['name'];
+                    $nom = htmlspecialchars($nom, ENT_QUOTES, 'UTF-8');
+                    $primary_key = htmlentities($node_row['node_id'], ENT_QUOTES, 'UTF-8');
+                    $html .= "value='$primary_key'>$nom</option>\n";
                 }
-
-                $nom = $node_row['node_id'].": ".$node_row['name'];
-                $nom = htmlspecialchars($nom, ENT_QUOTES, 'UTF-8');
-                $primary_key = htmlentities($node_row['node_id'], ENT_QUOTES, 'UTF-8');
-                $html .= "value='$primary_key'>$nom</option>\n";
-            }
-        }
-        $html .= "</select>\n";
+            }
+
+            $html .= "</select>\n";
+        } catch (Exception $e) {
+            $ui = new MainUI();
+            $ui->setToolSection('ADMIN');
+            $ui->displayError($e->getMessage(), false);
+            exit;
+        }
+
         return $html;
     }

trunk/wifidog-auth/wifidog/node_list.php

@@ -107 +107 @@
     throw new Exception(_("No nodes could not be found in the database"));
 
+$deploymentStatuses = array(
+    "DEPLOYED" => _("Deployed"),
+    "IN_PLANNING" => _("In planning"),
+    "IN_TESTING" => _("In testing"),
+    "NON_WIFIDOG_NODE" => _("Non-Wifidog node"),
+    "PERMANENTLY_CLOSED" => _("Permanently closed"),
+    "TEMPORARILY_CLOSED" => _("Temporarily closed")
+    );
+
 $nodes_list = array ();
 foreach ($nodes_results as $node_row)
@@ -113 +122 @@
     $node_row['duration'] = $db->GetDurationArrayFromIntervalStr($node_row['since_last_heartbeat']);
     $node_row['num_online_users'] = $node->getNumOnlineUsers();
+    $nodeDeploymentStatus = $node_row['node_deployment_status'];
+    $node_row['node_deployment_status'] = $deploymentStatuses["$nodeDeploymentStatus"];
     $nodes_list[] = $node_row;
 }

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

@@ -93 +93 @@
             {"%d hotspots are currently operationnal."|_|sprintf:$networkNumOnlineNodes}
         {/if}
+
+        {if $networkNumNonMonitoredNodes > 0}
+            {if $networkNumNonMonitoredNodes == 1}
+                {"Because of one hotspot not being monitored we don't know if it is currently operationnal."|_}
+            {else}
+                {"Because of %d hotspots not being monitored we don't know if they are currently operationnal."|_|sprintf:$networkNumNonMonitoredNodes}
+            {/if}
+        {/if}
     </p>