Changeset 1089 for trunk/wifidog-auth/wifidog/classes/Statistics.php

Timestamp:

09/03/06 18:54:01 (6 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)"

Files:

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

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;
     }