implement error log viewer

diff --git a/classes/logger.php b/classes/logger.php
index 6370e142569cad592dc4da5704c3c4300d25e062..e0ca373634d784efd21a442f7e76ee7eeb96cd53 100644 (file)
--- a/classes/logger.php
+++ b/classes/logger.php
@@ -1,7 +1,8 @@
 <?php
 class Logger {
 
-       protected $errornames = array(
+       public static $errornames = array(
+               1                       => 'E_ERROR',
                2                       => 'E_WARNING',
                8                       => 'E_NOTICE',
                256             => 'E_USER_ERROR',

diff --git a/classes/logger/sql.php b/classes/logger/sql.php
index 7ee22844e6318c55b20e548270eb27592e1d797c..a478e8928173eee9c294cedf14c3ccc1af5caede 100644 (file)
--- a/classes/logger/sql.php
+++ b/classes/logger/sql.php
@@ -16,7 +16,8 @@ class Logger_SQL {
                        $errstr = db_escape_string($this->link, $errstr);
                        $file = db_escape_string($this->link, $file);
                        $line = db_escape_string($this->link, $line);
-                       $context = db_escape_string($this->link, json_encode($context));
+                       $context = ''; // backtrace is a lot of data which is not really critical to store
+                       //$context = db_escape_string($this->link, serialize($context));
 
                        $owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : "NULL";
 

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 29541e04dad764bcaf02f791e414f67445064d9c..c6d41c15b31060a27dce3817d7271fdba49a0964 100644 (file)
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -723,6 +723,51 @@ class Pref_Prefs extends Handler_Protected {
 
                print "</div>"; #pane
 
+               if ($_SESSION["access_level"] == 10) {
+
+                       print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
+                       print "<h2>".__("Error Log")."</h2>";
+
+                       $result = db_query($this->link, "SELECT errno, errstr, filename, lineno,
+                               created_at, login FROM ttrss_error_log
+                               LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
+                               ORDER BY ttrss_error_log.id DESC
+                               LIMIT 100");
+
+                       print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
+
+                       print "<tr class=\"title\">
+                               <td width='5%'>".__("Error")."</td>
+                               <td>".__("Filename")."</td>
+                               <td>".__("Message")."</td>
+                               <td width='5%'>".__("User")."</td>
+                               <td width='5%'>".__("Date")."</td>
+                               </tr>";
+
+                       while ($line = db_fetch_assoc($result)) {
+                               print "<tr class=\"errrow\">";
+
+                               foreach ($line as $k => $v) {
+                                       $line[$k] = htmlspecialchars($v);
+                               }
+
+                               print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
+                               print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
+                               print "<td class='errstr'>" . $line["errstr"] . "</td>";
+                               print "<td class='login'>" . $line["login"] . "</td>";
+
+                               print "<td class='timestamp'>" .
+                                       make_local_datetime($this->link,
+                                       $line["created_at"], false) . "</td>";
+
+                               print "</tr>";
+                       }
+
+                       print "</table>";
+
+                       print "</div>";
+               }
+
                print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Plugins')."\">";
 
                print "<h2>".__("Plugins")."</h2>";

diff --git a/include/errorhandler.php b/include/errorhandler.php
index 13eed0e3088e6f88b759959b8b710b443f2b419b..bb60592b7c643ec4225b348cc21c7a5c097df43c 100644 (file)
--- a/include/errorhandler.php
+++ b/include/errorhandler.php
@@ -8,7 +8,7 @@ function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
 
        if (!$logger) $logger = new Logger_SQL();
 
-       $errfile = str_replace(dirname(dirname(__FILE__)), "", $errfile);
+       $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
        if ($logger) {
                return $logger->log_error($errno, $errstr, $file, $line, $context);
@@ -35,7 +35,7 @@ function ttrss_fatal_handler() {
 
                $context = debug_backtrace();
 
-               $file = str_replace(dirname(dirname(__FILE__)) . "/", "", $file);
+               $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
                if (!$logger) $logger = new Logger_SQL();
 

diff --git a/prefs.css b/prefs.css
index 353fbe80bd647f2a8dd12f56df4558302951b332..dc527ca1e7f5c01ef4bdee36cf0bfccf2c045a23 100644 (file)
--- a/prefs.css
+++ b/prefs.css
@@ -125,4 +125,11 @@ ul.userFeedList {
        padding : 0px;
 }
 
+table.prefErrorLog tr.errrow td {
+       font-size : 10px;
+}
 
+table.prefErrorLog tr.errrow td.errno {
+       font-style : italic;
+       white-space : nowrap;
+}