Changeset 726

Timestamp:

09/09/05 02:36:34 (8 years ago)

Author:

aprilp

Message:

* New stats system with graphs
* Changed the UI a bit to reflect this change
* Updated stylesheet

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/admin/graph_common.inc.php (added)
• wifidog/admin/graph_per_hour.php (added)
• wifidog/admin/graph_per_month.php (added)
• wifidog/admin/graph_per_weekday.php (added)
• wifidog/admin/graph_registrations.php (added)
• wifidog/admin/graph_registrations_cumulative.php (added)
• wifidog/admin/hotspot_log.php (deleted)
• wifidog/admin/online_users.php (modified) (1 diff)
• wifidog/admin/stats.php (added)
• wifidog/admin/stats_all_networks.inc.php (added)
• wifidog/admin/stats_network.inc.php (added)
• wifidog/admin/stats_node.inc.php (added)
• wifidog/admin/stats_user_id.inc.php (added)
• wifidog/admin/stats_user_mac.inc.php (added)
• wifidog/admin/templates/hotspot_log.html (deleted)
• wifidog/admin/templates/online_users.html (modified) (2 diffs)
• wifidog/admin/templates/user_stats.html (deleted)
• wifidog/admin/user_stats.php (deleted)
• wifidog/classes/MainUI.php (modified) (1 diff)
• wifidog/classes/Network.php (modified) (2 diffs)
• wifidog/classes/Node.php (modified) (4 diffs)
• wifidog/classes/Statistics.php (modified) (1 diff)
• wifidog/local_content/default/stylesheet.css (modified) (1 diff)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-09-08 Philippe April  <philippe@ilesansfil.org>
+        * New stats system with graphs
+        * Changed the UI a bit to reflect this change
+        * Updated stylesheet
+
 2005-09-08 Benoit Grégoire  <bock@step.polymtl.ca>
         * portal/index.php:  Custom portal redirect now operational.

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

@@ -41 +41 @@
 $ui->setMainContent($smarty->fetch("admin/templates/online_users.html"));
 $ui->display();
-//$smarty->display("admin/templates/online_users.html");
 ?>

trunk/wifidog-auth/wifidog/admin/templates/online_users.html

@@ -5 +5 @@
 {else}
 
-<div id="node_list">
+<fieldset class='pretty_fieldset'>
+<legend>Online users</legend>
 <table>
+
+<thead>
 <tr>
-        <th>Node</th>
-        <th>Username</th>
-        <th>Origin</th>
-        <th>Logged in Since</th>
-        <th>Traffic IN/OUT</th>
+  <th>Node</th>
+  <th>Username</th>
+  <th>Origin</th>
+  <th>Logged in Since</th>
+  <th>Traffic IN/OUT</th>
 </tr>
+</thead>
+
 {section name=i loop=$users_array}
-<tr>
+<tr class='{cycle values="odd,even"}'>
     <td>{$users_array[i].name}</td>
     <td><a href="user_log.php?user_id={$users_array[i].user_id}">{$users_array[i].username}</a></td>
@@ -25 +30 @@
 {/section}
 </table>
-</div>
-<br>
+</fieldset>
 
 {/if}

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

@@ -108 +108 @@
                                         $html .= "<li><a href='user_log.php'>"._("User logs")."</a></li>\n";
                                         $html .= "<li><a href='online_users.php'>"._("Online Users")."</a></li>\n";
-                                        $html .= "<li><a href='user_stats.php'>"._("Cumulative user statistics")."</a></li>\n";
-                                        $html .= "<li><a href='hotspot_log.php'>"._("Hotspot logs")."</a></li>\n";
+                                        $html .= "<li><a href='stats.php'>"._("Statistics")."</a></li>\n";
                                         $html .= "<li><a href='import_user_database.php'>"._("Import NoCat user database")."</a></li>\n";
                                         $html .= "<li><a href='content_admin.php'>"._("Content manager")."</a></li>\n";

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

@@ -244 +244 @@
         }
 
+        /**
+     * Retrieves the network's creation date
+         * @return A string
+     */
+        public function getCreationDate()
+        {
+                return $this->mRow['creation_date'];
+        }
+
         /** Retreives the network's homepage url 
          * @return The id */
@@ -402 +411 @@
         public function getMultipleLoginAllowed()
         {
-                ($this->mRow['allow_multiple_login']=='t')?$retval=true:$retval=false;
-                return $retval;
+                return ($this->mRow['allow_multiple_login'] == 't') ? true : false;
         }
 

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

@@ -320 +320 @@
         }
 
+    function getCreationDate()
+    {
+        return $this->mRow['creation_date'];
+    }
+
         function getHomePageURL()
         {
@@ -473 +478 @@
                 $status = $this->mDb->EscapeString($status);
                 $this->mDb->ExecSqlUpdate("UPDATE nodes SET node_deployment_status = '{$status}' WHERE node_id = '{$this->getId()}'");
+                $this->refresh();
+        }
+
+        function getLastPaged()
+        {
+                return $this->mRow['last_paged'];
+        }
+
+        function getLastHeartbeatIP()
+        {
+                return $this->mRow['last_heartbeat_ip'];
+        }
+
+        function getLastHeartbeatUserAgent()
+        {
+                return $this->mRow['last_heartbeat_user_agent'];
+        }
+
+        function getLastHeartbeatTimestamp()
+        {
+                return $this->mRow['last_heartbeat_timestamp'];
+        }
+
+        function setLastHeartbeatTimestamp($timestamp)
+        {
+                $status = $this->mDb->EscapeString($status);
+                $this->mDb->ExecSqlUpdate("UPDATE nodes SET last_heartbeat_timestamp = '{$timestamp}' WHERE node_id = '{$this->getId()}'");
                 $this->refresh();
         }
@@ -534 +566 @@
         }
         
-        /** Retreives the admin interface of this object.
+        /** Retrieves the admin interface of this object.
          * @return The HTML fragment for this interface */
         public function getAdminUI()
@@ -989 +1021 @@
                 $name = "node_{$this->id}_get_stats";
                 if (!empty ($_REQUEST[$name]))
-                        header("Location: hotspot_log.php?node_id=".urlencode($this->getId()));
+                        header("Location: stats.php?node_id=".urlencode($this->getId()));
 
                 // Node configuration section

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

@@ -91 +91 @@
   }
 
-  public static function getRegistrationsPerMonth() {
+  public static function getRegistrationsPerMonth($from = '', $to = '', $order = "DESC") {
     global $db;
-    $db->ExecSql("SELECT COUNT(users) AS num_users, date_trunc('month', reg_date) AS month FROM users  WHERE account_status = ".ACCOUNT_STATUS_ALLOWED." GROUP BY date_trunc('month', reg_date) ORDER BY month DESC",$results, false);
+
+    if ($from != '' && $to != '')
+        $date_constraint = "AND reg_date >= '$from' AND reg_date <= '$to'";
+    else
+        $date_constraint = '';
+
+    $db->ExecSql("SELECT COUNT(users) AS num_users, date_trunc('month', reg_date) AS month FROM users  WHERE account_status = ".ACCOUNT_STATUS_ALLOWED." ${date_constraint} GROUP BY date_trunc('month', reg_date) ORDER BY month $order",$results, false);
     return $results;
   }
 
-  public static function getMostMobileUsers($limit) {
+  public static function getRegistrationsPerNode($from = '', $to = '') {
     global $db;
-    $db->ExecSql("SELECT COUNT(DISTINCT node_id) AS num_hotspots_visited, user_id, username, account_origin FROM users NATURAL JOIN connections WHERE (incoming!=0 OR outgoing!=0) GROUP BY account_origin, username,user_id ORDER BY num_hotspots_visited DESC LIMIT $limit", $results, false);
+
+    if ($from != '' && $to != '')
+        $date_constraint = "AND timestamp_in BETWEEN '$from' AND '$to'";
+    else
+        $date_constraint = '';
+
+    $db->ExecSql("SELECT nodes.name,connections.node_id,COUNT(user_id) as registrations FROM connections,nodes WHERE timestamp_in IN (SELECT MIN(timestamp_in) as first_connection FROM connections GROUP BY user_id) ${date_constraint} AND nodes.node_id=connections.node_id GROUP BY connections.node_id,nodes.name ORDER BY registrations DESC", $results, false);
     return $results;
   }
 
-  public static function getMostFrequentUsers($limit) {
+  public static function getNodesUsage($from = '', $to = '') {
     global $db;
-    $db->ExecSql("SELECT COUNT(user_active_days.user_id) AS active_days, user_active_days.user_id, username, account_origin FROM (SELECT DISTINCT user_id, date_trunc('day', timestamp_in) AS date FROM connections WHERE (incoming!=0 OR outgoing!=0) GROUP BY date,user_id) user_active_days JOIN users ON (users.user_id = user_active_days.user_id) GROUP BY account_origin, username, user_active_days.user_id ORDER BY active_days DESC LIMIT $limit",$results, false);
+
+    if ($from != '' && $to != '')
+        $date_constraint = "AND timestamp_in BETWEEN '$from' AND '$to'";
+    else
+        $date_constraint = '';
+
+    $db->ExecSql("SELECT nodes.name,connections.node_id,COUNT(connections.node_id) AS connections FROM connections,nodes WHERE nodes.node_id=connections.node_id ${date_constraint} GROUP BY connections.node_id,nodes.name ORDER BY connections DESC;", $results, false);
     return $results;
   }
 
-  public static function getMostGreedyUsers($limit) {
+  public static function getMostMobileUsers($limit, $from = '', $to = '') {
     global $db;
-    $db->ExecSql("SELECT DISTINCT connections.user_id, SUM((incoming+outgoing)/1048576) AS total, SUM((incoming/1048576)) AS total_incoming, SUM((outgoing/1048576)) AS total_outgoing, username, account_origin FROM connections JOIN users ON (users.user_id = connections.user_id) WHERE incoming IS NOT NULL AND outgoing IS NOT NULL GROUP BY account_origin, username,connections.user_id ORDER BY total DESC limit $limit", $results, false);
+
+    if ($from != '' && $to != '')
+        $date_constraint = "AND timestamp_in >= '$from' AND timestamp_out <= '$to'";
+    else
+        $date_constraint = '';
+
+    $db->ExecSql("SELECT COUNT(DISTINCT node_id) AS num_hotspots_visited, user_id, username, account_origin FROM users NATURAL JOIN connections WHERE (incoming!=0 OR outgoing!=0) ${date_constraint} GROUP BY account_origin, username,user_id ORDER BY num_hotspots_visited DESC LIMIT $limit", $results, false);
+    return $results;
+  }
+
+  public static function getMostFrequentUsers($limit, $from = '', $to = '') {
+    global $db;
+
+    if ($from != '' && $to != '')
+        $date_constraint = "AND timestamp_in >= '$from' AND timestamp_out <= '$to'";
+    else
+        $date_constraint = '';
+
+    $db->ExecSql("SELECT COUNT(user_active_days.user_id) AS active_days, user_active_days.user_id, username, account_origin FROM (SELECT DISTINCT user_id, date_trunc('day', timestamp_in) AS date FROM connections WHERE (incoming!=0 OR outgoing!=0)  ${date_constraint} GROUP BY date,user_id) user_active_days JOIN users ON (users.user_id = user_active_days.user_id) GROUP BY account_origin, username, user_active_days.user_id ORDER BY active_days DESC LIMIT $limit",$results, false);
+    return $results;
+  }
+
+  public static function getMostGreedyUsers($limit, $from = '', $to = '') {
+    global $db;
+
+    if ($from != '' && $to != '')
+        $date_constraint = "AND timestamp_in >= '$from' AND timestamp_out <= '$to'";
+    else
+        $date_constraint = '';
+
+    $db->ExecSql("SELECT DISTINCT connections.user_id, SUM(incoming+outgoing) AS total, SUM(incoming) AS total_incoming, SUM(outgoing) AS total_outgoing, username, account_origin FROM connections JOIN users ON (users.user_id = connections.user_id) WHERE incoming IS NOT NULL AND outgoing IS NOT NULL  ${date_constraint} GROUP BY account_origin, username,connections.user_id ORDER BY total DESC limit $limit", $results, false);
     return $results;
   }

trunk/wifidog-auth/wifidog/local_content/default/stylesheet.css

@@ -481 +481 @@
 #std_table td.item { font-weight: bold; }
 
+.pretty_fieldset {
+    background-color: #e1f5da;
+    font-family: Verdana, Arial, Helvetica, sans-serif;
+    }
+.pretty_fieldset legend {
+    font-size: 14pt;
+    }
+.pretty_fieldset table {
+    width: 100%;
+    border-collapse: collapse;
+    }
+.pretty_fieldset tr.odd {
+    background-color: #d1e5ca;
+    }
+.pretty_fieldset th {
+    text-align: left;
+    text-transform: uppercase;
+    width: 200px;
+    }
+
+.pretty_fieldset div {
+    border: 1px dotted black;
+    background-color: #fff;
+    }
+
+.pretty_fieldset .red {
+    background-color: red;
+    }
+
+.smaller {
+    font-size: 80%;
+    }
+
 /* Google Maps stuff */
 #map_hotspots_list {