diff options
-rw-r--r-- | classes/logger.php | 3 | ||||
-rw-r--r-- | classes/logger/sql.php | 3 | ||||
-rw-r--r-- | classes/pref/prefs.php | 45 | ||||
-rw-r--r-- | include/errorhandler.php | 4 | ||||
-rw-r--r-- | prefs.css | 7 |
5 files changed, 58 insertions, 4 deletions
diff --git a/classes/logger.php b/classes/logger.php index 6370e1425..e0ca37363 100644 --- 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 7ee22844e..a478e8928 100644 --- 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 29541e04d..c6d41c15b 100644 --- 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 13eed0e30..bb60592b7 100644 --- 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(); @@ -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; +} |