support disabling of e-mail digests entirely

[tt-rss.git] / classes / pref / system.php

diff --git a/classes/pref/system.php b/classes/pref/system.php
index d2b6cd7461ff8240a4cbfabd87f3670a13204b41..2099ebb9c0ce965fa14223bc83f1991578550c36 100644 (file)
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -19,6 +19,10 @@ class Pref_System extends Handler_Protected {
                return array_search($method, $csrf_ignored) !== false;
        }
 
+       function clearLog() {
+               $this->pdo->query("DELETE FROM ttrss_error_log");
+       }
+
        function index() {
 
                print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
@@ -26,8 +30,8 @@ class Pref_System extends Handler_Protected {
 
                if (LOG_DESTINATION == "sql") {
 
-                       $result = $this->dbh->query("SELECT errno, errstr, filename, lineno,
-                               created_at, login FROM ttrss_error_log
+                       $res = $this->pdo->query("SELECT errno, errstr, filename, lineno,
+                               created_at, login, context FROM ttrss_error_log
                                LEFT JOIN ttrss_users ON (owner_uid = ttrss_users.id)
                                ORDER BY ttrss_error_log.id DESC
                                LIMIT 100");
@@ -35,6 +39,9 @@ class Pref_System extends Handler_Protected {
                        print "<button dojoType=\"dijit.form.Button\"
                                onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
 
+                       print "&nbsp;<button dojoType=\"dijit.form.Button\"
+                               onclick=\"clearSqlLog()\">".__('Clear log')."</button> ";
+
                        print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
 
                        print "<tr class=\"title\">
@@ -45,7 +52,7 @@ class Pref_System extends Handler_Protected {
                                <td width='5%'>".__("Date")."</td>
                                </tr>";
 
-                       while ($line = $this->dbh->fetch_assoc($result)) {
+                       while ($line = $res->fetch()) {
                                print "<tr class=\"errrow\">";
 
                                foreach ($line as $k => $v) {
@@ -54,7 +61,7 @@ class Pref_System extends Handler_Protected {
 
                                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='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>";
                                print "<td class='login'>" . $line["login"] . "</td>";
 
                                print "<td class='timestamp'>" .
@@ -80,4 +87,3 @@ class Pref_System extends Handler_Protected {
        }
 
 }
-?>