codysnider / tt-rss

classes/pref/system.php

Indentation +63 added lines, -63 removed lines

@@ -2,50 +2,50 @@ 
 
 class Pref_System extends Handler_Protected {
 
-	public function before($method) {
-		if (parent::before($method)) {
-			if ($_SESSION["access_level"] < 10) {
-				print __("Your access level is insufficient to open this tab.");
-				return false;
-			}
-			return true;
-		}
-		return false;
-	}
-
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("index");
-
-		return array_search($method, $csrf_ignored) !== false;
-	}
-
-	public function clearLog() {
-		$this->pdo->query("DELETE FROM ttrss_error_log");
-	}
-
-	public function index() {
-
-		print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+    public function before($method) {
+        if (parent::before($method)) {
+            if ($_SESSION["access_level"] < 10) {
+                print __("Your access level is insufficient to open this tab.");
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("index");
+
+        return array_search($method, $csrf_ignored) !== false;
+    }
+
+    public function clearLog() {
+        $this->pdo->query("DELETE FROM ttrss_error_log");
+    }
+
+    public function index() {
+
+        print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>report</i> ".__('Event Log')."\">";
 
-		if (LOG_DESTINATION == "sql") {
+        if (LOG_DESTINATION == "sql") {
 
-			$res = $this->pdo->query("SELECT errno, errstr, filename, lineno,
+            $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");
 
-			print "<button dojoType=\"dijit.form.Button\"
+            print "<button dojoType=\"dijit.form.Button\"
 				onclick=\"Helpers.updateEventLog()\">".__('Refresh')."</button> ";
 
-			print "&nbsp;<button dojoType=\"dijit.form.Button\"
+            print "&nbsp;<button dojoType=\"dijit.form.Button\"
 				class=\"alt-danger\" onclick=\"Helpers.clearEventLog()\">".__('Clear')."</button> ";
 
-			print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
+            print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";
 
-			print "<tr class=\"title\">
+            print "<tr class=\"title\">
 				<td width='5%'>".__("Error")."</td>
 				<td>".__("Filename")."</td>
 				<td>".__("Message")."</td>
@@ -53,52 +53,52 @@ 
 				<td width='5%'>".__("Date")."</td>
 				</tr>";
 
-			while ($line = $res->fetch()) {
-				print "<tr>";
+            while ($line = $res->fetch()) {
+                print "<tr>";
 
-				foreach ($line as $k => $v) {
-					$line[$k] = htmlspecialchars($v);
-				}
+                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"] . "<hr/>" . nl2br($line["context"]) . "</td>";
-				print "<td class='login'>" . $line["login"] . "</td>";
+                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"] . "<hr/>" . nl2br($line["context"]) . "</td>";
+                print "<td class='login'>" . $line["login"] . "</td>";
 
-				print "<td class='timestamp'>" .
-					make_local_datetime(
-					$line["created_at"], false) . "</td>";
+                print "<td class='timestamp'>" .
+                    make_local_datetime(
+                    $line["created_at"], false) . "</td>";
 
-				print "</tr>";
-			}
+                print "</tr>";
+            }
 
-			print "</table>";
-		} else {
+            print "</table>";
+        } else {
 
-			print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging.");
+            print_notice("Please set LOG_DESTINATION to 'sql' in config.php to enable database logging.");
 
-		}
+        }
 
-		print "</div>";
+        print "</div>";
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>info</i> ".__('PHP Information')."\">";
 
-		ob_start();
-		phpinfo();
-		$info = ob_get_contents();
-		ob_end_clean();
+        ob_start();
+        phpinfo();
+        $info = ob_get_contents();
+        ob_end_clean();
 
-		print "<div class='phpinfo'>";
-		print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info);
-		print "</div>";
+        print "<div class='phpinfo'>";
+        print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info);
+        print "</div>";
 
-		print "</div>";
+        print "</div>";
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
-			"hook_prefs_tab", "prefSystem");
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
+            "hook_prefs_tab", "prefSystem");
 
-		print "</div>"; #container
-	}
+        print "</div>"; #container
+    }
 
 }

classes/dlg.php

Indentation +127 added lines, -127 removed lines

@@ -1,206 +1,206 @@
 <?php
 class Dlg extends Handler_Protected {
-	private $param;
+    private $param;
     private $params;
 
     function before($method) {
-		if (parent::before($method)) {
-			header("Content-Type: text/html"); # required for iframe
+        if (parent::before($method)) {
+            header("Content-Type: text/html"); # required for iframe
 
-			$this->param = $_REQUEST["param"];
-			return true;
-		}
-		return false;
-	}
+            $this->param = $_REQUEST["param"];
+            return true;
+        }
+        return false;
+    }
 
-	public function importOpml() {
-		print_notice("If you have imported labels and/or filters, you might need to reload preferences to see your new data.");
+    public function importOpml() {
+        print_notice("If you have imported labels and/or filters, you might need to reload preferences to see your new data.");
 
-		print "<div class='panel panel-scrollable'>";
+        print "<div class='panel panel-scrollable'>";
 
-		$opml = new Opml($_REQUEST);
+        $opml = new Opml($_REQUEST);
 
-		$opml->opml_import($_SESSION["uid"]);
+        $opml->opml_import($_SESSION["uid"]);
 
-		print "</div>";
+        print "</div>";
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('opmlImportDlg').execute()\">".
-			__('Close this window')."</button>";
-		print "</footer>";
+            __('Close this window')."</button>";
+        print "</footer>";
 
-		print "</div>";
+        print "</div>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function pubOPMLUrl() {
-		$url_path = Opml::opml_publish_url();
+    public function pubOPMLUrl() {
+        $url_path = Opml::opml_publish_url();
 
-		print "<header>" . __("Your Public OPML URL is:") . "</header>";
+        print "<header>" . __("Your Public OPML URL is:") . "</header>";
 
-		print "<section>";
+        print "<section>";
 
-		print "<div class='panel text-center'>";
-		print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
-		print "</div>";
+        print "<div class='panel text-center'>";
+        print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
+        print "</div>";
 
-		print "</section>";
+        print "</section>";
 
-		print "<footer class='text-center'>";
+        print "<footer class='text-center'>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return Helpers.OPML.changeKey()\">".
-			__('Generate new URL')."</button> ";
+        print "<button dojoType='dijit.form.Button' onclick=\"return Helpers.OPML.changeKey()\">".
+            __('Generate new URL')."</button> ";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
+        print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
+            __('Close this window')."</button>";
 
-		print "</footer>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function explainError() {
-		print "<div class=\"errorExplained\">";
+    public function explainError() {
+        print "<div class=\"errorExplained\">";
 
-		if ($this->param == 1) {
-			print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner.");
+        if ($this->param == 1) {
+            print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner.");
 
-			$stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+            $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
 
-			print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
+            print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
 
-		}
+        }
 
-		if ($this->param == 3) {
-			print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner.");
+        if ($this->param == 3) {
+            print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner.");
 
-			$stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+            $stamp = (int) file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
 
-			print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
+            print "<p>" . __("Last update:") . " " . date("Y.m.d, G:i", $stamp);
 
-		}
+        }
 
-		print "</div>";
+        print "</div>";
 
-		print "<footer class='text-center'>";
-		print "<button onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
-		print "</footer>";
+        print "<footer class='text-center'>";
+        print "<button onclick=\"return CommonDialogs.closeInfoBox()\">".
+            __('Close this window')."</button>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function printTagCloud() {
-		print "<div class='panel text-center'>";
+    public function printTagCloud() {
+        print "<div class='panel text-center'>";
 
-		// from here: http://www.roscripts.com/Create_tag_cloud-71.html
+        // from here: http://www.roscripts.com/Create_tag_cloud-71.html
 
-		$sth = $this->pdo->prepare("SELECT tag_name, COUNT(post_int_id) AS count
+        $sth = $this->pdo->prepare("SELECT tag_name, COUNT(post_int_id) AS count
 			FROM ttrss_tags WHERE owner_uid = ?
 			GROUP BY tag_name ORDER BY count DESC LIMIT 50");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		$tags = array();
+        $tags = array();
 
-		while ($line = $sth->fetch()) {
-			$tags[$line["tag_name"]] = $line["count"];
-		}
+        while ($line = $sth->fetch()) {
+            $tags[$line["tag_name"]] = $line["count"];
+        }
 
         if(count($tags) == 0 ){ return; }
 
-		ksort($tags);
+        ksort($tags);
 
-		$max_size = 32; // max font size in pixels
-		$min_size = 11; // min font size in pixels
+        $max_size = 32; // max font size in pixels
+        $min_size = 11; // min font size in pixels
 
-		// largest and smallest array values
-		$max_qty = max(array_values($tags));
-		$min_qty = min(array_values($tags));
+        // largest and smallest array values
+        $max_qty = max(array_values($tags));
+        $min_qty = min(array_values($tags));
 
-		// find the range of values
-		$spread = $max_qty - $min_qty;
-		if ($spread == 0) { // we don't want to divide by zero
-				$spread = 1;
-		}
+        // find the range of values
+        $spread = $max_qty - $min_qty;
+        if ($spread == 0) { // we don't want to divide by zero
+                $spread = 1;
+        }
 
-		// set the font-size increment
-		$step = ($max_size - $min_size) / ($spread);
+        // set the font-size increment
+        $step = ($max_size - $min_size) / ($spread);
 
-		// loop through the tag array
-		foreach ($tags as $key => $value) {
-			// calculate font-size
-			// find the $value in excess of $min_qty
-			// multiply by the font-size increment ($size)
-			// and add the $min_size set above
-			$size = round($min_size + (($value - $min_qty) * $step));
+        // loop through the tag array
+        foreach ($tags as $key => $value) {
+            // calculate font-size
+            // find the $value in excess of $min_qty
+            // multiply by the font-size increment ($size)
+            // and add the $min_size set above
+            $size = round($min_size + (($value - $min_qty) * $step));
 
-			$key_escaped = str_replace("'", "\\'", $key);
+            $key_escaped = str_replace("'", "\\'", $key);
 
-			echo "<a href=\"#\" onclick=\"Feeds.open({feed:'$key_escaped'}) \" style=\"font-size: " .
-				$size . "px\" title=\"$value articles tagged with " .
-				$key . '">' . $key . '</a> ';
-		}
+            echo "<a href=\"#\" onclick=\"Feeds.open({feed:'$key_escaped'}) \" style=\"font-size: " .
+                $size . "px\" title=\"$value articles tagged with " .
+                $key . '">' . $key . '</a> ';
+        }
 
 
 
-		print "</div>";
+        print "</div>";
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
-		print "</footer>";
+            __('Close this window')."</button>";
+        print "</footer>";
 
-	}
+    }
 
-	public function generatedFeed() {
+    public function generatedFeed() {
 
-		$this->params = explode(":", $this->param, 3);
-		$feed_id = $this->params[0];
-		$is_cat = (bool) $this->params[1];
+        $this->params = explode(":", $this->param, 3);
+        $feed_id = $this->params[0];
+        $is_cat = (bool) $this->params[1];
 
-		$key = Feeds::get_feed_access_key($feed_id, $is_cat);
+        $key = Feeds::get_feed_access_key($feed_id, $is_cat);
 
-		$url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
+        $url_path = htmlspecialchars($this->params[2]) . "&key=" . $key;
 
-		$feed_title = Feeds::getFeedTitle($feed_id, $is_cat);
+        $feed_title = Feeds::getFeedTitle($feed_id, $is_cat);
 
-		print "<header>".T_sprintf("%s can be accessed via the following secret URL:", $feed_title)."</header>";
+        print "<header>".T_sprintf("%s can be accessed via the following secret URL:", $feed_title)."</header>";
 
-		print "<section>";
-		print "<div class='panel text-center'>";
-		print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
-		print "</div>";
-		print "</section>";
+        print "<section>";
+        print "<div class='panel text-center'>";
+        print "<a id='gen_feed_url' href='$url_path' target='_blank'>$url_path</a>";
+        print "</div>";
+        print "</section>";
 
-		print "<footer>";
+        print "<footer>";
 
-		print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/GeneratedFeeds\")'>
+        print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/GeneratedFeeds\")'>
 			<i class='material-icons'>help</i> ".__("More info...")."</button>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.genUrlChangeKey('$feed_id', '$is_cat')\">".
-			__('Generate new URL')."</button> ";
+        print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.genUrlChangeKey('$feed_id', '$is_cat')\">".
+            __('Generate new URL')."</button> ";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
+        print "<button dojoType='dijit.form.Button' onclick=\"return CommonDialogs.closeInfoBox()\">".
+            __('Close this window')."</button>";
 
-		print "</footer>";
+        print "</footer>";
 
-		//return;
-	}
+        //return;
+    }
 
-	public function defaultPasswordWarning() {
+    public function defaultPasswordWarning() {
 
-    	print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
+        print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
 
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button' onclick=\"document.location.href = 'prefs.php'\">".
-			__('Open Preferences')."</button> ";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button' onclick=\"document.location.href = 'prefs.php'\">".
+            __('Open Preferences')."</button> ";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"return CommonDialogs.closeInfoBox()\">".
-			__('Close this window')."</button>";
-		print "</footeer>";
-	}
+            __('Close this window')."</button>";
+        print "</footeer>";
+    }
 }

classes/logger/sql.php

Indentation +27 added lines, -27 removed lines

@@ -1,45 +1,45 @@
 <?php
 class Logger_SQL {
 
-	private $pdo;
+    private $pdo;
 
-	public function log_error($errno, $errstr, $file, $line, $context) {
+    public function log_error($errno, $errstr, $file, $line, $context) {
 
-		// separate PDO connection object is used for logging
-		if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
+        // separate PDO connection object is used for logging
+        if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
 
-		if ($this->pdo && get_schema_version() > 117) {
+        if ($this->pdo && get_schema_version() > 117) {
 
-			$owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : null;
+            $owner_uid = $_SESSION["uid"] ? $_SESSION["uid"] : null;
 
-			// limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
-			$context = mb_substr($context, 0, 8192);
+            // limit context length, DOMDocument dumps entire XML in here sometimes, which may be huge
+            $context = mb_substr($context, 0, 8192);
 
-			$server_params = [
-				"IP" => "REMOTE_ADDR",
-				"Request URI" => "REQUEST_URI",
-				"User agent" => "HTTP_USER_AGENT",
-			];
+            $server_params = [
+                "IP" => "REMOTE_ADDR",
+                "Request URI" => "REQUEST_URI",
+                "User agent" => "HTTP_USER_AGENT",
+            ];
 
-			foreach ($server_params as $n => $p) {
-				if (isset($_SERVER[$p]))
-					$context .= "\n$n: " . $_SERVER[$p];
-			}
+            foreach ($server_params as $n => $p) {
+                if (isset($_SERVER[$p]))
+                    $context .= "\n$n: " . $_SERVER[$p];
+            }
 
-			// passed error message may contain invalid unicode characters, failing to insert an error here
-			// would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc
-			$errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
-			$context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
+            // passed error message may contain invalid unicode characters, failing to insert an error here
+            // would break the execution entirely by generating an actual fatal error instead of a E_WARNING etc
+            $errstr = UConverter::transcode($errstr, 'UTF-8', 'UTF-8');
+            $context = UConverter::transcode($context, 'UTF-8', 'UTF-8');
 
-			$sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
+            $sth = $this->pdo->prepare("INSERT INTO ttrss_error_log
 				(errno, errstr, filename, lineno, context, owner_uid, created_at) VALUES
 				(?, ?, ?, ?, ?, ?, NOW())");
-			$sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
+            $sth->execute([$errno, $errstr, $file, $line, $context, $owner_uid]);
 
-			return $sth->rowCount();
-		}
+            return $sth->rowCount();
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 }

classes/logger/syslog.php

Indentation +24 added lines, -24 removed lines

@@ -1,33 +1,33 @@
 <?php
 class Logger_Syslog {
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public function log_error($errno, $errstr, $file, $line, $context) {
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function log_error($errno, $errstr, $file, $line, $context) {
 
-		switch ($errno) {
-		case E_ERROR:
-		case E_PARSE:
-		case E_CORE_ERROR:
-		case E_COMPILE_ERROR:
-		case E_USER_ERROR:
-			$priority = LOG_ERR;
-			break;
-		case E_WARNING:
-		case E_CORE_WARNING:
-		case E_COMPILE_WARNING:
-		case E_USER_WARNING:
-			$priority = LOG_WARNING;
-			break;
-		default:
-			$priority = LOG_INFO;
-		}
+        switch ($errno) {
+        case E_ERROR:
+        case E_PARSE:
+        case E_CORE_ERROR:
+        case E_COMPILE_ERROR:
+        case E_USER_ERROR:
+            $priority = LOG_ERR;
+            break;
+        case E_WARNING:
+        case E_CORE_WARNING:
+        case E_COMPILE_WARNING:
+        case E_USER_WARNING:
+            $priority = LOG_WARNING;
+            break;
+        default:
+            $priority = LOG_INFO;
+        }
 
-		$errname = Logger::$errornames[$errno] . " ($errno)";
+        $errname = Logger::$errornames[$errno] . " ($errno)";
 
-		syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
+        syslog($priority, "[tt-rss] $errname ($file:$line) $errstr");
 
-	}
+    }
 
 }

classes/db/prefs.php

Indentation +125 added lines, -125 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 class Db_Prefs {
-	private $pdo;
-	private static $instance;
-	private $cache;
+    private $pdo;
+    private static $instance;
+    private $cache;
 
-	public function __construct() {
-		$this->pdo = Db::pdo();
-		$this->cache = array();
+    public function __construct() {
+        $this->pdo = Db::pdo();
+        $this->cache = array();
 
-		if ($_SESSION["uid"]) $this->cache();
-	}
+        if ($_SESSION["uid"]) $this->cache();
+    }
 
-	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+    public static function get() {
+        if (self::$instance == null)
+            self::$instance = new self();
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
-	public function cache() {
-		$user_id = $_SESSION["uid"];
-		@$profile = $_SESSION["profile"];
+    public function cache() {
+        $user_id = $_SESSION["uid"];
+        @$profile = $_SESSION["profile"];
 
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+        if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
 
-		$sth = $this->pdo->prepare("SELECT
+        $sth = $this->pdo->prepare("SELECT
 			value,ttrss_prefs_types.type_name as type_name,ttrss_prefs.pref_name AS pref_name
 			FROM
 				ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
@@ -35,35 +35,35 @@ 
 				owner_uid = :uid AND
 				ttrss_user_prefs.pref_name = ttrss_prefs.pref_name");
 
-		$sth->execute([":profile" => $profile, ":uid" => $user_id]);
+        $sth->execute([":profile" => $profile, ":uid" => $user_id]);
 
-		while ($line = $sth->fetch()) {
-			if ($user_id == $_SESSION["uid"]) {
-				$pref_name = $line["pref_name"];
+        while ($line = $sth->fetch()) {
+            if ($user_id == $_SESSION["uid"]) {
+                $pref_name = $line["pref_name"];
 
-				$this->cache[$pref_name]["type"] = $line["type_name"];
-				$this->cache[$pref_name]["value"] = $line["value"];
-			}
-		}
-	}
+                $this->cache[$pref_name]["type"] = $line["type_name"];
+                $this->cache[$pref_name]["value"] = $line["value"];
+            }
+        }
+    }
 
-	public function read($pref_name, $user_id = false, $die_on_error = false) {
+    public function read($pref_name, $user_id = false, $die_on_error = false) {
 
-		if (!$user_id) {
-			$user_id = $_SESSION["uid"];
-			@$profile = $_SESSION["profile"];
-		} else {
-			$profile = false;
-		}
+        if (!$user_id) {
+            $user_id = $_SESSION["uid"];
+            @$profile = $_SESSION["profile"];
+        } else {
+            $profile = false;
+        }
 
-		if ($user_id == $_SESSION['uid'] && isset($this->cache[$pref_name])) {
-			$tuple = $this->cache[$pref_name];
-			return $this->convert($tuple["value"], $tuple["type"]);
-		}
+        if ($user_id == $_SESSION['uid'] && isset($this->cache[$pref_name])) {
+            $tuple = $this->cache[$pref_name];
+            return $this->convert($tuple["value"], $tuple["type"]);
+        }
 
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+        if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
 
-		$sth = $this->pdo->prepare("SELECT
+        $sth = $this->pdo->prepare("SELECT
 			value,ttrss_prefs_types.type_name as type_name
 			FROM
 				ttrss_user_prefs,ttrss_prefs,ttrss_prefs_types
@@ -73,96 +73,96 @@ 
 				ttrss_prefs_types.id = type_id AND
 				owner_uid = :uid AND
 				ttrss_user_prefs.pref_name = ttrss_prefs.pref_name");
-		$sth->execute([":uid" => $user_id, ":profile" => $profile, ":pref_name" => $pref_name]);
-
-		if ($row = $sth->fetch()) {
-			$value = $row["value"];
-			$type_name = $row["type_name"];
-
-			if ($user_id == $_SESSION["uid"]) {
-				$this->cache[$pref_name]["type"] = $type_name;
-				$this->cache[$pref_name]["value"] = $value;
-			}
-
-			return $this->convert($value, $type_name);
-
-		} else if ($die_on_error) {
-			user_error("Fatal error, unknown preferences key: $pref_name (owner: $user_id)", E_USER_ERROR);
-			return null;
-		} else {
-			return null;
-		}
-	}
-
-	public function convert($value, $type_name) {
-		if ($type_name == "bool") {
-			return $value == "true";
-		} else if ($type_name == "integer") {
-			return (int)$value;
-		} else {
-			return $value;
-		}
-	}
-
-	public function write($pref_name, $value, $user_id = false, $strip_tags = true) {
-		if ($strip_tags) $value = strip_tags($value);
-
-		if (!$user_id) {
-			$user_id = $_SESSION["uid"];
-			@$profile = $_SESSION["profile"];
-		} else {
-			$profile = null;
-		}
-
-		if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
-
-		$type_name = "";
-		$current_value = "";
-
-		if (isset($this->cache[$pref_name])) {
-			$type_name = $this->cache[$pref_name]["type"];
-			$current_value = $this->cache[$pref_name]["value"];
-		}
-
-		if (!$type_name) {
-			$sth = $this->pdo->prepare("SELECT type_name
+        $sth->execute([":uid" => $user_id, ":profile" => $profile, ":pref_name" => $pref_name]);
+
+        if ($row = $sth->fetch()) {
+            $value = $row["value"];
+            $type_name = $row["type_name"];
+
+            if ($user_id == $_SESSION["uid"]) {
+                $this->cache[$pref_name]["type"] = $type_name;
+                $this->cache[$pref_name]["value"] = $value;
+            }
+
+            return $this->convert($value, $type_name);
+
+        } else if ($die_on_error) {
+            user_error("Fatal error, unknown preferences key: $pref_name (owner: $user_id)", E_USER_ERROR);
+            return null;
+        } else {
+            return null;
+        }
+    }
+
+    public function convert($value, $type_name) {
+        if ($type_name == "bool") {
+            return $value == "true";
+        } else if ($type_name == "integer") {
+            return (int)$value;
+        } else {
+            return $value;
+        }
+    }
+
+    public function write($pref_name, $value, $user_id = false, $strip_tags = true) {
+        if ($strip_tags) $value = strip_tags($value);
+
+        if (!$user_id) {
+            $user_id = $_SESSION["uid"];
+            @$profile = $_SESSION["profile"];
+        } else {
+            $profile = null;
+        }
+
+        if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+
+        $type_name = "";
+        $current_value = "";
+
+        if (isset($this->cache[$pref_name])) {
+            $type_name = $this->cache[$pref_name]["type"];
+            $current_value = $this->cache[$pref_name]["value"];
+        }
+
+        if (!$type_name) {
+            $sth = $this->pdo->prepare("SELECT type_name
 				FROM ttrss_prefs,ttrss_prefs_types
 				WHERE pref_name = ? AND type_id = ttrss_prefs_types.id");
-			$sth->execute([$pref_name]);
-
-			if ($row = $sth->fetch())
-				$type_name = $row["type_name"];
-
-		} else if ($current_value == $value) {
-			return;
-		}
-
-		if ($type_name) {
-			if ($type_name == "bool") {
-				if ($value == "1" || $value == "true") {
-					$value = "true";
-				} else {
-					$value = "false";
-				}
-			} else if ($type_name == "integer") {
-				$value = (int)$value;
-			}
-
-			if ($pref_name == 'USER_TIMEZONE' && $value == '') {
-				$value = 'UTC';
-			}
-
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_prefs SET
+            $sth->execute([$pref_name]);
+
+            if ($row = $sth->fetch())
+                $type_name = $row["type_name"];
+
+        } else if ($current_value == $value) {
+            return;
+        }
+
+        if ($type_name) {
+            if ($type_name == "bool") {
+                if ($value == "1" || $value == "true") {
+                    $value = "true";
+                } else {
+                    $value = "false";
+                }
+            } else if ($type_name == "integer") {
+                $value = (int)$value;
+            }
+
+            if ($pref_name == 'USER_TIMEZONE' && $value == '') {
+                $value = 'UTC';
+            }
+
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_prefs SET
 				value = :value WHERE pref_name = :pref_name
 					AND (profile = :profile OR (:profile IS NULL AND profile IS NULL))
 					AND owner_uid = :uid");
 
-			$sth->execute([":pref_name" => $pref_name, ":value" => $value, ":uid" => $user_id, ":profile" => $profile]);
+            $sth->execute([":pref_name" => $pref_name, ":value" => $value, ":uid" => $user_id, ":profile" => $profile]);
 
-			if ($user_id == $_SESSION["uid"]) {
-				$this->cache[$pref_name]["type"] = $type_name;
-				$this->cache[$pref_name]["value"] = $value;
-			}
-		}
-	}
+            if ($user_id == $_SESSION["uid"]) {
+                $this->cache[$pref_name]["type"] = $type_name;
+                $this->cache[$pref_name]["value"] = $value;
+            }
+        }
+    }
 }

classes/labels.php

Indentation +116 added lines, -116 removed lines

@@ -1,112 +1,112 @@ 
 <?php
 class Labels
 {
-	public static function label_to_feed_id($label) {
-		return LABEL_BASE_INDEX - 1 - abs($label);
-	}
+    public static function label_to_feed_id($label) {
+        return LABEL_BASE_INDEX - 1 - abs($label);
+    }
 
-	public static function feed_to_label_id($feed) {
-		return LABEL_BASE_INDEX - 1 + abs($feed);
-	}
+    public static function feed_to_label_id($feed) {
+        return LABEL_BASE_INDEX - 1 + abs($feed);
+    }
 
-	public static function find_id($label, $owner_uid) {
-		$pdo = Db::pdo();
+    public static function find_id($label, $owner_uid) {
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id FROM ttrss_labels2 WHERE caption = ?
+        $sth = $pdo->prepare("SELECT id FROM ttrss_labels2 WHERE caption = ?
 				AND owner_uid = ? LIMIT 1");
-		$sth->execute([$label, $owner_uid]);
+        $sth->execute([$label, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
-			return $row['id'];
-		} else {
-			return 0;
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row['id'];
+        } else {
+            return 0;
+        }
+    }
 
-	public static function find_caption($label, $owner_uid) {
-		$pdo = Db::pdo();
+    public static function find_caption($label, $owner_uid) {
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT caption FROM ttrss_labels2 WHERE id = ?
+        $sth = $pdo->prepare("SELECT caption FROM ttrss_labels2 WHERE id = ?
 				AND owner_uid = ? LIMIT 1");
-		$sth->execute([$label, $owner_uid]);
+        $sth->execute([$label, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
-			return $row['caption'];
-		} else {
-			return "";
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row['caption'];
+        } else {
+            return "";
+        }
+    }
 
-	public static function get_all_labels($owner_uid)	{
-		$rv = array();
+    public static function get_all_labels($owner_uid)	{
+        $rv = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id, fg_color, bg_color, caption FROM ttrss_labels2
+        $sth = $pdo->prepare("SELECT id, fg_color, bg_color, caption FROM ttrss_labels2
 			WHERE owner_uid = ? ORDER BY caption");
-		$sth->execute([$owner_uid]);
+        $sth->execute([$owner_uid]);
 
-		while ($line = $sth->fetch()) {
-			array_push($rv, $line);
-		}
+        while ($line = $sth->fetch()) {
+            array_push($rv, $line);
+        }
 
-		return $rv;
-	}
+        return $rv;
+    }
 
-	public static function update_cache($owner_uid, $id, $labels = false, $force = false) {
-		$pdo = Db::pdo();
+    public static function update_cache($owner_uid, $id, $labels = false, $force = false) {
+        $pdo = Db::pdo();
 
-		if ($force)
-			Labels::clear_cache($id);
+        if ($force)
+            Labels::clear_cache($id);
 
-		if (!$labels)
-			$labels = Article::get_article_labels($id);
+        if (!$labels)
+            $labels = Article::get_article_labels($id);
 
-		$labels = json_encode($labels);
+        $labels = json_encode($labels);
 
-		$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
+        $sth = $pdo->prepare("UPDATE ttrss_user_entries SET
 			label_cache = ? WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$labels, $id, $owner_uid]);
+        $sth->execute([$labels, $id, $owner_uid]);
 
-	}
+    }
 
-	public static function clear_cache($id)	{
+    public static function clear_cache($id)	{
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
+        $sth = $pdo->prepare("UPDATE ttrss_user_entries SET
 			label_cache = '' WHERE ref_id = ?");
-		$sth->execute([$id]);
+        $sth->execute([$id]);
 
-	}
+    }
 
-	public static function remove_article($id, $label, $owner_uid) {
+    public static function remove_article($id, $label, $owner_uid) {
 
-		$label_id = Labels::find_id($label, $owner_uid);
+        $label_id = Labels::find_id($label, $owner_uid);
 
-		if (!$label_id) return;
+        if (!$label_id) return;
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("DELETE FROM ttrss_user_labels2
+        $sth = $pdo->prepare("DELETE FROM ttrss_user_labels2
 			WHERE
 				label_id = ? AND
 				article_id = ?");
 
-		$sth->execute([$label_id, $id]);
+        $sth->execute([$label_id, $id]);
 
-		Labels::clear_cache($id);
-	}
+        Labels::clear_cache($id);
+    }
 
-	public static function add_article($id, $label, $owner_uid)	{
+    public static function add_article($id, $label, $owner_uid)	{
 
-		$label_id = Labels::find_id($label, $owner_uid);
+        $label_id = Labels::find_id($label, $owner_uid);
 
-		if (!$label_id) return;
+        if (!$label_id) return;
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT
+        $sth = $pdo->prepare("SELECT
 				article_id FROM ttrss_labels2, ttrss_user_labels2
 			WHERE
 				label_id = id AND
@@ -114,92 +114,92 @@ 
 				article_id = ? AND owner_uid = ?
 			LIMIT 1");
 
-		$sth->execute([$label_id, $id, $owner_uid]);
+        $sth->execute([$label_id, $id, $owner_uid]);
 
-		if (!$sth->fetch()) {
-			$sth = $pdo->prepare("INSERT INTO ttrss_user_labels2
+        if (!$sth->fetch()) {
+            $sth = $pdo->prepare("INSERT INTO ttrss_user_labels2
 				(label_id, article_id) VALUES (?, ?)");
 
-			$sth->execute([$label_id, $id]);
-		}
+            $sth->execute([$label_id, $id]);
+        }
 
-		Labels::clear_cache($id);
+        Labels::clear_cache($id);
 
-	}
+    }
 
-	public static function remove($id, $owner_uid) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+    public static function remove($id, $owner_uid) {
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$pdo = Db::pdo();
-		$tr_in_progress = false;
+        $pdo = Db::pdo();
+        $tr_in_progress = false;
 
-		try {
-			$pdo->beginTransaction();
-		} catch (Exception $e) {
-			$tr_in_progress = true;
-		}
+        try {
+            $pdo->beginTransaction();
+        } catch (Exception $e) {
+            $tr_in_progress = true;
+        }
 
-		$sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
+        $sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
 			WHERE id = ?");
-		$sth->execute([$id]);
+        $sth->execute([$id]);
 
-		$row = $sth->fetch();
-		$caption = $row['caption'];
+        $row = $sth->fetch();
+        $caption = $row['caption'];
 
-		$sth = $pdo->prepare("DELETE FROM ttrss_labels2 WHERE id = ?
+        $sth = $pdo->prepare("DELETE FROM ttrss_labels2 WHERE id = ?
 			AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		if ($sth->rowCount() != 0 && $caption) {
+        if ($sth->rowCount() != 0 && $caption) {
 
-			/* Remove access key for the label */
+            /* Remove access key for the label */
 
-			$ext_id = LABEL_BASE_INDEX - 1 - $id;
+            $ext_id = LABEL_BASE_INDEX - 1 - $id;
 
-			$sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
+            $sth = $pdo->prepare("DELETE FROM ttrss_access_keys WHERE
 				feed_id = ? AND owner_uid = ?");
-			$sth->execute([$ext_id, $owner_uid]);
+            $sth->execute([$ext_id, $owner_uid]);
 
-			/* Remove cached data */
+            /* Remove cached data */
 
-			$sth = $pdo->prepare("UPDATE ttrss_user_entries SET label_cache = ''
+            $sth = $pdo->prepare("UPDATE ttrss_user_entries SET label_cache = ''
 				WHERE owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-		}
+        }
 
-		if (!$tr_in_progress) $pdo->commit();
-	}
+        if (!$tr_in_progress) $pdo->commit();
+    }
 
-	public static function create($caption, $fg_color = '', $bg_color = '', $owner_uid = false)	{
+    public static function create($caption, $fg_color = '', $bg_color = '', $owner_uid = false)	{
 
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+        if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$tr_in_progress = false;
+        $tr_in_progress = false;
 
-		try {
-			$pdo->beginTransaction();
-		} catch (Exception $e) {
-			$tr_in_progress = true;
-		}
+        try {
+            $pdo->beginTransaction();
+        } catch (Exception $e) {
+            $tr_in_progress = true;
+        }
 
-		$sth = $pdo->prepare("SELECT id FROM ttrss_labels2
+        $sth = $pdo->prepare("SELECT id FROM ttrss_labels2
 			WHERE caption = ? AND owner_uid = ?");
-		$sth->execute([$caption, $owner_uid]);
+        $sth->execute([$caption, $owner_uid]);
 
-		if (!$sth->fetch()) {
-			$sth = $pdo->prepare("INSERT INTO ttrss_labels2
+        if (!$sth->fetch()) {
+            $sth = $pdo->prepare("INSERT INTO ttrss_labels2
 				(caption,owner_uid,fg_color,bg_color) VALUES (?, ?, ?, ?)");
 
-			$sth->execute([$caption, $owner_uid, $fg_color, $bg_color]);
+            $sth->execute([$caption, $owner_uid, $fg_color, $bg_color]);
 
-			$result = $sth->rowCount();
-		}
+            $result = $sth->rowCount();
+        }
 
-		if (!$tr_in_progress) $pdo->commit();
+        if (!$tr_in_progress) $pdo->commit();
 
-		return $result;
-	}
+        return $result;
+    }
 }

classes/digest.php

Indentation +133 added lines, -133 removed lines

@@ -2,126 +2,126 @@ 
 class Digest
 {
 
-	/**
-	 * Send by mail a digest of last articles.
-	 *
-	 * @param mixed $link The database connection.
-	 * @param integer $limit The maximum number of articles by digest.
-	 * @return boolean Return false if digests are not enabled.
-	 */
-	public static function send_headlines_digests() {
+    /**
+     * Send by mail a digest of last articles.
+     *
+     * @param mixed $link The database connection.
+     * @param integer $limit The maximum number of articles by digest.
+     * @return boolean Return false if digests are not enabled.
+     */
+    public static function send_headlines_digests() {
 
-		$user_limit = 15; // amount of users to process (e.g. emails to send out)
-		$limit = 1000; // maximum amount of headlines to include
+        $user_limit = 15; // amount of users to process (e.g. emails to send out)
+        $limit = 1000; // maximum amount of headlines to include
 
-		Debug::log("Sending digests, batch of max $user_limit users, headline limit = $limit");
+        Debug::log("Sending digests, batch of max $user_limit users, headline limit = $limit");
 
-		if (DB_TYPE == "pgsql") {
-			$interval_qpart = "last_digest_sent < NOW() - INTERVAL '1 days'";
-		} else if (DB_TYPE == "mysql") {
-			$interval_qpart = "last_digest_sent < DATE_SUB(NOW(), INTERVAL 1 DAY)";
-		}
+        if (DB_TYPE == "pgsql") {
+            $interval_qpart = "last_digest_sent < NOW() - INTERVAL '1 days'";
+        } else if (DB_TYPE == "mysql") {
+            $interval_qpart = "last_digest_sent < DATE_SUB(NOW(), INTERVAL 1 DAY)";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$res = $pdo->query("SELECT id,email FROM ttrss_users
+        $res = $pdo->query("SELECT id,email FROM ttrss_users
 				WHERE email != '' AND (last_digest_sent IS NULL OR $interval_qpart)");
 
-		while ($line = $res->fetch()) {
+        while ($line = $res->fetch()) {
 
-			if (@get_pref('DIGEST_ENABLE', $line['id'], false)) {
-				$preferred_ts = strtotime(get_pref('DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
+            if (@get_pref('DIGEST_ENABLE', $line['id'], false)) {
+                $preferred_ts = strtotime(get_pref('DIGEST_PREFERRED_TIME', $line['id'], '00:00'));
 
-				// try to send digests within 2 hours of preferred time
-				if ($preferred_ts && time() >= $preferred_ts &&
-					time() - $preferred_ts <= 7200
-				) {
+                // try to send digests within 2 hours of preferred time
+                if ($preferred_ts && time() >= $preferred_ts &&
+                    time() - $preferred_ts <= 7200
+                ) {
 
-					Debug::log("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
+                    Debug::log("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
 
-					$do_catchup = get_pref('DIGEST_CATCHUP', $line['id'], false);
+                    $do_catchup = get_pref('DIGEST_CATCHUP', $line['id'], false);
 
-					global $tz_offset;
+                    global $tz_offset;
 
-					// reset tz_offset global to prevent tz cache clash between users
-					$tz_offset = -1;
+                    // reset tz_offset global to prevent tz cache clash between users
+                    $tz_offset = -1;
 
-					$tuple = Digest::prepare_headlines_digest($line["id"], 1, $limit);
-					$digest = $tuple[0];
-					$headlines_count = $tuple[1];
-					$affected_ids = $tuple[2];
-					$digest_text = $tuple[3];
+                    $tuple = Digest::prepare_headlines_digest($line["id"], 1, $limit);
+                    $digest = $tuple[0];
+                    $headlines_count = $tuple[1];
+                    $affected_ids = $tuple[2];
+                    $digest_text = $tuple[3];
 
-					if ($headlines_count > 0) {
+                    if ($headlines_count > 0) {
 
-						$mailer = new Mailer();
+                        $mailer = new Mailer();
 
-						//$rc = $mail->quickMail($line["email"], $line["login"], DIGEST_SUBJECT, $digest, $digest_text);
+                        //$rc = $mail->quickMail($line["email"], $line["login"], DIGEST_SUBJECT, $digest, $digest_text);
 
-						$rc = $mailer->mail(["to_name" => $line["login"],
-							"to_address" => $line["email"],
-							"subject" => DIGEST_SUBJECT,
-							"message" => $digest_text,
-							"message_html" => $digest]);
+                        $rc = $mailer->mail(["to_name" => $line["login"],
+                            "to_address" => $line["email"],
+                            "subject" => DIGEST_SUBJECT,
+                            "message" => $digest_text,
+                            "message_html" => $digest]);
 
-						//if (!$rc && $debug) Debug::log("ERROR: " . $mailer->lastError());
+                        //if (!$rc && $debug) Debug::log("ERROR: " . $mailer->lastError());
 
-						Debug::log("RC=$rc");
+                        Debug::log("RC=$rc");
 
-						if ($rc && $do_catchup) {
-							Debug::log("Marking affected articles as read...");
-							Article::catchupArticlesById($affected_ids, 0, $line["id"]);
-						}
-					} else {
-						Debug::log("No headlines");
-					}
+                        if ($rc && $do_catchup) {
+                            Debug::log("Marking affected articles as read...");
+                            Article::catchupArticlesById($affected_ids, 0, $line["id"]);
+                        }
+                    } else {
+                        Debug::log("No headlines");
+                    }
 
-					$sth = $pdo->prepare("UPDATE ttrss_users SET last_digest_sent = NOW()
+                    $sth = $pdo->prepare("UPDATE ttrss_users SET last_digest_sent = NOW()
 						WHERE id = ?");
-					$sth->execute([$line["id"]]);
+                    $sth->execute([$line["id"]]);
 
-				}
-			}
-		}
+                }
+            }
+        }
 
-		Debug::log("All done.");
+        Debug::log("All done.");
 
-	}
+    }
 
-	public static function prepare_headlines_digest($user_id, $days = 1, $limit = 1000) {
+    public static function prepare_headlines_digest($user_id, $days = 1, $limit = 1000) {
 
-		require_once "lib/MiniTemplator.class.php";
+        require_once "lib/MiniTemplator.class.php";
 
-		$tpl = new MiniTemplator;
-		$tpl_t = new MiniTemplator;
+        $tpl = new MiniTemplator;
+        $tpl_t = new MiniTemplator;
 
-		$tpl->readTemplateFromFile("templates/digest_template_html.txt");
-		$tpl_t->readTemplateFromFile("templates/digest_template.txt");
+        $tpl->readTemplateFromFile("templates/digest_template_html.txt");
+        $tpl_t->readTemplateFromFile("templates/digest_template.txt");
 
-		$user_tz_string = get_pref('USER_TIMEZONE', $user_id);
-		$local_ts = convert_timestamp(time(), 'UTC', $user_tz_string);
+        $user_tz_string = get_pref('USER_TIMEZONE', $user_id);
+        $local_ts = convert_timestamp(time(), 'UTC', $user_tz_string);
 
-		$tpl->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
-		$tpl->setVariable('CUR_TIME', date('G:i', $local_ts));
-		$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+        $tpl->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
+        $tpl->setVariable('CUR_TIME', date('G:i', $local_ts));
+        $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-		$tpl_t->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
-		$tpl_t->setVariable('CUR_TIME', date('G:i', $local_ts));
-		$tpl_t->setVariable('TTRSS_HOST', SELF_URL_PATH);
+        $tpl_t->setVariable('CUR_DATE', date('Y/m/d', $local_ts));
+        $tpl_t->setVariable('CUR_TIME', date('G:i', $local_ts));
+        $tpl_t->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-		$affected_ids = array();
+        $affected_ids = array();
 
-		$days = (int) $days;
+        $days = (int) $days;
 
-		if (DB_TYPE == "pgsql") {
-			$interval_qpart = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
-		} else if (DB_TYPE == "mysql") {
-			$interval_qpart = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
-		}
+        if (DB_TYPE == "pgsql") {
+            $interval_qpart = "ttrss_entries.date_updated > NOW() - INTERVAL '$days days'";
+        } else if (DB_TYPE == "mysql") {
+            $interval_qpart = "ttrss_entries.date_updated > DATE_SUB(NOW(), INTERVAL $days DAY)";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT ttrss_entries.title,
+        $sth = $pdo->prepare("SELECT ttrss_entries.title,
 				ttrss_feeds.title AS feed_title,
 				COALESCE(ttrss_feed_categories.title, '" . __('Uncategorized') . "') AS cat_title,
 				date_updated,
@@ -143,76 +143,76 @@ 
 				AND score >= 0
 			ORDER BY ttrss_feed_categories.title, ttrss_feeds.title, score DESC, date_updated DESC
 			LIMIT :limit");
-		$sth->bindParam(':user_id', intval($user_id, 10), PDO::PARAM_INT);
-		$sth->bindParam(':limit', intval($limit, 10), PDO::PARAM_INT);
-		$sth->execute();
+        $sth->bindParam(':user_id', intval($user_id, 10), PDO::PARAM_INT);
+        $sth->bindParam(':limit', intval($limit, 10), PDO::PARAM_INT);
+        $sth->execute();
 
-		$headlines_count = 0;
-		$headlines = array();
+        $headlines_count = 0;
+        $headlines = array();
 
-		while ($line = $sth->fetch()) {
-			array_push($headlines, $line);
-			$headlines_count++;
-		}
+        while ($line = $sth->fetch()) {
+            array_push($headlines, $line);
+            $headlines_count++;
+        }
 
-		for ($i = 0; $i < sizeof($headlines); $i++) {
+        for ($i = 0; $i < sizeof($headlines); $i++) {
 
-			$line = $headlines[$i];
+            $line = $headlines[$i];
 
-			array_push($affected_ids, $line["ref_id"]);
+            array_push($affected_ids, $line["ref_id"]);
 
-			$updated = make_local_datetime($line['last_updated'], false,
-				$user_id);
+            $updated = make_local_datetime($line['last_updated'], false,
+                $user_id);
 
-			if (get_pref('ENABLE_FEED_CATS', $user_id)) {
-				$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
-			}
+            if (get_pref('ENABLE_FEED_CATS', $user_id)) {
+                $line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
+            }
 
-			$article_labels = Article::get_article_labels($line["ref_id"], $user_id);
-			$article_labels_formatted = "";
+            $article_labels = Article::get_article_labels($line["ref_id"], $user_id);
+            $article_labels_formatted = "";
 
-			if (is_array($article_labels) && count($article_labels) > 0) {
-				$article_labels_formatted = implode(", ", array_map(function($a) {
-					return $a[1];
-				}, $article_labels));
-			}
+            if (is_array($article_labels) && count($article_labels) > 0) {
+                $article_labels_formatted = implode(", ", array_map(function($a) {
+                    return $a[1];
+                }, $article_labels));
+            }
 
-			$tpl->setVariable('FEED_TITLE', $line["feed_title"]);
-			$tpl->setVariable('ARTICLE_TITLE', $line["title"]);
-			$tpl->setVariable('ARTICLE_LINK', $line["link"]);
-			$tpl->setVariable('ARTICLE_UPDATED', $updated);
-			$tpl->setVariable('ARTICLE_EXCERPT',
-				truncate_string(strip_tags($line["content"]), 300));
+            $tpl->setVariable('FEED_TITLE', $line["feed_title"]);
+            $tpl->setVariable('ARTICLE_TITLE', $line["title"]);
+            $tpl->setVariable('ARTICLE_LINK', $line["link"]);
+            $tpl->setVariable('ARTICLE_UPDATED', $updated);
+            $tpl->setVariable('ARTICLE_EXCERPT',
+                truncate_string(strip_tags($line["content"]), 300));
 //			$tpl->setVariable('ARTICLE_CONTENT',
 //				strip_tags($article_content));
-			$tpl->setVariable('ARTICLE_LABELS', $article_labels_formatted, true);
+            $tpl->setVariable('ARTICLE_LABELS', $article_labels_formatted, true);
 
-			$tpl->addBlock('article');
+            $tpl->addBlock('article');
 
-			$tpl_t->setVariable('FEED_TITLE', $line["feed_title"]);
-			$tpl_t->setVariable('ARTICLE_TITLE', $line["title"]);
-			$tpl_t->setVariable('ARTICLE_LINK', $line["link"]);
-			$tpl_t->setVariable('ARTICLE_UPDATED', $updated);
-			$tpl_t->setVariable('ARTICLE_LABELS', $article_labels_formatted, true);
-			$tpl_t->setVariable('ARTICLE_EXCERPT',
-				truncate_string(strip_tags($line["content"]), 300, "..."), true);
+            $tpl_t->setVariable('FEED_TITLE', $line["feed_title"]);
+            $tpl_t->setVariable('ARTICLE_TITLE', $line["title"]);
+            $tpl_t->setVariable('ARTICLE_LINK', $line["link"]);
+            $tpl_t->setVariable('ARTICLE_UPDATED', $updated);
+            $tpl_t->setVariable('ARTICLE_LABELS', $article_labels_formatted, true);
+            $tpl_t->setVariable('ARTICLE_EXCERPT',
+                truncate_string(strip_tags($line["content"]), 300, "..."), true);
 
-			$tpl_t->addBlock('article');
+            $tpl_t->addBlock('article');
 
-			if ($headlines[$i]['feed_title'] != $headlines[$i + 1]['feed_title']) {
-				$tpl->addBlock('feed');
-				$tpl_t->addBlock('feed');
-			}
+            if ($headlines[$i]['feed_title'] != $headlines[$i + 1]['feed_title']) {
+                $tpl->addBlock('feed');
+                $tpl_t->addBlock('feed');
+            }
 
-		}
+        }
 
-		$tpl->addBlock('digest');
-		$tpl->generateOutputToString($tmp);
+        $tpl->addBlock('digest');
+        $tpl->generateOutputToString($tmp);
 
-		$tpl_t->addBlock('digest');
-		$tpl_t->generateOutputToString($tmp_t);
+        $tpl_t->addBlock('digest');
+        $tpl_t->generateOutputToString($tmp_t);
 
-		return array($tmp, $headlines_count, $affected_ids, $tmp_t);
-	}
+        return array($tmp, $headlines_count, $affected_ids, $tmp_t);
+    }
 
 }

classes/debug.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 class Debug {
-	public static $LOG_DISABLED = -1;
+    public static $LOG_DISABLED = -1;
     public static $LOG_NORMAL = 0;
     public static $LOG_VERBOSE = 1;
     public static $LOG_EXTENDED = 2;
@@ -10,7 +10,7 @@ 
     private static $logfile = false;
     private static $loglevel = 0;
 
-	public static function set_logfile($logfile) {
+    public static function set_logfile($logfile) {
         Debug::$logfile = $logfile;
     }
 

classes/auth/base.php

Indentation +32 added lines, -32 removed lines

@@ -1,48 +1,48 @@
 <?php
 class Auth_Base {
-	private $pdo;
+    private $pdo;
 
-	const AUTH_SERVICE_API = '_api';
+    const AUTH_SERVICE_API = '_api';
 
-	public function __construct() {
-		$this->pdo = Db::pdo();
-	}
+    public function __construct() {
+        $this->pdo = Db::pdo();
+    }
 
-	// Auto-creates specified user if allowed by system configuration
-	// Can be used instead of find_user_by_login() by external auth modules
-	public function auto_create_user($login, $password = false) {
-		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
-			$user_id = $this->find_user_by_login($login);
+    // Auto-creates specified user if allowed by system configuration
+    // Can be used instead of find_user_by_login() by external auth modules
+    public function auto_create_user($login, $password = false) {
+        if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
+            $user_id = $this->find_user_by_login($login);
 
-			if (!$password) $password = make_password();
+            if (!$password) $password = make_password();
 
-			if (!$user_id) {
-				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$pwd_hash = encrypt_password($password, $salt, true);
+            if (!$user_id) {
+                $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+                $pwd_hash = encrypt_password($password, $salt, true);
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_users
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_users
 						(login,access_level,last_login,created,pwd_hash,salt)
 						VALUES (?, 0, null, NOW(), ?,?)");
-				$sth->execute([$login, $pwd_hash, $salt]);
+                $sth->execute([$login, $pwd_hash, $salt]);
 
-				return $this->find_user_by_login($login);
+                return $this->find_user_by_login($login);
 
-			} else {
-				return $user_id;
-			}
-		}
+            } else {
+                return $user_id;
+            }
+        }
 
-		return $this->find_user_by_login($login);
-	}
+        return $this->find_user_by_login($login);
+    }
 
-	public function find_user_by_login($login) {
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
-		$sth->execute([$login]);
+    public function find_user_by_login($login) {
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+        $sth->execute([$login]);
 
-		if ($row = $sth->fetch()) {
-			return $row["id"];
-		} else {
-			return false;
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row["id"];
+        } else {
+            return false;
+        }
+    }
 }