Changeset 731

Timestamp:

09/10/05 13:28:30 (8 years ago)

Author:

fproulx

Message:

2005-09-10 Francois Proulx <francois.proulx@…>

• Automatically redirect user to login form when trying to access admin
• Added various isset, empty tests, vars init in stats (to avoid php warning)

Location:

trunk/wifidog-auth

Files:

• ChangeLog (modified) (1 diff)
• wifidog/admin/graph_common.inc.php (modified) (1 diff)
• wifidog/admin/index.php (modified) (1 diff)
• wifidog/admin/stats.php (modified) (2 diffs)
• wifidog/admin/stats_user_id.inc.php (modified) (7 diffs)
• wifidog/admin/stats_user_mac.inc.php (modified) (3 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-09-10 Francois Proulx <francois.proulx@gmail.com>
+        * Automatically redirect user to login form when trying to access admin
+        * Added various isset, empty tests, vars init in stats (to avoid php warning)
+
 2005-09-08 Philippe April  <philippe@ilesansfil.org>
         * New stats system with graphs

trunk/wifidog-auth/wifidog/admin/graph_common.inc.php

@@ -35 +35 @@
 $date_constraint = "AND timestamp_in >= '{$_REQUEST['date_from']}' AND timestamp_in <= '{$_REQUEST['date_to']}'";
 
-$node_id = $db->EscapeString($_REQUEST["node_id"]);
-$user_id = $db->EscapeString($_REQUEST["user_id"]);
-$network_id = $db->EscapeString($_REQUEST["network_id"]);
+$node_id = isset($_REQUEST["node_id"]) ? $db->EscapeString($_REQUEST["node_id"]) : null;
+$user_id = isset($_REQUEST["user_id"]) ? $db->EscapeString($_REQUEST["user_id"]) : null;
+$network_id = isset($_REQUEST["network_id"]) ? $db->EscapeString($_REQUEST["network_id"]) : null;
+
 ?>

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

@@ -34 +34 @@
 if(!$current_user)
 {
-    $html = '<p class="errormsg">'._('You must be logged in to access the administration panel.')."</p>\n";
+        // Redirect to login form automatically
+        header("Location: ../login/");
+        exit;
 }
 else

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

@@ -93 +93 @@
     }
 
-    if (!$_REQUEST["date_from"])
+    if (!isset($_REQUEST["date_from"]))
         $_REQUEST["date_from"] = strftime("%Y-%m-%d 00:00");
-    if (!$_REQUEST["date_to"])
+    if (!isset($_REQUEST["date_to"]))
         $_REQUEST["date_to"] = strftime("%Y-%m-%d 11:59");
 
@@ -208 +208 @@
 
             $html .= "<input type=\"radio\" name=\"group_connections\" value=\"\"";
-            $html .= $_REQUEST['group_connections'] == "" ? 'CHECKED' : '';
+            $html .= empty($_REQUEST['group_connections']) ? 'CHECKED' : '';
             $html .= ">No<br>";
 
             $html .= "<input type=\"radio\" name=\"group_connections\" value=\"group_connections_by_mac\"";
-            $html .= $_REQUEST['group_connections'] == "group_connections_by_mac" ? 'CHECKED' : '';
+            $html .= isset($_REQUEST['group_connections']) && $_REQUEST['group_connections'] == "group_connections_by_mac" ? 'CHECKED' : '';
             $html .= ">By unique MACs<br>";
 
             $html .= "<input type=\"radio\" name=\"group_connections\" value=\"group_connections_by_user\"";
-            $html .= $_REQUEST['group_connections'] == "group_connections_by_user" ? 'CHECKED' : '';
+            $html .= isset($_REQUEST['group_connections']) && $_REQUEST['group_connections'] == "group_connections_by_user" ? 'CHECKED' : '';
             $html .= ">By unique usernames<br>";
         }

trunk/wifidog-auth/wifidog/admin/stats_user_id.inc.php

@@ -1 +1 @@
 <?php
-  /********************************************************************\
-   * This program is free software; you can redistribute it and/or    *
-   * modify it under the terms of the GNU General Public License as   *
-   * published by the Free Software Foundation; either version 2 of   *
-   * the License, or (at your option) any later version.              *
-   *                                                                  *
-   * This program is distributed in the hope that it will be useful,  *
-   * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
-   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
-   * GNU General Public License for more details.                     *
-   *                                                                  *
-   * You should have received a copy of the GNU General Public License*
-   * along with this program; if not, contact:                        *
-   *                                                                  *
-   * Free Software Foundation           Voice:  +1-617-542-5942       *
-   * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
-   * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
-   *                                                                  *
-   \********************************************************************/
-  /**@file stats_user_id.inc.php
-   * @author Copyright (C) 2005 Philippe April
-   */
+
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+ \********************************************************************/
+/**@file stats_user_id.inc.php
+ * @author Copyright (C) 2005 Philippe April
+ */
 
 $userinfo = $userObject->getInfoArray();
@@ -27 +28 @@
 
 $html .= "<fieldset class='pretty_fieldset'>\n";
-$html .= "<legend>" . _("Profile") . "</legend>\n";
+$html .= "<legend>"._("Profile")."</legend>\n";
 
 $html .= "<table>\n";
 
 $html .= "<tr class='odd'>\n";
-$html .= "  <th>" . _("Username") . ":</th>\n";
-$html .= "  <td>" . $userinfo['username'] . "</td>\n";
+$html .= "  <th>"._("Username").":</th>\n";
+$html .= "  <td>".$userinfo['username']."</td>\n";
 $html .= "</tr>\n";
 
 $html .= "<tr>\n";
-$html .= "  <th>" . _("Real Name") . ":</th>\n";
-$html .= "  <td>" . $userinfo['real_name'] . "</td>\n";
+$html .= "  <th>"._("Real Name").":</th>\n";
+$html .= "  <td>".$userinfo['real_name']."</td>\n";
 $html .= "</tr>\n";
 
 $html .= "<tr class='odd'>\n";
-$html .= "  <th>" . _("Email") . ":</th>\n";
-$html .= "  <td>" . $userinfo['email'] . "</td>\n";
+$html .= "  <th>"._("Email").":</th>\n";
+$html .= "  <td>".$userinfo['email']."</td>\n";
 $html .= "</tr>\n";
 
 $html .= "<tr>\n";
-$html .= "  <th>" . _("Network") . ":</th>\n";
+$html .= "  <th>"._("Network").":</th>\n";
 $html .= "  <td><a href='?date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}&network_id={$userinfo['account_origin']}'>{$userinfo['account_origin']}</a></td>\n";
 $html .= "</tr>\n";
 
 $html .= "<tr class='odd'>\n";
-$html .= "  <th>" . _("Unique ID") . ":</th>\n";
-$html .= "  <td>" . $userinfo['user_id'] . "</td>\n";
+$html .= "  <th>"._("Unique ID").":</th>\n";
+$html .= "  <td>".$userinfo['user_id']."</td>\n";
 $html .= "</tr>\n";
 
 $html .= "<tr>\n";
-$html .= "  <th>" . _("Member since") . ":</th>\n";
-$html .= "  <td>" . utf8_encode(strftime("%c", strtotime($userinfo['reg_date']))) . "</td>\n";
+$html .= "  <th>"._("Member since").":</th>\n";
+$html .= "  <td>".utf8_encode(strftime("%c", strtotime($userinfo['reg_date'])))."</td>\n";
 $html .= "</tr>\n";
 
 $html .= "<tr class='odd'>\n";
-$html .= "  <th>" . _("Account Status") . ":</th>\n";
-$html .= "  <td>" . $userinfo['account_status_description'] . "</td>\n";
+$html .= "  <th>"._("Account Status").":</th>\n";
+$html .= "  <td>".$userinfo['account_status_description']."</td>\n";
 $html .= "</tr>\n";
 
 $html .= "<tr>\n";
-$html .= "  <th>" . _("Website") . ":</th>\n";
-$html .= "  <td>" . $userinfo['website'] . "</td>\n";
+$html .= "  <th>"._("Website").":</th>\n";
+$html .= "  <td>".$userinfo['website']."</td>\n";
 $html .= "</tr>\n";
 
 $html .= "<tr class='odd'>\n";
-$html .= "  <th>" . _("Prefered Locale") . ":</th>\n";
-$html .= "  <td>" . $userinfo['prefered_locale'] . "</td>\n";
+$html .= "  <th>"._("Prefered Locale").":</th>\n";
+$html .= "  <td>".$userinfo['prefered_locale']."</td>\n";
 $html .= "</tr>\n";
 
@@ -81 +82 @@
 
 $html .= "<tr>\n";
-$html .= "  <th>" . _("MAC addresses") . ":</th>\n";
-$html .= "  <td>" . $amount_of_mac_addresses . "</td>\n";
+$html .= "  <th>"._("MAC addresses").":</th>\n";
+$html .= "  <td>".$amount_of_mac_addresses."</td>\n";
 $html .= "</tr>\n";
 
@@ -89 +90 @@
 
 $html .= "<fieldset class='pretty_fieldset'>\n";
-$html .= "<legend>" . _("Connections") . "</legend>\n";
+$html .= "<legend>"._("Connections")."</legend>\n";
 $html .= "<table class='smaller'>\n";
 $html .= "<thead>\n";
 $html .= "<tr>\n";
-$html .= "  <th>" . _("Logged in") . "</th>\n";
-$html .= "  <th>" . _("Time spent") . "</th>\n";
-$html .= "  <th>" . _("Token status") . "</th>\n";
-$html .= "  <th>" . _("Node") . "</th>\n";
-$html .= "  <th>" . _("IP") . "</th>\n";
-$html .= "  <th>" . _("D") . "</th>\n";
-$html .= "  <th>" . _("U") . "</th>\n";
+$html .= "  <th>"._("Logged in")."</th>\n";
+$html .= "  <th>"._("Time spent")."</th>\n";
+$html .= "  <th>"._("Token status")."</th>\n";
+$html .= "  <th>"._("Node")."</th>\n";
+$html .= "  <th>"._("IP")."</th>\n";
+$html .= "  <th>"._("D")."</th>\n";
+$html .= "  <th>"._("U")."</th>\n";
 $html .= "</tr>\n";
 $html .= "</thead>\n";
@@ -109 +110 @@
 if ($connections)
 {
-    $even = 0;
-    foreach ($connections as $connection)
-    {
-        $timestamp_in = strtotime($connection['timestamp_in']);
-        $timestamp_out = strtotime($connection['timestamp_out']);
+        // Variables init
+        $even = 0;
+        $total = array ();
+        $total['incoming'] = 0;
+        $total['outgoing'] = 0;
+        foreach ($connections as $connection)
+        {
+                $timestamp_in = strtotime($connection['timestamp_in']);
+                $timestamp_out = strtotime($connection['timestamp_out']);
 
-        $nodeObject = Node::getObject($connection['node_id']);
-        $total['incoming'] += $connection['incoming'];
-        $total['outgoing'] += $connection['outgoing'];
-        $connection['token_status_description'] = $token_to_text[$connection['token_status']];
-        $html .= $even ? "<tr>\n" : "<tr class='odd'>\n";
-        if ($even == 0)
-            $even = 1;
-        else
-            $even = 0;
-        $html .= "  <td>" . utf8_encode(strftime("%c", $timestamp_in)) . "</td>\n";
-        if ($timestamp_in != -1 && $timestamp_out != -1) {
-            $html .= "<td>" . seconds_in_words($timestamp_out - $timestamp_in) . "</td>\n";
-        } else {
-            $html .= "<td></td>\n";
-        }
-        $html .= "  <td>" . $connection['token_status'] . "</td>\n";
-        $html .= "  <td><a href='?date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}&node_id={$nodeObject->getId()}'>{$nodeObject->getName()}</a></td>\n";
-        $html .= "  <td>" . $connection['user_ip'] . "</td>\n";
-        $html .= "  <td>" . bytes_in_words($connection['incoming']) . "</td>\n";
-        $html .= "  <td>" . bytes_in_words($connection['outgoing']) . "</td>\n";
-        $html .= "</tr>\n";
-    }
+                $nodeObject = Node :: getObject($connection['node_id']);
+                $total['incoming'] += $connection['incoming'];
+                $total['outgoing'] += $connection['outgoing'];
+                        
+                $connection['token_status_description'] = $token_to_text[$connection['token_status']];
+                $html .= $even ? "<tr>\n" : "<tr class='odd'>\n";
+                if ($even == 0)
+                        $even = 1;
+                else
+                        $even = 0;
+                $html .= "  <td>".utf8_encode(strftime("%c", $timestamp_in))."</td>\n";
+                if ($timestamp_in != -1 && $timestamp_out != -1)
+                {
+                        $html .= "<td>".seconds_in_words($timestamp_out - $timestamp_in)."</td>\n";
+                }
+                else
+                {
+                        $html .= "<td></td>\n";
+                }
+                $html .= "  <td>".$connection['token_status']."</td>\n";
+                $html .= "  <td><a href='?date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}&node_id={$nodeObject->getId()}'>{$nodeObject->getName()}</a></td>\n";
+                $html .= "  <td>".$connection['user_ip']."</td>\n";
+                $html .= "  <td>".bytes_in_words($connection['incoming'])."</td>\n";
+                $html .= "  <td>".bytes_in_words($connection['outgoing'])."</td>\n";
+                $html .= "</tr>\n";
+        }
 }
 
@@ -144 +153 @@
 $html .= "  <td></td>\n";
 $html .= "  <td></td>\n";
-$html .= "  <th>" . _("Total") . ":</th>\n";
-$html .= "  <th>" . bytes_in_words($total['incoming']) . "</th>\n";
-$html .= "  <th>" . bytes_in_words($total['outgoing']) . "</th>\n";
+$html .= "  <th>"._("Total").":</th>\n";
+$html .= "  <th>".bytes_in_words($total['incoming'])."</th>\n";
+$html .= "  <th>".bytes_in_words($total['outgoing'])."</th>\n";
 $html .= "</tr>\n";
 $html .= "</table>\n";
@@ -155 +164 @@
 
 $html .= "<fieldset class='pretty_fieldset'>\n";
-$html .= "<legend>" . _("MAC addresses") . "</legend>\n";
+$html .= "<legend>"._("MAC addresses")."</legend>\n";
 $html .= "<table>\n";
 $html .= "<thead>\n";
 $html .= "<tr>\n";
-$html .= "  <th>" . _("MAC") . "</th>\n";
-$html .= "  <th>" . _("Count") . "</th>\n";
+$html .= "  <th>"._("MAC")."</th>\n";
+$html .= "  <th>"._("Count")."</th>\n";
 $html .= "</tr>\n";
 $html .= "</thead>\n";
 
 $even = 0;
-foreach ($rows as $row) {
-    if ($row['user_mac']) {
-        $html .= $even ? "<tr>\n" : "<tr class='odd'>\n";
-        if ($even == 0)
-            $even = 1;
-        else
-            $even = 0;
-        $html .= "  <td><a href='?date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}&user_mac={$row['user_mac']}'>{$row['user_mac']}</a></td>\n";
-        $html .= "  <td>" . $row['nb'] . "</td>\n";
-        $html .= "</tr>\n";
-    }
+foreach ($rows as $row)
+{
+        if ($row['user_mac'])
+        {
+                $html .= $even ? "<tr>\n" : "<tr class='odd'>\n";
+                if ($even == 0)
+                        $even = 1;
+                else
+                        $even = 0;
+                $html .= "  <td><a href='?date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}&user_mac={$row['user_mac']}'>{$row['user_mac']}</a></td>\n";
+                $html .= "  <td>".$row['nb']."</td>\n";
+                $html .= "</tr>\n";
+        }
 }
 

trunk/wifidog-auth/wifidog/admin/stats_user_mac.inc.php

@@ -1 +1 @@
 <?php
-  /********************************************************************\
-   * This program is free software; you can redistribute it and/or    *
-   * modify it under the terms of the GNU General Public License as   *
-   * published by the Free Software Foundation; either version 2 of   *
-   * the License, or (at your option) any later version.              *
-   *                                                                  *
-   * This program is distributed in the hope that it will be useful,  *
-   * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
-   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
-   * GNU General Public License for more details.                     *
-   *                                                                  *
-   * You should have received a copy of the GNU General Public License*
-   * along with this program; if not, contact:                        *
-   *                                                                  *
-   * Free Software Foundation           Voice:  +1-617-542-5942       *
-   * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
-   * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
-   *                                                                  *
-   \********************************************************************/
-  /**@file stats_user_mac.inc.php
-   * @author Copyright (C) 2005 Philippe April
-   */
+
+/********************************************************************\
+ * This program is free software; you can redistribute it and/or    *
+ * modify it under the terms of the GNU General Public License as   *
+ * published by the Free Software Foundation; either version 2 of   *
+ * the License, or (at your option) any later version.              *
+ *                                                                  *
+ * This program is distributed in the hope that it will be useful,  *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
+ * GNU General Public License for more details.                     *
+ *                                                                  *
+ * You should have received a copy of the GNU General Public License*
+ * along with this program; if not, contact:                        *
+ *                                                                  *
+ * Free Software Foundation           Voice:  +1-617-542-5942       *
+ * 59 Temple Place - Suite 330        Fax:    +1-617-542-2652       *
+ * Boston, MA  02111-1307,  USA       gnu@gnu.org                   *
+ *                                                                  *
+ \********************************************************************/
+/**@file stats_user_mac.inc.php
+ * @author Copyright (C) 2005 Philippe April
+ */
 
 $sql = "select *,nodes.name,users.username from connections,nodes where nodes.node_id=connections.node_id and users.user_id=connections.user_id and user_mac = '{$_REQUEST['user_mac']}' {$date_constraint} order by timestamp_in desc";
@@ -27 +28 @@
 
 $html .= "<fieldset class='pretty_fieldset'>\n";
-$html .= "<legend>" . _("Connections") . "</legend>\n";
+$html .= "<legend>"._("Connections")."</legend>\n";
 $html .= "<table>\n";
 $html .= "<thead>\n";
 $html .= "<tr>\n";
-$html .= "  <th>" . _("Username") . "</th>\n";
-$html .= "  <th>" . _("Date") . "</th>\n";
-$html .= "  <th>" . _("Node") . "</th>\n";
-$html .= "  <th>" . _("Time spent") . "</th>\n";
-$html .= "  <th>" . _("D") . "</th>\n";
-$html .= "  <th>" . _("U") . "</th>\n";
+$html .= "  <th>"._("Username")."</th>\n";
+$html .= "  <th>"._("Date")."</th>\n";
+$html .= "  <th>"._("Node")."</th>\n";
+$html .= "  <th>"._("Time spent")."</th>\n";
+$html .= "  <th>"._("D")."</th>\n";
+$html .= "  <th>"._("U")."</th>\n";
 $html .= "</tr>\n";
 $html .= "</thead>\n";
 
+// Vars init
 $even = 0;
-foreach ($rows as $row) {
-    $timestamp_in = strtotime($row['timestamp_in']);
-    $timestamp_out = strtotime($row['timestamp_out']);
+$total = array ();
+$total['incoming'] = 0;
+$total['outgoing'] = 0;
+$total['time_spent'] = 0;
+foreach ($rows as $row)
+{
+        $timestamp_in = strtotime($row['timestamp_in']);
+        $timestamp_out = strtotime($row['timestamp_out']);
 
-    $total['incoming'] += $row['incoming'];
-    $total['outgoing'] += $row['outgoing'];
+        $total['incoming'] += $row['incoming'];
+        $total['outgoing'] += $row['outgoing'];
 
-    $html .= $even ? "<tr>\n" : "<tr class='odd'>\n";
-    if ($even == 0)
-        $even = 1;
-    else
-        $even = 0;
-    $html .= "  <td><a href='?date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}&user_id={$row['user_id']}'>{$row['username']}</a></td>\n";
-    $html .= "  <td>" . utf8_encode(strftime("%c", strtotime($row['timestamp_in']))) . "</td>";
-    $html .= "  <td><a href='?date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}&node_id={$row['node_id']}'>{$row['name']}</a></td>";
-    if ($timestamp_in != -1 && $timestamp_out != -1) {
-        $total['time_spent'] += ($timestamp_out - $timestamp_in);
-        $html .= "  <td>" . seconds_in_words($timestamp_out - $timestamp_in) . "</td>";
-    } else {
-        $html .= "  <td></td>";
-    }
-    if ($row['incoming'])
-        $html .= "<td>" . bytes_in_words($row['incoming']) . "</td>\n";
-    else
-        $html .= "<td></td>\n";
+        $html .= $even ? "<tr>\n" : "<tr class='odd'>\n";
+        if ($even == 0)
+                $even = 1;
+        else
+                $even = 0;
+        $html .= "  <td><a href='?date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}&user_id={$row['user_id']}'>{$row['username']}</a></td>\n";
+        $html .= "  <td>".utf8_encode(strftime("%c", strtotime($row['timestamp_in'])))."</td>";
+        $html .= "  <td><a href='?date_from={$_REQUEST['date_from']}&date_to={$_REQUEST['date_to']}&node_id={$row['node_id']}'>{$row['name']}</a></td>";
+        if ($timestamp_in != -1 && $timestamp_out != -1)
+        {
+                $total['time_spent'] += ($timestamp_out - $timestamp_in);
+                $html .= "  <td>".seconds_in_words($timestamp_out - $timestamp_in)."</td>";
+        }
+        else
+        {
+                $html .= "  <td></td>";
+        }
+        if ($row['incoming'])
+                $html .= "<td>".bytes_in_words($row['incoming'])."</td>\n";
+        else
+                $html .= "<td></td>\n";
 
-    if ($row['outgoing'])
-        $html .= "<td>" . bytes_in_words($row['outgoing']) . "</td>\n";
-    else
-        $html .= "<td></td>\n";
+        if ($row['outgoing'])
+                $html .= "<td>".bytes_in_words($row['outgoing'])."</td>\n";
+        else
+                $html .= "<td></td>\n";
 
-    $html .= "</tr>";
+        $html .= "</tr>";
 }
 
@@ -78 +88 @@
 $html .= "  <td></td>\n";
 $html .= "  <td></td>\n";
-$html .= "  <th>" . _("Total") . ":</th>\n";
-$html .= "  <th>" . seconds_in_words($total['time_spent']) . "</th>\n";
-$html .= "  <th>" . bytes_in_words($total['incoming']) . "</th>\n";
-$html .= "  <th>" . bytes_in_words($total['outgoing']) . "</th>\n";
+$html .= "  <th>"._("Total").":</th>\n";
+$html .= "  <th>".seconds_in_words($total['time_spent'])."</th>\n";
+$html .= "  <th>".bytes_in_words($total['incoming'])."</th>\n";
+$html .= "  <th>".bytes_in_words($total['outgoing'])."</th>\n";
 $html .= "</tr>\n";