Changeset 405

Timestamp:

01/27/05 11:00:52 (8 years ago)

Author:

aprilp

Message:

*** empty log message ***

Location:

trunk/wifidog-auth/wifidog

Files:

• admin/hotspot.php (modified) (4 diffs)
• classes/Node.php (modified) (5 diffs)
• node_list.php (modified) (1 diff)
• templates/node_list.html (modified) (1 diff)

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

@@ -37 +37 @@
     
     if ("$node_id" != "new") { // Node creation
-        $node = Node::GetObject($node_id);
+        $node = Node::getNode($node_id);
     }
 
@@ -43 +43 @@
     $smarty->assign("user_id", $user_id);
     $smarty->assign("node_id", $node_id);
-    $smarty->assign('node_deployment_status', Node::GetAllDeploymentStatus());
+    $smarty->assign('node_deployment_status', Node::getAllDeploymentStatus());
 
     $smarty->display("admin/templates/hotspot_edit.html");
@@ -59 +59 @@
     $smarty->assign("title", _("Add a new hotspot with"));
     $smarty->assign("node_id", $node_id);
-    $smarty->assign('node_deployment_status', Node::GetAllDeploymentStatus());
+    $smarty->assign('node_deployment_status', Node::getAllDeploymentStatus());
     $smarty->display("admin/templates/hotspot_edit.html");
 
@@ -128 +128 @@
 
     //if (is_array($node_results)) { // If no row return, $node_results will be NULL
-    $nodes = Node::GetAllNodes();
+    $nodes = Node::getAllNodes();
     if (is_array($nodes)) {
         $smarty->assign('nodes', $nodes);

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

@@ -34 +34 @@
    * @return a Node object, or null if there was an error
    */
-  static function getObject($id) {
+  static function getNode($id) {
       $object = null;
       $object = new self($id);
@@ -44 +44 @@
    * @return the newly created Node object, or null if there was an error
    */
-  static function createObject($id) {
+  static function createNode($id) {
       global $db;
 
@@ -62 +62 @@
     $db->ExecSqlUniqueRes($sql, $row, false);
     if ($row == null) {
-            throw new Exception(_("The id $node_id_str could not be found in the database"), "EXCEPTION_CREATE_OBJECT_FAILED");
+            throw new Exception(_("The id $node_id_str could not be found in the database"));
     }
     $this->mRow = $row;  
@@ -96 +96 @@
 
     $db->ExecSql("SELECT * FROM nodes", $nodes, false);
+
     if ($nodes == null) {
-        throw new Exception(_("No nodes could not be found in the database"), "EXCEPTION_NO_NODES");
+        throw new Exception(_("No nodes could not be found in the database"));
+    }
+    return $nodes;
+  }
+
+  static function getAllNodesOrdered($order_by) {
+    global $db;
+
+    $db->ExecSql("SELECT * FROM nodes ORDER BY $order_by", $nodes, false);
+
+    if ($nodes == null) {
+        throw new Exception(_("No nodes could not be found in the database"));
+    }
+    return $nodes;
+  }
+
+  static function getAllNodesWithStatus() {
+    global $db;
+    $db->ExecSql("SELECT node_id, name, last_heartbeat_user_agent, (NOW()-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((NOW()-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date FROM nodes ORDER BY node_id", $nodes, false);
+    if ($nodes == null) {
+        throw new Exception(_("No nodes could not be found in the database"));
     }
     return $nodes;
@@ -107 +128 @@
     $db->ExecSql("SELECT * FROM node_deployment_status", $statuses, false);
     if ($statuses == null) {
-        throw new Exception(_("No deployment statues  could be found in the database"), "EXCEPTION_NO_STATUSES");
+        throw new Exception(_("No deployment statues  could be found in the database"));
     }
     $statuses_array = array();

trunk/wifidog-auth/wifidog/node_list.php

@@ -27 +27 @@
 require_once BASEPATH.'include/common.php';
 require_once BASEPATH.'include/common_interface.php';
+require_once BASEPATH.'classes/Node.php';
 
-$db->ExecSql("SELECT node_id, name, last_heartbeat_user_agent, (NOW()-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((NOW()-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS is_up, creation_date FROM nodes ORDER BY node_id", $node_results, false);
-
-foreach($node_results as $node_row) {
-    $node_row['duration'] = $db->GetDurationArrayFromIntervalStr($node_row['since_last_heartbeat']);
-    $node_row['num_online_users'] = $stats->getNumOnlineUsers($node_row['node_id']);
-    $smarty->append("nodes", $node_row);
+foreach(Node::getAllNodesWithStatus("node_id") as $node) {
+    $node['duration'] = $db->GetDurationArrayFromIntervalStr($node['since_last_heartbeat']);
+    $node['num_online_users'] = $stats->getNumOnlineUsers($node['node_id']);
+    $smarty->append("nodes", $node);
 }
 

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

@@ -17 +17 @@
 <tr class="{cycle values="odd,even"}">
     <td class="status">
-    {if $nodes[node].is_up == "t"}
+    {if $nodes[node].online == 't'}
     <img src='{$smarty.const.BASE_URL_PATH}images/hotspot_status_up.png'>
     {else}