From: arjen <arjen>
Date: Mon, 11 Aug 2003 17:59:17 +0000 (+0000)
Subject: BUGFIX: Convert special characters for HTML (<, >, and &) into
X-Git-Tag: V0_0_7~9
X-Git-Url: http://www.andromeda.nl/gitweb/?p=gnucomo.git;a=commitdiff_plain;h=a86a1d7605972c7f26e996676d842a0fff454461

BUGFIX: Convert special characters for HTML (<, >, and &) into
their entities.
---

diff --git a/src/web/log.php b/src/web/log.php
index bee2061..04896fa 100644
--- 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.5 $
 **
 **  DESCRIPTION      : Logs page
 **
@@ -27,7 +27,11 @@
 
 /*****************************
    $Log: log.php,v $
-   Revision 1.4  2003-07-15 11:03:39  arjen
+   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 +45,7 @@
 
 ******************************/
 
-// RCSID = "$Id: log.php,v 1.4 2003-07-15 11:03:39 arjen Exp $";
+// RCSID = "$Id: log.php,v 1.5 2003-08-11 17:59:17 arjen Exp $";
 
 ini_set('include_path', '.:./classes:../phpclasses');
 
@@ -55,7 +59,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>";
 
@@ -96,7 +101,7 @@ class log_page extends page
          $res = pg_exec($this->database, "SELECT 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";
@@ -110,7 +115,7 @@ class log_page extends page
             </td><td>
                <?php echo $log->servicecode?>
             </td><td>
-               <?php echo $log->rawdata?>
+               <?php echo htmlentities($log->rawdata)?>
             </td></tr>
             <?php
             $row++;