From b367c951b990b38677e67f1a1756cd4d1eaee50b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 19 Apr 2013 09:45:43 +0400
Subject: make logging configurable; add logging to syslog

---
 classes/pref/system.php | 75 +++++++++++++++++++++++++++----------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

(limited to 'classes/pref')

diff --git a/classes/pref/system.php b/classes/pref/system.php
index 725c337dc..d2b6cd746 100644
--- a/classes/pref/system.php
+++ b/classes/pref/system.php
@@ -24,46 +24,53 @@ class Pref_System extends Handler_Protected {
 		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
 		print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Error Log')."\">";
 
-		$result = $this->dbh->query("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 "<button dojoType=\"dijit.form.Button\"
-			onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
-
-		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 = $this->dbh->fetch_assoc($result)) {
-			print "<tr class=\"errrow\">";
-
-			foreach ($line as $k => $v) {
-				$line[$k] = htmlspecialchars($v);
+		if (LOG_DESTINATION == "sql") {
+
+			$result = $this->dbh->query("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 "<button dojoType=\"dijit.form.Button\"
+				onclick=\"updateSystemList()\">".__('Refresh')."</button> ";
+
+			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 = $this->dbh->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(
+					$line["created_at"], false) . "</td>";
+
+				print "</tr>";
 			}
 
-			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 "</table>";
+		} else {
 
-			print "<td class='timestamp'>" .
-				make_local_datetime(
-				$line["created_at"], false) . "</td>";
+			print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging.");
 
-			print "</tr>";
 		}
 
-		print "</table>";
-
 		print "</div>";
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-- 
cgit v1.2.3