Changeset 224

Timestamp:

09/02/04 11:19:57 (9 years ago)

Author:

benoitg

Message:

2004-09-02 Benoit Gr�goire <bock@…>

• wifidog/node_list.php: Complete the status page
• Add images
• Add hotspot creation date

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• sql/wifidog-postgres-schema.sql (modified) (1 diff)
• wifidog/classes/AbstractDbPostgres.php (modified) (1 diff)
• wifidog/images (added)
• wifidog/images/hotspot_status_down.png (added)
• wifidog/images/hotspot_status_up.png (added)
• wifidog/index.php (modified) (1 diff)
• wifidog/node_list.php (modified) (2 diffs)

trunk/wifidog-auth/ChangeLog

@@ -1 +1 @@
 # $Header$
+2004-09-02 Benoit Gr�goire  <bock@step.polymtl.ca>
+        * wifidog/node_list.php: Complete the status page
+        * Add images
+        * Add hotspot creation date
+        
 2004-08-31 Benoit Gr�goire  <bock@step.polymtl.ca>
         * sql/: Update the postgres schemas and add scripts to ease maintaining it.

trunk/wifidog-auth/sql/wifidog-postgres-schema.sql

@@ -85 +85 @@
     rss_url text,
     last_heartbeat_ip character varying(16),
-    last_heartbeat_timestamp timestamp without time zone
+    last_heartbeat_timestamp timestamp without time zone DEFAULT now(),
+    creation_date date DEFAULT now()
 );
 

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

@@ -360 +360 @@
                 {
                         $sql = "SELECT EXTRACT (year FROM INTERVAL '$intervalstr') AS years, EXTRACT (month FROM INTERVAL '$intervalstr') AS months, EXTRACT (day FROM INTERVAL '$intervalstr') AS days, EXTRACT (hour FROM INTERVAL '$intervalstr') AS hours, EXTRACT (minutes FROM INTERVAL '$intervalstr') AS minutes, EXTRACT (seconds FROM INTERVAL '$intervalstr') AS seconds";
-                        $this -> ExecuterSqlResUnique($sql, $retval, false);
+                        $this -> ExecSqlUniqueRes($sql, $retval, false);
                 }
                 return $retval;

trunk/wifidog-auth/wifidog/index.php

@@ -46 +46 @@
     echo "<ul>\n";
     echo "<li><a href='node_list.php'>List network nodes</a></li>\n";
-    echo "<li><a href='".BASE_SSL_PATH."login/index.php?gw_id=default&gw_address=127.0.0.1&gw_port=80'>Login (demo)</a></li>\n";
-    echo "<li><a href='./portal/index.php?gw_id=default'>Portal (demo)</a></li>\n";
     echo "<li><a href='./user_management/index.php'>Personal user management</a></li>\n";
     echo "<li><a href='".BASE_SSL_PATH."admin/index.php'>Administration</a></li>\n";

trunk/wifidog-auth/wifidog/node_list.php

@@ -27 +27 @@
 require_once BASEPATH.'include/common.php';
 require_once BASEPATH.'classes/Style.php';
+require_once (BASEPATH.'include/user_management_menu.php');
 
 $style = new Style();
@@ -36 +37 @@
     echo "<h1>". HOTSPOT_NETWORK_NAME ." node list</h1>\n";
 
-$row = null;
-$db->ExecSqlUniqueRes("SELECT node_id, name, NOW()-last_heartbeat_timestamp AS last_heartbeat, last_heartbeat_ip FROM nodes ORDER BY node_id",$row, true);
+
+$db->ExecSql("SELECT node_id, name, (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);
+echo "<table class='spreadsheet'>\n";
+        echo "<thead><tr class='spreadsheet'><th class='spreadsheet' colspan=5>Status of all nodes of the ".HOTSPOT_NETWORK_NAME." network</th></tr>\n";
+        echo "<tr class='spreadsheet'><th class='spreadsheet'>Status</th>\n";
+        echo "<th class='spreadsheet'>Id</th>\n";
+        echo "<th class='spreadsheet'>Name</th>\n";
+        echo "<th class='spreadsheet'>Local content demo</th>\n";
+        echo "<th class='spreadsheet'>Opened on</th>\n";
+        echo "</tr></thead\n";
+        foreach($node_results as $node_row)
+        {
+                echo "<tr class='spreadsheet'>\n";
+                echo "<td class='spreadsheet'>\n";
+                if($node_row['is_up']=='t')
+                {
+                echo "<img src='".BASE_URL_PATH . "images/hotspot_status_up.png'>";
+                }
+                else
+                {
+                echo "<img src='".BASE_URL_PATH . "images/hotspot_status_down.png'>";
+                $duration = $db->GetDurationArrayFromIntervalStr($node_row['since_last_heartbeat']);
+                echo $duration['days'].'days '.$duration['hours'].'h '.$duration['minutes'].'min';
+                }
+                echo "</td>\n";
+                echo "<td class='spreadsheet'>$node_row[node_id]</td>\n";
+                echo "<td class='spreadsheet'>$node_row[name]</td>\n";
+                echo "<td class='spreadsheet'>\n";
+                echo "<a href='".BASE_SSL_PATH."login/index.php?gw_id=$node_row[node_id]&gw_address=127.0.0.1&gw_port=80'>Login page</a><br />\n";
+                echo "<a href='".BASE_URL_PATH."portal/index.php?gw_id=$node_row[node_id]'>Portal page</a>\n";
+                echo "</td>\n";
+                echo "<td class='spreadsheet'>$node_row[creation_date]</td>\n";
+                echo "</tr>\n";
+}
+echo "</table>\n";
 
     echo "</div>\n";    
-
+echo "<div id='navLeft'>\n";
+echo get_user_management_menu();
+echo "</div>\n";
 echo $style->GetFooter();
 ?>