Removed link to advanced log analysis

[gnucomo.git] / src / web / log.php

diff --git a/src/web/log.php b/src/web/log.php
index bee2061..89691d1 100644 (file)
--- a/src/web/log.php
+++ b/src/web/log.php
@@ -9,7 +9,7 @@
 ***********************
 **      FILE NAME      : log.php
 **      SYSTEM NAME    : Gnucomo - Gnu Computer Monitoring
-**      VERSION NUMBER : $Revision: 1.4 $
+**      VERSION NUMBER : $Revision: 1.7 $
 **
 **  DESCRIPTION      : Logs page
 **
@@ -27,7 +27,17 @@
 
 /*****************************
    $Log: log.php,v $
-   Revision 1.4  2003-07-15 11:03:39  arjen
+   Revision 1.7  2007-10-27 08:38:18  arjen
+   Removed link to advanced log analysis
+
+   Revision 1.6  2005/06/04 07:18:26  arjen
+   Added a view for the log analysis with a link from the log page.
+
+   Revision 1.5  2003/08/11 17:59:17  arjen
+   BUGFIX: Convert special characters for HTML (<, >, and &) into
+   their entities.
+
+   Revision 1.4  2003/07/15 11:03:39  arjen
    Show the log one day at a time.
 
    Revision 1.3  2003/02/21 08:50:12  arjen
@@ -41,7 +51,7 @@
 
 ******************************/
 
-// RCSID = "$Id: log.php,v 1.4 2003-07-15 11:03:39 arjen Exp $";
+// RCSID = "$Id: log.php,v 1.7 2007-10-27 08:38:18 arjen Exp $";
 
 ini_set('include_path', '.:./classes:../phpclasses');
 
@@ -55,7 +65,8 @@ class log_page extends page
    {
       if (!empty($_GET['oid']))
       {
-         $res = pg_exec($this->database, "SELECT objectname FROM object WHERE objectid=CAST('" . $_GET['oid']. "' AS BIGINT)");
+         $res = pg_exec($this->database, "SELECT objectname FROM object
+                               WHERE objectid=CAST('" . $_GET['oid']. "' AS BIGINT)");
          $obj = pg_fetch_object($res, 0);
          echo "<h1>Log for " . $obj->objectname . "</h1><hr>";
 
@@ -93,10 +104,10 @@ class log_page extends page
 
          // Show the log for one day only.
 
-         $res = pg_exec($this->database, "SELECT object_timestamp, servicecode, rawdata FROM log "
+         $res = pg_exec($this->database, "SELECT logid, object_timestamp, servicecode, rawdata FROM log "
                         ."WHERE objectid = CAST('" . $_GET['oid'] . "' AS BIGINT)
                          AND date_trunc('day', object_timestamp)='" . date('Y-m-d', $logday) . "'
-                         ORDER BY object_timestamp");
+                         ORDER BY object_timestamp, logid");
 
          echo "<table>\n";
          echo "<tr><th>Date</th><th>Service</th><th>Log</th></tr>\n";
@@ -106,11 +117,11 @@ class log_page extends page
             $log = pg_fetch_object($res, $row);
             ?>
             <tr><td class='time'>
-               <?php echo $log->object_timestamp?>
+                 <?php echo $log->object_timestamp?>
             </td><td>
                <?php echo $log->servicecode?>
             </td><td>
-               <?php echo $log->rawdata?>
+               <?php echo htmlentities($log->rawdata)?>
             </td></tr>
             <?php
             $row++;