codysnider / tt-rss

classes/pluginhost.php

Indentation +497 added lines, -497 removed lines

@@ -1,526 +1,526 @@
 <?php
 class PluginHost {
-	private $pdo;
-	private $hooks = array();
-	private $plugins = array();
-	private $handlers = array();
-	private $commands = array();
-	private $storage = array();
-	private $feeds = array();
-	private $api_methods = array();
-	private $plugin_actions = array();
-	private $owner_uid;
-	private $last_registered;
-	private static $instance;
-
-	const API_VERSION = 2;
-
-	// Hooks marked with *1 are run in global context and available
-	// to plugins loaded in config.php only
-
-	const HOOK_ARTICLE_BUTTON = 1;
-	const HOOK_ARTICLE_FILTER = 2;
-	const HOOK_PREFS_TAB = 3;
-	const HOOK_PREFS_TAB_SECTION = 4;
-	const HOOK_PREFS_TABS = 5;
-	const HOOK_FEED_PARSED = 6;
-	const HOOK_UPDATE_TASK = 7; // *1
-	const HOOK_AUTH_USER = 8;
-	const HOOK_HOTKEY_MAP = 9;
-	const HOOK_RENDER_ARTICLE = 10;
-	const HOOK_RENDER_ARTICLE_CDM = 11;
-	const HOOK_FEED_FETCHED = 12;
-	const HOOK_SANITIZE = 13;
-	const HOOK_RENDER_ARTICLE_API = 14;
-	const HOOK_TOOLBAR_BUTTON = 15;
-	const HOOK_ACTION_ITEM = 16;
-	const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
-	const HOOK_HOTKEY_INFO = 18;
-	const HOOK_ARTICLE_LEFT_BUTTON = 19;
-	const HOOK_PREFS_EDIT_FEED = 20;
-	const HOOK_PREFS_SAVE_FEED = 21;
-	const HOOK_FETCH_FEED = 22;
-	const HOOK_QUERY_HEADLINES = 23;
-	const HOOK_HOUSE_KEEPING = 24; // *1
-	const HOOK_SEARCH = 25;
-	const HOOK_FORMAT_ENCLOSURES = 26;
-	const HOOK_SUBSCRIBE_FEED = 27;
-	const HOOK_HEADLINES_BEFORE = 28;
-	const HOOK_RENDER_ENCLOSURE = 29;
-	const HOOK_ARTICLE_FILTER_ACTION = 30;
-	const HOOK_ARTICLE_EXPORT_FEED = 31;
-	const HOOK_MAIN_TOOLBAR_BUTTON = 32;
-	const HOOK_ENCLOSURE_ENTRY = 33;
-	const HOOK_FORMAT_ARTICLE = 34;
-	const HOOK_FORMAT_ARTICLE_CDM = 35; /* RIP */
-	const HOOK_FEED_BASIC_INFO = 36;
-	const HOOK_SEND_LOCAL_FILE = 37;
-	const HOOK_UNSUBSCRIBE_FEED = 38;
-	const HOOK_SEND_MAIL = 39;
-	const HOOK_FILTER_TRIGGERED = 40;
-	const HOOK_GET_FULL_TEXT = 41;
-	const HOOK_ARTICLE_IMAGE = 42;
-	const HOOK_FEED_TREE = 43;
-	const HOOK_IFRAME_WHITELISTED = 44;
-
-	const KIND_ALL = 1;
-	const KIND_SYSTEM = 2;
-	const KIND_USER = 3;
-
-	public static function object_to_domain($plugin) {
-		return strtolower(get_class($plugin));
-	}
-
-	public function __construct() {
-		$this->pdo = Db::pdo();
-
-		$this->storage = array();
-	}
-
-	private function __clone() {
-		//
-	}
-
-	public static function getInstance() {
-		if (self::$instance == null)
-			self::$instance = new self();
-
-		return self::$instance;
-	}
-
-	private function register_plugin($name, $plugin) {
-		//array_push($this->plugins, $plugin);
-		$this->plugins[$name] = $plugin;
-	}
-
-	// needed for compatibility with API 1
-	public function get_link() {
-		return false;
-	}
-
-	public function get_dbh() {
-		return Db::get();
-	}
-
-	public function get_pdo() {
-		return $this->pdo;
-	}
-
-	public function get_plugin_names() {
-		$names = array();
-
-		foreach ($this->plugins as $p) {
-			array_push($names, get_class($p));
-		}
-
-		return $names;
-	}
-
-	public function get_plugins() {
-		return $this->plugins;
-	}
-
-	public function get_plugin($name) {
-		return $this->plugins[strtolower($name)];
-	}
-
-	public function run_hooks($type, $method, $args) {
-		foreach ($this->get_hooks($type) as $hook) {
-			$hook->$method($args);
-		}
-	}
-
-	public function add_hook($type, $sender, $priority = 50) {
-		$priority = (int) $priority;
-
-		if (!is_array($this->hooks[$type])) {
-			$this->hooks[$type] = [];
-		}
-
-		if (!is_array($this->hooks[$type][$priority])) {
-			$this->hooks[$type][$priority] = [];
-		}
-
-		array_push($this->hooks[$type][$priority], $sender);
-		ksort($this->hooks[$type]);
-	}
-
-	public function del_hook($type, $sender) {
-		if (is_array($this->hooks[$type])) {
-			foreach (array_keys($this->hooks[$type]) as $prio) {
-				$key = array_search($sender, $this->hooks[$type][$prio]);
-
-				if ($key !== false) {
-					unset($this->hooks[$type][$prio][$key]);
-				}
-			}
-		}
-	}
-
-	public function get_hooks($type) {
-		if (isset($this->hooks[$type])) {
-			$tmp = [];
-
-			foreach (array_keys($this->hooks[$type]) as $prio) {
-				$tmp = array_merge($tmp, $this->hooks[$type][$prio]);
-			}
-
-			return $tmp;
-		} else {
-			return [];
-		}
-	}
-	public function load_all($kind, $owner_uid = false, $skip_init = false) {
-
-		$plugins = array_merge(glob("plugins/*"), glob("plugins.local/*"));
-		$plugins = array_filter($plugins, "is_dir");
-		$plugins = array_map("basename", $plugins);
-
-		asort($plugins);
-
-		$this->load(join(",", $plugins), $kind, $owner_uid, $skip_init);
-	}
-
-	public function load($classlist, $kind, $owner_uid = false, $skip_init = false) {
-		$plugins = explode(",", $classlist);
-
-		$this->owner_uid = (int) $owner_uid;
-
-		foreach ($plugins as $class) {
-			$class = trim($class);
-			$class_file = strtolower(clean_filename($class));
-
-			if (!is_dir(__DIR__."/../plugins/$class_file") &&
-					!is_dir(__DIR__."/../plugins.local/$class_file")) continue;
-
-			// try system plugin directory first
-			$file = __DIR__ . "/../plugins/$class_file/init.php";
-			$vendor_dir = __DIR__ . "/../plugins/$class_file/vendor";
-
-			if (!file_exists($file)) {
-				$file = __DIR__ . "/../plugins.local/$class_file/init.php";
-				$vendor_dir = __DIR__ . "/../plugins.local/$class_file/vendor";
-			}
-
-			if (!isset($this->plugins[$class])) {
-				if (file_exists($file)) require_once $file;
-
-				if (class_exists($class) && is_subclass_of($class, "Plugin")) {
-
-					// register plugin autoloader if necessary, for namespaced classes ONLY
-					// layout corresponds to tt-rss main /vendor/author/Package/Class.php
-
-					if (file_exists($vendor_dir)) {
-						spl_autoload_register(function($class) use ($vendor_dir) {
-
-							if (strpos($class, '\\') !== false) {
-								list ($namespace, $class_name) = explode('\\', $class, 2);
-
-								if ($namespace && $class_name) {
-									$class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
-
-									if (file_exists($class_file))
-										require_once $class_file;
-								}
-							}
-						});
-					}
-
-					$plugin = new $class($this);
-
-					$plugin_api = $plugin->api_version();
-
-					if ($plugin_api < PluginHost::API_VERSION) {
-						user_error("plugin $class is not compatible with current API version (need: " . PluginHost::API_VERSION . ", got: $plugin_api)", E_USER_WARNING);
-						continue;
-					}
-
-					if (file_exists(dirname($file) . "/locale")) {
-						_bindtextdomain($class, dirname($file) . "/locale");
-						_bind_textdomain_codeset($class, "UTF-8");
-					}
-
-					$this->last_registered = $class;
-
-					switch ($kind) {
-					case $this::KIND_SYSTEM:
-						if ($this->is_system($plugin)) {
-							if (!$skip_init) $plugin->init($this);
-							$this->register_plugin($class, $plugin);
-						}
-						break;
-					case $this::KIND_USER:
-						if (!$this->is_system($plugin)) {
-							if (!$skip_init) $plugin->init($this);
-							$this->register_plugin($class, $plugin);
-						}
-						break;
-					case $this::KIND_ALL:
-						if (!$skip_init) $plugin->init($this);
-						$this->register_plugin($class, $plugin);
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	public function is_system($plugin) {
-		$about = $plugin->about();
-
-		return @$about[3];
-	}
-
-	// only system plugins are allowed to modify routing
-	public function add_handler($handler, $method, $sender) {
-		$handler = str_replace("-", "_", strtolower($handler));
-		$method = strtolower($method);
-
-		if ($this->is_system($sender)) {
-			if (!is_array($this->handlers[$handler])) {
-				$this->handlers[$handler] = array();
-			}
-
-			$this->handlers[$handler][$method] = $sender;
-		}
-	}
-
-	public function del_handler($handler, $method, $sender) {
-		$handler = str_replace("-", "_", strtolower($handler));
-		$method = strtolower($method);
-
-		if ($this->is_system($sender)) {
-			unset($this->handlers[$handler][$method]);
-		}
-	}
-
-	public function lookup_handler($handler, $method) {
-		$handler = str_replace("-", "_", strtolower($handler));
-		$method = strtolower($method);
-
-		if (is_array($this->handlers[$handler])) {
-			if (isset($this->handlers[$handler]["*"])) {
-				return $this->handlers[$handler]["*"];
-			} else {
-				return $this->handlers[$handler][$method];
-			}
-		}
-
-		return false;
-	}
-
-	public function add_command($command, $description, $sender, $suffix = "", $arghelp = "") {
-		$command = str_replace("-", "_", strtolower($command));
-
-		$this->commands[$command] = array("description" => $description,
-			"suffix" => $suffix,
-			"arghelp" => $arghelp,
-			"class" => $sender);
-	}
-
-	public function del_command($command) {
-		$command = "-" . strtolower($command);
-
-		unset($this->commands[$command]);
-	}
-
-	public function lookup_command($command) {
-		$command = "-" . strtolower($command);
-
-		if (is_array($this->commands[$command])) {
-			return $this->commands[$command]["class"];
-		} else {
-			return false;
-		}
-	}
-
-	public function get_commands() {
-		return $this->commands;
-	}
-
-	public function run_commands($args) {
-		foreach ($this->get_commands() as $command => $data) {
-			if (isset($args[$command])) {
-				$command = str_replace("-", "", $command);
-				$data["class"]->$command($args);
-			}
-		}
-	}
-
-	public function load_data() {
-		if ($this->owner_uid)  {
-			$sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
+    private $pdo;
+    private $hooks = array();
+    private $plugins = array();
+    private $handlers = array();
+    private $commands = array();
+    private $storage = array();
+    private $feeds = array();
+    private $api_methods = array();
+    private $plugin_actions = array();
+    private $owner_uid;
+    private $last_registered;
+    private static $instance;
+
+    const API_VERSION = 2;
+
+    // Hooks marked with *1 are run in global context and available
+    // to plugins loaded in config.php only
+
+    const HOOK_ARTICLE_BUTTON = 1;
+    const HOOK_ARTICLE_FILTER = 2;
+    const HOOK_PREFS_TAB = 3;
+    const HOOK_PREFS_TAB_SECTION = 4;
+    const HOOK_PREFS_TABS = 5;
+    const HOOK_FEED_PARSED = 6;
+    const HOOK_UPDATE_TASK = 7; // *1
+    const HOOK_AUTH_USER = 8;
+    const HOOK_HOTKEY_MAP = 9;
+    const HOOK_RENDER_ARTICLE = 10;
+    const HOOK_RENDER_ARTICLE_CDM = 11;
+    const HOOK_FEED_FETCHED = 12;
+    const HOOK_SANITIZE = 13;
+    const HOOK_RENDER_ARTICLE_API = 14;
+    const HOOK_TOOLBAR_BUTTON = 15;
+    const HOOK_ACTION_ITEM = 16;
+    const HOOK_HEADLINE_TOOLBAR_BUTTON = 17;
+    const HOOK_HOTKEY_INFO = 18;
+    const HOOK_ARTICLE_LEFT_BUTTON = 19;
+    const HOOK_PREFS_EDIT_FEED = 20;
+    const HOOK_PREFS_SAVE_FEED = 21;
+    const HOOK_FETCH_FEED = 22;
+    const HOOK_QUERY_HEADLINES = 23;
+    const HOOK_HOUSE_KEEPING = 24; // *1
+    const HOOK_SEARCH = 25;
+    const HOOK_FORMAT_ENCLOSURES = 26;
+    const HOOK_SUBSCRIBE_FEED = 27;
+    const HOOK_HEADLINES_BEFORE = 28;
+    const HOOK_RENDER_ENCLOSURE = 29;
+    const HOOK_ARTICLE_FILTER_ACTION = 30;
+    const HOOK_ARTICLE_EXPORT_FEED = 31;
+    const HOOK_MAIN_TOOLBAR_BUTTON = 32;
+    const HOOK_ENCLOSURE_ENTRY = 33;
+    const HOOK_FORMAT_ARTICLE = 34;
+    const HOOK_FORMAT_ARTICLE_CDM = 35; /* RIP */
+    const HOOK_FEED_BASIC_INFO = 36;
+    const HOOK_SEND_LOCAL_FILE = 37;
+    const HOOK_UNSUBSCRIBE_FEED = 38;
+    const HOOK_SEND_MAIL = 39;
+    const HOOK_FILTER_TRIGGERED = 40;
+    const HOOK_GET_FULL_TEXT = 41;
+    const HOOK_ARTICLE_IMAGE = 42;
+    const HOOK_FEED_TREE = 43;
+    const HOOK_IFRAME_WHITELISTED = 44;
+
+    const KIND_ALL = 1;
+    const KIND_SYSTEM = 2;
+    const KIND_USER = 3;
+
+    public static function object_to_domain($plugin) {
+        return strtolower(get_class($plugin));
+    }
+
+    public function __construct() {
+        $this->pdo = Db::pdo();
+
+        $this->storage = array();
+    }
+
+    private function __clone() {
+        //
+    }
+
+    public static function getInstance() {
+        if (self::$instance == null)
+            self::$instance = new self();
+
+        return self::$instance;
+    }
+
+    private function register_plugin($name, $plugin) {
+        //array_push($this->plugins, $plugin);
+        $this->plugins[$name] = $plugin;
+    }
+
+    // needed for compatibility with API 1
+    public function get_link() {
+        return false;
+    }
+
+    public function get_dbh() {
+        return Db::get();
+    }
+
+    public function get_pdo() {
+        return $this->pdo;
+    }
+
+    public function get_plugin_names() {
+        $names = array();
+
+        foreach ($this->plugins as $p) {
+            array_push($names, get_class($p));
+        }
+
+        return $names;
+    }
+
+    public function get_plugins() {
+        return $this->plugins;
+    }
+
+    public function get_plugin($name) {
+        return $this->plugins[strtolower($name)];
+    }
+
+    public function run_hooks($type, $method, $args) {
+        foreach ($this->get_hooks($type) as $hook) {
+            $hook->$method($args);
+        }
+    }
+
+    public function add_hook($type, $sender, $priority = 50) {
+        $priority = (int) $priority;
+
+        if (!is_array($this->hooks[$type])) {
+            $this->hooks[$type] = [];
+        }
+
+        if (!is_array($this->hooks[$type][$priority])) {
+            $this->hooks[$type][$priority] = [];
+        }
+
+        array_push($this->hooks[$type][$priority], $sender);
+        ksort($this->hooks[$type]);
+    }
+
+    public function del_hook($type, $sender) {
+        if (is_array($this->hooks[$type])) {
+            foreach (array_keys($this->hooks[$type]) as $prio) {
+                $key = array_search($sender, $this->hooks[$type][$prio]);
+
+                if ($key !== false) {
+                    unset($this->hooks[$type][$prio][$key]);
+                }
+            }
+        }
+    }
+
+    public function get_hooks($type) {
+        if (isset($this->hooks[$type])) {
+            $tmp = [];
+
+            foreach (array_keys($this->hooks[$type]) as $prio) {
+                $tmp = array_merge($tmp, $this->hooks[$type][$prio]);
+            }
+
+            return $tmp;
+        } else {
+            return [];
+        }
+    }
+    public function load_all($kind, $owner_uid = false, $skip_init = false) {
+
+        $plugins = array_merge(glob("plugins/*"), glob("plugins.local/*"));
+        $plugins = array_filter($plugins, "is_dir");
+        $plugins = array_map("basename", $plugins);
+
+        asort($plugins);
+
+        $this->load(join(",", $plugins), $kind, $owner_uid, $skip_init);
+    }
+
+    public function load($classlist, $kind, $owner_uid = false, $skip_init = false) {
+        $plugins = explode(",", $classlist);
+
+        $this->owner_uid = (int) $owner_uid;
+
+        foreach ($plugins as $class) {
+            $class = trim($class);
+            $class_file = strtolower(clean_filename($class));
+
+            if (!is_dir(__DIR__."/../plugins/$class_file") &&
+                    !is_dir(__DIR__."/../plugins.local/$class_file")) continue;
+
+            // try system plugin directory first
+            $file = __DIR__ . "/../plugins/$class_file/init.php";
+            $vendor_dir = __DIR__ . "/../plugins/$class_file/vendor";
+
+            if (!file_exists($file)) {
+                $file = __DIR__ . "/../plugins.local/$class_file/init.php";
+                $vendor_dir = __DIR__ . "/../plugins.local/$class_file/vendor";
+            }
+
+            if (!isset($this->plugins[$class])) {
+                if (file_exists($file)) require_once $file;
+
+                if (class_exists($class) && is_subclass_of($class, "Plugin")) {
+
+                    // register plugin autoloader if necessary, for namespaced classes ONLY
+                    // layout corresponds to tt-rss main /vendor/author/Package/Class.php
+
+                    if (file_exists($vendor_dir)) {
+                        spl_autoload_register(function($class) use ($vendor_dir) {
+
+                            if (strpos($class, '\\') !== false) {
+                                list ($namespace, $class_name) = explode('\\', $class, 2);
+
+                                if ($namespace && $class_name) {
+                                    $class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
+
+                                    if (file_exists($class_file))
+                                        require_once $class_file;
+                                }
+                            }
+                        });
+                    }
+
+                    $plugin = new $class($this);
+
+                    $plugin_api = $plugin->api_version();
+
+                    if ($plugin_api < PluginHost::API_VERSION) {
+                        user_error("plugin $class is not compatible with current API version (need: " . PluginHost::API_VERSION . ", got: $plugin_api)", E_USER_WARNING);
+                        continue;
+                    }
+
+                    if (file_exists(dirname($file) . "/locale")) {
+                        _bindtextdomain($class, dirname($file) . "/locale");
+                        _bind_textdomain_codeset($class, "UTF-8");
+                    }
+
+                    $this->last_registered = $class;
+
+                    switch ($kind) {
+                    case $this::KIND_SYSTEM:
+                        if ($this->is_system($plugin)) {
+                            if (!$skip_init) $plugin->init($this);
+                            $this->register_plugin($class, $plugin);
+                        }
+                        break;
+                    case $this::KIND_USER:
+                        if (!$this->is_system($plugin)) {
+                            if (!$skip_init) $plugin->init($this);
+                            $this->register_plugin($class, $plugin);
+                        }
+                        break;
+                    case $this::KIND_ALL:
+                        if (!$skip_init) $plugin->init($this);
+                        $this->register_plugin($class, $plugin);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    public function is_system($plugin) {
+        $about = $plugin->about();
+
+        return @$about[3];
+    }
+
+    // only system plugins are allowed to modify routing
+    public function add_handler($handler, $method, $sender) {
+        $handler = str_replace("-", "_", strtolower($handler));
+        $method = strtolower($method);
+
+        if ($this->is_system($sender)) {
+            if (!is_array($this->handlers[$handler])) {
+                $this->handlers[$handler] = array();
+            }
+
+            $this->handlers[$handler][$method] = $sender;
+        }
+    }
+
+    public function del_handler($handler, $method, $sender) {
+        $handler = str_replace("-", "_", strtolower($handler));
+        $method = strtolower($method);
+
+        if ($this->is_system($sender)) {
+            unset($this->handlers[$handler][$method]);
+        }
+    }
+
+    public function lookup_handler($handler, $method) {
+        $handler = str_replace("-", "_", strtolower($handler));
+        $method = strtolower($method);
+
+        if (is_array($this->handlers[$handler])) {
+            if (isset($this->handlers[$handler]["*"])) {
+                return $this->handlers[$handler]["*"];
+            } else {
+                return $this->handlers[$handler][$method];
+            }
+        }
+
+        return false;
+    }
+
+    public function add_command($command, $description, $sender, $suffix = "", $arghelp = "") {
+        $command = str_replace("-", "_", strtolower($command));
+
+        $this->commands[$command] = array("description" => $description,
+            "suffix" => $suffix,
+            "arghelp" => $arghelp,
+            "class" => $sender);
+    }
+
+    public function del_command($command) {
+        $command = "-" . strtolower($command);
+
+        unset($this->commands[$command]);
+    }
+
+    public function lookup_command($command) {
+        $command = "-" . strtolower($command);
+
+        if (is_array($this->commands[$command])) {
+            return $this->commands[$command]["class"];
+        } else {
+            return false;
+        }
+    }
+
+    public function get_commands() {
+        return $this->commands;
+    }
+
+    public function run_commands($args) {
+        foreach ($this->get_commands() as $command => $data) {
+            if (isset($args[$command])) {
+                $command = str_replace("-", "", $command);
+                $data["class"]->$command($args);
+            }
+        }
+    }
+
+    public function load_data() {
+        if ($this->owner_uid)  {
+            $sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
 				WHERE owner_uid = ?");
-			$sth->execute([$this->owner_uid]);
+            $sth->execute([$this->owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				$this->storage[$line["name"]] = unserialize($line["content"]);
-			}
-		}
-	}
+            while ($line = $sth->fetch()) {
+                $this->storage[$line["name"]] = unserialize($line["content"]);
+            }
+        }
+    }
 
-	private function save_data($plugin) {
-		if ($this->owner_uid) {
-			$this->pdo->beginTransaction();
+    private function save_data($plugin) {
+        if ($this->owner_uid) {
+            $this->pdo->beginTransaction();
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_plugin_storage WHERE
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_plugin_storage WHERE
 				owner_uid= ? AND name = ?");
-			$sth->execute([$this->owner_uid, $plugin]);
+            $sth->execute([$this->owner_uid, $plugin]);
 
-			if (!isset($this->storage[$plugin]))
-				$this->storage[$plugin] = array();
+            if (!isset($this->storage[$plugin]))
+                $this->storage[$plugin] = array();
 
-			$content = serialize($this->storage[$plugin]);
+            $content = serialize($this->storage[$plugin]);
 
-			if ($sth->fetch()) {
-				$sth = $this->pdo->prepare("UPDATE ttrss_plugin_storage SET content = ?
+            if ($sth->fetch()) {
+                $sth = $this->pdo->prepare("UPDATE ttrss_plugin_storage SET content = ?
 					WHERE owner_uid= ? AND name = ?");
-				$sth->execute([(string)$content, $this->owner_uid, $plugin]);
+                $sth->execute([(string)$content, $this->owner_uid, $plugin]);
 
-			} else {
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_plugin_storage
+            } else {
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_plugin_storage
 					(name,owner_uid,content) VALUES
 					(?, ?, ?)");
-				$sth->execute([$plugin, $this->owner_uid, (string)$content]);
-			}
+                $sth->execute([$plugin, $this->owner_uid, (string)$content]);
+            }
 
-			$this->pdo->commit();
-		}
-	}
+            $this->pdo->commit();
+        }
+    }
 
-	public function set($sender, $name, $value, $sync = true) {
-		$idx = get_class($sender);
+    public function set($sender, $name, $value, $sync = true) {
+        $idx = get_class($sender);
 
-		if (!isset($this->storage[$idx]))
-			$this->storage[$idx] = array();
+        if (!isset($this->storage[$idx]))
+            $this->storage[$idx] = array();
 
-		$this->storage[$idx][$name] = $value;
+        $this->storage[$idx][$name] = $value;
 
-		if ($sync) $this->save_data(get_class($sender));
-	}
+        if ($sync) $this->save_data(get_class($sender));
+    }
 
-	public function get($sender, $name, $default_value = false) {
-		$idx = get_class($sender);
+    public function get($sender, $name, $default_value = false) {
+        $idx = get_class($sender);
 
-		if (isset($this->storage[$idx][$name])) {
-			return $this->storage[$idx][$name];
-		} else {
-			return $default_value;
-		}
-	}
+        if (isset($this->storage[$idx][$name])) {
+            return $this->storage[$idx][$name];
+        } else {
+            return $default_value;
+        }
+    }
 
-	public function get_all($sender) {
-		$idx = get_class($sender);
+    public function get_all($sender) {
+        $idx = get_class($sender);
 
-		$data = $this->storage[$idx];
+        $data = $this->storage[$idx];
 
-		return $data ? $data : [];
-	}
+        return $data ? $data : [];
+    }
 
-	public function clear_data($sender) {
-		if ($this->owner_uid) {
-			$idx = get_class($sender);
+    public function clear_data($sender) {
+        if ($this->owner_uid) {
+            $idx = get_class($sender);
 
-			unset($this->storage[$idx]);
+            unset($this->storage[$idx]);
 
-			$sth = $this->pdo->prepare("DELETE FROM ttrss_plugin_storage WHERE name = ?
+            $sth = $this->pdo->prepare("DELETE FROM ttrss_plugin_storage WHERE name = ?
 				AND owner_uid = ?");
-			$sth->execute([$idx, $this->owner_uid]);
-		}
-	}
-
-	// Plugin feed functions are *EXPERIMENTAL*!
-
-	// cat_id: only -1 is supported (Special)
-	public function add_feed($cat_id, $title, $icon, $sender) {
-		if (!$this->feeds[$cat_id]) $this->feeds[$cat_id] = array();
-
-		$id = count($this->feeds[$cat_id]);
-
-		array_push($this->feeds[$cat_id],
-			array('id' => $id, 'title' => $title, 'sender' => $sender, 'icon' => $icon));
-
-		return $id;
-	}
-
-	public function get_feeds($cat_id) {
-		return $this->feeds[$cat_id];
-	}
-
-	// convert feed_id (e.g. -129) to pfeed_id first
-	public function get_feed_handler($pfeed_id) {
-		foreach ($this->feeds as $cat) {
-			foreach ($cat as $feed) {
-				if ($feed['id'] == $pfeed_id) {
-					return $feed['sender'];
-				}
-			}
-		}
-	}
-
-	public static function pfeed_to_feed_id($label) {
-		return PLUGIN_FEED_BASE_INDEX - 1 - abs($label);
-	}
-
-	public static function feed_to_pfeed_id($feed) {
-		return PLUGIN_FEED_BASE_INDEX - 1 + abs($feed);
-	}
-
-	public function add_api_method($name, $sender) {
-		if ($this->is_system($sender)) {
-			$this->api_methods[strtolower($name)] = $sender;
-		}
-	}
-
-	public function get_api_method($name) {
-		return $this->api_methods[$name];
-	}
-
-	public function add_filter_action($sender, $action_name, $action_desc) {
-		$sender_class = get_class($sender);
-
-		if (!isset($this->plugin_actions[$sender_class]))
-			$this->plugin_actions[$sender_class] = array();
-
-		array_push($this->plugin_actions[$sender_class],
-			array("action" => $action_name, "description" => $action_desc, "sender" => $sender));
-	}
-
-	public function get_filter_actions() {
-		return $this->plugin_actions;
-	}
-
-	public function get_owner_uid() {
-		return $this->owner_uid;
-	}
-
-	// handled by classes/pluginhandler.php, requires valid session
-	public function get_method_url($sender, $method, $params)  {
-		return get_self_url_prefix() . "/backend.php?" .
-			http_build_query(
-				array_merge(
-					[
-						"op" => "pluginhandler",
-						"plugin" => strtolower(get_class($sender)),
-						"method" => $method
-					],
-					$params));
-	}
-
-	// WARNING: endpoint in public.php, exposed to unauthenticated users
-	public function get_public_method_url($sender, $method, $params)  {
-		if ($sender->is_public_method($method)) {
-			return get_self_url_prefix() . "/public.php?" .
-				http_build_query(
-					array_merge(
-						[
-							"op" => "pluginhandler",
-							"plugin" => strtolower(get_class($sender)),
-							"pmethod" => $method
-						],
-						$params));
-		} else {
-			user_error("get_public_method_url: requested method '$method' of '" . get_class($sender) . "' is private.");
-		}
-	}
+            $sth->execute([$idx, $this->owner_uid]);
+        }
+    }
+
+    // Plugin feed functions are *EXPERIMENTAL*!
+
+    // cat_id: only -1 is supported (Special)
+    public function add_feed($cat_id, $title, $icon, $sender) {
+        if (!$this->feeds[$cat_id]) $this->feeds[$cat_id] = array();
+
+        $id = count($this->feeds[$cat_id]);
+
+        array_push($this->feeds[$cat_id],
+            array('id' => $id, 'title' => $title, 'sender' => $sender, 'icon' => $icon));
+
+        return $id;
+    }
+
+    public function get_feeds($cat_id) {
+        return $this->feeds[$cat_id];
+    }
+
+    // convert feed_id (e.g. -129) to pfeed_id first
+    public function get_feed_handler($pfeed_id) {
+        foreach ($this->feeds as $cat) {
+            foreach ($cat as $feed) {
+                if ($feed['id'] == $pfeed_id) {
+                    return $feed['sender'];
+                }
+            }
+        }
+    }
+
+    public static function pfeed_to_feed_id($label) {
+        return PLUGIN_FEED_BASE_INDEX - 1 - abs($label);
+    }
+
+    public static function feed_to_pfeed_id($feed) {
+        return PLUGIN_FEED_BASE_INDEX - 1 + abs($feed);
+    }
+
+    public function add_api_method($name, $sender) {
+        if ($this->is_system($sender)) {
+            $this->api_methods[strtolower($name)] = $sender;
+        }
+    }
+
+    public function get_api_method($name) {
+        return $this->api_methods[$name];
+    }
+
+    public function add_filter_action($sender, $action_name, $action_desc) {
+        $sender_class = get_class($sender);
+
+        if (!isset($this->plugin_actions[$sender_class]))
+            $this->plugin_actions[$sender_class] = array();
+
+        array_push($this->plugin_actions[$sender_class],
+            array("action" => $action_name, "description" => $action_desc, "sender" => $sender));
+    }
+
+    public function get_filter_actions() {
+        return $this->plugin_actions;
+    }
+
+    public function get_owner_uid() {
+        return $this->owner_uid;
+    }
+
+    // handled by classes/pluginhandler.php, requires valid session
+    public function get_method_url($sender, $method, $params)  {
+        return get_self_url_prefix() . "/backend.php?" .
+            http_build_query(
+                array_merge(
+                    [
+                        "op" => "pluginhandler",
+                        "plugin" => strtolower(get_class($sender)),
+                        "method" => $method
+                    ],
+                    $params));
+    }
+
+    // WARNING: endpoint in public.php, exposed to unauthenticated users
+    public function get_public_method_url($sender, $method, $params)  {
+        if ($sender->is_public_method($method)) {
+            return get_self_url_prefix() . "/public.php?" .
+                http_build_query(
+                    array_merge(
+                        [
+                            "op" => "pluginhandler",
+                            "plugin" => strtolower(get_class($sender)),
+                            "pmethod" => $method
+                        ],
+                        $params));
+        } else {
+            user_error("get_public_method_url: requested method '$method' of '" . get_class($sender) . "' is private.");
+        }
+    }
 }

classes/backend.php

Indentation +92 added lines, -92 removed lines

@@ -1,97 +1,97 @@
 <?php
 class Backend extends Handler {
-	public function loading() {
-		header("Content-type: text/html");
-		print __("Loading, please wait...") . " " .
-			"<img src='images/indicator_tiny.gif'>";
-	}
-
-	public function digestTest() {
-		if (isset($_SESSION['uid'])) {
-			header("Content-type: text/html");
-
-			$rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000);
-
-			print "<h1>HTML</h1>";
-			print $rv[0];
-			print "<h1>Plain text</h1>";
-			print "<pre>".$rv[3]."</pre>";
-		} else {
-			print error_json(6);
-		}
-	}
-
-	public function help() {
-		$topic = clean_filename($_REQUEST["topic"]); // only one for now
-
-		if ($topic == "main") {
-			$info = get_hotkeys_info();
-			$imap = get_hotkeys_map();
-			$omap = array();
-
-			foreach ($imap[1] as $sequence => $action) {
-				if (!isset($omap[$action])) $omap[$action] = array();
-
-				array_push($omap[$action], $sequence);
-			}
-
-			print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>";
-
-			$cur_section = "";
-			foreach ($info as $section => $hotkeys) {
-
-				if ($cur_section) print "<li>&nbsp;</li>";
-				print "<li><h3>" . $section . "</h3></li>";
-				$cur_section = $section;
-
-				foreach ($hotkeys as $action => $description) {
-
-					if (is_array($omap[$action])) {
-						foreach ($omap[$action] as $sequence) {
-							if (strpos($sequence, "|") !== false) {
-								$sequence = substr($sequence,
-									strpos($sequence, "|")+1,
-									strlen($sequence));
-							} else {
-								$keys = explode(" ", $sequence);
-
-								for ($i = 0; $i < count($keys); $i++) {
-									if (strlen($keys[$i]) > 1) {
-										$tmp = '';
-										foreach (str_split($keys[$i]) as $c) {
-											switch ($c) {
-												case '*':
-													$tmp .= __('Shift') . '+';
-													break;
-												case '^':
-													$tmp .= __('Ctrl') . '+';
-													break;
-												default:
-													$tmp .= $c;
-											}
-										}
-										$keys[$i] = $tmp;
-									}
-								}
-								$sequence = join(" ", $keys);
-							}
-
-							print "<li>";
-							print "<div class='hk'><code>$sequence</code></div>";
-							print "<div class='desc'>$description</div>";
-							print "</li>";
-						}
-					}
-				}
-			}
-
-			print "</ul>";
-		}
-
-		print "<footer class='text-center'>";
-		print "<button dojoType='dijit.form.Button'
+    public function loading() {
+        header("Content-type: text/html");
+        print __("Loading, please wait...") . " " .
+            "<img src='images/indicator_tiny.gif'>";
+    }
+
+    public function digestTest() {
+        if (isset($_SESSION['uid'])) {
+            header("Content-type: text/html");
+
+            $rv = Digest::prepare_headlines_digest($_SESSION['uid'], 1, 1000);
+
+            print "<h1>HTML</h1>";
+            print $rv[0];
+            print "<h1>Plain text</h1>";
+            print "<pre>".$rv[3]."</pre>";
+        } else {
+            print error_json(6);
+        }
+    }
+
+    public function help() {
+        $topic = clean_filename($_REQUEST["topic"]); // only one for now
+
+        if ($topic == "main") {
+            $info = get_hotkeys_info();
+            $imap = get_hotkeys_map();
+            $omap = array();
+
+            foreach ($imap[1] as $sequence => $action) {
+                if (!isset($omap[$action])) $omap[$action] = array();
+
+                array_push($omap[$action], $sequence);
+            }
+
+            print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>";
+
+            $cur_section = "";
+            foreach ($info as $section => $hotkeys) {
+
+                if ($cur_section) print "<li>&nbsp;</li>";
+                print "<li><h3>" . $section . "</h3></li>";
+                $cur_section = $section;
+
+                foreach ($hotkeys as $action => $description) {
+
+                    if (is_array($omap[$action])) {
+                        foreach ($omap[$action] as $sequence) {
+                            if (strpos($sequence, "|") !== false) {
+                                $sequence = substr($sequence,
+                                    strpos($sequence, "|")+1,
+                                    strlen($sequence));
+                            } else {
+                                $keys = explode(" ", $sequence);
+
+                                for ($i = 0; $i < count($keys); $i++) {
+                                    if (strlen($keys[$i]) > 1) {
+                                        $tmp = '';
+                                        foreach (str_split($keys[$i]) as $c) {
+                                            switch ($c) {
+                                                case '*':
+                                                    $tmp .= __('Shift') . '+';
+                                                    break;
+                                                case '^':
+                                                    $tmp .= __('Ctrl') . '+';
+                                                    break;
+                                                default:
+                                                    $tmp .= $c;
+                                            }
+                                        }
+                                        $keys[$i] = $tmp;
+                                    }
+                                }
+                                $sequence = join(" ", $keys);
+                            }
+
+                            print "<li>";
+                            print "<div class='hk'><code>$sequence</code></div>";
+                            print "<div class='desc'>$description</div>";
+                            print "</li>";
+                        }
+                    }
+                }
+            }
+
+            print "</ul>";
+        }
+
+        print "<footer class='text-center'>";
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"return dijit.byId('helpDlg').hide()\">".__('Close this window')."</button>";
-		print "</footer>";
+        print "</footer>";
 
-	}
+    }
 }

classes/feeds.php

Indentation +1546 added lines, -1546 removed lines

@@ -2,298 +2,298 @@ 
 require_once "colors.php";
 
 class Feeds extends Handler_Protected {
-	const NEVER_GROUP_FEEDS = [ -6, 0 ];
-	const NEVER_GROUP_BY_DATE = [ -2, -1, -3 ];
+    const NEVER_GROUP_FEEDS = [ -6, 0 ];
+    const NEVER_GROUP_BY_DATE = [ -2, -1, -3 ];
 
     private $params;
 
     function csrf_ignore($method) {
-		$csrf_ignored = array("index", "quickaddfeed", "search");
+        $csrf_ignored = array("index", "quickaddfeed", "search");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	private function format_headline_subtoolbar($feed_site_url, $feed_title,
-			$feed_id, $is_cat, $search,
-			$error, $feed_last_updated) {
+    private function format_headline_subtoolbar($feed_site_url, $feed_title,
+            $feed_id, $is_cat, $search,
+            $error, $feed_last_updated) {
 
-		if ($is_cat) $cat_q = "&is_cat=$is_cat";
+        if ($is_cat) $cat_q = "&is_cat=$is_cat";
 
-		if ($search) {
-			$search_q = "&q=$search";
-		} else {
-			$search_q = "";
-		}
+        if ($search) {
+            $search_q = "&q=$search";
+        } else {
+            $search_q = "";
+        }
 
-		$reply = "";
+        $reply = "";
 
-		$rss_link = htmlspecialchars(get_self_url_prefix() .
-			"/public.php?op=rss&id=$feed_id$cat_q$search_q");
+        $rss_link = htmlspecialchars(get_self_url_prefix() .
+            "/public.php?op=rss&id=$feed_id$cat_q$search_q");
 
-		$reply .= "<span class='left'>";
+        $reply .= "<span class='left'>";
 
-		$reply .= "<a href=\"#\"
+        $reply .= "<a href=\"#\"
 				title=\"".__("Show as feed")."\"
 				onclick=\"App.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">
 				<i class='icon-syndicate material-icons'>rss_feed</i></a>";
 
-		$reply .= "<span id='feed_title'>";
+        $reply .= "<span id='feed_title'>";
 
-		if ($feed_site_url) {
-			$last_updated = T_sprintf("Last updated: %s", $feed_last_updated);
+        if ($feed_site_url) {
+            $last_updated = T_sprintf("Last updated: %s", $feed_last_updated);
 
-			$reply .= "<a title=\"$last_updated\" target='_blank' href=\"$feed_site_url\">".
-				truncate_string(strip_tags($feed_title), 30)."</a>";
-		} else {
-			$reply .= strip_tags($feed_title);
-		}
+            $reply .= "<a title=\"$last_updated\" target='_blank' href=\"$feed_site_url\">".
+                truncate_string(strip_tags($feed_title), 30)."</a>";
+        } else {
+            $reply .= strip_tags($feed_title);
+        }
 
-		if ($error)
-			$reply .= " <i title=\"" . htmlspecialchars($error) . "\" class='material-icons icon-error'>error</i>";
+        if ($error)
+            $reply .= " <i title=\"" . htmlspecialchars($error) . "\" class='material-icons icon-error'>error</i>";
 
-		$reply .= "</span>";
-		$reply .= "<span id='feed_current_unread' style='display: none'></span>";
-		$reply .= "</span>";
+        $reply .= "</span>";
+        $reply .= "<span id='feed_current_unread' style='display: none'></span>";
+        $reply .= "</span>";
 
-		$reply .= "<span class=\"right\">";
-		$reply .= "<span id='selected_prompt'></span>";
-		$reply .= "&nbsp;";
-		$reply .= "<select dojoType=\"fox.form.Select\"
+        $reply .= "<span class=\"right\">";
+        $reply .= "<span id='selected_prompt'></span>";
+        $reply .= "&nbsp;";
+        $reply .= "<select dojoType=\"fox.form.Select\"
 			onchange=\"Headlines.onActionChanged(this)\">";
 
-		$reply .= "<option value=\"0\" disabled='1'>".__('Select...')."</option>";
+        $reply .= "<option value=\"0\" disabled='1'>".__('Select...')."</option>";
 
-		$reply .= "<option value=\"Headlines.select('all')\">".__('All')."</option>";
-		$reply .= "<option value=\"Headlines.select('unread')\">".__('Unread')."</option>";
-		$reply .= "<option value=\"Headlines.select('invert')\">".__('Invert')."</option>";
-		$reply .= "<option value=\"Headlines.select('none')\">".__('None')."</option>";
+        $reply .= "<option value=\"Headlines.select('all')\">".__('All')."</option>";
+        $reply .= "<option value=\"Headlines.select('unread')\">".__('Unread')."</option>";
+        $reply .= "<option value=\"Headlines.select('invert')\">".__('Invert')."</option>";
+        $reply .= "<option value=\"Headlines.select('none')\">".__('None')."</option>";
 
-		$reply .= "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>";
+        $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection toggle:')."</option>";
 
-		$reply .= "<option value=\"Headlines.selectionToggleUnread()\">".__('Unread')."</option>
+        $reply .= "<option value=\"Headlines.selectionToggleUnread()\">".__('Unread')."</option>
 			<option value=\"Headlines.selectionToggleMarked()\">".__('Starred')."</option>
 			<option value=\"Headlines.selectionTogglePublished()\">".__('Published')."</option>";
 
-		$reply .= "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";
+        $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";
 
-		$reply .= "<option value=\"Headlines.catchupSelection()\">".__('Mark as read')."</option>";
-		$reply .= "<option value=\"Article.selectionSetScore()\">".__('Set score')."</option>";
+        $reply .= "<option value=\"Headlines.catchupSelection()\">".__('Mark as read')."</option>";
+        $reply .= "<option value=\"Article.selectionSetScore()\">".__('Set score')."</option>";
 
-		if ($feed_id == 0 && !$is_cat) {
-			$reply .= "<option value=\"Headlines.archiveSelection()\">".__('Move back')."</option>";
-			$reply .= "<option value=\"Headlines.deleteSelection()\">".__('Delete')."</option>";
-		} else {
-			$reply .= "<option value=\"Headlines.archiveSelection()\">".__('Archive')."</option>";
-		}
+        if ($feed_id == 0 && !$is_cat) {
+            $reply .= "<option value=\"Headlines.archiveSelection()\">".__('Move back')."</option>";
+            $reply .= "<option value=\"Headlines.deleteSelection()\">".__('Delete')."</option>";
+        } else {
+            $reply .= "<option value=\"Headlines.archiveSelection()\">".__('Archive')."</option>";
+        }
 
-		if (PluginHost::getInstance()->get_plugin("mail")) {
-			$reply .= "<option value=\"Plugins.Mail.send()\">".__('Forward by email').
-				"</option>";
-		}
+        if (PluginHost::getInstance()->get_plugin("mail")) {
+            $reply .= "<option value=\"Plugins.Mail.send()\">".__('Forward by email').
+                "</option>";
+        }
 
-		if (PluginHost::getInstance()->get_plugin("mailto")) {
-			$reply .= "<option value=\"Plugins.Mailto.send()\">".__('Forward by email').
-				"</option>";
-		}
+        if (PluginHost::getInstance()->get_plugin("mailto")) {
+            $reply .= "<option value=\"Plugins.Mailto.send()\">".__('Forward by email').
+                "</option>";
+        }
 
-		$reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
+        $reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
 
-		//$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
+        //$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
 
-		$reply .= "<option value=\"App.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">".
+        $reply .= "<option value=\"App.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">".
             __('Show as feed')."</option>";
 
-		$reply .= "</select>";
+        $reply .= "</select>";
 
-		//$reply .= "</h2";
+        //$reply .= "</h2";
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINE_TOOLBAR_BUTTON) as $p) {
-			 $reply .= $p->hook_headline_toolbar_button($feed_id, $is_cat);
-		}
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINE_TOOLBAR_BUTTON) as $p) {
+                $reply .= $p->hook_headline_toolbar_button($feed_id, $is_cat);
+        }
 
-		$reply .= "</span>";
+        $reply .= "</span>";
 
-		return $reply;
-	}
+        return $reply;
+    }
 
-	private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
-					$offset, $override_order = false, $include_children = false, $check_first_id = false,
-					$skip_first_id_check = false, $order_by = false) {
+    private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
+                    $offset, $override_order = false, $include_children = false, $check_first_id = false,
+                    $skip_first_id_check = false, $order_by = false) {
 
-		$disable_cache = false;
+        $disable_cache = false;
 
-		$reply = array();
+        $reply = array();
 
-		$rgba_cache = array();
-		$topmost_article_ids = array();
+        $rgba_cache = array();
+        $topmost_article_ids = array();
 
-		if (!$offset) $offset = 0;
-		if ($method == "undefined") $method = "";
+        if (!$offset) $offset = 0;
+        if ($method == "undefined") $method = "";
 
-		$method_split = explode(":", $method);
+        $method_split = explode(":", $method);
 
-		if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
+        if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
             $sth = $this->pdo->prepare("UPDATE ttrss_feeds
                             SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
                             WHERE id = ?");
             $sth->execute([$feed]);
-		}
-
-		if ($method_split[0] == "MarkAllReadGR")  {
-			$this->catchup_feed($method_split[1], false);
-		}
-
-		// FIXME: might break tag display?
-
-		if (is_numeric($feed) && $feed > 0 && !$cat_view) {
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? LIMIT 1");
-			$sth->execute([$feed]);
-
-			if (!$sth->fetch()) {
-				$reply['content'] = "<div align='center'>".__('Feed not found.')."</div>";
-			}
-		}
-
-		@$search = $_REQUEST["query"];
-		@$search_language = $_REQUEST["search_language"]; // PGSQL only
-
-		if ($search) {
-			$disable_cache = true;
-		}
-
-		if (!$cat_view && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
-			$handler = PluginHost::getInstance()->get_feed_handler(
-				PluginHost::feed_to_pfeed_id($feed));
-
-			if ($handler) {
-				$options = array(
-					"limit" => $limit,
-					"view_mode" => $view_mode,
-					"cat_view" => $cat_view,
-					"search" => $search,
-					"override_order" => $override_order,
-					"offset" => $offset,
-					"owner_uid" => $_SESSION["uid"],
-					"filter" => false,
-					"since_id" => 0,
-					"include_children" => $include_children,
-					"order_by" => $order_by);
-
-				$qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed),
-					$options);
-			}
-
-		} else {
-
-			$params = array(
-				"feed" => $feed,
-				"limit" => $limit,
-				"view_mode" => $view_mode,
-				"cat_view" => $cat_view,
-				"search" => $search,
-				"search_language" => $search_language,
-				"override_order" => $override_order,
-				"offset" => $offset,
-				"include_children" => $include_children,
-				"check_first_id" => $check_first_id,
-				"skip_first_id_check" => $skip_first_id_check,
-                "order_by" => $order_by
-			);
+        }
+
+        if ($method_split[0] == "MarkAllReadGR")  {
+            $this->catchup_feed($method_split[1], false);
+        }
+
+        // FIXME: might break tag display?
+
+        if (is_numeric($feed) && $feed > 0 && !$cat_view) {
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? LIMIT 1");
+            $sth->execute([$feed]);
 
-			$qfh_ret = $this->queryFeedHeadlines($params);
-		}
+            if (!$sth->fetch()) {
+                $reply['content'] = "<div align='center'>".__('Feed not found.')."</div>";
+            }
+        }
 
-		$vfeed_group_enabled = get_pref("VFEED_GROUP_BY_FEED") &&
-			!(in_array($feed, Feeds::NEVER_GROUP_FEEDS) && !$cat_view);
+        @$search = $_REQUEST["query"];
+        @$search_language = $_REQUEST["search_language"]; // PGSQL only
 
-		$result = $qfh_ret[0]; // this could be either a PDO query result or a -1 if first id changed
-		$feed_title = $qfh_ret[1];
-		$feed_site_url = $qfh_ret[2];
-		$last_error = $qfh_ret[3];
-		$last_updated = strpos($qfh_ret[4], '1970-') === false ?
-			make_local_datetime($qfh_ret[4], false) : __("Never");
-		$highlight_words = $qfh_ret[5];
-		$reply['first_id'] = $qfh_ret[6];
-		$reply['is_vfeed'] = $qfh_ret[7];
-		$query_error_override = $qfh_ret[8];
+        if ($search) {
+            $disable_cache = true;
+        }
 
-		$reply['search_query'] = [$search, $search_language];
-		$reply['vfeed_group_enabled'] = $vfeed_group_enabled;
+        if (!$cat_view && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
+            $handler = PluginHost::getInstance()->get_feed_handler(
+                PluginHost::feed_to_pfeed_id($feed));
+
+            if ($handler) {
+                $options = array(
+                    "limit" => $limit,
+                    "view_mode" => $view_mode,
+                    "cat_view" => $cat_view,
+                    "search" => $search,
+                    "override_order" => $override_order,
+                    "offset" => $offset,
+                    "owner_uid" => $_SESSION["uid"],
+                    "filter" => false,
+                    "since_id" => 0,
+                    "include_children" => $include_children,
+                    "order_by" => $order_by);
+
+                $qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed),
+                    $options);
+            }
+
+        } else {
+
+            $params = array(
+                "feed" => $feed,
+                "limit" => $limit,
+                "view_mode" => $view_mode,
+                "cat_view" => $cat_view,
+                "search" => $search,
+                "search_language" => $search_language,
+                "override_order" => $override_order,
+                "offset" => $offset,
+                "include_children" => $include_children,
+                "check_first_id" => $check_first_id,
+                "skip_first_id_check" => $skip_first_id_check,
+                "order_by" => $order_by
+            );
 
-		$reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,
-			$feed_title,
-			$feed, $cat_view, $search,
-			$last_error, $last_updated);
+            $qfh_ret = $this->queryFeedHeadlines($params);
+        }
 
-		if ($offset == 0) {
-			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINES_BEFORE) as $p) {
-				 $reply['content'] .= $p->hook_headlines_before($feed, $cat_view, $qfh_ret);
-			}
-		}
+        $vfeed_group_enabled = get_pref("VFEED_GROUP_BY_FEED") &&
+            !(in_array($feed, Feeds::NEVER_GROUP_FEEDS) && !$cat_view);
+
+        $result = $qfh_ret[0]; // this could be either a PDO query result or a -1 if first id changed
+        $feed_title = $qfh_ret[1];
+        $feed_site_url = $qfh_ret[2];
+        $last_error = $qfh_ret[3];
+        $last_updated = strpos($qfh_ret[4], '1970-') === false ?
+            make_local_datetime($qfh_ret[4], false) : __("Never");
+        $highlight_words = $qfh_ret[5];
+        $reply['first_id'] = $qfh_ret[6];
+        $reply['is_vfeed'] = $qfh_ret[7];
+        $query_error_override = $qfh_ret[8];
+
+        $reply['search_query'] = [$search, $search_language];
+        $reply['vfeed_group_enabled'] = $vfeed_group_enabled;
+
+        $reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,
+            $feed_title,
+            $feed, $cat_view, $search,
+            $last_error, $last_updated);
+
+        if ($offset == 0) {
+            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINES_BEFORE) as $p) {
+                    $reply['content'] .= $p->hook_headlines_before($feed, $cat_view, $qfh_ret);
+            }
+        }
 
-		$reply['content'] = [];
+        $reply['content'] = [];
 
-		$headlines_count = 0;
+        $headlines_count = 0;
 
         if (is_object($result)) {
-			while ($line = $result->fetch(PDO::FETCH_ASSOC)) {
+            while ($line = $result->fetch(PDO::FETCH_ASSOC)) {
 
-				++$headlines_count;
+                ++$headlines_count;
 
-				if (!get_pref('SHOW_CONTENT_PREVIEW')) {
-					$line["content_preview"] = "";
-				} else {
-					$line["content_preview"] =  "&mdash; " . truncate_string(strip_tags($line["content"]), 250);
+                if (!get_pref('SHOW_CONTENT_PREVIEW')) {
+                    $line["content_preview"] = "";
+                } else {
+                    $line["content_preview"] =  "&mdash; " . truncate_string(strip_tags($line["content"]), 250);
 
-					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-						$line = $p->hook_query_headlines($line, 250, false);
-					}
+                    foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                        $line = $p->hook_query_headlines($line, 250, false);
+                    }
                 }
 
-				$id = $line["id"];
+                $id = $line["id"];
 
-				// frontend doesn't expect pdo returning booleans as strings on mysql
-				if (DB_TYPE == "mysql") {
-					foreach (["unread", "marked", "published"] as $k) {
-						$line[$k] = $line[$k] === "1";
-					}
-				}
+                // frontend doesn't expect pdo returning booleans as strings on mysql
+                if (DB_TYPE == "mysql") {
+                    foreach (["unread", "marked", "published"] as $k) {
+                        $line[$k] = $line[$k] === "1";
+                    }
+                }
 
-				// normalize archived feed
-				if ($line['feed_id'] === null) {
-					$line['feed_id'] = 0;
-					$line["feed_title"] = __("Archived articles");
-				}
+                // normalize archived feed
+                if ($line['feed_id'] === null) {
+                    $line['feed_id'] = 0;
+                    $line["feed_title"] = __("Archived articles");
+                }
 
-				$feed_id = $line["feed_id"];
+                $feed_id = $line["feed_id"];
 
-				$label_cache = $line["label_cache"];
-				$labels = false;
+                $label_cache = $line["label_cache"];
+                $labels = false;
 
-				if ($label_cache) {
-					$label_cache = json_decode($label_cache, true);
+                if ($label_cache) {
+                    $label_cache = json_decode($label_cache, true);
 
-					if ($label_cache) {
-						if ($label_cache["no-labels"] == 1)
-							$labels = array();
-						else
-							$labels = $label_cache;
-					}
-				}
+                    if ($label_cache) {
+                        if ($label_cache["no-labels"] == 1)
+                            $labels = array();
+                        else
+                            $labels = $label_cache;
+                    }
+                }
 
-				if (!is_array($labels)) $labels = Article::get_article_labels($id);
+                if (!is_array($labels)) $labels = Article::get_article_labels($id);
 
-				$labels_str = "<span class=\"HLLCTR-$id\">";
-				$labels_str .= Article::format_article_labels($labels);
-				$labels_str .= "</span>";
+                $labels_str = "<span class=\"HLLCTR-$id\">";
+                $labels_str .= Article::format_article_labels($labels);
+                $labels_str .= "</span>";
 
-				$line["labels"] = $labels_str;
+                $line["labels"] = $labels_str;
 
-				if (count($topmost_article_ids) < 3) {
-					array_push($topmost_article_ids, $id);
-				}
+                if (count($topmost_article_ids) < 3) {
+                    array_push($topmost_article_ids, $id);
+                }
 
-				if (!$line["feed_title"]) $line["feed_title"] = "";
+                if (!$line["feed_title"]) $line["feed_title"] = "";
 
                 $line["buttons_left"] = "";
                 foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
@@ -343,341 +343,341 @@ 
                     }
                 }
 
-				$line["updated_long"] = make_local_datetime($line["updated"],true);
-				$line["updated"] = make_local_datetime($line["updated"], false, false, false, true);
+                $line["updated_long"] = make_local_datetime($line["updated"],true);
+                $line["updated"] = make_local_datetime($line["updated"], false, false, false, true);
 
 
-				$line['imported'] = T_sprintf("Imported at %s",
-					make_local_datetime($line["date_entered"], false));
+                $line['imported'] = T_sprintf("Imported at %s",
+                    make_local_datetime($line["date_entered"], false));
 
-				if ($line["tag_cache"])
-					$tags = explode(",", $line["tag_cache"]);
-				else
-					$tags = false;
+                if ($line["tag_cache"])
+                    $tags = explode(",", $line["tag_cache"]);
+                else
+                    $tags = false;
 
-				$line["tags_str"] = Article::format_tags_string($tags);
+                $line["tags_str"] = Article::format_tags_string($tags);
 
-				if (feeds::feedHasIcon($feed_id)) {
-					$line['feed_icon'] = "<img class=\"icon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
-				} else {
-					$line['feed_icon'] = "<i class='icon-no-feed material-icons'>rss_feed</i>";
-				}
+                if (feeds::feedHasIcon($feed_id)) {
+                    $line['feed_icon'] = "<img class=\"icon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
+                } else {
+                    $line['feed_icon'] = "<i class='icon-no-feed material-icons'>rss_feed</i>";
+                }
 
-			    //setting feed headline background color, needs to change text color based on dark/light
-				$fav_color = $line['favicon_avg_color'];
+                //setting feed headline background color, needs to change text color based on dark/light
+                $fav_color = $line['favicon_avg_color'];
 
-				require_once "colors.php";
+                require_once "colors.php";
 
-				if (!isset($rgba_cache[$feed_id])) {
-					if ($fav_color && $fav_color != 'fail') {
-						$rgba_cache[$feed_id] = _color_unpack($fav_color);
-					} else {
-						$rgba_cache[$feed_id] = _color_unpack($this->color_of($line['feed_title']));
-					}
-				}
+                if (!isset($rgba_cache[$feed_id])) {
+                    if ($fav_color && $fav_color != 'fail') {
+                        $rgba_cache[$feed_id] = _color_unpack($fav_color);
+                    } else {
+                        $rgba_cache[$feed_id] = _color_unpack($this->color_of($line['feed_title']));
+                    }
+                }
 
-				if (isset($rgba_cache[$feed_id])) {
-				    $line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
+                if (isset($rgba_cache[$feed_id])) {
+                    $line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
                 }
 
-				/* we don't need those */
+                /* we don't need those */
 
                 foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
-                             "uuid", "label_cache", "yyiw"] as $k)
+                                "uuid", "label_cache", "yyiw"] as $k)
                     unset($line[$k]);
 
-				array_push($reply['content'], $line);
-			}
-        }
-
-		if (!$headlines_count) {
-
-			if (is_object($result)) {
-
-				if ($query_error_override) {
-					$message = $query_error_override;
-				} else {
-					switch ($view_mode) {
-						case "unread":
-							$message = __("No unread articles found to display.");
-							break;
-						case "updated":
-							$message = __("No updated articles found to display.");
-							break;
-						case "marked":
-							$message = __("No starred articles found to display.");
-							break;
-						default:
-							if ($feed < LABEL_BASE_INDEX) {
-								$message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter.");
-							} else {
-								$message = __("No articles found to display.");
-							}
-					}
-				}
-
-				if (!$offset && $message) {
-					$reply['content'] = "<div class='whiteBox'>$message";
-
-					$reply['content'] .= "<p><span class=\"text-muted\">";
-
-					$sth = $this->pdo->prepare("SELECT " . SUBSTRING_FOR_DATE . "(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+                array_push($reply['content'], $line);
+            }
+        }
+
+        if (!$headlines_count) {
+
+            if (is_object($result)) {
+
+                if ($query_error_override) {
+                    $message = $query_error_override;
+                } else {
+                    switch ($view_mode) {
+                        case "unread":
+                            $message = __("No unread articles found to display.");
+                            break;
+                        case "updated":
+                            $message = __("No updated articles found to display.");
+                            break;
+                        case "marked":
+                            $message = __("No starred articles found to display.");
+                            break;
+                        default:
+                            if ($feed < LABEL_BASE_INDEX) {
+                                $message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter.");
+                            } else {
+                                $message = __("No articles found to display.");
+                            }
+                    }
+                }
+
+                if (!$offset && $message) {
+                    $reply['content'] = "<div class='whiteBox'>$message";
+
+                    $reply['content'] .= "<p><span class=\"text-muted\">";
+
+                    $sth = $this->pdo->prepare("SELECT " . SUBSTRING_FOR_DATE . "(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
                         WHERE owner_uid = ?");
-					$sth->execute([$_SESSION['uid']]);
-					$row = $sth->fetch();
+                    $sth->execute([$_SESSION['uid']]);
+                    $row = $sth->fetch();
 
-					$last_updated = make_local_datetime($row["last_updated"], false);
+                    $last_updated = make_local_datetime($row["last_updated"], false);
 
-					$reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
+                    $reply['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
 
-					$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
+                    $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
                         FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
-					$sth->execute([$_SESSION['uid']]);
-					$row = $sth->fetch();
+                    $sth->execute([$_SESSION['uid']]);
+                    $row = $sth->fetch();
 
-					$num_errors = $row["num_errors"];
+                    $num_errors = $row["num_errors"];
 
-					if ($num_errors > 0) {
-						$reply['content'] .= "<br/>";
-						$reply['content'] .= "<a class=\"text-muted\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">" .
-							__('Some feeds have update errors (click for details)') . "</a>";
-					}
-					$reply['content'] .= "</span></p></div>";
+                    if ($num_errors > 0) {
+                        $reply['content'] .= "<br/>";
+                        $reply['content'] .= "<a class=\"text-muted\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">" .
+                            __('Some feeds have update errors (click for details)') . "</a>";
+                    }
+                    $reply['content'] .= "</span></p></div>";
 
-				}
-			} else if (is_numeric($result) && $result == -1) {
-				$reply['first_id_changed'] = true;
-			}
-		}
+                }
+            } else if (is_numeric($result) && $result == -1) {
+                $reply['first_id_changed'] = true;
+            }
+        }
 
-		return array($topmost_article_ids, $headlines_count, $feed, $disable_cache, $reply);
-	}
+        return array($topmost_article_ids, $headlines_count, $feed, $disable_cache, $reply);
+    }
 
-	public function catchupAll() {
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+    public function catchupAll() {
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 						last_read = NOW(), unread = false WHERE unread = true AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		CCache::zero_all($_SESSION["uid"]);
-	}
+        CCache::zero_all($_SESSION["uid"]);
+    }
 
-	public function view() {
-		$reply = array();
+    public function view() {
+        $reply = array();
 
-		$feed = $_REQUEST["feed"];
-		$method = $_REQUEST["m"];
-		$view_mode = $_REQUEST["view_mode"];
-		$limit = 30;
-		@$cat_view = $_REQUEST["cat"] == "true";
-		@$next_unread_feed = $_REQUEST["nuf"];
-		@$offset = $_REQUEST["skip"];
-		$order_by = $_REQUEST["order_by"];
-		$check_first_id = $_REQUEST["fid"];
+        $feed = $_REQUEST["feed"];
+        $method = $_REQUEST["m"];
+        $view_mode = $_REQUEST["view_mode"];
+        $limit = 30;
+        @$cat_view = $_REQUEST["cat"] == "true";
+        @$next_unread_feed = $_REQUEST["nuf"];
+        @$offset = $_REQUEST["skip"];
+        $order_by = $_REQUEST["order_by"];
+        $check_first_id = $_REQUEST["fid"];
 
-		if (is_numeric($feed)) $feed = (int) $feed;
+        if (is_numeric($feed)) $feed = (int) $feed;
 
-		/* Feed -5 is a special case: it is used to display auxiliary information
+        /* Feed -5 is a special case: it is used to display auxiliary information
 		 * when there's nothing to load - e.g. no stuff in fresh feed */
 
-		if ($feed == -5) {
-			print json_encode($this->generate_dashboard_feed());
-			return;
-		}
+        if ($feed == -5) {
+            print json_encode($this->generate_dashboard_feed());
+            return;
+        }
 
-		$sth = false;
-		if ($feed < LABEL_BASE_INDEX) {
+        $sth = false;
+        if ($feed < LABEL_BASE_INDEX) {
 
-			$label_feed = Labels::feed_to_label_id($feed);
+            $label_feed = Labels::feed_to_label_id($feed);
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_labels2 WHERE
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_labels2 WHERE
 							id = ? AND owner_uid = ?");
-			$sth->execute([$label_feed, $_SESSION['uid']]);
+            $sth->execute([$label_feed, $_SESSION['uid']]);
 
-		} else if (!$cat_view && is_numeric($feed) && $feed > 0) {
+        } else if (!$cat_view && is_numeric($feed) && $feed > 0) {
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 							id = ? AND owner_uid = ?");
-			$sth->execute([$feed, $_SESSION['uid']]);
+            $sth->execute([$feed, $_SESSION['uid']]);
 
-		} else if ($cat_view && is_numeric($feed) && $feed > 0) {
+        } else if ($cat_view && is_numeric($feed) && $feed > 0) {
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories WHERE
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories WHERE
 							id = ? AND owner_uid = ?");
 
-			$sth->execute([$feed, $_SESSION['uid']]);
-		}
+            $sth->execute([$feed, $_SESSION['uid']]);
+        }
 
-		if ($sth && !$sth->fetch()) {
-			print json_encode($this->generate_error_feed(__("Feed not found.")));
-			return;
-		}
+        if ($sth && !$sth->fetch()) {
+            print json_encode($this->generate_error_feed(__("Feed not found.")));
+            return;
+        }
 
-		/* Updating a label ccache means recalculating all of the caches
+        /* Updating a label ccache means recalculating all of the caches
 		 * so for performance reasons we don't do that here */
 
-		if ($feed >= 0) {
-			CCache::update($feed, $_SESSION["uid"], $cat_view);
-		}
+        if ($feed >= 0) {
+            CCache::update($feed, $_SESSION["uid"], $cat_view);
+        }
 
-		set_pref("_DEFAULT_VIEW_MODE", $view_mode);
-		set_pref("_DEFAULT_VIEW_ORDER_BY", $order_by);
+        set_pref("_DEFAULT_VIEW_MODE", $view_mode);
+        set_pref("_DEFAULT_VIEW_ORDER_BY", $order_by);
 
-		/* bump login timestamp if needed */
-		if (time() - $_SESSION["last_login_update"] > 3600) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_users SET last_login = NOW() WHERE id = ?");
-			$sth->execute([$_SESSION['uid']]);
+        /* bump login timestamp if needed */
+        if (time() - $_SESSION["last_login_update"] > 3600) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_users SET last_login = NOW() WHERE id = ?");
+            $sth->execute([$_SESSION['uid']]);
 
-			$_SESSION["last_login_update"] = time();
-		}
+            $_SESSION["last_login_update"] = time();
+        }
 
-		if (!$cat_view && is_numeric($feed) && $feed > 0) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET last_viewed = NOW()
+        if (!$cat_view && is_numeric($feed) && $feed > 0) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_feeds SET last_viewed = NOW()
 							WHERE id = ? AND owner_uid = ?");
-			$sth->execute([$feed, $_SESSION['uid']]);
-		}
-
-		$reply['headlines'] = [];
-
-		$override_order = false;
-		$skip_first_id_check = false;
+            $sth->execute([$feed, $_SESSION['uid']]);
+        }
 
-		switch ($order_by) {
-		case "title":
-			$override_order = "ttrss_entries.title, date_entered, updated";
-			break;
-		case "date_reverse":
-			$override_order = "score DESC, date_entered, updated";
-			$skip_first_id_check = true;
-			break;
-		case "feed_dates":
-			$override_order = "updated DESC";
-			break;
-		}
+        $reply['headlines'] = [];
+
+        $override_order = false;
+        $skip_first_id_check = false;
+
+        switch ($order_by) {
+        case "title":
+            $override_order = "ttrss_entries.title, date_entered, updated";
+            break;
+        case "date_reverse":
+            $override_order = "score DESC, date_entered, updated";
+            $skip_first_id_check = true;
+            break;
+        case "feed_dates":
+            $override_order = "updated DESC";
+            break;
+        }
 
-		$ret = $this->format_headlines_list($feed, $method,
-			$view_mode, $limit, $cat_view, $offset,
-			$override_order, true, $check_first_id, $skip_first_id_check, $order_by);
+        $ret = $this->format_headlines_list($feed, $method,
+            $view_mode, $limit, $cat_view, $offset,
+            $override_order, true, $check_first_id, $skip_first_id_check, $order_by);
 
-		$headlines_count = $ret[1];
-		$disable_cache = $ret[3];
-		$reply['headlines'] = $ret[4];
+        $headlines_count = $ret[1];
+        $disable_cache = $ret[3];
+        $reply['headlines'] = $ret[4];
 
-		if (!$next_unread_feed)
-			$reply['headlines']['id'] = $feed;
-		else
-			$reply['headlines']['id'] = $next_unread_feed;
+        if (!$next_unread_feed)
+            $reply['headlines']['id'] = $feed;
+        else
+            $reply['headlines']['id'] = $next_unread_feed;
 
-		$reply['headlines']['is_cat'] = (bool) $cat_view;
+        $reply['headlines']['is_cat'] = (bool) $cat_view;
 
-		$reply['headlines-info'] = ["count" => (int) $headlines_count,
-            						"disable_cache" => (bool) $disable_cache];
+        $reply['headlines-info'] = ["count" => (int) $headlines_count,
+                                    "disable_cache" => (bool) $disable_cache];
 
-		// this is parsed by handleRpcJson() on first viewfeed() to set cdm expanded, etc
-		$reply['runtime-info'] = make_runtime_info();
+        // this is parsed by handleRpcJson() on first viewfeed() to set cdm expanded, etc
+        $reply['runtime-info'] = make_runtime_info();
 
-		$reply_json = json_encode($reply);
+        $reply_json = json_encode($reply);
 
-		if (!$reply_json) {
-		    $reply_json = json_encode(["error" => ["code" => 15,
+        if (!$reply_json) {
+            $reply_json = json_encode(["error" => ["code" => 15,
                 "message" => json_last_error_msg()]]);
         }
 
-		print $reply_json;
+        print $reply_json;
 
-	}
+    }
 
-	private function generate_dashboard_feed() {
-		$reply = array();
+    private function generate_dashboard_feed() {
+        $reply = array();
 
-		$reply['headlines']['id'] = -5;
-		$reply['headlines']['is_cat'] = false;
+        $reply['headlines']['id'] = -5;
+        $reply['headlines']['is_cat'] = false;
 
-		$reply['headlines']['toolbar'] = '';
+        $reply['headlines']['toolbar'] = '';
 
-		$reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');
+        $reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');
 
-		$reply['headlines']['content'] .= "<p><span class=\"text-muted\">";
+        $reply['headlines']['content'] .= "<p><span class=\"text-muted\">";
 
-		$sth = $this->pdo->prepare("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
+        $sth = $this->pdo->prepare("SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
 			WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-		$row = $sth->fetch();
+        $sth->execute([$_SESSION['uid']]);
+        $row = $sth->fetch();
 
-		$last_updated = make_local_datetime($row["last_updated"], false);
+        $last_updated = make_local_datetime($row["last_updated"], false);
 
-		$reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
+        $reply['headlines']['content'] .= sprintf(__("Feeds last updated at %s"), $last_updated);
 
-		$sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
+        $sth = $this->pdo->prepare("SELECT COUNT(id) AS num_errors
 			FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-		$row = $sth->fetch();
+        $sth->execute([$_SESSION['uid']]);
+        $row = $sth->fetch();
 
-		$num_errors = $row["num_errors"];
+        $num_errors = $row["num_errors"];
 
-		if ($num_errors > 0) {
-			$reply['headlines']['content'] .= "<br/>";
-			$reply['headlines']['content'] .= "<a class=\"text-muted\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">".
-				__('Some feeds have update errors (click for details)')."</a>";
-		}
-		$reply['headlines']['content'] .= "</span></p>";
+        if ($num_errors > 0) {
+            $reply['headlines']['content'] .= "<br/>";
+            $reply['headlines']['content'] .= "<a class=\"text-muted\" href=\"#\" onclick=\"CommonDialogs.showFeedsWithErrors()\">".
+                __('Some feeds have update errors (click for details)')."</a>";
+        }
+        $reply['headlines']['content'] .= "</span></p>";
 
-		$reply['headlines-info'] = array("count" => 0,
-			"unread" => 0,
-			"disable_cache" => true);
+        $reply['headlines-info'] = array("count" => 0,
+            "unread" => 0,
+            "disable_cache" => true);
 
-		return $reply;
-	}
+        return $reply;
+    }
 
-	private function generate_error_feed($error) {
-		$reply = array();
+    private function generate_error_feed($error) {
+        $reply = array();
 
-		$reply['headlines']['id'] = -7;
-		$reply['headlines']['is_cat'] = false;
+        $reply['headlines']['id'] = -7;
+        $reply['headlines']['is_cat'] = false;
 
-		$reply['headlines']['toolbar'] = '';
-		$reply['headlines']['content'] = "<div class='whiteBox'>". $error . "</div>";
+        $reply['headlines']['toolbar'] = '';
+        $reply['headlines']['content'] = "<div class='whiteBox'>". $error . "</div>";
 
-		$reply['headlines-info'] = array("count" => 0,
-			"unread" => 0,
-			"disable_cache" => true);
+        $reply['headlines-info'] = array("count" => 0,
+            "unread" => 0,
+            "disable_cache" => true);
 
-		return $reply;
-	}
+        return $reply;
+    }
 
-	public function quickAddFeed() {
-		print "<form onsubmit='return false'>";
+    public function quickAddFeed() {
+        print "<form onsubmit='return false'>";
 
-		print_hidden("op", "rpc");
-		print_hidden("method", "addfeed");
+        print_hidden("op", "rpc");
+        print_hidden("method", "addfeed");
 
-		print "<div id='fadd_error_message' style='display : none' class='alert alert-danger'></div>";
+        print "<div id='fadd_error_message' style='display : none' class='alert alert-danger'></div>";
 
-		print "<div id='fadd_multiple_notify' style='display : none'>";
-		print_notice("Provided URL is a HTML page referencing multiple feeds, please select required feed from the dropdown menu below.");
-		print "<p></div>";
+        print "<div id='fadd_multiple_notify' style='display : none'>";
+        print_notice("Provided URL is a HTML page referencing multiple feeds, please select required feed from the dropdown menu below.");
+        print "<p></div>";
 
-		print "<section>";
+        print "<section>";
 
-		print "<fieldset>";
-		print "<div style='float : right'><img style='display : none' id='feed_add_spinner' src='images/indicator_white.gif'></div>";
-		print "<input style='font-size : 16px; width : 500px;'
+        print "<fieldset>";
+        print "<div style='float : right'><img style='display : none' id='feed_add_spinner' src='images/indicator_white.gif'></div>";
+        print "<input style='font-size : 16px; width : 500px;'
 			placeHolder=\"".__("Feed or site URL")."\"
 			dojoType='dijit.form.ValidationTextBox' required='1' name='feed' id='feedDlg_feedUrl'>";
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		print "<fieldset>";
+        print "<fieldset>";
 
-		if (get_pref('ENABLE_FEED_CATS')) {
-			print "<label class='inline'>" . __('Place in category:') . "</label> ";
-			print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
-		}
+        if (get_pref('ENABLE_FEED_CATS')) {
+            print "<label class='inline'>" . __('Place in category:') . "</label> ";
+            print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
+        }
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		print "</section>";
+        print "</section>";
 
-		print '<div id="feedDlg_feedsContainer" style="display : none">
+        print '<div id="feedDlg_feedsContainer" style="display : none">
 				<header>' . __('Available feeds') . '</header>
 				<section>
 					<fieldset>
@@ -691,7 +691,7 @@ 
 				</section>
 			</div>';
 
-		print "<div id='feedDlg_loginContainer' style='display : none'>
+        print "<div id='feedDlg_loginContainer' style='display : none'>
 				<section>
 				<fieldset>
 					<input dojoType=\"dijit.form.TextBox\" name='login'\"
@@ -707,98 +707,98 @@ 
 				</section>
 			</div>";
 
-		print "<section>";
-		print "<label>
+        print "<section>";
+        print "<label>
 			<label class='checkbox'><input type='checkbox' name='need_auth' dojoType='dijit.form.CheckBox' id='feedDlg_loginCheck'
 					onclick='displayIfChecked(this, \"feedDlg_loginContainer\")'>
 				".__('This feed requires authentication.')."</label>";
-		print "</section>";
+        print "</section>";
 
-		print "<footer>";
-		print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit'
+        print "<footer>";
+        print "<button dojoType='dijit.form.Button' class='alt-primary' type='submit'
 				onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>";
 
-		print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('feedAddDlg').hide()\">".__('Cancel')."</button>";
-		print "</footer>";
+        print "<button dojoType='dijit.form.Button' onclick=\"return dijit.byId('feedAddDlg').hide()\">".__('Cancel')."</button>";
+        print "</footer>";
 
-		print "</form>";
-	}
+        print "</form>";
+    }
 
-	public function search() {
-		$this->params = explode(":", $_REQUEST["param"], 2);
+    public function search() {
+        $this->params = explode(":", $_REQUEST["param"], 2);
 
-		$active_feed_id = sprintf("%d", $this->params[0]);
-		$is_cat = $this->params[1] != "false";
+        $active_feed_id = sprintf("%d", $this->params[0]);
+        $is_cat = $this->params[1] != "false";
 
-		print "<form onsubmit='return false;'>";
+        print "<form onsubmit='return false;'>";
 
-		print "<section>";
+        print "<section>";
 
-		print "<fieldset>";
-		print "<input dojoType='dijit.form.ValidationTextBox' id='search_query'
+        print "<fieldset>";
+        print "<input dojoType='dijit.form.ValidationTextBox' id='search_query'
 			style='font-size : 16px; width : 540px;'
 			placeHolder=\"".T_sprintf("Search %s...", $this->getFeedTitle($active_feed_id, $is_cat))."\"
 			name='query' type='search' value=''>";
-		print "</fieldset>";
-
-		if (DB_TYPE == "pgsql") {
-			print "<fieldset>";
-			print "<label class='inline'>" . __("Language:") . "</label>";
-			print_select("search_language", get_pref('DEFAULT_SEARCH_LANGUAGE'), Pref_Feeds::get_ts_languages(),
-				"dojoType='fox.form.Select' title=\"".__('Used for word stemming')."\"");
-			print "</fieldset>";
-		}
+        print "</fieldset>";
+
+        if (DB_TYPE == "pgsql") {
+            print "<fieldset>";
+            print "<label class='inline'>" . __("Language:") . "</label>";
+            print_select("search_language", get_pref('DEFAULT_SEARCH_LANGUAGE'), Pref_Feeds::get_ts_languages(),
+                "dojoType='fox.form.Select' title=\"".__('Used for word stemming')."\"");
+            print "</fieldset>";
+        }
 
-		print "</section>";
+        print "</section>";
 
-		print "<footer>";
+        print "<footer>";
 
-		if (count(PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH)) == 0) {
-			print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/SearchSyntax\")'>
+        if (count(PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH)) == 0) {
+            print "<button dojoType='dijit.form.Button' style='float : left' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/SearchSyntax\")'>
 				<i class='material-icons'>help</i> ".__("Search syntax")."</button>";
-		}
+        }
 
-		print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
+        print "<button dojoType='dijit.form.Button' type='submit' class='alt-primary' onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
 			<button dojoType='dijit.form.Button' onclick=\"dijit.byId('searchDlg').hide()\">".__('Cancel')."</button>";
 
-		print "</footer>";
+        print "</footer>";
 
-		print "</form>";
-	}
+        print "</form>";
+    }
 
-	public function update_debugger() {
-		header("Content-type: text/html");
+    public function update_debugger() {
+        header("Content-type: text/html");
 
-		Debug::set_enabled(true);
-		Debug::set_loglevel($_REQUEST["xdebug"]);
+        Debug::set_enabled(true);
+        Debug::set_loglevel($_REQUEST["xdebug"]);
 
-		$feed_id = (int)$_REQUEST["feed_id"];
-		@$do_update = $_REQUEST["action"] == "do_update";
-		$csrf_token = $_REQUEST["csrf_token"];
+        $feed_id = (int)$_REQUEST["feed_id"];
+        @$do_update = $_REQUEST["action"] == "do_update";
+        $csrf_token = $_REQUEST["csrf_token"];
 
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, $_SESSION['uid']]);
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
+        $sth->execute([$feed_id, $_SESSION['uid']]);
 
-		if (!$sth->fetch()) {
-		    print "Access denied.";
-		    return;
+        if (!$sth->fetch()) {
+            print "Access denied.";
+            return;
         }
 
-		$refetch_checked = isset($_REQUEST["force_refetch"]) ? "checked" : "";
-		$rehash_checked = isset($_REQUEST["force_rehash"]) ? "checked" : "";
+        $refetch_checked = isset($_REQUEST["force_refetch"]) ? "checked" : "";
+        $rehash_checked = isset($_REQUEST["force_rehash"]) ? "checked" : "";
 
-		?>
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
 			<?php echo stylesheet_tag("css/default.css") ?>
 			<title>Feed Debugger</title>
 			<?php
-				echo stylesheet_tag("css/default.css");
-				echo javascript_tag("lib/prototype.js");
-				echo javascript_tag("lib/dojo/dojo.js");
-				echo javascript_tag("lib/dojo/tt-rss-layer.js");
-			?>
+                echo stylesheet_tag("css/default.css");
+                echo javascript_tag("lib/prototype.js");
+                echo javascript_tag("lib/dojo/dojo.js");
+                echo javascript_tag("lib/dojo/tt-rss-layer.js");
+            ?>
 		</head>
 		<body class="flat ttrss_utility feed_debugger">
 		<script type="text/javascript">
@@ -836,904 +836,904 @@ 
 
 					<pre><?php
 
-					if ($do_update) {
-						RSSUtils::update_rss_feed($feed_id, true);
-					}
+                    if ($do_update) {
+                        RSSUtils::update_rss_feed($feed_id, true);
+                    }
 
-					?></pre>
+                    ?></pre>
 				</div>
 			</div>
 		</body>
 		</html>
 		<?php
 
-	}
-
-	public static function catchup_feed($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) {
-
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
-
-		$pdo = Db::pdo();
-
-		if (is_array($search) && $search[0]) {
-			$search_qpart = "";
-
-			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH) as $plugin) {
-				list($search_qpart, $search_words) = $plugin->hook_search($search[0]);
-				break;
-			}
-
-			// fall back in case of no plugins
-			if (!$search_qpart) {
-				list($search_qpart, $search_words) = Feeds::search_to_sql($search[0], $search[1]);
-			}
-		} else {
-			$search_qpart = "true";
-		}
-
-		// TODO: all this interval stuff needs some generic generator function
-
-		switch ($mode) {
-			case "1day":
-				if (DB_TYPE == "pgsql") {
-					$date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
-				} else {
-					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
-				}
-				break;
-			case "1week":
-				if (DB_TYPE == "pgsql") {
-					$date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
-				} else {
-					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
-				}
-				break;
-			case "2week":
-				if (DB_TYPE == "pgsql") {
-					$date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
-				} else {
-					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
-				}
-				break;
-			default:
-				$date_qpart = "true";
-		}
-
-		if (is_numeric($feed)) {
-			if ($cat_view) {
-
-				if ($feed >= 0) {
-
-					if ($feed > 0) {
-						$children = Feeds::getChildCategories($feed, $owner_uid);
-						array_push($children, $feed);
-						$children = array_map("intval", $children);
-
-						$children = join(",", $children);
-
-						$cat_qpart = "cat_id IN ($children)";
-					} else {
-						$cat_qpart = "cat_id IS NULL";
-					}
-
-					$sth = $pdo->prepare("UPDATE ttrss_user_entries
+    }
+
+    public static function catchup_feed($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) {
+
+        if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+
+        $pdo = Db::pdo();
+
+        if (is_array($search) && $search[0]) {
+            $search_qpart = "";
+
+            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH) as $plugin) {
+                list($search_qpart, $search_words) = $plugin->hook_search($search[0]);
+                break;
+            }
+
+            // fall back in case of no plugins
+            if (!$search_qpart) {
+                list($search_qpart, $search_words) = Feeds::search_to_sql($search[0], $search[1]);
+            }
+        } else {
+            $search_qpart = "true";
+        }
+
+        // TODO: all this interval stuff needs some generic generator function
+
+        switch ($mode) {
+            case "1day":
+                if (DB_TYPE == "pgsql") {
+                    $date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
+                } else {
+                    $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
+                }
+                break;
+            case "1week":
+                if (DB_TYPE == "pgsql") {
+                    $date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
+                } else {
+                    $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
+                }
+                break;
+            case "2week":
+                if (DB_TYPE == "pgsql") {
+                    $date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
+                } else {
+                    $date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
+                }
+                break;
+            default:
+                $date_qpart = "true";
+        }
+
+        if (is_numeric($feed)) {
+            if ($cat_view) {
+
+                if ($feed >= 0) {
+
+                    if ($feed > 0) {
+                        $children = Feeds::getChildCategories($feed, $owner_uid);
+                        array_push($children, $feed);
+                        $children = array_map("intval", $children);
+
+                        $children = join(",", $children);
+
+                        $cat_qpart = "cat_id IN ($children)";
+                    } else {
+                        $cat_qpart = "cat_id IS NULL";
+                    }
+
+                    $sth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
 								(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 									AND owner_uid = ? AND unread = true AND feed_id IN
 										(SELECT id FROM ttrss_feeds WHERE $cat_qpart) AND $date_qpart AND $search_qpart) as tmp)");
-					$sth->execute([$owner_uid]);
+                    $sth->execute([$owner_uid]);
 
-				} else if ($feed == -2) {
+                } else if ($feed == -2) {
 
-					$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                    $sth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
 							FROM ttrss_user_labels2, ttrss_entries WHERE article_id = ref_id AND id = ref_id AND $date_qpart AND $search_qpart) > 0
 							AND unread = true AND owner_uid = ?");
-					$sth->execute([$owner_uid]);
-				}
+                    $sth->execute([$owner_uid]);
+                }
 
-			} else if ($feed > 0) {
+            } else if ($feed > 0) {
 
-				$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                $sth = $pdo->prepare("UPDATE ttrss_user_entries
 					SET unread = false, last_read = NOW() WHERE ref_id IN
 						(SELECT id FROM
 							(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 								AND owner_uid = ? AND unread = true AND feed_id = ? AND $date_qpart AND $search_qpart) as tmp)");
-				$sth->execute([$owner_uid, $feed]);
+                $sth->execute([$owner_uid, $feed]);
 
-			} else if ($feed < 0 && $feed > LABEL_BASE_INDEX) { // special, like starred
+            } else if ($feed < 0 && $feed > LABEL_BASE_INDEX) { // special, like starred
 
-				if ($feed == -1) {
-					$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                if ($feed == -1) {
+                    $sth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
 								(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 									AND owner_uid = ? AND unread = true AND marked = true AND $date_qpart AND $search_qpart) as tmp)");
-					$sth->execute([$owner_uid]);
-				}
+                    $sth->execute([$owner_uid]);
+                }
 
-				if ($feed == -2) {
-					$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                if ($feed == -2) {
+                    $sth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
 								(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 									AND owner_uid = ? AND unread = true AND published = true AND $date_qpart AND $search_qpart) as tmp)");
-					$sth->execute([$owner_uid]);
-				}
+                    $sth->execute([$owner_uid]);
+                }
 
-				if ($feed == -3) {
+                if ($feed == -3) {
 
-					$intl = (int) get_pref("FRESH_ARTICLE_MAX_AGE");
+                    $intl = (int) get_pref("FRESH_ARTICLE_MAX_AGE");
 
-					if (DB_TYPE == "pgsql") {
-						$match_part = "date_entered > NOW() - INTERVAL '$intl hour' ";
-					} else {
-						$match_part = "date_entered > DATE_SUB(NOW(),
+                    if (DB_TYPE == "pgsql") {
+                        $match_part = "date_entered > NOW() - INTERVAL '$intl hour' ";
+                    } else {
+                        $match_part = "date_entered > DATE_SUB(NOW(),
 							INTERVAL $intl HOUR) ";
-					}
+                    }
 
-					$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                    $sth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
 								(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 									AND owner_uid = ? AND score >= 0 AND unread = true AND $date_qpart AND $match_part AND $search_qpart) as tmp)");
-					$sth->execute([$owner_uid]);
-				}
+                    $sth->execute([$owner_uid]);
+                }
 
-				if ($feed == -4) {
-					$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                if ($feed == -4) {
+                    $sth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET unread = false, last_read = NOW() WHERE ref_id IN
 							(SELECT id FROM
 								(SELECT DISTINCT id FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id
 									AND owner_uid = ? AND unread = true AND $date_qpart AND $search_qpart) as tmp)");
-					$sth->execute([$owner_uid]);
-				}
+                    $sth->execute([$owner_uid]);
+                }
 
-			} else if ($feed < LABEL_BASE_INDEX) { // label
+            } else if ($feed < LABEL_BASE_INDEX) { // label
 
-				$label_id = Labels::feed_to_label_id($feed);
+                $label_id = Labels::feed_to_label_id($feed);
 
-				$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                $sth = $pdo->prepare("UPDATE ttrss_user_entries
 					SET unread = false, last_read = NOW() WHERE ref_id IN
 						(SELECT id FROM
 							(SELECT DISTINCT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_user_labels2 WHERE ref_id = id
 								AND label_id = ? AND ref_id = article_id
 								AND owner_uid = ? AND unread = true AND $date_qpart AND $search_qpart) as tmp)");
-				$sth->execute([$label_id, $owner_uid]);
+                $sth->execute([$label_id, $owner_uid]);
 
-			}
+            }
 
-			CCache::update($feed, $owner_uid, $cat_view);
+            CCache::update($feed, $owner_uid, $cat_view);
 
-		} else { // tag
-			$sth = $pdo->prepare("UPDATE ttrss_user_entries
+        } else { // tag
+            $sth = $pdo->prepare("UPDATE ttrss_user_entries
 				SET unread = false, last_read = NOW() WHERE ref_id IN
 					(SELECT id FROM
 						(SELECT DISTINCT ttrss_entries.id FROM ttrss_entries, ttrss_user_entries, ttrss_tags WHERE ref_id = ttrss_entries.id
 							AND post_int_id = int_id AND tag_name = ?
 							AND ttrss_user_entries.owner_uid = ? AND unread = true AND $date_qpart AND $search_qpart) as tmp)");
-			$sth->execute([$feed, $owner_uid]);
+            $sth->execute([$feed, $owner_uid]);
 
-		}
-	}
+        }
+    }
 
-	public static function getFeedArticles($feed, $is_cat = false, $unread_only = false,
-							 $owner_uid = false) {
+    public static function getFeedArticles($feed, $is_cat = false, $unread_only = false,
+                                $owner_uid = false) {
 
-		$n_feed = (int) $feed;
-		$need_entries = false;
+        $n_feed = (int) $feed;
+        $need_entries = false;
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		if ($unread_only) {
-			$unread_qpart = "unread = true";
-		} else {
-			$unread_qpart = "true";
-		}
+        if ($unread_only) {
+            $unread_qpart = "unread = true";
+        } else {
+            $unread_qpart = "true";
+        }
 
-		$match_part = "";
+        $match_part = "";
 
-		if ($is_cat) {
-			return Feeds::getCategoryUnread($n_feed, $owner_uid);
-		} else if ($n_feed == -6) {
-			return 0;
-		} else if ($feed != "0" && $n_feed == 0) {
+        if ($is_cat) {
+            return Feeds::getCategoryUnread($n_feed, $owner_uid);
+        } else if ($n_feed == -6) {
+            return 0;
+        } else if ($feed != "0" && $n_feed == 0) {
 
-			$sth = $pdo->prepare("SELECT SUM((SELECT COUNT(int_id)
+            $sth = $pdo->prepare("SELECT SUM((SELECT COUNT(int_id)
 				FROM ttrss_user_entries,ttrss_entries WHERE int_id = post_int_id
 					AND ref_id = id AND $unread_qpart)) AS count FROM ttrss_tags
 				WHERE owner_uid = ? AND tag_name = ?");
 
-			$sth->execute([$owner_uid, $feed]);
-			$row = $sth->fetch();
+            $sth->execute([$owner_uid, $feed]);
+            $row = $sth->fetch();
 
-			return $row["count"];
+            return $row["count"];
 
-		} else if ($n_feed == -1) {
-			$match_part = "marked = true";
-		} else if ($n_feed == -2) {
-			$match_part = "published = true";
-		} else if ($n_feed == -3) {
-			$match_part = "unread = true AND score >= 0";
+        } else if ($n_feed == -1) {
+            $match_part = "marked = true";
+        } else if ($n_feed == -2) {
+            $match_part = "published = true";
+        } else if ($n_feed == -3) {
+            $match_part = "unread = true AND score >= 0";
 
-			$intl = (int) get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
+            $intl = (int) get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
-			if (DB_TYPE == "pgsql") {
-				$match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
-			} else {
-				$match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
-			}
+            if (DB_TYPE == "pgsql") {
+                $match_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
+            } else {
+                $match_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
+            }
 
-			$need_entries = true;
+            $need_entries = true;
 
-		} else if ($n_feed == -4) {
-			$match_part = "true";
-		} else if ($n_feed >= 0) {
+        } else if ($n_feed == -4) {
+            $match_part = "true";
+        } else if ($n_feed >= 0) {
 
-			if ($n_feed != 0) {
-				$match_part = "feed_id = " . (int)$n_feed;
-			} else {
-				$match_part = "feed_id IS NULL";
-			}
+            if ($n_feed != 0) {
+                $match_part = "feed_id = " . (int)$n_feed;
+            } else {
+                $match_part = "feed_id IS NULL";
+            }
 
-		} else if ($feed < LABEL_BASE_INDEX) {
+        } else if ($feed < LABEL_BASE_INDEX) {
 
-			$label_id = Labels::feed_to_label_id($feed);
+            $label_id = Labels::feed_to_label_id($feed);
 
-			return Feeds::getLabelUnread($label_id, $owner_uid);
-		}
+            return Feeds::getLabelUnread($label_id, $owner_uid);
+        }
 
-		if ($match_part) {
+        if ($match_part) {
 
-			if ($need_entries) {
-				$from_qpart = "ttrss_user_entries,ttrss_entries";
-				$from_where = "ttrss_entries.id = ttrss_user_entries.ref_id AND";
-			} else {
-				$from_qpart = "ttrss_user_entries";
-				$from_where = "";
-			}
+            if ($need_entries) {
+                $from_qpart = "ttrss_user_entries,ttrss_entries";
+                $from_where = "ttrss_entries.id = ttrss_user_entries.ref_id AND";
+            } else {
+                $from_qpart = "ttrss_user_entries";
+                $from_where = "";
+            }
 
-			$sth = $pdo->prepare("SELECT count(int_id) AS unread
+            $sth = $pdo->prepare("SELECT count(int_id) AS unread
 				FROM $from_qpart WHERE
 				$unread_qpart AND $from_where ($match_part) AND ttrss_user_entries.owner_uid = ?");
-			$sth->execute([$owner_uid]);
-			$row = $sth->fetch();
+            $sth->execute([$owner_uid]);
+            $row = $sth->fetch();
 
-			return $row["unread"];
+            return $row["unread"];
 
-		} else {
+        } else {
 
-			$sth = $pdo->prepare("SELECT COUNT(post_int_id) AS unread
+            $sth = $pdo->prepare("SELECT COUNT(post_int_id) AS unread
 				FROM ttrss_tags,ttrss_user_entries,ttrss_entries
 				WHERE tag_name = ? AND post_int_id = int_id AND ref_id = ttrss_entries.id
 				AND $unread_qpart AND ttrss_tags.owner_uid = ,");
 
-			$sth->execute([$feed, $owner_uid]);
-			$row = $sth->fetch();
-
-			return $row["unread"];
-		}
-	}
-
-	/**
-	 * @return array (code => Status code, message => error message if available)
-	 *
-	 *                 0 - OK, Feed already exists
-	 *                 1 - OK, Feed added
-	 *                 2 - Invalid URL
-	 *                 3 - URL content is HTML, no feeds available
-	 *                 4 - URL content is HTML which contains multiple feeds.
-	 *                     Here you should call extractfeedurls in rpc-backend
-	 *                     to get all possible feeds.
-	 *                 5 - Couldn't download the URL content.
-	 *                 6 - Content is an invalid XML.
-	 */
-	public static function subscribe_to_feed($url, $cat_id = 0,
-							   $auth_login = '', $auth_pass = '') {
-
-		global $fetch_last_error;
-		global $fetch_last_error_content;
-		global $fetch_last_content_type;
-
-		$pdo = Db::pdo();
-
-		$url = Feeds::fix_url($url);
-
-		if (!$url || !Feeds::validate_feed_url($url)) return array("code" => 2);
-
-		$contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
+            $sth->execute([$feed, $owner_uid]);
+            $row = $sth->fetch();
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SUBSCRIBE_FEED) as $plugin) {
-			$contents = $plugin->hook_subscribe_feed($contents, $url, $auth_login, $auth_pass);
-		}
+            return $row["unread"];
+        }
+    }
+
+    /**
+     * @return array (code => Status code, message => error message if available)
+     *
+     *                 0 - OK, Feed already exists
+     *                 1 - OK, Feed added
+     *                 2 - Invalid URL
+     *                 3 - URL content is HTML, no feeds available
+     *                 4 - URL content is HTML which contains multiple feeds.
+     *                     Here you should call extractfeedurls in rpc-backend
+     *                     to get all possible feeds.
+     *                 5 - Couldn't download the URL content.
+     *                 6 - Content is an invalid XML.
+     */
+    public static function subscribe_to_feed($url, $cat_id = 0,
+                                $auth_login = '', $auth_pass = '') {
+
+        global $fetch_last_error;
+        global $fetch_last_error_content;
+        global $fetch_last_content_type;
+
+        $pdo = Db::pdo();
+
+        $url = Feeds::fix_url($url);
+
+        if (!$url || !Feeds::validate_feed_url($url)) return array("code" => 2);
+
+        $contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
+
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SUBSCRIBE_FEED) as $plugin) {
+            $contents = $plugin->hook_subscribe_feed($contents, $url, $auth_login, $auth_pass);
+        }
 
-		if (!$contents) {
-			if (preg_match("/cloudflare\.com/", $fetch_last_error_content)) {
-				$fetch_last_error .= " (feed behind Cloudflare)";
-			}
+        if (!$contents) {
+            if (preg_match("/cloudflare\.com/", $fetch_last_error_content)) {
+                $fetch_last_error .= " (feed behind Cloudflare)";
+            }
 
-			return array("code" => 5, "message" => $fetch_last_error);
-		}
+            return array("code" => 5, "message" => $fetch_last_error);
+        }
 
-		if (mb_strpos($fetch_last_content_type, "html") !== false && Feeds::is_html($contents)) {
-			$feedUrls = Feeds::get_feeds_from_html($url, $contents);
+        if (mb_strpos($fetch_last_content_type, "html") !== false && Feeds::is_html($contents)) {
+            $feedUrls = Feeds::get_feeds_from_html($url, $contents);
 
-			if (count($feedUrls) == 0) {
-				return array("code" => 3);
-			} else if (count($feedUrls) > 1) {
-				return array("code" => 4, "feeds" => $feedUrls);
-			}
-			//use feed url as new URL
-			$url = key($feedUrls);
-		}
+            if (count($feedUrls) == 0) {
+                return array("code" => 3);
+            } else if (count($feedUrls) > 1) {
+                return array("code" => 4, "feeds" => $feedUrls);
+            }
+            //use feed url as new URL
+            $url = key($feedUrls);
+        }
 
-		if (!$cat_id) $cat_id = null;
+        if (!$cat_id) $cat_id = null;
 
-		$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
+        $sth = $pdo->prepare("SELECT id FROM ttrss_feeds
 			WHERE feed_url = ? AND owner_uid = ?");
-		$sth->execute([$url, $_SESSION['uid']]);
+        $sth->execute([$url, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			return array("code" => 0, "feed_id" => (int) $row["id"]);
-		} else {
-			$sth = $pdo->prepare(
-				"INSERT INTO ttrss_feeds
+        if ($row = $sth->fetch()) {
+            return array("code" => 0, "feed_id" => (int) $row["id"]);
+        } else {
+            $sth = $pdo->prepare(
+                "INSERT INTO ttrss_feeds
 					(owner_uid,feed_url,title,cat_id, auth_login,auth_pass,update_method,auth_pass_encrypted)
 				VALUES (?, ?, ?, ?, ?, ?, 0, false)");
 
-			$sth->execute([$_SESSION['uid'], $url, "[Unknown]", $cat_id, (string)$auth_login, (string)$auth_pass]);
+            $sth->execute([$_SESSION['uid'], $url, "[Unknown]", $cat_id, (string)$auth_login, (string)$auth_pass]);
 
-			$sth = $pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
+            $sth = $pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
 					AND owner_uid = ?");
-			$sth->execute([$url, $_SESSION['uid']]);
-			$row = $sth->fetch();
-
-			$feed_id = $row["id"];
-
-			if ($feed_id) {
-				RSSUtils::set_basic_feed_info($feed_id);
-			}
-
-			return array("code" => 1, "feed_id" => (int) $feed_id);
-
-		}
-	}
-
-	public static function getIconFile($feed_id) {
-		return ICONS_DIR . "/$feed_id.ico";
-	}
-
-	public static function feedHasIcon($id) {
-		return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
-	}
-
-	public static function getFeedIcon($id) {
-		switch ($id) {
-			case 0:
-				return "archive";
-			case -1:
-				return "star";
-			case -2:
-				return "rss_feed";
-			case -3:
-				return "whatshot";
-			case -4:
-				return "inbox";
-			case -6:
-				return "restore";
-			default:
-				if ($id < LABEL_BASE_INDEX) {
-					return "label";
-				} else {
-					$icon = self::getIconFile($id);
-
-                    if ($icon && file_exists($icon)) {
-						return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
-					}
-				}
-		}
-
-		return false;
-	}
-
-	public static function getFeedTitle($id, $cat = false) {
-	    $pdo = Db::pdo();
-
-		if ($cat) {
-			return Feeds::getCategoryTitle($id);
-		} else if ($id == -1) {
-			return __("Starred articles");
-		} else if ($id == -2) {
-			return __("Published articles");
-		} else if ($id == -3) {
-			return __("Fresh articles");
-		} else if ($id == -4) {
-			return __("All articles");
-		} else if ($id === 0 || $id === "0") {
-			return __("Archived articles");
-		} else if ($id == -6) {
-			return __("Recently read");
-		} else if ($id < LABEL_BASE_INDEX) {
-
-			$label_id = Labels::feed_to_label_id($id);
+            $sth->execute([$url, $_SESSION['uid']]);
+            $row = $sth->fetch();
 
-			$sth = $pdo->prepare("SELECT caption FROM ttrss_labels2 WHERE id = ?");
-			$sth->execute([$label_id]);
+            $feed_id = $row["id"];
 
-			if ($row = $sth->fetch()) {
-				return $row["caption"];
-			} else {
-				return "Unknown label ($label_id)";
-			}
+            if ($feed_id) {
+                RSSUtils::set_basic_feed_info($feed_id);
+            }
 
-		} else if (is_numeric($id) && $id > 0) {
+            return array("code" => 1, "feed_id" => (int) $feed_id);
 
-		    $sth = $pdo->prepare("SELECT title FROM ttrss_feeds WHERE id = ?");
-		    $sth->execute([$id]);
+        }
+    }
+
+    public static function getIconFile($feed_id) {
+        return ICONS_DIR . "/$feed_id.ico";
+    }
+
+    public static function feedHasIcon($id) {
+        return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0;
+    }
+
+    public static function getFeedIcon($id) {
+        switch ($id) {
+            case 0:
+                return "archive";
+            case -1:
+                return "star";
+            case -2:
+                return "rss_feed";
+            case -3:
+                return "whatshot";
+            case -4:
+                return "inbox";
+            case -6:
+                return "restore";
+            default:
+                if ($id < LABEL_BASE_INDEX) {
+                    return "label";
+                } else {
+                    $icon = self::getIconFile($id);
 
-		    if ($row = $sth->fetch()) {
-				return $row["title"];
-			} else {
-				return "Unknown feed ($id)";
-			}
+                    if ($icon && file_exists($icon)) {
+                        return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
+                    }
+                }
+        }
 
-		} else {
-			return $id;
-		}
-	}
+        return false;
+    }
+
+    public static function getFeedTitle($id, $cat = false) {
+        $pdo = Db::pdo();
+
+        if ($cat) {
+            return Feeds::getCategoryTitle($id);
+        } else if ($id == -1) {
+            return __("Starred articles");
+        } else if ($id == -2) {
+            return __("Published articles");
+        } else if ($id == -3) {
+            return __("Fresh articles");
+        } else if ($id == -4) {
+            return __("All articles");
+        } else if ($id === 0 || $id === "0") {
+            return __("Archived articles");
+        } else if ($id == -6) {
+            return __("Recently read");
+        } else if ($id < LABEL_BASE_INDEX) {
+
+            $label_id = Labels::feed_to_label_id($id);
+
+            $sth = $pdo->prepare("SELECT caption FROM ttrss_labels2 WHERE id = ?");
+            $sth->execute([$label_id]);
+
+            if ($row = $sth->fetch()) {
+                return $row["caption"];
+            } else {
+                return "Unknown label ($label_id)";
+            }
+
+        } else if (is_numeric($id) && $id > 0) {
+
+            $sth = $pdo->prepare("SELECT title FROM ttrss_feeds WHERE id = ?");
+            $sth->execute([$id]);
+
+            if ($row = $sth->fetch()) {
+                return $row["title"];
+            } else {
+                return "Unknown feed ($id)";
+            }
+
+        } else {
+            return $id;
+        }
+    }
 
-	public static function getCategoryUnread($cat, $owner_uid = false) {
+    public static function getCategoryUnread($cat, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if ($cat >= 0) {
+        if ($cat >= 0) {
 
-		    if (!$cat) $cat = null;
+            if (!$cat) $cat = null;
 
-			$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
+            $sth = $pdo->prepare("SELECT id FROM ttrss_feeds
                     WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
 					AND owner_uid = :uid");
 
-			$sth->execute([":cat" => $cat, ":uid" => $owner_uid]);
+            $sth->execute([":cat" => $cat, ":uid" => $owner_uid]);
 
-			$cat_feeds = array();
-			while ($line = $sth->fetch()) {
-				array_push($cat_feeds, "feed_id = " . (int)$line["id"]);
-			}
+            $cat_feeds = array();
+            while ($line = $sth->fetch()) {
+                array_push($cat_feeds, "feed_id = " . (int)$line["id"]);
+            }
 
-			if (count($cat_feeds) == 0) return 0;
+            if (count($cat_feeds) == 0) return 0;
 
-			$match_part = implode(" OR ", $cat_feeds);
+            $match_part = implode(" OR ", $cat_feeds);
 
-			$sth = $pdo->prepare("SELECT COUNT(int_id) AS unread
+            $sth = $pdo->prepare("SELECT COUNT(int_id) AS unread
 				FROM ttrss_user_entries
 				WHERE	unread = true AND ($match_part)
 				AND owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			$unread = 0;
+            $unread = 0;
 
-			# this needs to be rewritten
-			while ($line = $sth->fetch()) {
-				$unread += $line["unread"];
-			}
+            # this needs to be rewritten
+            while ($line = $sth->fetch()) {
+                $unread += $line["unread"];
+            }
 
-			return $unread;
-		} else if ($cat == -1) {
-			return getFeedUnread(-1) + getFeedUnread(-2) + getFeedUnread(-3) + getFeedUnread(0);
-		} else if ($cat == -2) {
+            return $unread;
+        } else if ($cat == -1) {
+            return getFeedUnread(-1) + getFeedUnread(-2) + getFeedUnread(-3) + getFeedUnread(0);
+        } else if ($cat == -2) {
 
-			$sth = $pdo->prepare("SELECT COUNT(unread) AS unread FROM
+            $sth = $pdo->prepare("SELECT COUNT(unread) AS unread FROM
 					ttrss_user_entries, ttrss_user_labels2
 				WHERE article_id = ref_id AND unread = true
 					AND ttrss_user_entries.owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
             $row = $sth->fetch();
 
-			return $row["unread"];
-		}
-	}
+            return $row["unread"];
+        }
+    }
 
-	// only accepts real cats (>= 0)
-	public static function getCategoryChildrenUnread($cat, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+    // only accepts real cats (>= 0)
+    public static function getCategoryChildrenUnread($cat, $owner_uid = false) {
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id FROM ttrss_feed_categories WHERE parent_cat = ?
+        $sth = $pdo->prepare("SELECT id FROM ttrss_feed_categories WHERE parent_cat = ?
 				AND owner_uid = ?");
-		$sth->execute([$cat, $owner_uid]);
+        $sth->execute([$cat, $owner_uid]);
 
-		$unread = 0;
+        $unread = 0;
 
-		while ($line = $sth->fetch()) {
-			$unread += Feeds::getCategoryUnread($line["id"], $owner_uid);
-			$unread += Feeds::getCategoryChildrenUnread($line["id"], $owner_uid);
-		}
+        while ($line = $sth->fetch()) {
+            $unread += Feeds::getCategoryUnread($line["id"], $owner_uid);
+            $unread += Feeds::getCategoryChildrenUnread($line["id"], $owner_uid);
+        }
 
-		return $unread;
-	}
+        return $unread;
+    }
 
-	public static function getGlobalUnread($user_id = false) {
+    public static function getGlobalUnread($user_id = false) {
 
-		if (!$user_id) $user_id = $_SESSION["uid"];
+        if (!$user_id) $user_id = $_SESSION["uid"];
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT SUM(value) AS c_id FROM ttrss_counters_cache
+        $sth = $pdo->prepare("SELECT SUM(value) AS c_id FROM ttrss_counters_cache
 			WHERE owner_uid = ? AND feed_id > 0");
-		$sth->execute([$user_id]);
-		$row = $sth->fetch();
+        $sth->execute([$user_id]);
+        $row = $sth->fetch();
 
-		return $row["c_id"];
-	}
+        return $row["c_id"];
+    }
 
-	public static function getCategoryTitle($cat_id) {
+    public static function getCategoryTitle($cat_id) {
 
-		if ($cat_id == -1) {
-			return __("Special");
-		} else if ($cat_id == -2) {
-			return __("Labels");
-		} else {
+        if ($cat_id == -1) {
+            return __("Special");
+        } else if ($cat_id == -2) {
+            return __("Labels");
+        } else {
 
-		    $pdo = Db::pdo();
+            $pdo = Db::pdo();
 
-			$sth = $pdo->prepare("SELECT title FROM ttrss_feed_categories WHERE
+            $sth = $pdo->prepare("SELECT title FROM ttrss_feed_categories WHERE
 				id = ?");
-			$sth->execute([$cat_id]);
+            $sth->execute([$cat_id]);
 
-			if ($row = $sth->fetch()) {
-				return $row["title"];
-			} else {
-				return __("Uncategorized");
-			}
-		}
-	}
+            if ($row = $sth->fetch()) {
+                return $row["title"];
+            } else {
+                return __("Uncategorized");
+            }
+        }
+    }
 
-	public static function getLabelUnread($label_id, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+    public static function getLabelUnread($label_id, $owner_uid = false) {
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT COUNT(ref_id) AS unread FROM ttrss_user_entries, ttrss_user_labels2
+        $sth = $pdo->prepare("SELECT COUNT(ref_id) AS unread FROM ttrss_user_entries, ttrss_user_labels2
 			WHERE owner_uid = ? AND unread = true AND label_id = ? AND article_id = ref_id");
 
-		$sth->execute([$owner_uid, $label_id]);
+        $sth->execute([$owner_uid, $label_id]);
 
-		if ($row = $sth->fetch()) {
-			return $row["unread"];
-		} else {
-			return 0;
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row["unread"];
+        } else {
+            return 0;
+        }
+    }
 
-	public static function queryFeedHeadlines($params) {
+    public static function queryFeedHeadlines($params) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		// WARNING: due to highly dynamic nature of this query its going to quote parameters
+        // WARNING: due to highly dynamic nature of this query its going to quote parameters
         // right before adding them to SQL part
 
-		$feed = $params["feed"];
-		$limit = isset($params["limit"]) ? $params["limit"] : 30;
-		$view_mode = $params["view_mode"];
-		$cat_view = isset($params["cat_view"]) ? $params["cat_view"] : false;
-		$search = isset($params["search"]) ? $params["search"] : false;
-		$search_language = isset($params["search_language"]) ? $params["search_language"] : "";
-		$override_order = isset($params["override_order"]) ? $params["override_order"] : false;
-		$offset = isset($params["offset"]) ? $params["offset"] : 0;
-		$owner_uid = isset($params["owner_uid"]) ? $params["owner_uid"] : $_SESSION["uid"];
-		$since_id = isset($params["since_id"]) ? $params["since_id"] : 0;
-		$include_children = isset($params["include_children"]) ? $params["include_children"] : false;
-		$ignore_vfeed_group = isset($params["ignore_vfeed_group"]) ? $params["ignore_vfeed_group"] : false;
-		$override_strategy = isset($params["override_strategy"]) ? $params["override_strategy"] : false;
-		$override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false;
-		$start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false;
-		$check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false;
-		$skip_first_id_check = isset($params["skip_first_id_check"]) ? $params["skip_first_id_check"] : false;
-		//$order_by = isset($params["order_by"]) ? $params["order_by"] : false;
-
-		$ext_tables_part = "";
-		$limit_query_part = "";
-		$query_error_override = "";
-
-		$search_words = [];
-
-		if ($search) {
-			$search_query_part = "";
-
-			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH) as $plugin) {
-				list($search_query_part, $search_words) = $plugin->hook_search($search);
-				break;
-			}
-
-			// fall back in case of no plugins
-			if (!$search_query_part) {
-				list($search_query_part, $search_words) = Feeds::search_to_sql($search, $search_language);
-			}
-
-			if (DB_TYPE == "pgsql") {
-				$test_sth = $pdo->prepare("select $search_query_part
+        $feed = $params["feed"];
+        $limit = isset($params["limit"]) ? $params["limit"] : 30;
+        $view_mode = $params["view_mode"];
+        $cat_view = isset($params["cat_view"]) ? $params["cat_view"] : false;
+        $search = isset($params["search"]) ? $params["search"] : false;
+        $search_language = isset($params["search_language"]) ? $params["search_language"] : "";
+        $override_order = isset($params["override_order"]) ? $params["override_order"] : false;
+        $offset = isset($params["offset"]) ? $params["offset"] : 0;
+        $owner_uid = isset($params["owner_uid"]) ? $params["owner_uid"] : $_SESSION["uid"];
+        $since_id = isset($params["since_id"]) ? $params["since_id"] : 0;
+        $include_children = isset($params["include_children"]) ? $params["include_children"] : false;
+        $ignore_vfeed_group = isset($params["ignore_vfeed_group"]) ? $params["ignore_vfeed_group"] : false;
+        $override_strategy = isset($params["override_strategy"]) ? $params["override_strategy"] : false;
+        $override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false;
+        $start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false;
+        $check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false;
+        $skip_first_id_check = isset($params["skip_first_id_check"]) ? $params["skip_first_id_check"] : false;
+        //$order_by = isset($params["order_by"]) ? $params["order_by"] : false;
+
+        $ext_tables_part = "";
+        $limit_query_part = "";
+        $query_error_override = "";
+
+        $search_words = [];
+
+        if ($search) {
+            $search_query_part = "";
+
+            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEARCH) as $plugin) {
+                list($search_query_part, $search_words) = $plugin->hook_search($search);
+                break;
+            }
+
+            // fall back in case of no plugins
+            if (!$search_query_part) {
+                list($search_query_part, $search_words) = Feeds::search_to_sql($search, $search_language);
+            }
+
+            if (DB_TYPE == "pgsql") {
+                $test_sth = $pdo->prepare("select $search_query_part
 					FROM ttrss_entries, ttrss_user_entries WHERE id = ref_id limit 1");
 
-				try {
-					$test_sth->execute();
-				} catch (PDOException $e) {
-					// looks like tsquery syntax is invalid
-					$search_query_part = "false";
+                try {
+                    $test_sth->execute();
+                } catch (PDOException $e) {
+                    // looks like tsquery syntax is invalid
+                    $search_query_part = "false";
 
-					$query_error_override = T_sprintf("Incorrect search syntax: %s.", implode(" ", $search_words));
-				}
-			}
+                    $query_error_override = T_sprintf("Incorrect search syntax: %s.", implode(" ", $search_words));
+                }
+            }
 
-			$search_query_part .= " AND ";
-		} else {
-			$search_query_part = "";
-		}
+            $search_query_part .= " AND ";
+        } else {
+            $search_query_part = "";
+        }
 
-		if ($since_id) {
-			$since_id_part = "ttrss_entries.id > ".$pdo->quote($since_id)." AND ";
-		} else {
-			$since_id_part = "";
-		}
+        if ($since_id) {
+            $since_id_part = "ttrss_entries.id > ".$pdo->quote($since_id)." AND ";
+        } else {
+            $since_id_part = "";
+        }
 
-		$view_query_part = "";
+        $view_query_part = "";
 
-		if ($view_mode == "adaptive") {
-			if ($search) {
-				$view_query_part = " ";
-			} else if ($feed != -1) {
+        if ($view_mode == "adaptive") {
+            if ($search) {
+                $view_query_part = " ";
+            } else if ($feed != -1) {
 
-				$unread = getFeedUnread($feed, $cat_view);
+                $unread = getFeedUnread($feed, $cat_view);
 
-				if ($cat_view && $feed > 0 && $include_children)
-					$unread += Feeds::getCategoryChildrenUnread($feed);
+                if ($cat_view && $feed > 0 && $include_children)
+                    $unread += Feeds::getCategoryChildrenUnread($feed);
 
-				if ($unread > 0) {
-					$view_query_part = " unread = true AND ";
-				}
-			}
-		}
+                if ($unread > 0) {
+                    $view_query_part = " unread = true AND ";
+                }
+            }
+        }
 
-		if ($view_mode == "marked") {
-			$view_query_part = " marked = true AND ";
-		}
+        if ($view_mode == "marked") {
+            $view_query_part = " marked = true AND ";
+        }
 
-		if ($view_mode == "has_note") {
-			$view_query_part = " (note IS NOT NULL AND note != '') AND ";
-		}
+        if ($view_mode == "has_note") {
+            $view_query_part = " (note IS NOT NULL AND note != '') AND ";
+        }
 
-		if ($view_mode == "published") {
-			$view_query_part = " published = true AND ";
-		}
+        if ($view_mode == "published") {
+            $view_query_part = " published = true AND ";
+        }
 
-		if ($view_mode == "unread" && $feed != -6) {
-			$view_query_part = " unread = true AND ";
-		}
+        if ($view_mode == "unread" && $feed != -6) {
+            $view_query_part = " unread = true AND ";
+        }
 
-		if ($limit > 0) {
-			$limit_query_part = "LIMIT " . (int)$limit;
-		}
+        if ($limit > 0) {
+            $limit_query_part = "LIMIT " . (int)$limit;
+        }
 
-		$allow_archived = false;
+        $allow_archived = false;
 
-		$vfeed_query_part = "";
+        $vfeed_query_part = "";
 
-		/* tags */
-		if (!is_numeric($feed)) {
-			$query_strategy_part = "true";
-			$vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
+        /* tags */
+        if (!is_numeric($feed)) {
+            $query_strategy_part = "true";
+            $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
 					id = feed_id) as feed_title,";
-		} else if ($feed > 0) {
-
-			if ($cat_view) {
-
-				if ($feed > 0) {
-					if ($include_children) {
-						# sub-cats
-						$subcats = Feeds::getChildCategories($feed, $owner_uid);
-						array_push($subcats, $feed);
-						$subcats = array_map("intval", $subcats);
-
-						$query_strategy_part = "cat_id IN (".
-							implode(",", $subcats).")";
-
-					} else {
-						$query_strategy_part = "cat_id = " . $pdo->quote($feed);
-					}
-
-				} else {
-					$query_strategy_part = "cat_id IS NULL";
-				}
+        } else if ($feed > 0) {
 
-				$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+            if ($cat_view) {
 
-			} else {
-				$query_strategy_part = "feed_id = " . $pdo->quote($feed);
-			}
-		} else if ($feed == 0 && !$cat_view) { // archive virtual feed
-			$query_strategy_part = "feed_id IS NULL";
-			$allow_archived = true;
-		} else if ($feed == 0 && $cat_view) { // uncategorized
-			$query_strategy_part = "cat_id IS NULL AND feed_id IS NOT NULL";
-			$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-		} else if ($feed == -1) { // starred virtual feed
-			$query_strategy_part = "marked = true";
-			$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-			$allow_archived = true;
+                if ($feed > 0) {
+                    if ($include_children) {
+                        # sub-cats
+                        $subcats = Feeds::getChildCategories($feed, $owner_uid);
+                        array_push($subcats, $feed);
+                        $subcats = array_map("intval", $subcats);
 
-			if (!$override_order) {
-				$override_order = "last_marked DESC, date_entered DESC, updated DESC";
-			}
+                        $query_strategy_part = "cat_id IN (".
+                            implode(",", $subcats).")";
 
-		} else if ($feed == -2) { // published virtual feed OR labels category
+                    } else {
+                        $query_strategy_part = "cat_id = " . $pdo->quote($feed);
+                    }
 
-			if (!$cat_view) {
-				$query_strategy_part = "published = true";
-				$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-				$allow_archived = true;
+                } else {
+                    $query_strategy_part = "cat_id IS NULL";
+                }
 
-				if (!$override_order) {
-					$override_order = "last_published DESC, date_entered DESC, updated DESC";
-				}
+                $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+
+            } else {
+                $query_strategy_part = "feed_id = " . $pdo->quote($feed);
+            }
+        } else if ($feed == 0 && !$cat_view) { // archive virtual feed
+            $query_strategy_part = "feed_id IS NULL";
+            $allow_archived = true;
+        } else if ($feed == 0 && $cat_view) { // uncategorized
+            $query_strategy_part = "cat_id IS NULL AND feed_id IS NOT NULL";
+            $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+        } else if ($feed == -1) { // starred virtual feed
+            $query_strategy_part = "marked = true";
+            $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+            $allow_archived = true;
+
+            if (!$override_order) {
+                $override_order = "last_marked DESC, date_entered DESC, updated DESC";
+            }
+
+        } else if ($feed == -2) { // published virtual feed OR labels category
+
+            if (!$cat_view) {
+                $query_strategy_part = "published = true";
+                $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+                $allow_archived = true;
+
+                if (!$override_order) {
+                    $override_order = "last_published DESC, date_entered DESC, updated DESC";
+                }
 
-			} else {
-				$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+            } else {
+                $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
 
-				$ext_tables_part = "ttrss_labels2,ttrss_user_labels2,";
+                $ext_tables_part = "ttrss_labels2,ttrss_user_labels2,";
 
-				$query_strategy_part = "ttrss_labels2.id = ttrss_user_labels2.label_id AND
+                $query_strategy_part = "ttrss_labels2.id = ttrss_user_labels2.label_id AND
 						ttrss_user_labels2.article_id = ref_id";
 
-			}
-		} else if ($feed == -6) { // recently read
-			$query_strategy_part = "unread = false AND last_read IS NOT NULL";
+            }
+        } else if ($feed == -6) { // recently read
+            $query_strategy_part = "unread = false AND last_read IS NOT NULL";
 
-			if (DB_TYPE == "pgsql") {
-				$query_strategy_part .= " AND last_read > NOW() - INTERVAL '1 DAY' ";
-			} else {
-				$query_strategy_part .= " AND last_read > DATE_SUB(NOW(), INTERVAL 1 DAY) ";
-			}
+            if (DB_TYPE == "pgsql") {
+                $query_strategy_part .= " AND last_read > NOW() - INTERVAL '1 DAY' ";
+            } else {
+                $query_strategy_part .= " AND last_read > DATE_SUB(NOW(), INTERVAL 1 DAY) ";
+            }
 
-			$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-			$allow_archived = true;
-			$ignore_vfeed_group = true;
+            $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+            $allow_archived = true;
+            $ignore_vfeed_group = true;
 
-			if (!$override_order) $override_order = "last_read DESC";
+            if (!$override_order) $override_order = "last_read DESC";
 
-		} else if ($feed == -3) { // fresh virtual feed
-			$query_strategy_part = "unread = true AND score >= 0";
+        } else if ($feed == -3) { // fresh virtual feed
+            $query_strategy_part = "unread = true AND score >= 0";
 
-			$intl = (int) get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
+            $intl = (int) get_pref("FRESH_ARTICLE_MAX_AGE", $owner_uid);
 
-			if (DB_TYPE == "pgsql") {
-				$query_strategy_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
-			} else {
-				$query_strategy_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
-			}
+            if (DB_TYPE == "pgsql") {
+                $query_strategy_part .= " AND date_entered > NOW() - INTERVAL '$intl hour' ";
+            } else {
+                $query_strategy_part .= " AND date_entered > DATE_SUB(NOW(), INTERVAL $intl HOUR) ";
+            }
 
-			$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-		} else if ($feed == -4) { // all articles virtual feed
-			$allow_archived = true;
-			$query_strategy_part = "true";
-			$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-		} else if ($feed <= LABEL_BASE_INDEX) { // labels
-			$label_id = Labels::feed_to_label_id($feed);
+            $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+        } else if ($feed == -4) { // all articles virtual feed
+            $allow_archived = true;
+            $query_strategy_part = "true";
+            $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+        } else if ($feed <= LABEL_BASE_INDEX) { // labels
+            $label_id = Labels::feed_to_label_id($feed);
 
-			$query_strategy_part = "label_id = ".$pdo->quote($label_id)." AND
+            $query_strategy_part = "label_id = ".$pdo->quote($label_id)." AND
 					ttrss_labels2.id = ttrss_user_labels2.label_id AND
 					ttrss_user_labels2.article_id = ref_id";
 
-			$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
-			$ext_tables_part = "ttrss_labels2,ttrss_user_labels2,";
-			$allow_archived = true;
+            $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
+            $ext_tables_part = "ttrss_labels2,ttrss_user_labels2,";
+            $allow_archived = true;
 
-		} else {
-			$query_strategy_part = "true";
-		}
+        } else {
+            $query_strategy_part = "true";
+        }
 
-		$order_by = "score DESC, date_entered DESC, updated DESC";
+        $order_by = "score DESC, date_entered DESC, updated DESC";
 
-		if ($override_order) {
-			$order_by = $override_order;
-		}
+        if ($override_order) {
+            $order_by = $override_order;
+        }
 
-		if ($override_strategy) {
-			$query_strategy_part = $override_strategy;
-		}
+        if ($override_strategy) {
+            $query_strategy_part = $override_strategy;
+        }
 
-		if ($override_vfeed) {
-			$vfeed_query_part = $override_vfeed;
-		}
+        if ($override_vfeed) {
+            $vfeed_query_part = $override_vfeed;
+        }
 
-		if ($search) {
-			$feed_title = T_sprintf("Search results: %s", $search);
-		} else {
-			if ($cat_view) {
-				$feed_title = Feeds::getCategoryTitle($feed);
-			} else {
-				if (is_numeric($feed) && $feed > 0) {
-					$ssth = $pdo->prepare("SELECT title,site_url,last_error,last_updated
+        if ($search) {
+            $feed_title = T_sprintf("Search results: %s", $search);
+        } else {
+            if ($cat_view) {
+                $feed_title = Feeds::getCategoryTitle($feed);
+            } else {
+                if (is_numeric($feed) && $feed > 0) {
+                    $ssth = $pdo->prepare("SELECT title,site_url,last_error,last_updated
 							FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
-					$ssth->execute([$feed, $owner_uid]);
+                    $ssth->execute([$feed, $owner_uid]);
                     $row = $ssth->fetch();
 
-					$feed_title = $row["title"];
-					$feed_site_url = $row["site_url"];
-					$last_error = $row["last_error"];
-					$last_updated = $row["last_updated"];
-				} else {
-					$feed_title = Feeds::getFeedTitle($feed);
-				}
-			}
-		}
-
-		$content_query_part = "content, ";
-
-		if ($limit_query_part) {
-			$offset_query_part = "OFFSET " . (int)$offset;
-		} else {
-			$offset_query_part = "";
-		}
-
-		if ($start_ts) {
-			$start_ts_formatted = date("Y/m/d H:i:s", strtotime($start_ts));
-			$start_ts_query_part = "date_entered >= '$start_ts_formatted' AND";
-		} else {
-			$start_ts_query_part = "";
-		}
-
-		if (is_numeric($feed)) {
-			// proper override_order applied above
-			if ($vfeed_query_part && !$ignore_vfeed_group && get_pref('VFEED_GROUP_BY_FEED', $owner_uid)) {
-
-				if (!(in_array($feed, Feeds::NEVER_GROUP_BY_DATE) && !$cat_view)) {
-					$yyiw_desc = $order_by == "date_reverse" ? "" : "desc";
-					$yyiw_order_qpart = "yyiw $yyiw_desc, ";
-				} else {
-					$yyiw_order_qpart = "";
-				}
-
-				if (!$override_order) {
-					$order_by = "$yyiw_order_qpart ttrss_feeds.title, $order_by";
-				} else {
-					$order_by = "$yyiw_order_qpart ttrss_feeds.title, $override_order";
-				}
-			}
-
-			if (!$allow_archived) {
-				$from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id),ttrss_feeds";
-				$feed_check_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
-
-			} else {
-				$from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id)
+                    $feed_title = $row["title"];
+                    $feed_site_url = $row["site_url"];
+                    $last_error = $row["last_error"];
+                    $last_updated = $row["last_updated"];
+                } else {
+                    $feed_title = Feeds::getFeedTitle($feed);
+                }
+            }
+        }
+
+        $content_query_part = "content, ";
+
+        if ($limit_query_part) {
+            $offset_query_part = "OFFSET " . (int)$offset;
+        } else {
+            $offset_query_part = "";
+        }
+
+        if ($start_ts) {
+            $start_ts_formatted = date("Y/m/d H:i:s", strtotime($start_ts));
+            $start_ts_query_part = "date_entered >= '$start_ts_formatted' AND";
+        } else {
+            $start_ts_query_part = "";
+        }
+
+        if (is_numeric($feed)) {
+            // proper override_order applied above
+            if ($vfeed_query_part && !$ignore_vfeed_group && get_pref('VFEED_GROUP_BY_FEED', $owner_uid)) {
+
+                if (!(in_array($feed, Feeds::NEVER_GROUP_BY_DATE) && !$cat_view)) {
+                    $yyiw_desc = $order_by == "date_reverse" ? "" : "desc";
+                    $yyiw_order_qpart = "yyiw $yyiw_desc, ";
+                } else {
+                    $yyiw_order_qpart = "";
+                }
+
+                if (!$override_order) {
+                    $order_by = "$yyiw_order_qpart ttrss_feeds.title, $order_by";
+                } else {
+                    $order_by = "$yyiw_order_qpart ttrss_feeds.title, $override_order";
+                }
+            }
+
+            if (!$allow_archived) {
+                $from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id),ttrss_feeds";
+                $feed_check_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND";
+
+            } else {
+                $from_qpart = "${ext_tables_part}ttrss_entries LEFT JOIN ttrss_user_entries ON (ref_id = ttrss_entries.id)
 						LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
-			}
+            }
 
-			if ($vfeed_query_part) $vfeed_query_part .= "favicon_avg_color,";
+            if ($vfeed_query_part) $vfeed_query_part .= "favicon_avg_color,";
 
-			$first_id = 0;
-			$first_id_query_strategy_part = $query_strategy_part;
+            $first_id = 0;
+            $first_id_query_strategy_part = $query_strategy_part;
 
-			if ($feed == -3)
-				$first_id_query_strategy_part = "true";
+            if ($feed == -3)
+                $first_id_query_strategy_part = "true";
 
-			if (DB_TYPE == "pgsql") {
-				$sanity_interval_qpart = "date_entered >= NOW() - INTERVAL '1 hour' AND";
-				$yyiw_qpart = "to_char(date_entered, 'IYYY-IW') AS yyiw";
-			} else {
-				$sanity_interval_qpart = "date_entered >= DATE_SUB(NOW(), INTERVAL 1 hour) AND";
-				$yyiw_qpart = "date_format(date_entered, '%Y-%u') AS yyiw";
-			}
+            if (DB_TYPE == "pgsql") {
+                $sanity_interval_qpart = "date_entered >= NOW() - INTERVAL '1 hour' AND";
+                $yyiw_qpart = "to_char(date_entered, 'IYYY-IW') AS yyiw";
+            } else {
+                $sanity_interval_qpart = "date_entered >= DATE_SUB(NOW(), INTERVAL 1 hour) AND";
+                $yyiw_qpart = "date_format(date_entered, '%Y-%u') AS yyiw";
+            }
 
-			if (!$search && !$skip_first_id_check) {
-				// if previous topmost article id changed that means our current pagination is no longer valid
-				$query = "SELECT DISTINCT
+            if (!$search && !$skip_first_id_check) {
+                // if previous topmost article id changed that means our current pagination is no longer valid
+                $query = "SELECT DISTINCT
 							ttrss_feeds.title,
 							date_entered,
                             $yyiw_qpart,
@@ -1758,22 +1758,22 @@ 
 						$sanity_interval_qpart
 						$first_id_query_strategy_part ORDER BY $order_by LIMIT 1";
 
-				/*if ($_REQUEST["debug"]) {
+                /*if ($_REQUEST["debug"]) {
 					print $query;
 				}*/
 
-				$res = $pdo->query($query);
+                $res = $pdo->query($query);
 
-				if ($row = $res->fetch()) {
-					$first_id = (int)$row["id"];
+                if ($row = $res->fetch()) {
+                    $first_id = (int)$row["id"];
 
-					if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) {
-						return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != "", $query_error_override);
-					}
-				}
-			}
+                    if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) {
+                        return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != "", $query_error_override);
+                    }
+                }
+            }
 
-			$query = "SELECT DISTINCT
+            $query = "SELECT DISTINCT
 						date_entered,
                         $yyiw_qpart,
 						guid,
@@ -1807,14 +1807,14 @@ 
 					$query_strategy_part ORDER BY $order_by
 					$limit_query_part $offset_query_part";
 
-			//if ($_REQUEST["debug"]) print $query;
+            //if ($_REQUEST["debug"]) print $query;
 
-			$res = $pdo->query($query);
+            $res = $pdo->query($query);
 
-		} else {
-			// browsing by tag
+        } else {
+            // browsing by tag
 
-			$query = "SELECT DISTINCT
+            $query = "SELECT DISTINCT
 							date_entered,
 							guid,
 							note,
@@ -1853,63 +1853,63 @@ 
 							$query_strategy_part ORDER BY $order_by
 							$limit_query_part $offset_query_part";
 
-			if ($_REQUEST["debug"]) print $query;
+            if ($_REQUEST["debug"]) print $query;
 
-			$res = $pdo->query($query);
-		}
+            $res = $pdo->query($query);
+        }
 
-		return array($res, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != "", $query_error_override);
+        return array($res, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id, $vfeed_query_part != "", $query_error_override);
 
-	}
+    }
 
-	public static function getParentCategories($cat, $owner_uid) {
-		$rv = array();
+    public static function getParentCategories($cat, $owner_uid) {
+        $rv = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT parent_cat FROM ttrss_feed_categories
+        $sth = $pdo->prepare("SELECT parent_cat FROM ttrss_feed_categories
 			WHERE id = ? AND parent_cat IS NOT NULL AND owner_uid = ?");
-		$sth->execute([$cat, $owner_uid]);
+        $sth->execute([$cat, $owner_uid]);
 
-		while ($line = $sth->fetch()) {
-			array_push($rv, $line["parent_cat"]);
-			$rv = array_merge($rv, Feeds::getParentCategories($line["parent_cat"], $owner_uid));
-		}
+        while ($line = $sth->fetch()) {
+            array_push($rv, $line["parent_cat"]);
+            $rv = array_merge($rv, Feeds::getParentCategories($line["parent_cat"], $owner_uid));
+        }
 
-		return $rv;
-	}
+        return $rv;
+    }
 
-	public static function getChildCategories($cat, $owner_uid) {
-		$rv = array();
+    public static function getChildCategories($cat, $owner_uid) {
+        $rv = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id FROM ttrss_feed_categories
+        $sth = $pdo->prepare("SELECT id FROM ttrss_feed_categories
 			WHERE parent_cat = ? AND owner_uid = ?");
-		$sth->execute([$cat, $owner_uid]);
+        $sth->execute([$cat, $owner_uid]);
 
-		while ($line = $sth->fetch()) {
-			array_push($rv, $line["id"]);
-			$rv = array_merge($rv, Feeds::getChildCategories($line["id"], $owner_uid));
-		}
+        while ($line = $sth->fetch()) {
+            array_push($rv, $line["id"]);
+            $rv = array_merge($rv, Feeds::getChildCategories($line["id"], $owner_uid));
+        }
 
-		return $rv;
-	}
+        return $rv;
+    }
 
-	public static function getFeedCategory($feed) {
-		$pdo = Db::pdo();
+    public static function getFeedCategory($feed) {
+        $pdo = Db::pdo();
 
-	    $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
+        $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
 				WHERE id = ?");
-	    $sth->execute([$feed]);
+        $sth->execute([$feed]);
 
-		if ($row = $sth->fetch()) {
-			return $row["cat_id"];
-		} else {
-			return false;
-		}
+        if ($row = $sth->fetch()) {
+            return $row["cat_id"];
+        } else {
+            return false;
+        }
 
-	}
+    }
 
     function color_of($name) {
         $colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
@@ -1925,402 +1925,402 @@ 
         $sum %= count($colormap);
 
         return $colormap[$sum];
-	}
-
-	public static function get_feeds_from_html($url, $content) {
-		$url     = Feeds::fix_url($url);
-		$baseUrl = substr($url, 0, strrpos($url, '/') + 1);
-
-		$feedUrls = [];
-
-		$doc = new DOMDocument();
-		if ($doc->loadHTML($content)) {
-			$xpath = new DOMXPath($doc);
-			$entries = $xpath->query('/html/head/link[@rel="alternate" and '.
-				'(contains(@type,"rss") or contains(@type,"atom"))]|/html/head/link[@rel="feed"]');
-
-			foreach ($entries as $entry) {
-				if ($entry->hasAttribute('href')) {
-					$title = $entry->getAttribute('title');
-					if ($title == '') {
-						$title = $entry->getAttribute('type');
-					}
-					$feedUrl = rewrite_relative_url(
-						$baseUrl, $entry->getAttribute('href')
-					);
-					$feedUrls[$feedUrl] = $title;
-				}
-			}
-		}
-		return $feedUrls;
-	}
-
-	public static function is_html($content) {
-		return preg_match("/<html|DOCTYPE html/i", substr($content, 0, 8192)) !== 0;
-	}
-
-	public static function validate_feed_url($url) {
-		$parts = parse_url($url);
-
-		return ($parts['scheme'] == 'http' || $parts['scheme'] == 'feed' || $parts['scheme'] == 'https');
-	}
-
-	/**
-	 * Fixes incomplete URLs by prepending "http://".
-	 * Also replaces feed:// with http://, and
-	 * prepends a trailing slash if the url is a domain name only.
-	 *
-	 * @param string $url Possibly incomplete URL
-	 *
-	 * @return string Fixed URL.
-	 */
-	public static function fix_url($url) {
-
-		// support schema-less urls
-		if (strpos($url, '//') === 0) {
-			$url = 'https:' . $url;
-		}
-
-		if (strpos($url, '://') === false) {
-			$url = 'http://' . $url;
-		} else if (substr($url, 0, 5) == 'feed:') {
-			$url = 'http:' . substr($url, 5);
-		}
-
-		//prepend slash if the URL has no slash in it
-		// "http://www.example" -> "http://www.example/"
-		if (strpos($url, '/', strpos($url, ':') + 3) === false) {
-			$url .= '/';
-		}
-
-		//convert IDNA hostname to punycode if possible
-		if (function_exists("idn_to_ascii")) {
-			$parts = parse_url($url);
-			if (mb_detect_encoding($parts['host']) != 'ASCII')
-			{
-				$parts['host'] = idn_to_ascii($parts['host']);
-				$url = build_url($parts);
-			}
-		}
-
-		if ($url != "http:///")
-			return $url;
-		else
-			return '';
-	}
-
-	public static function add_feed_category($feed_cat, $parent_cat_id = false, $order_id = 0) {
-
-		if (!$feed_cat) return false;
-
-		$feed_cat = mb_substr($feed_cat, 0, 250);
-		if (!$parent_cat_id) $parent_cat_id = null;
-
-		$pdo = Db::pdo();
-		$tr_in_progress = false;
-
-		try {
-			$pdo->beginTransaction();
-		} catch (Exception $e) {
-			$tr_in_progress = true;
-		}
-
-		$sth = $pdo->prepare("SELECT id FROM ttrss_feed_categories
+    }
+
+    public static function get_feeds_from_html($url, $content) {
+        $url     = Feeds::fix_url($url);
+        $baseUrl = substr($url, 0, strrpos($url, '/') + 1);
+
+        $feedUrls = [];
+
+        $doc = new DOMDocument();
+        if ($doc->loadHTML($content)) {
+            $xpath = new DOMXPath($doc);
+            $entries = $xpath->query('/html/head/link[@rel="alternate" and '.
+                '(contains(@type,"rss") or contains(@type,"atom"))]|/html/head/link[@rel="feed"]');
+
+            foreach ($entries as $entry) {
+                if ($entry->hasAttribute('href')) {
+                    $title = $entry->getAttribute('title');
+                    if ($title == '') {
+                        $title = $entry->getAttribute('type');
+                    }
+                    $feedUrl = rewrite_relative_url(
+                        $baseUrl, $entry->getAttribute('href')
+                    );
+                    $feedUrls[$feedUrl] = $title;
+                }
+            }
+        }
+        return $feedUrls;
+    }
+
+    public static function is_html($content) {
+        return preg_match("/<html|DOCTYPE html/i", substr($content, 0, 8192)) !== 0;
+    }
+
+    public static function validate_feed_url($url) {
+        $parts = parse_url($url);
+
+        return ($parts['scheme'] == 'http' || $parts['scheme'] == 'feed' || $parts['scheme'] == 'https');
+    }
+
+    /**
+     * Fixes incomplete URLs by prepending "http://".
+     * Also replaces feed:// with http://, and
+     * prepends a trailing slash if the url is a domain name only.
+     *
+     * @param string $url Possibly incomplete URL
+     *
+     * @return string Fixed URL.
+     */
+    public static function fix_url($url) {
+
+        // support schema-less urls
+        if (strpos($url, '//') === 0) {
+            $url = 'https:' . $url;
+        }
+
+        if (strpos($url, '://') === false) {
+            $url = 'http://' . $url;
+        } else if (substr($url, 0, 5) == 'feed:') {
+            $url = 'http:' . substr($url, 5);
+        }
+
+        //prepend slash if the URL has no slash in it
+        // "http://www.example" -> "http://www.example/"
+        if (strpos($url, '/', strpos($url, ':') + 3) === false) {
+            $url .= '/';
+        }
+
+        //convert IDNA hostname to punycode if possible
+        if (function_exists("idn_to_ascii")) {
+            $parts = parse_url($url);
+            if (mb_detect_encoding($parts['host']) != 'ASCII')
+            {
+                $parts['host'] = idn_to_ascii($parts['host']);
+                $url = build_url($parts);
+            }
+        }
+
+        if ($url != "http:///")
+            return $url;
+        else
+            return '';
+    }
+
+    public static function add_feed_category($feed_cat, $parent_cat_id = false, $order_id = 0) {
+
+        if (!$feed_cat) return false;
+
+        $feed_cat = mb_substr($feed_cat, 0, 250);
+        if (!$parent_cat_id) $parent_cat_id = null;
+
+        $pdo = Db::pdo();
+        $tr_in_progress = false;
+
+        try {
+            $pdo->beginTransaction();
+        } catch (Exception $e) {
+            $tr_in_progress = true;
+        }
+
+        $sth = $pdo->prepare("SELECT id FROM ttrss_feed_categories
 				WHERE (parent_cat = :parent OR (:parent IS NULL AND parent_cat IS NULL))
 				AND title = :title AND owner_uid = :uid");
-		$sth->execute([':parent' => $parent_cat_id, ':title' => $feed_cat, ':uid' => $_SESSION['uid']]);
+        $sth->execute([':parent' => $parent_cat_id, ':title' => $feed_cat, ':uid' => $_SESSION['uid']]);
 
-		if (!$sth->fetch()) {
+        if (!$sth->fetch()) {
 
-			$sth = $pdo->prepare("INSERT INTO ttrss_feed_categories (owner_uid,title,parent_cat,order_id)
+            $sth = $pdo->prepare("INSERT INTO ttrss_feed_categories (owner_uid,title,parent_cat,order_id)
 					VALUES (?, ?, ?, ?)");
-			$sth->execute([$_SESSION['uid'], $feed_cat, $parent_cat_id, (int)$order_id]);
+            $sth->execute([$_SESSION['uid'], $feed_cat, $parent_cat_id, (int)$order_id]);
 
-			if (!$tr_in_progress) $pdo->commit();
+            if (!$tr_in_progress) $pdo->commit();
 
-			return true;
-		}
+            return true;
+        }
 
-		$pdo->commit();
+        $pdo->commit();
 
-		return false;
-	}
+        return false;
+    }
 
-	public static function get_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
+    public static function get_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$is_cat = bool_to_sql_bool($is_cat);
+        $is_cat = bool_to_sql_bool($is_cat);
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT access_key FROM ttrss_access_keys
+        $sth = $pdo->prepare("SELECT access_key FROM ttrss_access_keys
 				WHERE feed_id = ? AND is_cat = ?
 				AND owner_uid = ?");
-		$sth->execute([$feed_id, $is_cat, $owner_uid]);
+        $sth->execute([$feed_id, $is_cat, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
-			return $row["access_key"];
-		} else {
-			$key = uniqid_short();
+        if ($row = $sth->fetch()) {
+            return $row["access_key"];
+        } else {
+            $key = uniqid_short();
 
-			$sth = $pdo->prepare("INSERT INTO ttrss_access_keys
+            $sth = $pdo->prepare("INSERT INTO ttrss_access_keys
 					(access_key, feed_id, is_cat, owner_uid)
 					VALUES (?, ?, ?, ?)");
 
-			$sth->execute([$key, $feed_id, $is_cat, $owner_uid]);
+            $sth->execute([$key, $feed_id, $is_cat, $owner_uid]);
 
-			return $key;
-		}
-	}
+            return $key;
+        }
+    }
 
-	/**
-	 * Purge a feed old posts.
-	 *
-	 * @param mixed $link A database connection.
-	 * @param mixed $feed_id The id of the purged feed.
-	 * @param mixed $purge_interval Olderness of purged posts.
-	 * @param boolean $debug Set to True to enable the debug. False by default.
-	 * @access public
-	 * @return void
-	 */
-	public static function purge_feed($feed_id, $purge_interval) {
+    /**
+     * Purge a feed old posts.
+     *
+     * @param mixed $link A database connection.
+     * @param mixed $feed_id The id of the purged feed.
+     * @param mixed $purge_interval Olderness of purged posts.
+     * @param boolean $debug Set to True to enable the debug. False by default.
+     * @access public
+     * @return void
+     */
+    public static function purge_feed($feed_id, $purge_interval) {
 
-		if (!$purge_interval) $purge_interval = Feeds::feed_purge_interval($feed_id);
+        if (!$purge_interval) $purge_interval = Feeds::feed_purge_interval($feed_id);
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT owner_uid FROM ttrss_feeds WHERE id = ?");
-		$sth->execute([$feed_id]);
+        $sth = $pdo->prepare("SELECT owner_uid FROM ttrss_feeds WHERE id = ?");
+        $sth->execute([$feed_id]);
 
-		$owner_uid = false;
+        $owner_uid = false;
 
-		if ($row = $sth->fetch()) {
-			$owner_uid = $row["owner_uid"];
-		}
+        if ($row = $sth->fetch()) {
+            $owner_uid = $row["owner_uid"];
+        }
 
-		if ($purge_interval == -1 || !$purge_interval) {
-			if ($owner_uid) {
-				CCache::update($feed_id, $owner_uid);
-			}
-			return;
-		}
+        if ($purge_interval == -1 || !$purge_interval) {
+            if ($owner_uid) {
+                CCache::update($feed_id, $owner_uid);
+            }
+            return;
+        }
 
-		if (!$owner_uid) return;
+        if (!$owner_uid) return;
 
-		if (FORCE_ARTICLE_PURGE == 0) {
-			$purge_unread = get_pref("PURGE_UNREAD_ARTICLES",
-				$owner_uid, false);
-		} else {
-			$purge_unread = true;
-			$purge_interval = FORCE_ARTICLE_PURGE;
-		}
+        if (FORCE_ARTICLE_PURGE == 0) {
+            $purge_unread = get_pref("PURGE_UNREAD_ARTICLES",
+                $owner_uid, false);
+        } else {
+            $purge_unread = true;
+            $purge_interval = FORCE_ARTICLE_PURGE;
+        }
 
-		if (!$purge_unread)
-			$query_limit = " unread = false AND ";
-		else
-			$query_limit = "";
+        if (!$purge_unread)
+            $query_limit = " unread = false AND ";
+        else
+            $query_limit = "";
 
-		$purge_interval = (int) $purge_interval;
+        $purge_interval = (int) $purge_interval;
 
-		if (DB_TYPE == "pgsql") {
-			$sth = $pdo->prepare("DELETE FROM ttrss_user_entries
+        if (DB_TYPE == "pgsql") {
+            $sth = $pdo->prepare("DELETE FROM ttrss_user_entries
 				USING ttrss_entries
 				WHERE ttrss_entries.id = ref_id AND
 				marked = false AND
 				feed_id = ? AND
 				$query_limit
 				ttrss_entries.date_updated < NOW() - INTERVAL '$purge_interval days'");
-			$sth->execute([$feed_id]);
+            $sth->execute([$feed_id]);
 
-		} else {
-			$sth  = $pdo->prepare("DELETE FROM ttrss_user_entries
+        } else {
+            $sth  = $pdo->prepare("DELETE FROM ttrss_user_entries
 				USING ttrss_user_entries, ttrss_entries
 				WHERE ttrss_entries.id = ref_id AND
 				marked = false AND
 				feed_id = ? AND
 				$query_limit
 				ttrss_entries.date_updated < DATE_SUB(NOW(), INTERVAL $purge_interval DAY)");
-			$sth->execute([$feed_id]);
+            $sth->execute([$feed_id]);
 
-		}
+        }
 
-		$rows = $sth->rowCount();
+        $rows = $sth->rowCount();
 
-		CCache::update($feed_id, $owner_uid);
+        CCache::update($feed_id, $owner_uid);
 
-		Debug::log("Purged feed $feed_id ($purge_interval): deleted $rows articles");
+        Debug::log("Purged feed $feed_id ($purge_interval): deleted $rows articles");
 
-		return $rows;
-	}
+        return $rows;
+    }
 
-	public static function feed_purge_interval($feed_id) {
+    public static function feed_purge_interval($feed_id) {
 
-		$pdo = DB::pdo();
+        $pdo = DB::pdo();
 
-		$sth = $pdo->prepare("SELECT purge_interval, owner_uid FROM ttrss_feeds
+        $sth = $pdo->prepare("SELECT purge_interval, owner_uid FROM ttrss_feeds
 			WHERE id = ?");
-		$sth->execute([$feed_id]);
-
-		if ($row = $sth->fetch()) {
-			$purge_interval = $row["purge_interval"];
-			$owner_uid = $row["owner_uid"];
-
-			if ($purge_interval == 0) $purge_interval = get_pref(
-				'PURGE_OLD_DAYS', $owner_uid);
-
-			return $purge_interval;
-
-		} else {
-			return -1;
-		}
-	}
+        $sth->execute([$feed_id]);
 
-	public static function search_to_sql($search, $search_language) {
+        if ($row = $sth->fetch()) {
+            $purge_interval = $row["purge_interval"];
+            $owner_uid = $row["owner_uid"];
 
-		$keywords = str_getcsv(trim($search), " ");
-		$query_keywords = array();
-		$search_words = array();
-		$search_query_leftover = array();
+            if ($purge_interval == 0) $purge_interval = get_pref(
+                'PURGE_OLD_DAYS', $owner_uid);
 
-		$pdo = Db::pdo();
+            return $purge_interval;
 
-		if ($search_language)
-			$search_language = $pdo->quote(mb_strtolower($search_language));
-		else
-			$search_language = $pdo->quote("english");
-
-		foreach ($keywords as $k) {
-			if (strpos($k, "-") === 0) {
-				$k = substr($k, 1);
-				$not = "NOT";
-			} else {
-				$not = "";
-			}
-
-			$commandpair = explode(":", mb_strtolower($k), 2);
-
-			switch ($commandpair[0]) {
-				case "title":
-					if ($commandpair[1]) {
-						array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
-							$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%') ."))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+        } else {
+            return -1;
+        }
+    }
+
+    public static function search_to_sql($search, $search_language) {
+
+        $keywords = str_getcsv(trim($search), " ");
+        $query_keywords = array();
+        $search_words = array();
+        $search_query_leftover = array();
+
+        $pdo = Db::pdo();
+
+        if ($search_language)
+            $search_language = $pdo->quote(mb_strtolower($search_language));
+        else
+            $search_language = $pdo->quote("english");
+
+        foreach ($keywords as $k) {
+            if (strpos($k, "-") === 0) {
+                $k = substr($k, 1);
+                $not = "NOT";
+            } else {
+                $not = "";
+            }
+
+            $commandpair = explode(":", mb_strtolower($k), 2);
+
+            switch ($commandpair[0]) {
+                case "title":
+                    if ($commandpair[1]) {
+                        array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
+                            $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%') ."))");
+                    } else {
+                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						array_push($search_words, $k);
-					}
-					break;
-				case "author":
-					if ($commandpair[1]) {
-						array_push($query_keywords, "($not (LOWER(author) LIKE ".
-							$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+                        array_push($search_words, $k);
+                    }
+                    break;
+                case "author":
+                    if ($commandpair[1]) {
+                        array_push($query_keywords, "($not (LOWER(author) LIKE ".
+                            $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+                    } else {
+                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						array_push($search_words, $k);
-					}
-					break;
-				case "note":
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-						else if ($commandpair[1] == "false")
-							array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-						else
-							array_push($query_keywords, "($not (LOWER(note) LIKE ".
-								$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                        array_push($search_words, $k);
+                    }
+                    break;
+                case "note":
+                    if ($commandpair[1]) {
+                        if ($commandpair[1] == "true")
+                            array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+                        else if ($commandpair[1] == "false")
+                            array_push($query_keywords, "($not (note IS NULL OR note = ''))");
+                        else
+                            array_push($query_keywords, "($not (LOWER(note) LIKE ".
+                                $pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+                    } else {
+                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				case "star":
-
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (marked = true))");
-						else
-							array_push($query_keywords, "($not (marked = false))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                        if (!$not) array_push($search_words, $k);
+                    }
+                    break;
+                case "star":
+
+                    if ($commandpair[1]) {
+                        if ($commandpair[1] == "true")
+                            array_push($query_keywords, "($not (marked = true))");
+                        else
+                            array_push($query_keywords, "($not (marked = false))");
+                    } else {
+                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				case "pub":
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (published = true))");
-						else
-							array_push($query_keywords, "($not (published = false))");
-
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+                        if (!$not) array_push($search_words, $k);
+                    }
+                    break;
+                case "pub":
+                    if ($commandpair[1]) {
+                        if ($commandpair[1] == "true")
+                            array_push($query_keywords, "($not (published = true))");
+                        else
+                            array_push($query_keywords, "($not (published = false))");
+
+                    } else {
+                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				case "unread":
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (unread = true))");
-						else
-							array_push($query_keywords, "($not (unread = false))");
-
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                        if (!$not) array_push($search_words, $k);
+                    }
+                    break;
+                case "unread":
+                    if ($commandpair[1]) {
+                        if ($commandpair[1] == "true")
+                            array_push($query_keywords, "($not (unread = true))");
+                        else
+                            array_push($query_keywords, "($not (unread = false))");
+
+                    } else {
+                        array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				default:
-					if (strpos($k, "@") === 0) {
-
-						$user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
-						$orig_ts = strtotime(substr($k, 1));
-						$k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
-
-						//$k = date("Y-m-d", strtotime(substr($k, 1)));
-
-						array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
-					} else {
-
-						if (DB_TYPE == "pgsql") {
-							$k = mb_strtolower($k);
-							array_push($search_query_leftover, $not ? "!$k" : $k);
-						} else {
-							array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+                        if (!$not) array_push($search_words, $k);
+                    }
+                    break;
+                default:
+                    if (strpos($k, "@") === 0) {
+
+                        $user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
+                        $orig_ts = strtotime(substr($k, 1));
+                        $k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
+
+                        //$k = date("Y-m-d", strtotime(substr($k, 1)));
+
+                        array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
+                    } else {
+
+                        if (DB_TYPE == "pgsql") {
+                            $k = mb_strtolower($k);
+                            array_push($search_query_leftover, $not ? "!$k" : $k);
+                        } else {
+                            array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						}
+                        }
 
-						if (!$not) array_push($search_words, $k);
-					}
-			}
-		}
+                        if (!$not) array_push($search_words, $k);
+                    }
+            }
+        }
 
-		if (count($search_query_leftover) > 0) {
+        if (count($search_query_leftover) > 0) {
 
-			if (DB_TYPE == "pgsql") {
+            if (DB_TYPE == "pgsql") {
 
-				// if there's no joiners consider this a "simple" search and
-				// concatenate everything with &, otherwise don't try to mess with tsquery syntax
-				if (preg_match("/[&|]/", implode(" " , $search_query_leftover))) {
-					$tsquery = $pdo->quote(implode(" ", $search_query_leftover));
-				} else {
-					$tsquery = $pdo->quote(implode(" & ", $search_query_leftover));
-				}
+                // if there's no joiners consider this a "simple" search and
+                // concatenate everything with &, otherwise don't try to mess with tsquery syntax
+                if (preg_match("/[&|]/", implode(" " , $search_query_leftover))) {
+                    $tsquery = $pdo->quote(implode(" ", $search_query_leftover));
+                } else {
+                    $tsquery = $pdo->quote(implode(" & ", $search_query_leftover));
+                }
 
-				array_push($query_keywords,
-					"(tsvector_combined @@ to_tsquery($search_language, $tsquery))");
-			}
+                array_push($query_keywords,
+                    "(tsvector_combined @@ to_tsquery($search_language, $tsquery))");
+            }
 
-		}
+        }
 
-		$search_query_part = implode("AND", $query_keywords);
+        $search_query_part = implode("AND", $query_keywords);
 
-		return array($search_query_part, $search_words);
-	}
+        return array($search_query_part, $search_words);
+    }
 }
 

classes/db/mysqli.php

Indentation +81 added lines, -81 removed lines

@@ -1,85 +1,85 @@
 <?php
 class Db_Mysqli implements IDb {
-	private $link;
-	private $last_error;
-
-	public function connect($host, $user, $pass, $db, $port) {
-		if ($port)
-			$this->link = mysqli_connect($host, $user, $pass, $db, $port);
-		else
-			$this->link = mysqli_connect($host, $user, $pass, $db);
-
-		if ($this->link) {
-			$this->init();
-
-			return $this->link;
-		} else {
-			print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
-			exit(102);
-		}
-	}
-
-	public function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
-
-		return mysqli_real_escape_string($this->link, $s);
-	}
-
-	public function query($query, $die_on_error = true) {
-		$result = @mysqli_query($this->link, $query);
-		if (!$result) {
-			$this->last_error = @mysqli_error($this->link);
-
-			@mysqli_query($this->link, "ROLLBACK");
-			user_error("query $query failed: " . ($this->link ? $this->last_error : "No connection"),
-				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
-		}
-
-		return $result;
-	}
-
-	public function fetch_assoc($result) {
-		return mysqli_fetch_assoc($result);
-	}
-
-
-	public function num_rows($result) {
-		return mysqli_num_rows($result);
-	}
-
-	public function fetch_result($result, $row, $param) {
-		if (mysqli_data_seek($result, $row)) {
-			$line = mysqli_fetch_assoc($result);
-			return $line[$param];
-		} else {
-			return false;
-		}
-	}
-
-	public function close() {
-		return mysqli_close($this->link);
-	}
-
-	public function affected_rows($result) {
-		return mysqli_affected_rows($this->link);
-	}
-
-	public function last_error() {
-		return mysqli_error($this->link);
-	}
-
-	public function last_query_error() {
-		return $this->last_error;
-	}
-
-	public function init() {
-		$this->query("SET time_zone = '+0:0'");
-
-		if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-			mysqli_set_charset($this->link, MYSQL_CHARSET);
-		}
-
-		return true;
-	}
+    private $link;
+    private $last_error;
+
+    public function connect($host, $user, $pass, $db, $port) {
+        if ($port)
+            $this->link = mysqli_connect($host, $user, $pass, $db, $port);
+        else
+            $this->link = mysqli_connect($host, $user, $pass, $db);
+
+        if ($this->link) {
+            $this->init();
+
+            return $this->link;
+        } else {
+            print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
+            exit(102);
+        }
+    }
+
+    public function escape_string($s, $strip_tags = true) {
+        if ($strip_tags) $s = strip_tags($s);
+
+        return mysqli_real_escape_string($this->link, $s);
+    }
+
+    public function query($query, $die_on_error = true) {
+        $result = @mysqli_query($this->link, $query);
+        if (!$result) {
+            $this->last_error = @mysqli_error($this->link);
+
+            @mysqli_query($this->link, "ROLLBACK");
+            user_error("query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+                $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+        }
+
+        return $result;
+    }
+
+    public function fetch_assoc($result) {
+        return mysqli_fetch_assoc($result);
+    }
+
+
+    public function num_rows($result) {
+        return mysqli_num_rows($result);
+    }
+
+    public function fetch_result($result, $row, $param) {
+        if (mysqli_data_seek($result, $row)) {
+            $line = mysqli_fetch_assoc($result);
+            return $line[$param];
+        } else {
+            return false;
+        }
+    }
+
+    public function close() {
+        return mysqli_close($this->link);
+    }
+
+    public function affected_rows($result) {
+        return mysqli_affected_rows($this->link);
+    }
+
+    public function last_error() {
+        return mysqli_error($this->link);
+    }
+
+    public function last_query_error() {
+        return $this->last_error;
+    }
+
+    public function init() {
+        $this->query("SET time_zone = '+0:0'");
+
+        if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
+            mysqli_set_charset($this->link, MYSQL_CHARSET);
+        }
+
+        return true;
+    }
 
 }

classes/db/pgsql.php

Indentation +65 added lines, -65 removed lines

@@ -1,91 +1,91 @@
 <?php
 class Db_Pgsql implements IDb {
-	private $link;
-	private $last_error;
+    private $link;
+    private $last_error;
 
-	public function connect($host, $user, $pass, $db, $port) {
-		$string = "dbname=$db user=$user";
+    public function connect($host, $user, $pass, $db, $port) {
+        $string = "dbname=$db user=$user";
 
-		if ($pass) {
-			$string .= " password=$pass";
-		}
+        if ($pass) {
+            $string .= " password=$pass";
+        }
 
-		if ($host) {
-			$string .= " host=$host";
-		}
+        if ($host) {
+            $string .= " host=$host";
+        }
 
-		if (is_numeric($port) && $port > 0) {
-			$string = "$string port=" . $port;
-		}
+        if (is_numeric($port) && $port > 0) {
+            $string = "$string port=" . $port;
+        }
 
-		$this->link = pg_connect($string);
+        $this->link = pg_connect($string);
 
-		if (!$this->link) {
-			print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
-			exit(102);
-		}
+        if (!$this->link) {
+            print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
+            exit(102);
+        }
 
-		$this->init();
+        $this->init();
 
-		return $this->link;
-	}
+        return $this->link;
+    }
 
-	public function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
+    public function escape_string($s, $strip_tags = true) {
+        if ($strip_tags) $s = strip_tags($s);
 
-		return pg_escape_string($s);
-	}
+        return pg_escape_string($s);
+    }
 
-	public function query($query, $die_on_error = true) {
-		$result = @pg_query($this->link, $query);
+    public function query($query, $die_on_error = true) {
+        $result = @pg_query($this->link, $query);
 
-		if (!$result) {
-			$this->last_error = @pg_last_error($this->link);
+        if (!$result) {
+            $this->last_error = @pg_last_error($this->link);
 
-			@pg_query($this->link, "ROLLBACK");
-			$query = htmlspecialchars($query); // just in case
-			user_error("query $query failed: " . ($this->link ? $this->last_error : "No connection"),
-				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
-		}
-		return $result;
-	}
+            @pg_query($this->link, "ROLLBACK");
+            $query = htmlspecialchars($query); // just in case
+            user_error("query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+                $die_on_error ? E_USER_ERROR : E_USER_WARNING);
+        }
+        return $result;
+    }
 
-	public function fetch_assoc($result) {
-		return pg_fetch_assoc($result);
-	}
+    public function fetch_assoc($result) {
+        return pg_fetch_assoc($result);
+    }
 
 
-	public function num_rows($result) {
-		return pg_num_rows($result);
-	}
+    public function num_rows($result) {
+        return pg_num_rows($result);
+    }
 
-	public function fetch_result($result, $row, $param) {
-		return pg_fetch_result($result, $row, $param);
-	}
+    public function fetch_result($result, $row, $param) {
+        return pg_fetch_result($result, $row, $param);
+    }
 
-	public function close() {
-		return pg_close($this->link);
-	}
+    public function close() {
+        return pg_close($this->link);
+    }
 
-	public function affected_rows($result) {
-		return pg_affected_rows($result);
-	}
+    public function affected_rows($result) {
+        return pg_affected_rows($result);
+    }
 
-	public function last_error() {
-		return pg_last_error($this->link);
-	}
+    public function last_error() {
+        return pg_last_error($this->link);
+    }
 
-	public function last_query_error() {
-		return $this->last_error;
-	}
+    public function last_query_error() {
+        return $this->last_error;
+    }
 
-	public function init() {
-		$this->query("set client_encoding = 'UTF-8'");
-		pg_set_client_encoding("UNICODE");
-		$this->query("set datestyle = 'ISO, european'");
-		$this->query("set TIME ZONE 0");
-		$this->query("set cpu_tuple_cost = 0.5");
+    public function init() {
+        $this->query("set client_encoding = 'UTF-8'");
+        pg_set_client_encoding("UNICODE");
+        $this->query("set datestyle = 'ISO, european'");
+        $this->query("set TIME ZONE 0");
+        $this->query("set cpu_tuple_cost = 0.5");
 
-		return true;
-	}
+        return true;
+    }
 }

classes/rssutils.php

Indentation +1270 added lines, -1270 removed lines

@@ -1,50 +1,50 @@ 
 <?php
 class RSSUtils {
-	public static function calculate_article_hash($article, $pluginhost) {
-		$tmp = "";
-
-		foreach ($article as $k => $v) {
-			if ($k != "feed" && isset($v)) {
-				$x = strip_tags(is_array($v) ? implode(",", $v) : $v);
-
-				$tmp .= sha1("$k:" . sha1($x));
-			}
-		}
-
-		return sha1(implode(",", $pluginhost->get_plugin_names()) . $tmp);
-	}
-
-	// Strips utf8mb4 characters (i.e. emoji) for mysql
-	public static function strip_utf8mb4($str) {
-		return preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $str);
-	}
-
-	public static function cleanup_feed_browser() {
-		$pdo = Db::pdo();
-		$pdo->query("DELETE FROM ttrss_feedbrowser_cache");
-	}
-
-	public static function update_daemon_common($limit = DAEMON_FEED_LIMIT) {
-		$schema_version = get_schema_version();
-
-		if ($schema_version != SCHEMA_VERSION) {
-			die("Schema version is wrong, please upgrade the database.\n");
-		}
-
-		$pdo = Db::pdo();
-
-		if (!SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) {
-			if (DB_TYPE == "pgsql") {
-				$login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
-			} else {
-				$login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
-			}
-		} else {
-			$login_thresh_qpart = "";
-		}
-
-		if (DB_TYPE == "pgsql") {
-			$update_limit_qpart = "AND ((
+    public static function calculate_article_hash($article, $pluginhost) {
+        $tmp = "";
+
+        foreach ($article as $k => $v) {
+            if ($k != "feed" && isset($v)) {
+                $x = strip_tags(is_array($v) ? implode(",", $v) : $v);
+
+                $tmp .= sha1("$k:" . sha1($x));
+            }
+        }
+
+        return sha1(implode(",", $pluginhost->get_plugin_names()) . $tmp);
+    }
+
+    // Strips utf8mb4 characters (i.e. emoji) for mysql
+    public static function strip_utf8mb4($str) {
+        return preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $str);
+    }
+
+    public static function cleanup_feed_browser() {
+        $pdo = Db::pdo();
+        $pdo->query("DELETE FROM ttrss_feedbrowser_cache");
+    }
+
+    public static function update_daemon_common($limit = DAEMON_FEED_LIMIT) {
+        $schema_version = get_schema_version();
+
+        if ($schema_version != SCHEMA_VERSION) {
+            die("Schema version is wrong, please upgrade the database.\n");
+        }
+
+        $pdo = Db::pdo();
+
+        if (!SINGLE_USER_MODE && DAEMON_UPDATE_LOGIN_LIMIT > 0) {
+            if (DB_TYPE == "pgsql") {
+                $login_thresh_qpart = "AND ttrss_users.last_login >= NOW() - INTERVAL '".DAEMON_UPDATE_LOGIN_LIMIT." days'";
+            } else {
+                $login_thresh_qpart = "AND ttrss_users.last_login >= DATE_SUB(NOW(), INTERVAL ".DAEMON_UPDATE_LOGIN_LIMIT." DAY)";
+            }
+        } else {
+            $login_thresh_qpart = "";
+        }
+
+        if (DB_TYPE == "pgsql") {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_user_prefs.value != '-1'
 					AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
@@ -55,8 +55,8 @@ 
 					AND ttrss_user_prefs.value != '-1')
 				OR (last_updated = '1970-01-01 00:00:00'
 					AND ttrss_user_prefs.value != '-1'))";
-		} else {
-			$update_limit_qpart = "AND ((
+        } else {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_user_prefs.value != '-1'
 					AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
@@ -67,22 +67,22 @@ 
 					AND ttrss_user_prefs.value != '-1')
 				OR (last_updated = '1970-01-01 00:00:00'
 					AND ttrss_user_prefs.value != '-1'))";
-		}
+        }
 
-		// Test if feed is currently being updated by another process.
-		if (DB_TYPE == "pgsql") {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '10 minutes')";
-		} else {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
-		}
+        // Test if feed is currently being updated by another process.
+        if (DB_TYPE == "pgsql") {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < NOW() - INTERVAL '10 minutes')";
+        } else {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 10 MINUTE))";
+        }
 
-		$query_limit = $limit ? sprintf("LIMIT %d", $limit) : "";
+        $query_limit = $limit ? sprintf("LIMIT %d", $limit) : "";
 
-		// Update the least recently updated feeds first
-		$query_order = "ORDER BY last_updated";
-		if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
+        // Update the least recently updated feeds first
+        $query_order = "ORDER BY last_updated";
+        if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
 
-		$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
+        $query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -94,32 +94,32 @@ 
 				$updstart_thresh_qpart
 				$query_order $query_limit";
 
-		$res = $pdo->query($query);
+        $res = $pdo->query($query);
 
-		$feeds_to_update = array();
-		while ($line = $res->fetch()) {
-			array_push($feeds_to_update, $line['feed_url']);
-		}
+        $feeds_to_update = array();
+        while ($line = $res->fetch()) {
+            array_push($feeds_to_update, $line['feed_url']);
+        }
 
-		Debug::log(sprintf("Scheduled %d feeds to update...", count($feeds_to_update)));
+        Debug::log(sprintf("Scheduled %d feeds to update...", count($feeds_to_update)));
 
-		// Update last_update_started before actually starting the batch
-		// in order to minimize collision risk for parallel daemon tasks
-		if (count($feeds_to_update) > 0) {
-			$feeds_qmarks = arr_qmarks($feeds_to_update);
+        // Update last_update_started before actually starting the batch
+        // in order to minimize collision risk for parallel daemon tasks
+        if (count($feeds_to_update) > 0) {
+            $feeds_qmarks = arr_qmarks($feeds_to_update);
 
-			$tmph = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
+            $tmph = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
 				WHERE feed_url IN ($feeds_qmarks)");
-			$tmph->execute($feeds_to_update);
-		}
+            $tmph->execute($feeds_to_update);
+        }
 
-		$nf = 0;
-		$bstarted = microtime(true);
+        $nf = 0;
+        $bstarted = microtime(true);
 
-		$batch_owners = array();
+        $batch_owners = array();
 
-		// since we have the data cached, we can deal with other feeds with the same url
-		$usth = $pdo->prepare("SELECT DISTINCT ttrss_feeds.id,last_updated,ttrss_feeds.owner_uid
+        // since we have the data cached, we can deal with other feeds with the same url
+        $usth = $pdo->prepare("SELECT DISTINCT ttrss_feeds.id,last_updated,ttrss_feeds.owner_uid
 			FROM ttrss_feeds, ttrss_users, ttrss_user_prefs WHERE
 				ttrss_user_prefs.owner_uid = ttrss_feeds.owner_uid AND
 				ttrss_users.id = ttrss_user_prefs.owner_uid AND
@@ -130,715 +130,715 @@ 
 				$login_thresh_qpart
 			ORDER BY ttrss_feeds.id $query_limit");
 
-		foreach ($feeds_to_update as $feed) {
-			Debug::log("Base feed: $feed");
+        foreach ($feeds_to_update as $feed) {
+            Debug::log("Base feed: $feed");
 
-			$usth->execute([$feed]);
-			//update_rss_feed($line["id"], true);
+            $usth->execute([$feed]);
+            //update_rss_feed($line["id"], true);
 
-			if ($tline = $usth->fetch()) {
-				Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
+            if ($tline = $usth->fetch()) {
+                Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
 
-				if (array_search($tline["owner_uid"], $batch_owners) === false)
-					array_push($batch_owners, $tline["owner_uid"]);
+                if (array_search($tline["owner_uid"], $batch_owners) === false)
+                    array_push($batch_owners, $tline["owner_uid"]);
 
-				$fstarted = microtime(true);
+                $fstarted = microtime(true);
 
-				try {
-					RSSUtils::update_rss_feed($tline["id"], true, false);
-				} catch (PDOException $e) {
-					Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
+                try {
+                    RSSUtils::update_rss_feed($tline["id"], true, false);
+                } catch (PDOException $e) {
+                    Logger::get()->log_error(E_USER_NOTICE, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTraceAsString());
 
-					try {
-						$pdo->rollback();
-					} catch (PDOException $e) {
-						// it doesn't matter if there wasn't actually anything to rollback, PDO Exception can be
-						// thrown outside of an active transaction during feed update
-					}
-				}
+                    try {
+                        $pdo->rollback();
+                    } catch (PDOException $e) {
+                        // it doesn't matter if there wasn't actually anything to rollback, PDO Exception can be
+                        // thrown outside of an active transaction during feed update
+                    }
+                }
 
-				Debug::log(sprintf("    %.4f (sec)", microtime(true) - $fstarted));
+                Debug::log(sprintf("    %.4f (sec)", microtime(true) - $fstarted));
 
-				++$nf;
-			}
-		}
+                ++$nf;
+            }
+        }
 
-		if ($nf > 0) {
-			Debug::log(sprintf("Processed %d feeds in %.4f (sec), %.4f (sec/feed avg)", $nf,
-				microtime(true) - $bstarted, (microtime(true) - $bstarted) / $nf));
-		}
+        if ($nf > 0) {
+            Debug::log(sprintf("Processed %d feeds in %.4f (sec), %.4f (sec/feed avg)", $nf,
+                microtime(true) - $bstarted, (microtime(true) - $bstarted) / $nf));
+        }
 
-		foreach ($batch_owners as $owner_uid) {
-			Debug::log("Running housekeeping tasks for user $owner_uid...");
+        foreach ($batch_owners as $owner_uid) {
+            Debug::log("Running housekeeping tasks for user $owner_uid...");
 
-			RSSUtils::housekeeping_user($owner_uid);
-		}
+            RSSUtils::housekeeping_user($owner_uid);
+        }
 
-		// Send feed digests by email if needed.
-		Digest::send_headlines_digests();
+        // Send feed digests by email if needed.
+        Digest::send_headlines_digests();
 
-		return $nf;
-	}
+        return $nf;
+    }
 
-	// this is used when subscribing
-	public static function set_basic_feed_info($feed) {
+    // this is used when subscribing
+    public static function set_basic_feed_info($feed) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT owner_uid,feed_url,auth_pass,auth_login
+        $sth = $pdo->prepare("SELECT owner_uid,feed_url,auth_pass,auth_login
 				FROM ttrss_feeds WHERE id = ?");
-		$sth->execute([$feed]);
+        $sth->execute([$feed]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$owner_uid = $row["owner_uid"];
-			$auth_login = $row["auth_login"];
-			$auth_pass = $row["auth_pass"];
-			$fetch_url = $row["feed_url"];
+            $owner_uid = $row["owner_uid"];
+            $auth_login = $row["auth_login"];
+            $auth_pass = $row["auth_pass"];
+            $fetch_url = $row["feed_url"];
 
-			$pluginhost = new PluginHost();
-			$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+            $pluginhost = new PluginHost();
+            $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-			$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
-			$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
-			$pluginhost->load_data();
+            $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+            $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
+            $pluginhost->load_data();
 
-			$basic_info = array();
-			foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_BASIC_INFO) as $plugin) {
-				$basic_info = $plugin->hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass);
-			}
+            $basic_info = array();
+            foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_BASIC_INFO) as $plugin) {
+                $basic_info = $plugin->hook_feed_basic_info($basic_info, $fetch_url, $owner_uid, $feed, $auth_login, $auth_pass);
+            }
 
-			if (!$basic_info) {
-				$feed_data = fetch_file_contents($fetch_url, false,
-					$auth_login, $auth_pass, false,
-					FEED_FETCH_TIMEOUT,
-					0);
+            if (!$basic_info) {
+                $feed_data = fetch_file_contents($fetch_url, false,
+                    $auth_login, $auth_pass, false,
+                    FEED_FETCH_TIMEOUT,
+                    0);
 
-				$feed_data = trim($feed_data);
+                $feed_data = trim($feed_data);
 
-				$rss = new FeedParser($feed_data);
-				$rss->init();
+                $rss = new FeedParser($feed_data);
+                $rss->init();
 
-				if (!$rss->error()) {
-					$basic_info = array(
-						'title' => mb_substr(clean($rss->get_title()), 0, 199),
-						'site_url' => mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245)
-					);
-				}
-			}
+                if (!$rss->error()) {
+                    $basic_info = array(
+                        'title' => mb_substr(clean($rss->get_title()), 0, 199),
+                        'site_url' => mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245)
+                    );
+                }
+            }
 
-			if ($basic_info && is_array($basic_info)) {
-				$sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
-				$sth->execute([$feed]);
+            if ($basic_info && is_array($basic_info)) {
+                $sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
+                $sth->execute([$feed]);
 
-				if ($row = $sth->fetch()) {
+                if ($row = $sth->fetch()) {
 
-					$registered_title = $row["title"];
-					$orig_site_url = $row["site_url"];
+                    $registered_title = $row["title"];
+                    $orig_site_url = $row["site_url"];
 
-					if ($basic_info['title'] && (!$registered_title || $registered_title == "[Unknown]")) {
+                    if ($basic_info['title'] && (!$registered_title || $registered_title == "[Unknown]")) {
 
-						$sth = $pdo->prepare("UPDATE ttrss_feeds SET
+                        $sth = $pdo->prepare("UPDATE ttrss_feeds SET
 							title = ? WHERE id = ?");
-						$sth->execute([$basic_info['title'], $feed]);
-					}
+                        $sth->execute([$basic_info['title'], $feed]);
+                    }
 
-					if ($basic_info['site_url'] && $orig_site_url != $basic_info['site_url']) {
-						$sth = $pdo->prepare("UPDATE ttrss_feeds SET
+                    if ($basic_info['site_url'] && $orig_site_url != $basic_info['site_url']) {
+                        $sth = $pdo->prepare("UPDATE ttrss_feeds SET
 							site_url = ? WHERE id = ?");
-						$sth->execute([$basic_info['site_url'], $feed]);
-					}
+                        $sth->execute([$basic_info['site_url'], $feed]);
+                    }
 
-				}
-			}
-		}
-	}
+                }
+            }
+        }
+    }
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public static function update_rss_feed($feed, $no_cache = false) {
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public static function update_rss_feed($feed, $no_cache = false) {
 
-		reset_fetch_domain_quota();
+        reset_fetch_domain_quota();
 
-		Debug::log("start", Debug::$LOG_VERBOSE);
+        Debug::log("start", Debug::$LOG_VERBOSE);
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
-		$sth->execute([$feed]);
+        $sth = $pdo->prepare("SELECT title, site_url FROM ttrss_feeds WHERE id = ?");
+        $sth->execute([$feed]);
 
-		if (!$row = $sth->fetch()) {
-			Debug::log("feed $feed not found, skipping.");
-			user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
-			return false;
-		}
+        if (!$row = $sth->fetch()) {
+            Debug::log("feed $feed not found, skipping.");
+            user_error("Attempt to update unknown/invalid feed $feed", E_USER_WARNING);
+            return false;
+        }
 
-		$title = $row["title"];
-		$site_url = $row["site_url"];
+        $title = $row["title"];
+        $site_url = $row["site_url"];
 
-		// feed was batch-subscribed or something, we need to get basic info
-		// this is not optimal currently as it fetches stuff separately TODO: optimize
-		if ($title == "[Unknown]" || !$title || !$site_url) {
-			Debug::log("setting basic feed info for $feed [$title, $site_url]...");
-			RSSUtils::set_basic_feed_info($feed);
-		}
+        // feed was batch-subscribed or something, we need to get basic info
+        // this is not optimal currently as it fetches stuff separately TODO: optimize
+        if ($title == "[Unknown]" || !$title || !$site_url) {
+            Debug::log("setting basic feed info for $feed [$title, $site_url]...");
+            RSSUtils::set_basic_feed_info($feed);
+        }
 
-		$sth = $pdo->prepare("SELECT id,update_interval,auth_login,
+        $sth = $pdo->prepare("SELECT id,update_interval,auth_login,
 			feed_url,auth_pass,cache_images,
 			mark_unread_on_update, owner_uid,
 			auth_pass_encrypted, feed_language,
 			last_modified,
 			".SUBSTRING_FOR_DATE."(last_unconditional, 1, 19) AS last_unconditional
 			FROM ttrss_feeds WHERE id = ?");
-		$sth->execute([$feed]);
+        $sth->execute([$feed]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$owner_uid = $row["owner_uid"];
-			$mark_unread_on_update = $row["mark_unread_on_update"];
+            $owner_uid = $row["owner_uid"];
+            $mark_unread_on_update = $row["mark_unread_on_update"];
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
+            $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_update_started = NOW()
 				WHERE id = ?");
-			$sth->execute([$feed]);
+            $sth->execute([$feed]);
 
-			$auth_login = $row["auth_login"];
-			$auth_pass = $row["auth_pass"];
-			$stored_last_modified = $row["last_modified"];
-			$last_unconditional = $row["last_unconditional"];
-			$cache_images = $row["cache_images"];
-			$fetch_url = $row["feed_url"];
+            $auth_login = $row["auth_login"];
+            $auth_pass = $row["auth_pass"];
+            $stored_last_modified = $row["last_modified"];
+            $last_unconditional = $row["last_unconditional"];
+            $cache_images = $row["cache_images"];
+            $fetch_url = $row["feed_url"];
 
-			$feed_language = mb_strtolower($row["feed_language"]);
+            $feed_language = mb_strtolower($row["feed_language"]);
 
-			if (!$feed_language)
-				$feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
+            if (!$feed_language)
+                $feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
 
-			if (!$feed_language)
-				$feed_language = 'simple';
+            if (!$feed_language)
+                $feed_language = 'simple';
 
-		} else {
-			return false;
-		}
+        } else {
+            return false;
+        }
 
-		$date_feed_processed = date('Y-m-d H:i');
+        $date_feed_processed = date('Y-m-d H:i');
 
-		$cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
+        $cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
 
-		$pluginhost = new PluginHost();
-		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+        $pluginhost = new PluginHost();
+        $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
 
-		$pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
-		$pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
-		$pluginhost->load_data();
+        $pluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+        $pluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
+        $pluginhost->load_data();
 
-		$rss_hash = false;
+        $rss_hash = false;
 
-		$force_refetch = isset($_REQUEST["force_refetch"]);
-		$feed_data = "";
+        $force_refetch = isset($_REQUEST["force_refetch"]);
+        $feed_data = "";
 
-		Debug::log("running HOOK_FETCH_FEED handlers...", Debug::$LOG_VERBOSE);
+        Debug::log("running HOOK_FETCH_FEED handlers...", Debug::$LOG_VERBOSE);
 
-		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
-			$start = microtime(true);
-			$feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
-			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-		}
+        foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
+            Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+            $start = microtime(true);
+            $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
+            Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+        }
 
-		if ($feed_data) {
-			Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
-		} else {
-			Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
-		}
+        if ($feed_data) {
+            Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
+        } else {
+            Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
+        }
 
-		// try cache
-		if (!$feed_data &&
-			file_exists($cache_filename) &&
-			is_readable($cache_filename) &&
-			!$auth_login && !$auth_pass &&
-			filemtime($cache_filename) > time() - 30) {
+        // try cache
+        if (!$feed_data &&
+            file_exists($cache_filename) &&
+            is_readable($cache_filename) &&
+            !$auth_login && !$auth_pass &&
+            filemtime($cache_filename) > time() - 30) {
 
-			Debug::log("using local cache [$cache_filename].", Debug::$LOG_VERBOSE);
+            Debug::log("using local cache [$cache_filename].", Debug::$LOG_VERBOSE);
 
-			@$feed_data = file_get_contents($cache_filename);
+            @$feed_data = file_get_contents($cache_filename);
 
-			if ($feed_data) {
-				$rss_hash = sha1($feed_data);
-			}
+            if ($feed_data) {
+                $rss_hash = sha1($feed_data);
+            }
 
-		} else {
-			Debug::log("local cache will not be used for this feed", Debug::$LOG_VERBOSE);
-		}
+        } else {
+            Debug::log("local cache will not be used for this feed", Debug::$LOG_VERBOSE);
+        }
 
-		global $fetch_last_modified;
+        global $fetch_last_modified;
 
-		// fetch feed from source
-		if (!$feed_data) {
-			Debug::log("last unconditional update request: $last_unconditional", Debug::$LOG_VERBOSE);
+        // fetch feed from source
+        if (!$feed_data) {
+            Debug::log("last unconditional update request: $last_unconditional", Debug::$LOG_VERBOSE);
 
-			if (ini_get("open_basedir") && function_exists("curl_init")) {
-				Debug::log("not using CURL due to open_basedir restrictions", Debug::$LOG_VERBOSE);
-			}
+            if (ini_get("open_basedir") && function_exists("curl_init")) {
+                Debug::log("not using CURL due to open_basedir restrictions", Debug::$LOG_VERBOSE);
+            }
 
-			if (time() - strtotime($last_unconditional) > MAX_CONDITIONAL_INTERVAL) {
-				Debug::log("maximum allowed interval for conditional requests exceeded, forcing refetch", Debug::$LOG_VERBOSE);
+            if (time() - strtotime($last_unconditional) > MAX_CONDITIONAL_INTERVAL) {
+                Debug::log("maximum allowed interval for conditional requests exceeded, forcing refetch", Debug::$LOG_VERBOSE);
 
-				$force_refetch = true;
-			} else {
-				Debug::log("stored last modified for conditional request: $stored_last_modified", Debug::$LOG_VERBOSE);
-			}
+                $force_refetch = true;
+            } else {
+                Debug::log("stored last modified for conditional request: $stored_last_modified", Debug::$LOG_VERBOSE);
+            }
 
-			Debug::log("fetching [$fetch_url] (force_refetch: $force_refetch)...", Debug::$LOG_VERBOSE);
+            Debug::log("fetching [$fetch_url] (force_refetch: $force_refetch)...", Debug::$LOG_VERBOSE);
 
-			$feed_data = fetch_file_contents([
-				"url" => $fetch_url,
-				"login" => $auth_login,
-				"pass" => $auth_pass,
-				"timeout" => $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
-				"last_modified" => $force_refetch ? "" : $stored_last_modified
-			]);
+            $feed_data = fetch_file_contents([
+                "url" => $fetch_url,
+                "login" => $auth_login,
+                "pass" => $auth_pass,
+                "timeout" => $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
+                "last_modified" => $force_refetch ? "" : $stored_last_modified
+            ]);
 
-			$feed_data = trim($feed_data);
+            $feed_data = trim($feed_data);
 
-			Debug::log("fetch done.", Debug::$LOG_VERBOSE);
-			Debug::log("source last modified: " . $fetch_last_modified, Debug::$LOG_VERBOSE);
+            Debug::log("fetch done.", Debug::$LOG_VERBOSE);
+            Debug::log("source last modified: " . $fetch_last_modified, Debug::$LOG_VERBOSE);
 
-			if ($feed_data && $fetch_last_modified != $stored_last_modified) {
-				$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_modified = ? WHERE id = ?");
-				$sth->execute([substr($fetch_last_modified, 0, 245), $feed]);
-			}
+            if ($feed_data && $fetch_last_modified != $stored_last_modified) {
+                $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_modified = ? WHERE id = ?");
+                $sth->execute([substr($fetch_last_modified, 0, 245), $feed]);
+            }
 
-			// cache vanilla feed data for re-use
-			if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
-				$new_rss_hash = sha1($feed_data);
+            // cache vanilla feed data for re-use
+            if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
+                $new_rss_hash = sha1($feed_data);
 
-				if ($new_rss_hash != $rss_hash) {
-					Debug::log("saving $cache_filename", Debug::$LOG_VERBOSE);
-					@file_put_contents($cache_filename, $feed_data);
-				}
-			}
-		}
+                if ($new_rss_hash != $rss_hash) {
+                    Debug::log("saving $cache_filename", Debug::$LOG_VERBOSE);
+                    @file_put_contents($cache_filename, $feed_data);
+                }
+            }
+        }
 
-		if (!$feed_data) {
-			global $fetch_last_error;
-			global $fetch_last_error_code;
+        if (!$feed_data) {
+            global $fetch_last_error;
+            global $fetch_last_error_code;
 
-			Debug::log("unable to fetch: $fetch_last_error [$fetch_last_error_code]", Debug::$LOG_VERBOSE);
+            Debug::log("unable to fetch: $fetch_last_error [$fetch_last_error_code]", Debug::$LOG_VERBOSE);
 
-			// If-Modified-Since
-			if ($fetch_last_error_code != 304) {
-				$error_message = $fetch_last_error;
-			} else {
-				Debug::log("source claims data not modified, nothing to do.", Debug::$LOG_VERBOSE);
-				$error_message = "";
-			}
+            // If-Modified-Since
+            if ($fetch_last_error_code != 304) {
+                $error_message = $fetch_last_error;
+            } else {
+                Debug::log("source claims data not modified, nothing to do.", Debug::$LOG_VERBOSE);
+                $error_message = "";
+            }
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
+            $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
 					last_updated = NOW() WHERE id = ?");
-			$sth->execute([$error_message, $feed]);
+            $sth->execute([$error_message, $feed]);
 
-			return;
-		}
+            return;
+        }
 
-		Debug::log("running HOOK_FEED_FETCHED handlers...", Debug::$LOG_VERBOSE);
-		$feed_data_checksum = md5($feed_data);
+        Debug::log("running HOOK_FEED_FETCHED handlers...", Debug::$LOG_VERBOSE);
+        $feed_data_checksum = md5($feed_data);
 
-		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
-			$start = microtime(true);
-			$feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
-			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-		}
+        foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
+            Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+            $start = microtime(true);
+            $feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
+            Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+        }
 
-		if (md5($feed_data) != $feed_data_checksum) {
-			Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
-		} else {
-			Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
-		}
+        if (md5($feed_data) != $feed_data_checksum) {
+            Debug::log("feed data has been modified by a plugin.", Debug::$LOG_VERBOSE);
+        } else {
+            Debug::log("feed data has not been modified by a plugin.", Debug::$LOG_VERBOSE);
+        }
 
-		$rss = new FeedParser($feed_data);
-		$rss->init();
+        $rss = new FeedParser($feed_data);
+        $rss->init();
 
-		if (!$rss->error()) {
+        if (!$rss->error()) {
 
-			Debug::log("running HOOK_FEED_PARSED handlers...", Debug::$LOG_VERBOSE);
+            Debug::log("running HOOK_FEED_PARSED handlers...", Debug::$LOG_VERBOSE);
 
-			// We use local pluginhost here because we need to load different per-user feed plugins
+            // We use local pluginhost here because we need to load different per-user feed plugins
 
-			foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_PARSED) as $plugin) {
-				Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
-				$start = microtime(true);
-				$plugin->hook_feed_parsed($rss);
-				Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-			}
+            foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_PARSED) as $plugin) {
+                Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+                $start = microtime(true);
+                $plugin->hook_feed_parsed($rss);
+                Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+            }
 
-			Debug::log("language: $feed_language", Debug::$LOG_VERBOSE);
-			Debug::log("processing feed data...", Debug::$LOG_VERBOSE);
+            Debug::log("language: $feed_language", Debug::$LOG_VERBOSE);
+            Debug::log("processing feed data...", Debug::$LOG_VERBOSE);
 
-			if (DB_TYPE == "pgsql") {
-				$favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'";
-			} else {
-				$favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
-			}
+            if (DB_TYPE == "pgsql") {
+                $favicon_interval_qpart = "favicon_last_checked < NOW() - INTERVAL '12 hour'";
+            } else {
+                $favicon_interval_qpart = "favicon_last_checked < DATE_SUB(NOW(), INTERVAL 12 HOUR)";
+            }
 
-			$sth = $pdo->prepare("SELECT owner_uid,favicon_avg_color,
+            $sth = $pdo->prepare("SELECT owner_uid,favicon_avg_color,
 				(favicon_last_checked IS NULL OR $favicon_interval_qpart) AS
 						favicon_needs_check
 				FROM ttrss_feeds WHERE id = ?");
-			$sth->execute([$feed]);
+            $sth->execute([$feed]);
 
-			if ($row = $sth->fetch()) {
-				$favicon_needs_check = $row["favicon_needs_check"];
-				$favicon_avg_color = $row["favicon_avg_color"];
-				$owner_uid = $row["owner_uid"];
-			} else {
-				return false;
-			}
+            if ($row = $sth->fetch()) {
+                $favicon_needs_check = $row["favicon_needs_check"];
+                $favicon_avg_color = $row["favicon_avg_color"];
+                $owner_uid = $row["owner_uid"];
+            } else {
+                return false;
+            }
 
-			$site_url = mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245);
+            $site_url = mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245);
 
-			Debug::log("site_url: $site_url", Debug::$LOG_VERBOSE);
-			Debug::log("feed_title: " . clean($rss->get_title()), Debug::$LOG_VERBOSE);
+            Debug::log("site_url: $site_url", Debug::$LOG_VERBOSE);
+            Debug::log("feed_title: " . clean($rss->get_title()), Debug::$LOG_VERBOSE);
 
-			if ($favicon_needs_check || $force_refetch) {
+            if ($favicon_needs_check || $force_refetch) {
 
-				/* terrible hack: if we crash on floicon shit here, we won't check
+                /* terrible hack: if we crash on floicon shit here, we won't check
 				 * the icon avgcolor again (unless the icon got updated) */
 
-				$favicon_file = ICONS_DIR . "/$feed.ico";
-				$favicon_modified = @filemtime($favicon_file);
+                $favicon_file = ICONS_DIR . "/$feed.ico";
+                $favicon_modified = @filemtime($favicon_file);
 
-				Debug::log("checking favicon...", Debug::$LOG_VERBOSE);
+                Debug::log("checking favicon...", Debug::$LOG_VERBOSE);
 
-				RSSUtils::check_feed_favicon($site_url, $feed);
-				$favicon_modified_new = @filemtime($favicon_file);
+                RSSUtils::check_feed_favicon($site_url, $feed);
+                $favicon_modified_new = @filemtime($favicon_file);
 
-				if ($favicon_modified_new > $favicon_modified)
-					$favicon_avg_color = '';
+                if ($favicon_modified_new > $favicon_modified)
+                    $favicon_avg_color = '';
 
-				$favicon_colorstring = "";
-				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
-					require_once "colors.php";
+                $favicon_colorstring = "";
+                if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
+                    require_once "colors.php";
 
-					$sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
+                    $sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = 'fail' WHERE
 							id = ?");
-					$sth->execute([$feed]);
+                    $sth->execute([$feed]);
 
-					$favicon_color = calculate_avg_color($favicon_file);
+                    $favicon_color = calculate_avg_color($favicon_file);
 
-					$favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color);
+                    $favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color);
 
-				} else if ($favicon_avg_color == 'fail') {
-					Debug::log("floicon failed on this file, not trying to recalculate avg color", Debug::$LOG_VERBOSE);
-				}
+                } else if ($favicon_avg_color == 'fail') {
+                    Debug::log("floicon failed on this file, not trying to recalculate avg color", Debug::$LOG_VERBOSE);
+                }
 
-				$sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_last_checked = NOW()
+                $sth = $pdo->prepare("UPDATE ttrss_feeds SET favicon_last_checked = NOW()
 					$favicon_colorstring WHERE id = ?");
-				$sth->execute([$feed]);
-			}
+                $sth->execute([$feed]);
+            }
 
-			Debug::log("loading filters & labels...", Debug::$LOG_VERBOSE);
+            Debug::log("loading filters & labels...", Debug::$LOG_VERBOSE);
 
-			$filters = RSSUtils::load_filters($feed, $owner_uid);
+            $filters = RSSUtils::load_filters($feed, $owner_uid);
 
-			if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-				print_r($filters);
-			}
+            if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                print_r($filters);
+            }
 
-			Debug::log("" . count($filters) . " filters loaded.", Debug::$LOG_VERBOSE);
+            Debug::log("" . count($filters) . " filters loaded.", Debug::$LOG_VERBOSE);
 
-			$items = $rss->get_items();
+            $items = $rss->get_items();
 
-			if (!is_array($items)) {
-				Debug::log("no articles found.", Debug::$LOG_VERBOSE);
+            if (!is_array($items)) {
+                Debug::log("no articles found.", Debug::$LOG_VERBOSE);
 
-				$sth = $pdo->prepare("UPDATE ttrss_feeds
+                $sth = $pdo->prepare("UPDATE ttrss_feeds
 					SET last_updated = NOW(), last_unconditional = NOW(), last_error = '' WHERE id = ?");
-				$sth->execute([$feed]);
+                $sth->execute([$feed]);
 
-				return true; // no articles
-			}
+                return true; // no articles
+            }
 
-			Debug::log("processing articles...", Debug::$LOG_VERBOSE);
+            Debug::log("processing articles...", Debug::$LOG_VERBOSE);
 
-			$tstart = time();
+            $tstart = time();
 
-			foreach ($items as $item) {
-				$pdo->beginTransaction();
+            foreach ($items as $item) {
+                $pdo->beginTransaction();
 
-				if (Debug::get_loglevel() >= 3) {
-					print_r($item);
-				}
+                if (Debug::get_loglevel() >= 3) {
+                    print_r($item);
+                }
 
-				if (ini_get("max_execution_time") > 0 && time() - $tstart >= ini_get("max_execution_time") * 0.7) {
-					Debug::log("looks like there's too many articles to process at once, breaking out", Debug::$LOG_VERBOSE);
-					$pdo->commit();
-					break;
-				}
+                if (ini_get("max_execution_time") > 0 && time() - $tstart >= ini_get("max_execution_time") * 0.7) {
+                    Debug::log("looks like there's too many articles to process at once, breaking out", Debug::$LOG_VERBOSE);
+                    $pdo->commit();
+                    break;
+                }
 
-				$entry_guid = strip_tags($item->get_id());
-				if (!$entry_guid) $entry_guid = strip_tags($item->get_link());
-				if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
+                $entry_guid = strip_tags($item->get_id());
+                if (!$entry_guid) $entry_guid = strip_tags($item->get_link());
+                if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
 
-				if (!$entry_guid) {
-					$pdo->commit();
-					continue;
-				}
+                if (!$entry_guid) {
+                    $pdo->commit();
+                    continue;
+                }
 
-				$entry_guid = "$owner_uid,$entry_guid";
+                $entry_guid = "$owner_uid,$entry_guid";
 
-				$entry_guid_hashed = 'SHA1:' . sha1($entry_guid);
+                $entry_guid_hashed = 'SHA1:' . sha1($entry_guid);
 
-				Debug::log("guid $entry_guid / $entry_guid_hashed", Debug::$LOG_VERBOSE);
+                Debug::log("guid $entry_guid / $entry_guid_hashed", Debug::$LOG_VERBOSE);
 
-				$entry_timestamp = (int)$item->get_date();
+                $entry_timestamp = (int)$item->get_date();
 
-				Debug::log("orig date: " . $item->get_date(), Debug::$LOG_VERBOSE);
+                Debug::log("orig date: " . $item->get_date(), Debug::$LOG_VERBOSE);
 
-				$entry_title = strip_tags($item->get_title());
+                $entry_title = strip_tags($item->get_title());
 
-				$entry_link = rewrite_relative_url($site_url, clean($item->get_link()));
+                $entry_link = rewrite_relative_url($site_url, clean($item->get_link()));
 
-				$entry_language = mb_substr(trim($item->get_language()), 0, 2);
+                $entry_language = mb_substr(trim($item->get_language()), 0, 2);
 
-				Debug::log("title $entry_title", Debug::$LOG_VERBOSE);
-				Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
-				Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
+                Debug::log("title $entry_title", Debug::$LOG_VERBOSE);
+                Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
+                Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
 
-				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
+                if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
 
-				$entry_content = $item->get_content();
-				if (!$entry_content) $entry_content = $item->get_description();
+                $entry_content = $item->get_content();
+                if (!$entry_content) $entry_content = $item->get_description();
 
-				if (Debug::get_loglevel() >= 3) {
-					print "content: ";
-					print htmlspecialchars($entry_content);
-					print "\n";
-				}
+                if (Debug::get_loglevel() >= 3) {
+                    print "content: ";
+                    print htmlspecialchars($entry_content);
+                    print "\n";
+                }
 
-				$entry_comments = mb_substr(strip_tags($item->get_comments_url()), 0, 245);
-				$num_comments = (int) $item->get_comments_count();
+                $entry_comments = mb_substr(strip_tags($item->get_comments_url()), 0, 245);
+                $num_comments = (int) $item->get_comments_count();
 
-				$entry_author = strip_tags($item->get_author());
-				$entry_guid = mb_substr($entry_guid, 0, 245);
+                $entry_author = strip_tags($item->get_author());
+                $entry_guid = mb_substr($entry_guid, 0, 245);
 
-				Debug::log("author $entry_author", Debug::$LOG_VERBOSE);
-				Debug::log("looking for tags...", Debug::$LOG_VERBOSE);
+                Debug::log("author $entry_author", Debug::$LOG_VERBOSE);
+                Debug::log("looking for tags...", Debug::$LOG_VERBOSE);
 
-				$entry_tags = $item->get_categories();
-				Debug::log("tags found: " . join(", ", $entry_tags), Debug::$LOG_VERBOSE);
+                $entry_tags = $item->get_categories();
+                Debug::log("tags found: " . join(", ", $entry_tags), Debug::$LOG_VERBOSE);
 
-				Debug::log("done collecting data.", Debug::$LOG_VERBOSE);
+                Debug::log("done collecting data.", Debug::$LOG_VERBOSE);
 
-				$sth = $pdo->prepare("SELECT id, content_hash, lang FROM ttrss_entries
+                $sth = $pdo->prepare("SELECT id, content_hash, lang FROM ttrss_entries
 					WHERE guid = ? OR guid = ?");
-				$sth->execute([$entry_guid, $entry_guid_hashed]);
-
-				if ($row = $sth->fetch()) {
-					$base_entry_id = $row["id"];
-					$entry_stored_hash = $row["content_hash"];
-					$article_labels = Article::get_article_labels($base_entry_id, $owner_uid);
-
-					$existing_tags = Article::get_article_tags($base_entry_id, $owner_uid);
-					$entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
-				} else {
-					$base_entry_id = false;
-					$entry_stored_hash = "";
-					$article_labels = array();
-				}
-
-				$article = array("owner_uid" => $owner_uid, // read only
-					"guid" => $entry_guid, // read only
-					"guid_hashed" => $entry_guid_hashed, // read only
-					"title" => $entry_title,
-					"content" => $entry_content,
-					"link" => $entry_link,
-					"labels" => $article_labels, // current limitation: can add labels to article, can't remove them
-					"tags" => $entry_tags,
-					"author" => $entry_author,
-					"force_catchup" => false, // ugly hack for the time being
-					"score_modifier" => 0, // no previous value, plugin should recalculate score modifier based on content if needed
-					"language" => $entry_language,
-					"timestamp" => $entry_timestamp,
-					"num_comments" => $num_comments,
-					"feed" => array("id" => $feed,
-						"fetch_url" => $fetch_url,
-						"site_url" => $site_url,
-						"cache_images" => $cache_images)
-				);
-
-				$entry_plugin_data = "";
-				$entry_current_hash = RSSUtils::calculate_article_hash($article, $pluginhost);
-
-				Debug::log("article hash: $entry_current_hash [stored=$entry_stored_hash]", Debug::$LOG_VERBOSE);
-
-				if ($entry_current_hash == $entry_stored_hash && !isset($_REQUEST["force_rehash"])) {
-					Debug::log("stored article seems up to date [IID: $base_entry_id], updating timestamp only", Debug::$LOG_VERBOSE);
-
-					// we keep encountering the entry in feeds, so we need to
-					// update date_updated column so that we don't get horrible
-					// dupes when the entry gets purged and reinserted again e.g.
-					// in the case of SLOW SLOW OMG SLOW updating feeds
-
-					$sth = $pdo->prepare("UPDATE ttrss_entries SET date_updated = NOW()
+                $sth->execute([$entry_guid, $entry_guid_hashed]);
+
+                if ($row = $sth->fetch()) {
+                    $base_entry_id = $row["id"];
+                    $entry_stored_hash = $row["content_hash"];
+                    $article_labels = Article::get_article_labels($base_entry_id, $owner_uid);
+
+                    $existing_tags = Article::get_article_tags($base_entry_id, $owner_uid);
+                    $entry_tags = array_unique(array_merge($entry_tags, $existing_tags));
+                } else {
+                    $base_entry_id = false;
+                    $entry_stored_hash = "";
+                    $article_labels = array();
+                }
+
+                $article = array("owner_uid" => $owner_uid, // read only
+                    "guid" => $entry_guid, // read only
+                    "guid_hashed" => $entry_guid_hashed, // read only
+                    "title" => $entry_title,
+                    "content" => $entry_content,
+                    "link" => $entry_link,
+                    "labels" => $article_labels, // current limitation: can add labels to article, can't remove them
+                    "tags" => $entry_tags,
+                    "author" => $entry_author,
+                    "force_catchup" => false, // ugly hack for the time being
+                    "score_modifier" => 0, // no previous value, plugin should recalculate score modifier based on content if needed
+                    "language" => $entry_language,
+                    "timestamp" => $entry_timestamp,
+                    "num_comments" => $num_comments,
+                    "feed" => array("id" => $feed,
+                        "fetch_url" => $fetch_url,
+                        "site_url" => $site_url,
+                        "cache_images" => $cache_images)
+                );
+
+                $entry_plugin_data = "";
+                $entry_current_hash = RSSUtils::calculate_article_hash($article, $pluginhost);
+
+                Debug::log("article hash: $entry_current_hash [stored=$entry_stored_hash]", Debug::$LOG_VERBOSE);
+
+                if ($entry_current_hash == $entry_stored_hash && !isset($_REQUEST["force_rehash"])) {
+                    Debug::log("stored article seems up to date [IID: $base_entry_id], updating timestamp only", Debug::$LOG_VERBOSE);
+
+                    // we keep encountering the entry in feeds, so we need to
+                    // update date_updated column so that we don't get horrible
+                    // dupes when the entry gets purged and reinserted again e.g.
+                    // in the case of SLOW SLOW OMG SLOW updating feeds
+
+                    $sth = $pdo->prepare("UPDATE ttrss_entries SET date_updated = NOW()
 						WHERE id = ?");
-					$sth->execute([$base_entry_id]);
+                    $sth->execute([$base_entry_id]);
 
-					$pdo->commit();
-					continue;
-				}
+                    $pdo->commit();
+                    continue;
+                }
 
-				Debug::log("hash differs, applying plugin filters:", Debug::$LOG_VERBOSE);
+                Debug::log("hash differs, applying plugin filters:", Debug::$LOG_VERBOSE);
 
-				foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
-					Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+                foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
+                    Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
 
-					$start = microtime(true);
-					$article = $plugin->hook_article_filter($article);
+                    $start = microtime(true);
+                    $article = $plugin->hook_article_filter($article);
 
-					Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+                    Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
 
-					$entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
-				}
+                    $entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
+                }
 
                 if (Debug::get_loglevel() >= 3) {
-					print "processed content: ";
-					print htmlspecialchars($article["content"]);
-					print "\n";
-				}
+                    print "processed content: ";
+                    print htmlspecialchars($article["content"]);
+                    print "\n";
+                }
 
-				Debug::log("plugin data: $entry_plugin_data", Debug::$LOG_VERBOSE);
+                Debug::log("plugin data: $entry_plugin_data", Debug::$LOG_VERBOSE);
 
-				// Workaround: 4-byte unicode requires utf8mb4 in MySQL. See https://tt-rss.org/forum/viewtopic.php?f=1&t=3377&p=20077#p20077
-				if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
-					foreach ($article as $k => $v) {
-						// i guess we'll have to take the risk of 4byte unicode labels & tags here
-						if (is_string($article[$k])) {
-							$article[$k] = RSSUtils::strip_utf8mb4($v);
-						}
-					}
-				}
+                // Workaround: 4-byte unicode requires utf8mb4 in MySQL. See https://tt-rss.org/forum/viewtopic.php?f=1&t=3377&p=20077#p20077
+                if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+                    foreach ($article as $k => $v) {
+                        // i guess we'll have to take the risk of 4byte unicode labels & tags here
+                        if (is_string($article[$k])) {
+                            $article[$k] = RSSUtils::strip_utf8mb4($v);
+                        }
+                    }
+                }
 
-				/* Collect article tags here so we could filter by them: */
+                /* Collect article tags here so we could filter by them: */
 
-				$matched_rules = [];
-				$matched_filters = [];
+                $matched_rules = [];
+                $matched_filters = [];
 
-				$article_filters = RSSUtils::get_article_filters($filters, $article["title"],
-					$article["content"], $article["link"], $article["author"],
-					$article["tags"], $matched_rules, $matched_filters);
+                $article_filters = RSSUtils::get_article_filters($filters, $article["title"],
+                    $article["content"], $article["link"], $article["author"],
+                    $article["tags"], $matched_rules, $matched_filters);
 
-				// $article_filters should be renamed to something like $filter_actions; actual filter objects are in $matched_filters
-				foreach ($pluginhost->get_hooks(PluginHost::HOOK_FILTER_TRIGGERED) as $plugin) {
-					$plugin->hook_filter_triggered($feed, $owner_uid, $article, $matched_filters, $matched_rules, $article_filters);
-				}
+                // $article_filters should be renamed to something like $filter_actions; actual filter objects are in $matched_filters
+                foreach ($pluginhost->get_hooks(PluginHost::HOOK_FILTER_TRIGGERED) as $plugin) {
+                    $plugin->hook_filter_triggered($feed, $owner_uid, $article, $matched_filters, $matched_rules, $article_filters);
+                }
 
-				$matched_filter_ids = array_map(function($f) { return $f['id']; }, $matched_filters);
+                $matched_filter_ids = array_map(function($f) { return $f['id']; }, $matched_filters);
 
-				if (count($matched_filter_ids) > 0) {
-					$filter_ids_qmarks = arr_qmarks($matched_filter_ids);
+                if (count($matched_filter_ids) > 0) {
+                    $filter_ids_qmarks = arr_qmarks($matched_filter_ids);
 
-					$fsth = $pdo->prepare("UPDATE ttrss_filters2 SET last_triggered = NOW() WHERE
+                    $fsth = $pdo->prepare("UPDATE ttrss_filters2 SET last_triggered = NOW() WHERE
 							   id IN ($filter_ids_qmarks) AND owner_uid = ?");
 
-					$fsth->execute(array_merge($matched_filter_ids, [$owner_uid]));
-				}
+                    $fsth->execute(array_merge($matched_filter_ids, [$owner_uid]));
+                }
 
-				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-					Debug::log("matched filters: ", Debug::$LOG_VERBOSE);
+                if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                    Debug::log("matched filters: ", Debug::$LOG_VERBOSE);
 
-					if (count($matched_filters != 0)) {
-						print_r($matched_filters);
-					}
+                    if (count($matched_filters != 0)) {
+                        print_r($matched_filters);
+                    }
 
-					Debug::log("matched filter rules: ", Debug::$LOG_VERBOSE);
+                    Debug::log("matched filter rules: ", Debug::$LOG_VERBOSE);
 
-					if (count($matched_rules) != 0) {
-						print_r($matched_rules);
-					}
+                    if (count($matched_rules) != 0) {
+                        print_r($matched_rules);
+                    }
 
-					Debug::log("filter actions: ", Debug::$LOG_VERBOSE);
+                    Debug::log("filter actions: ", Debug::$LOG_VERBOSE);
 
-					if (count($article_filters) != 0) {
-						print_r($article_filters);
-					}
-				}
+                    if (count($article_filters) != 0) {
+                        print_r($article_filters);
+                    }
+                }
 
-				$plugin_filter_names = RSSUtils::find_article_filters($article_filters, "plugin");
-				$plugin_filter_actions = $pluginhost->get_filter_actions();
+                $plugin_filter_names = RSSUtils::find_article_filters($article_filters, "plugin");
+                $plugin_filter_actions = $pluginhost->get_filter_actions();
 
-				if (count($plugin_filter_names) > 0) {
-					Debug::log("applying plugin filter actions...", Debug::$LOG_VERBOSE);
+                if (count($plugin_filter_names) > 0) {
+                    Debug::log("applying plugin filter actions...", Debug::$LOG_VERBOSE);
 
-					foreach ($plugin_filter_names as $pfn) {
-						list($pfclass,$pfaction) = explode(":", $pfn["param"]);
+                    foreach ($plugin_filter_names as $pfn) {
+                        list($pfclass,$pfaction) = explode(":", $pfn["param"]);
 
-						if (isset($plugin_filter_actions[$pfclass])) {
-							$plugin = $pluginhost->get_plugin($pfclass);
+                        if (isset($plugin_filter_actions[$pfclass])) {
+                            $plugin = $pluginhost->get_plugin($pfclass);
 
-							Debug::log("... $pfclass: $pfaction", Debug::$LOG_VERBOSE);
+                            Debug::log("... $pfclass: $pfaction", Debug::$LOG_VERBOSE);
 
-							if ($plugin) {
-								$start = microtime(true);
-								$article = $plugin->hook_article_filter_action($article, $pfaction);
+                            if ($plugin) {
+                                $start = microtime(true);
+                                $article = $plugin->hook_article_filter_action($article, $pfaction);
 
-								Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
-							} else {
-								Debug::log("??? $pfclass: plugin object not found.", Debug::$LOG_VERBOSE);
-							}
-						} else {
-							Debug::log("??? $pfclass: filter plugin not registered.", Debug::$LOG_VERBOSE);
-						}
-					}
-				}
+                                Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
+                            } else {
+                                Debug::log("??? $pfclass: plugin object not found.", Debug::$LOG_VERBOSE);
+                            }
+                        } else {
+                            Debug::log("??? $pfclass: filter plugin not registered.", Debug::$LOG_VERBOSE);
+                        }
+                    }
+                }
 
-				$entry_tags = $article["tags"];
-				$entry_title = strip_tags($article["title"]);
-				$entry_author = mb_substr(strip_tags($article["author"]), 0, 245);
-				$entry_link = strip_tags($article["link"]);
-				$entry_content = $article["content"]; // escaped below
-				$entry_force_catchup = $article["force_catchup"];
-				$article_labels = $article["labels"];
-				$entry_score_modifier = (int) $article["score_modifier"];
-				$entry_language = $article["language"];
-				$entry_timestamp = $article["timestamp"];
-				$num_comments = $article["num_comments"];
+                $entry_tags = $article["tags"];
+                $entry_title = strip_tags($article["title"]);
+                $entry_author = mb_substr(strip_tags($article["author"]), 0, 245);
+                $entry_link = strip_tags($article["link"]);
+                $entry_content = $article["content"]; // escaped below
+                $entry_force_catchup = $article["force_catchup"];
+                $article_labels = $article["labels"];
+                $entry_score_modifier = (int) $article["score_modifier"];
+                $entry_language = $article["language"];
+                $entry_timestamp = $article["timestamp"];
+                $num_comments = $article["num_comments"];
 
-				if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
-					$entry_timestamp = time();
-				}
+                if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
+                    $entry_timestamp = time();
+                }
 
-				$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
+                $entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
 
-				Debug::log("date $entry_timestamp [$entry_timestamp_fmt]", Debug::$LOG_VERBOSE);
-				Debug::log("num_comments: $num_comments", Debug::$LOG_VERBOSE);
+                Debug::log("date $entry_timestamp [$entry_timestamp_fmt]", Debug::$LOG_VERBOSE);
+                Debug::log("num_comments: $num_comments", Debug::$LOG_VERBOSE);
 
-				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-					Debug::log("article labels:", Debug::$LOG_VERBOSE);
+                if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                    Debug::log("article labels:", Debug::$LOG_VERBOSE);
 
-					if (count($article_labels) != 0) {
-						print_r($article_labels);
-					}
-				}
+                    if (count($article_labels) != 0) {
+                        print_r($article_labels);
+                    }
+                }
 
-				Debug::log("force catchup: $entry_force_catchup", Debug::$LOG_VERBOSE);
+                Debug::log("force catchup: $entry_force_catchup", Debug::$LOG_VERBOSE);
 
-				if ($cache_images)
-					RSSUtils::cache_media($entry_content, $site_url);
+                if ($cache_images)
+                    RSSUtils::cache_media($entry_content, $site_url);
 
-				$csth = $pdo->prepare("SELECT id FROM ttrss_entries
+                $csth = $pdo->prepare("SELECT id FROM ttrss_entries
 					WHERE guid = ? OR guid = ?");
-				$csth->execute([$entry_guid, $entry_guid_hashed]);
+                $csth->execute([$entry_guid, $entry_guid_hashed]);
 
-				if (!$row = $csth->fetch()) {
+                if (!$row = $csth->fetch()) {
 
-					Debug::log("base guid [$entry_guid or $entry_guid_hashed] not found, creating...", Debug::$LOG_VERBOSE);
+                    Debug::log("base guid [$entry_guid or $entry_guid_hashed] not found, creating...", Debug::$LOG_VERBOSE);
 
-					// base post entry does not exist, create it
+                    // base post entry does not exist, create it
 
-					$usth = $pdo->prepare(
-						"INSERT INTO ttrss_entries
+                    $usth = $pdo->prepare(
+                        "INSERT INTO ttrss_entries
 							(title,
 							guid,
 							link,
@@ -859,110 +859,110 @@ 
 							NOW(),
 							?, ?, ?, ?,	?, ?)");
 
-						$usth->execute([$entry_title,
-							$entry_guid_hashed,
-							$entry_link,
-							$entry_timestamp_fmt,
-							"$entry_content",
-							$entry_current_hash,
-							$date_feed_processed,
-							$entry_comments,
-							(int)$num_comments,
-							$entry_plugin_data,
-							"$entry_language",
-							"$entry_author"]);
+                        $usth->execute([$entry_title,
+                            $entry_guid_hashed,
+                            $entry_link,
+                            $entry_timestamp_fmt,
+                            "$entry_content",
+                            $entry_current_hash,
+                            $date_feed_processed,
+                            $entry_comments,
+                            (int)$num_comments,
+                            $entry_plugin_data,
+                            "$entry_language",
+                            "$entry_author"]);
 
-				}
+                }
 
-				$csth->execute([$entry_guid, $entry_guid_hashed]);
+                $csth->execute([$entry_guid, $entry_guid_hashed]);
 
-				$entry_ref_id = 0;
-				$entry_int_id = 0;
+                $entry_ref_id = 0;
+                $entry_int_id = 0;
 
-				if ($row = $csth->fetch()) {
+                if ($row = $csth->fetch()) {
 
-					Debug::log("base guid found, checking for user record", Debug::$LOG_VERBOSE);
+                    Debug::log("base guid found, checking for user record", Debug::$LOG_VERBOSE);
 
-					$ref_id = $row['id'];
-					$entry_ref_id = $ref_id;
+                    $ref_id = $row['id'];
+                    $entry_ref_id = $ref_id;
 
-					if (RSSUtils::find_article_filter($article_filters, "filter")) {
-						Debug::log("article is filtered out, nothing to do.", Debug::$LOG_VERBOSE);
-						$pdo->commit();
-						continue;
-					}
+                    if (RSSUtils::find_article_filter($article_filters, "filter")) {
+                        Debug::log("article is filtered out, nothing to do.", Debug::$LOG_VERBOSE);
+                        $pdo->commit();
+                        continue;
+                    }
 
-					$score = RSSUtils::calculate_article_score($article_filters) + $entry_score_modifier;
+                    $score = RSSUtils::calculate_article_score($article_filters) + $entry_score_modifier;
 
-					Debug::log("initial score: $score [including plugin modifier: $entry_score_modifier]", Debug::$LOG_VERBOSE);
+                    Debug::log("initial score: $score [including plugin modifier: $entry_score_modifier]", Debug::$LOG_VERBOSE);
 
-					// check for user post link to main table
+                    // check for user post link to main table
 
-					$sth = $pdo->prepare("SELECT ref_id, int_id FROM ttrss_user_entries WHERE
+                    $sth = $pdo->prepare("SELECT ref_id, int_id FROM ttrss_user_entries WHERE
 							ref_id = ? AND owner_uid = ?");
-					$sth->execute([$ref_id, $owner_uid]);
-
-					// okay it doesn't exist - create user entry
-					if ($row = $sth->fetch()) {
-						$entry_ref_id = $row["ref_id"];
-						$entry_int_id = $row["int_id"];
-
-						Debug::log("user record FOUND: RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
-					} else {
-
-						Debug::log("user record not found, creating...", Debug::$LOG_VERBOSE);
-
-						if ($score >= -500 && !RSSUtils::find_article_filter($article_filters, 'catchup') && !$entry_force_catchup) {
-							$unread = 1;
-							$last_read_qpart = null;
-						} else {
-							$unread = 0;
-							$last_read_qpart = date("Y-m-d H:i"); // we can't use NOW() here because it gets quoted
-						}
-
-						if (RSSUtils::find_article_filter($article_filters, 'mark') || $score > 1000) {
-							$marked = 1;
-						} else {
-							$marked = 0;
-						}
-
-						if (RSSUtils::find_article_filter($article_filters, 'publish')) {
-							$published = 1;
-						} else {
-							$published = 0;
-						}
-
-						$last_marked = ($marked == 1) ? 'NOW()' : 'NULL';
-						$last_published = ($published == 1) ? 'NOW()' : 'NULL';
-
-						$sth = $pdo->prepare(
-							"INSERT INTO ttrss_user_entries
+                    $sth->execute([$ref_id, $owner_uid]);
+
+                    // okay it doesn't exist - create user entry
+                    if ($row = $sth->fetch()) {
+                        $entry_ref_id = $row["ref_id"];
+                        $entry_int_id = $row["int_id"];
+
+                        Debug::log("user record FOUND: RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
+                    } else {
+
+                        Debug::log("user record not found, creating...", Debug::$LOG_VERBOSE);
+
+                        if ($score >= -500 && !RSSUtils::find_article_filter($article_filters, 'catchup') && !$entry_force_catchup) {
+                            $unread = 1;
+                            $last_read_qpart = null;
+                        } else {
+                            $unread = 0;
+                            $last_read_qpart = date("Y-m-d H:i"); // we can't use NOW() here because it gets quoted
+                        }
+
+                        if (RSSUtils::find_article_filter($article_filters, 'mark') || $score > 1000) {
+                            $marked = 1;
+                        } else {
+                            $marked = 0;
+                        }
+
+                        if (RSSUtils::find_article_filter($article_filters, 'publish')) {
+                            $published = 1;
+                        } else {
+                            $published = 0;
+                        }
+
+                        $last_marked = ($marked == 1) ? 'NOW()' : 'NULL';
+                        $last_published = ($published == 1) ? 'NOW()' : 'NULL';
+
+                        $sth = $pdo->prepare(
+                            "INSERT INTO ttrss_user_entries
 								(ref_id, owner_uid, feed_id, unread, last_read, marked,
 								published, score, tag_cache, label_cache, uuid,
 								last_marked, last_published)
 							VALUES (?, ?, ?, ?, ?, ?, ?, ?, '', '', '', ".$last_marked.", ".$last_published.")");
 
-						$sth->execute([$ref_id, $owner_uid, $feed, $unread, $last_read_qpart, $marked,
-							$published, $score]);
+                        $sth->execute([$ref_id, $owner_uid, $feed, $unread, $last_read_qpart, $marked,
+                            $published, $score]);
 
-						$sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
+                        $sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
 								ref_id = ? AND owner_uid = ? AND
 								feed_id = ? LIMIT 1");
 
-						$sth->execute([$ref_id, $owner_uid, $feed]);
+                        $sth->execute([$ref_id, $owner_uid, $feed]);
 
-						if ($row = $sth->fetch())
-							$entry_int_id = $row['int_id'];
-					}
+                        if ($row = $sth->fetch())
+                            $entry_int_id = $row['int_id'];
+                    }
 
-					Debug::log("resulting RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
+                    Debug::log("resulting RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
 
-					if (DB_TYPE == "pgsql")
-						$tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
-					else
-						$tsvector_qpart = "";
+                    if (DB_TYPE == "pgsql")
+                        $tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
+                    else
+                        $tsvector_qpart = "";
 
-					$sth = $pdo->prepare("UPDATE ttrss_entries
+                    $sth = $pdo->prepare("UPDATE ttrss_entries
 						SET title = :title,
 							$tsvector_qpart
 							content = :content,
@@ -975,634 +975,634 @@ 
 							lang = :lang
 						WHERE id = :id");
 
-					$params = [":title" => $entry_title,
-						":content" => "$entry_content",
-						":content_hash" => $entry_current_hash,
-						":updated" => $entry_timestamp_fmt,
-						":num_comments" => (int)$num_comments,
-						":plugin_data" => $entry_plugin_data,
-						":author" => "$entry_author",
-						":lang" => $entry_language,
-						":id" => $ref_id];
-
-					if (DB_TYPE == "pgsql") {
-						$params[":ts_lang"] = $feed_language;
-						$params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 900000);
-					}
-
-					$sth->execute($params);
-
-					// update aux data
-					$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                    $params = [":title" => $entry_title,
+                        ":content" => "$entry_content",
+                        ":content_hash" => $entry_current_hash,
+                        ":updated" => $entry_timestamp_fmt,
+                        ":num_comments" => (int)$num_comments,
+                        ":plugin_data" => $entry_plugin_data,
+                        ":author" => "$entry_author",
+                        ":lang" => $entry_language,
+                        ":id" => $ref_id];
+
+                    if (DB_TYPE == "pgsql") {
+                        $params[":ts_lang"] = $feed_language;
+                        $params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 900000);
+                    }
+
+                    $sth->execute($params);
+
+                    // update aux data
+                    $sth = $pdo->prepare("UPDATE ttrss_user_entries
 							SET score = ? WHERE ref_id = ?");
-					$sth->execute([$score, $ref_id]);
+                    $sth->execute([$score, $ref_id]);
 
-					if ($mark_unread_on_update &&
-						!$entry_force_catchup &&
-						!RSSUtils::find_article_filter($article_filters, 'catchup')) {
+                    if ($mark_unread_on_update &&
+                        !$entry_force_catchup &&
+                        !RSSUtils::find_article_filter($article_filters, 'catchup')) {
 
-						Debug::log("article updated, marking unread as requested.", Debug::$LOG_VERBOSE);
+                        Debug::log("article updated, marking unread as requested.", Debug::$LOG_VERBOSE);
 
-						$sth = $pdo->prepare("UPDATE ttrss_user_entries
+                        $sth = $pdo->prepare("UPDATE ttrss_user_entries
 							SET last_read = null, unread = true WHERE ref_id = ?");
-						$sth->execute([$ref_id]);
-					} else {
-						Debug::log("article updated, but we're forbidden to mark it unread.", Debug::$LOG_VERBOSE);
-					}
-				}
+                        $sth->execute([$ref_id]);
+                    } else {
+                        Debug::log("article updated, but we're forbidden to mark it unread.", Debug::$LOG_VERBOSE);
+                    }
+                }
 
-				Debug::log("assigning labels [other]...", Debug::$LOG_VERBOSE);
+                Debug::log("assigning labels [other]...", Debug::$LOG_VERBOSE);
 
-				foreach ($article_labels as $label) {
-					Labels::add_article($entry_ref_id, $label[1], $owner_uid);
-				}
+                foreach ($article_labels as $label) {
+                    Labels::add_article($entry_ref_id, $label[1], $owner_uid);
+                }
 
-				Debug::log("assigning labels [filters]...", Debug::$LOG_VERBOSE);
+                Debug::log("assigning labels [filters]...", Debug::$LOG_VERBOSE);
 
-				RSSUtils::assign_article_to_label_filters($entry_ref_id, $article_filters,
-					$owner_uid, $article_labels);
+                RSSUtils::assign_article_to_label_filters($entry_ref_id, $article_filters,
+                    $owner_uid, $article_labels);
 
-				Debug::log("looking for enclosures...", Debug::$LOG_VERBOSE);
+                Debug::log("looking for enclosures...", Debug::$LOG_VERBOSE);
 
-				// enclosures
+                // enclosures
 
-				$enclosures = array();
+                $enclosures = array();
 
-				$encs = $item->get_enclosures();
+                $encs = $item->get_enclosures();
 
-				if (is_array($encs)) {
-					foreach ($encs as $e) {
-						$e_item = array(
-							rewrite_relative_url($site_url, $e->link),
-							$e->type, $e->length, $e->title, $e->width, $e->height);
+                if (is_array($encs)) {
+                    foreach ($encs as $e) {
+                        $e_item = array(
+                            rewrite_relative_url($site_url, $e->link),
+                            $e->type, $e->length, $e->title, $e->width, $e->height);
 
-						// Yet another episode of "mysql utf8_general_ci is gimped"
-						if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
-							for ($i = 0; $i < count($e_item); $i++) {
-								if (is_string($e_item[$i])) {
-									$e_item[$i] = RSSUtils::strip_utf8mb4($e_item[$i]);
-								}
-							}
-						}
+                        // Yet another episode of "mysql utf8_general_ci is gimped"
+                        if (DB_TYPE == "mysql" && MYSQL_CHARSET != "UTF8MB4") {
+                            for ($i = 0; $i < count($e_item); $i++) {
+                                if (is_string($e_item[$i])) {
+                                    $e_item[$i] = RSSUtils::strip_utf8mb4($e_item[$i]);
+                                }
+                            }
+                        }
 
-						array_push($enclosures, $e_item);
-					}
-				}
+                        array_push($enclosures, $e_item);
+                    }
+                }
 
-				if ($cache_images)
-					RSSUtils::cache_enclosures($enclosures, $site_url);
+                if ($cache_images)
+                    RSSUtils::cache_enclosures($enclosures, $site_url);
 
-				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
-					Debug::log("article enclosures:", Debug::$LOG_VERBOSE);
-					print_r($enclosures);
-				}
+                if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
+                    Debug::log("article enclosures:", Debug::$LOG_VERBOSE);
+                    print_r($enclosures);
+                }
 
-				$esth = $pdo->prepare("SELECT id FROM ttrss_enclosures
+                $esth = $pdo->prepare("SELECT id FROM ttrss_enclosures
 						WHERE content_url = ? AND content_type = ? AND post_id = ?");
 
-				$usth = $pdo->prepare("INSERT INTO ttrss_enclosures
+                $usth = $pdo->prepare("INSERT INTO ttrss_enclosures
 							(content_url, content_type, title, duration, post_id, width, height) VALUES
 							(?, ?, ?, ?, ?, ?, ?)");
 
-				foreach ($enclosures as $enc) {
-					$enc_url = $enc[0];
-					$enc_type = $enc[1];
-					$enc_dur = (int)$enc[2];
-					$enc_title = $enc[3];
-					$enc_width = intval($enc[4]);
-					$enc_height = intval($enc[5]);
+                foreach ($enclosures as $enc) {
+                    $enc_url = $enc[0];
+                    $enc_type = $enc[1];
+                    $enc_dur = (int)$enc[2];
+                    $enc_title = $enc[3];
+                    $enc_width = intval($enc[4]);
+                    $enc_height = intval($enc[5]);
 
-					$esth->execute([$enc_url, $enc_type, $entry_ref_id]);
+                    $esth->execute([$enc_url, $enc_type, $entry_ref_id]);
 
-					if (!$esth->fetch()) {
-						$usth->execute([$enc_url, $enc_type, (string)$enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
-					}
-				}
+                    if (!$esth->fetch()) {
+                        $usth->execute([$enc_url, $enc_type, (string)$enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
+                    }
+                }
 
-				// check for manual tags (we have to do it here since they're loaded from filters)
+                // check for manual tags (we have to do it here since they're loaded from filters)
 
-				foreach ($article_filters as $f) {
-					if ($f["type"] == "tag") {
+                foreach ($article_filters as $f) {
+                    if ($f["type"] == "tag") {
 
-						$manual_tags = trim_array(explode(",", $f["param"]));
+                        $manual_tags = trim_array(explode(",", $f["param"]));
 
-						foreach ($manual_tags as $tag) {
-							array_push($entry_tags, $tag);
-						}
-					}
-				}
+                        foreach ($manual_tags as $tag) {
+                            array_push($entry_tags, $tag);
+                        }
+                    }
+                }
 
-				// Skip boring tags
+                // Skip boring tags
 
-				$boring_tags = trim_array(explode(",", mb_strtolower(get_pref(
-					'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
+                $boring_tags = trim_array(explode(",", mb_strtolower(get_pref(
+                    'BLACKLISTED_TAGS', $owner_uid, ''), 'utf-8')));
 
-				$filtered_tags = array();
-				$tags_to_cache = array();
+                $filtered_tags = array();
+                $tags_to_cache = array();
 
-				foreach ($entry_tags as $tag) {
-					if (array_search($tag, $boring_tags) === false) {
-						array_push($filtered_tags, $tag);
-					}
-				}
+                foreach ($entry_tags as $tag) {
+                    if (array_search($tag, $boring_tags) === false) {
+                        array_push($filtered_tags, $tag);
+                    }
+                }
 
-				$filtered_tags = array_unique($filtered_tags);
+                $filtered_tags = array_unique($filtered_tags);
 
-				if (Debug::get_loglevel() >= Debug::$LOG_VERBOSE) {
-					Debug::log("filtered tags: " . implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
+                if (Debug::get_loglevel() >= Debug::$LOG_VERBOSE) {
+                    Debug::log("filtered tags: " . implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
 
-				}
+                }
 
-				// Save article tags in the database
+                // Save article tags in the database
 
-				if (count($filtered_tags) > 0) {
+                if (count($filtered_tags) > 0) {
 
-					$tsth = $pdo->prepare("SELECT id FROM ttrss_tags
+                    $tsth = $pdo->prepare("SELECT id FROM ttrss_tags
 							WHERE tag_name = ? AND post_int_id = ? AND
 							owner_uid = ? LIMIT 1");
 
-					$usth = $pdo->prepare("INSERT INTO ttrss_tags
+                    $usth = $pdo->prepare("INSERT INTO ttrss_tags
 									(owner_uid,tag_name,post_int_id)
 									VALUES (?, ?, ?)");
 
-					$filtered_tags = FeedItem_Common::normalize_categories($filtered_tags);
+                    $filtered_tags = FeedItem_Common::normalize_categories($filtered_tags);
 
-					foreach ($filtered_tags as $tag) {
-						$tsth->execute([$tag, $entry_int_id, $owner_uid]);
+                    foreach ($filtered_tags as $tag) {
+                        $tsth->execute([$tag, $entry_int_id, $owner_uid]);
 
-						if (!$tsth->fetch()) {
-							$usth->execute([$owner_uid, $tag, $entry_int_id]);
-						}
+                        if (!$tsth->fetch()) {
+                            $usth->execute([$owner_uid, $tag, $entry_int_id]);
+                        }
 
-						array_push($tags_to_cache, $tag);
-					}
+                        array_push($tags_to_cache, $tag);
+                    }
 
-					/* update the cache */
-					$tags_str = join(",", $tags_to_cache);
+                    /* update the cache */
+                    $tags_str = join(",", $tags_to_cache);
 
-					$tsth = $pdo->prepare("UPDATE ttrss_user_entries
+                    $tsth = $pdo->prepare("UPDATE ttrss_user_entries
 						SET tag_cache = ? WHERE ref_id = ?
 						AND owner_uid = ?");
-					$tsth->execute([$tags_str, $entry_ref_id, $owner_uid]);
-				}
+                    $tsth->execute([$tags_str, $entry_ref_id, $owner_uid]);
+                }
 
-				Debug::log("article processed", Debug::$LOG_VERBOSE);
+                Debug::log("article processed", Debug::$LOG_VERBOSE);
 
-				$pdo->commit();
-			}
+                $pdo->commit();
+            }
 
-			Debug::log("purging feed...", Debug::$LOG_VERBOSE);
+            Debug::log("purging feed...", Debug::$LOG_VERBOSE);
 
-			Feeds::purge_feed($feed, 0);
+            Feeds::purge_feed($feed, 0);
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds
+            $sth = $pdo->prepare("UPDATE ttrss_feeds
 				SET last_updated = NOW(), last_unconditional = NOW(), last_error = '' WHERE id = ?");
-			$sth->execute([$feed]);
+            $sth->execute([$feed]);
 
-		} else {
+        } else {
 
-			$error_msg = mb_substr($rss->error(), 0, 245);
+            $error_msg = mb_substr($rss->error(), 0, 245);
 
-			Debug::log("fetch error: $error_msg", Debug::$LOG_VERBOSE);
+            Debug::log("fetch error: $error_msg", Debug::$LOG_VERBOSE);
 
-			if (count($rss->errors()) > 1) {
-				foreach ($rss->errors() as $error) {
-					Debug::log("+ $error", Debug::$LOG_VERBOSE);
-				}
-			}
+            if (count($rss->errors()) > 1) {
+                foreach ($rss->errors() as $error) {
+                    Debug::log("+ $error", Debug::$LOG_VERBOSE);
+                }
+            }
 
-			$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
+            $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_error = ?,
 				last_updated = NOW(), last_unconditional = NOW() WHERE id = ?");
-			$sth->execute([$error_msg, $feed]);
+            $sth->execute([$error_msg, $feed]);
 
-			unset($rss);
+            unset($rss);
 
-			Debug::log("update failed.", Debug::$LOG_VERBOSE);
-			return false;
-		}
+            Debug::log("update failed.", Debug::$LOG_VERBOSE);
+            return false;
+        }
 
-		Debug::log("update done.", Debug::$LOG_VERBOSE);
+        Debug::log("update done.", Debug::$LOG_VERBOSE);
 
-		return true;
-	}
+        return true;
+    }
 
-	public static function cache_enclosures($enclosures, $site_url) {
-		$cache = new DiskCache("images");
+    public static function cache_enclosures($enclosures, $site_url) {
+        $cache = new DiskCache("images");
 
-		if ($cache->isWritable()) {
-			foreach ($enclosures as $enc) {
+        if ($cache->isWritable()) {
+            foreach ($enclosures as $enc) {
 
-				if (preg_match("/(image|audio|video)/", $enc[1])) {
-					$src = rewrite_relative_url($site_url, $enc[0]);
+                if (preg_match("/(image|audio|video)/", $enc[1])) {
+                    $src = rewrite_relative_url($site_url, $enc[0]);
 
-					$local_filename = sha1($src);
+                    $local_filename = sha1($src);
 
-					Debug::log("cache_enclosures: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
+                    Debug::log("cache_enclosures: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
 
-					if (!$cache->exists($local_filename)) {
+                    if (!$cache->exists($local_filename)) {
 
-						global $fetch_last_error_code;
-						global $fetch_last_error;
+                        global $fetch_last_error_code;
+                        global $fetch_last_error;
 
-						$file_content = fetch_file_contents(array("url" => $src,
-							"http_referrer" => $src,
-							"max_size" => MAX_CACHE_FILE_SIZE));
+                        $file_content = fetch_file_contents(array("url" => $src,
+                            "http_referrer" => $src,
+                            "max_size" => MAX_CACHE_FILE_SIZE));
 
-						if ($file_content) {
-							$cache->put($local_filename, $file_content);
-						} else {
-							Debug::log("cache_enclosures: failed with $fetch_last_error_code: $fetch_last_error");
-						}
-					} else if (is_writable($local_filename)) {
-						$cache->touch($local_filename);
-					}
-				}
-			}
-		}
-	}
+                        if ($file_content) {
+                            $cache->put($local_filename, $file_content);
+                        } else {
+                            Debug::log("cache_enclosures: failed with $fetch_last_error_code: $fetch_last_error");
+                        }
+                    } else if (is_writable($local_filename)) {
+                        $cache->touch($local_filename);
+                    }
+                }
+            }
+        }
+    }
 
-	public static function cache_media($html, $site_url) {
-		$cache = new DiskCache("images");
+    public static function cache_media($html, $site_url) {
+        $cache = new DiskCache("images");
 
-		if ($cache->isWritable()) {
-			$doc = new DOMDocument();
-			if ($doc->loadHTML($html)) {
-				$xpath = new DOMXPath($doc);
+        if ($cache->isWritable()) {
+            $doc = new DOMDocument();
+            if ($doc->loadHTML($html)) {
+                $xpath = new DOMXPath($doc);
 
-				$entries = $xpath->query('(//img[@src])|(//video/source[@src])|(//audio/source[@src])');
+                $entries = $xpath->query('(//img[@src])|(//video/source[@src])|(//audio/source[@src])');
 
-				foreach ($entries as $entry) {
-					if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) {
-						$src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
+                foreach ($entries as $entry) {
+                    if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) {
+                        $src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
 
-						$local_filename = sha1($src);
+                        $local_filename = sha1($src);
 
-						Debug::log("cache_media: checking $src", Debug::$LOG_VERBOSE);
+                        Debug::log("cache_media: checking $src", Debug::$LOG_VERBOSE);
 
-						if (!$cache->exists($local_filename)) {
-							Debug::log("cache_media: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
+                        if (!$cache->exists($local_filename)) {
+                            Debug::log("cache_media: downloading: $src to $local_filename", Debug::$LOG_VERBOSE);
 
-							global $fetch_last_error_code;
-							global $fetch_last_error;
+                            global $fetch_last_error_code;
+                            global $fetch_last_error;
 
-							$file_content = fetch_file_contents(array("url" => $src,
-								"http_referrer" => $src,
-								"max_size" => MAX_CACHE_FILE_SIZE));
+                            $file_content = fetch_file_contents(array("url" => $src,
+                                "http_referrer" => $src,
+                                "max_size" => MAX_CACHE_FILE_SIZE));
 
-							if ($file_content) {
-								$cache->put($local_filename, $file_content);
-							} else {
-								Debug::log("cache_media: failed with $fetch_last_error_code: $fetch_last_error");
-							}
-						} else if ($cache->isWritable($local_filename)) {
-							$cache->touch($local_filename);
-						}
-					}
-				}
-			}
-		}
-	}
+                            if ($file_content) {
+                                $cache->put($local_filename, $file_content);
+                            } else {
+                                Debug::log("cache_media: failed with $fetch_last_error_code: $fetch_last_error");
+                            }
+                        } else if ($cache->isWritable($local_filename)) {
+                            $cache->touch($local_filename);
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-	public static function expire_error_log() {
-		Debug::log("Removing old error log entries...");
+    public static function expire_error_log() {
+        Debug::log("Removing old error log entries...");
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if (DB_TYPE == "pgsql") {
-			$pdo->query("DELETE FROM ttrss_error_log
+        if (DB_TYPE == "pgsql") {
+            $pdo->query("DELETE FROM ttrss_error_log
 				WHERE created_at < NOW() - INTERVAL '7 days'");
-		} else {
-			$pdo->query("DELETE FROM ttrss_error_log
+        } else {
+            $pdo->query("DELETE FROM ttrss_error_log
 				WHERE created_at < DATE_SUB(NOW(), INTERVAL 7 DAY)");
-		}
-	}
+        }
+    }
 
-	public static function expire_feed_archive() {
-		Debug::log("Removing old archived feeds...");
+    public static function expire_feed_archive() {
+        Debug::log("Removing old archived feeds...");
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if (DB_TYPE == "pgsql") {
-			$pdo->query("DELETE FROM ttrss_archived_feeds
+        if (DB_TYPE == "pgsql") {
+            $pdo->query("DELETE FROM ttrss_archived_feeds
 				WHERE created < NOW() - INTERVAL '1 month'");
-		} else {
-			$pdo->query("DELETE FROM ttrss_archived_feeds
+        } else {
+            $pdo->query("DELETE FROM ttrss_archived_feeds
 				WHERE created < DATE_SUB(NOW(), INTERVAL 1 MONTH)");
-		}
-	}
-
-	public static function expire_lock_files() {
-		Debug::log("Removing old lock files...", Debug::$LOG_VERBOSE);
-
-		$num_deleted = 0;
-
-		if (is_writable(LOCK_DIRECTORY)) {
-			$files = glob(LOCK_DIRECTORY . "/*.lock");
-
-			if ($files) {
-				foreach ($files as $file) {
-					if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400*2) {
-						unlink($file);
-						++$num_deleted;
-					}
-				}
-			}
-		}
-
-		Debug::log("removed $num_deleted old lock files.");
-	}
-
-	/**
-	 * Source: http://www.php.net/manual/en/function.parse-url.php#104527
-	 * Returns the url query as associative array
-	 *
-	 * @param    string    query
-	 * @return    array    params
-	 */
-	public static function convertUrlQuery($query) {
-		$queryParts = explode('&', $query);
-
-		$params = array();
-
-		foreach ($queryParts as $param) {
-			$item = explode('=', $param);
-			$params[$item[0]] = $item[1];
-		}
-
-		return $params;
-	}
-
-	public static function get_article_filters($filters, $title, $content, $link, $author, $tags, &$matched_rules = false, &$matched_filters = false) {
-		$matches = array();
-
-		foreach ($filters as $filter) {
-			$match_any_rule = $filter["match_any_rule"];
-			$inverse = $filter["inverse"];
-			$filter_match = false;
-
-			foreach ($filter["rules"] as $rule) {
-				$match = false;
-				$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
-				$rule_inverse = $rule["inverse"];
-
-				if (!$reg_exp)
-					continue;
-
-				switch ($rule["type"]) {
-					case "title":
-						$match = @preg_match("/$reg_exp/iu", $title);
-						break;
-					case "content":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
-
-						$match = @preg_match("/$reg_exp/iu", $content);
-						break;
-					case "both":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
-
-						$match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
-						break;
-					case "link":
-						$match = @preg_match("/$reg_exp/iu", $link);
-						break;
-					case "author":
-						$match = @preg_match("/$reg_exp/iu", $author);
-						break;
-					case "tag":
-						foreach ($tags as $tag) {
-							if (@preg_match("/$reg_exp/iu", $tag)) {
-								$match = true;
-								break;
-							}
-						}
-						break;
-				}
-
-				if ($rule_inverse) $match = !$match;
-
-				if ($match_any_rule) {
-					if ($match) {
-						$filter_match = true;
-						break;
-					}
-				} else {
-					$filter_match = $match;
-					if (!$match) {
-						break;
-					}
-				}
-			}
-
-			if ($inverse) $filter_match = !$filter_match;
-
-			if ($filter_match) {
-				if (is_array($matched_rules)) array_push($matched_rules, $rule);
-				if (is_array($matched_filters)) array_push($matched_filters, $filter);
-
-				foreach ($filter["actions"] as $action) {
-					array_push($matches, $action);
-
-					// if Stop action encountered, perform no further processing
-					if (isset($action["type"]) && $action["type"] == "stop") return $matches;
-				}
-			}
-		}
-
-		return $matches;
-	}
-
-	public static function find_article_filter($filters, $filter_name) {
-		foreach ($filters as $f) {
-			if ($f["type"] == $filter_name) {
-				return $f;
-			};
-		}
-		return false;
-	}
-
-	public static function find_article_filters($filters, $filter_name) {
-		$results = array();
-
-		foreach ($filters as $f) {
-			if ($f["type"] == $filter_name) {
-				array_push($results, $f);
-			};
-		}
-		return $results;
-	}
-
-	public static function calculate_article_score($filters) {
-		$score = 0;
-
-		foreach ($filters as $f) {
-			if ($f["type"] == "score") {
-				$score += $f["param"];
-			};
-		}
-		return $score;
-	}
-
-	public static function labels_contains_caption($labels, $caption) {
-		foreach ($labels as $label) {
-			if ($label[1] == $caption) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public static function assign_article_to_label_filters($id, $filters, $owner_uid, $article_labels) {
-		foreach ($filters as $f) {
-			if ($f["type"] == "label") {
-				if (!RSSUtils::labels_contains_caption($article_labels, $f["param"])) {
-					Labels::add_article($id, $f["param"], $owner_uid);
-				}
-			}
-		}
-	}
-
-	public static function make_guid_from_title($title) {
-		return preg_replace("/[ \"\',.:;]/", "-",
-			mb_strtolower(strip_tags($title), 'utf-8'));
-	}
-
-	public static function cleanup_counters_cache() {
-		$pdo = Db::pdo();
-
-		$res = $pdo->query("DELETE FROM ttrss_counters_cache
+        }
+    }
+
+    public static function expire_lock_files() {
+        Debug::log("Removing old lock files...", Debug::$LOG_VERBOSE);
+
+        $num_deleted = 0;
+
+        if (is_writable(LOCK_DIRECTORY)) {
+            $files = glob(LOCK_DIRECTORY . "/*.lock");
+
+            if ($files) {
+                foreach ($files as $file) {
+                    if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400*2) {
+                        unlink($file);
+                        ++$num_deleted;
+                    }
+                }
+            }
+        }
+
+        Debug::log("removed $num_deleted old lock files.");
+    }
+
+    /**
+     * Source: http://www.php.net/manual/en/function.parse-url.php#104527
+     * Returns the url query as associative array
+     *
+     * @param    string    query
+     * @return    array    params
+     */
+    public static function convertUrlQuery($query) {
+        $queryParts = explode('&', $query);
+
+        $params = array();
+
+        foreach ($queryParts as $param) {
+            $item = explode('=', $param);
+            $params[$item[0]] = $item[1];
+        }
+
+        return $params;
+    }
+
+    public static function get_article_filters($filters, $title, $content, $link, $author, $tags, &$matched_rules = false, &$matched_filters = false) {
+        $matches = array();
+
+        foreach ($filters as $filter) {
+            $match_any_rule = $filter["match_any_rule"];
+            $inverse = $filter["inverse"];
+            $filter_match = false;
+
+            foreach ($filter["rules"] as $rule) {
+                $match = false;
+                $reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
+                $rule_inverse = $rule["inverse"];
+
+                if (!$reg_exp)
+                    continue;
+
+                switch ($rule["type"]) {
+                    case "title":
+                        $match = @preg_match("/$reg_exp/iu", $title);
+                        break;
+                    case "content":
+                        // we don't need to deal with multiline regexps
+                        $content = preg_replace("/[\r\n\t]/", "", $content);
+
+                        $match = @preg_match("/$reg_exp/iu", $content);
+                        break;
+                    case "both":
+                        // we don't need to deal with multiline regexps
+                        $content = preg_replace("/[\r\n\t]/", "", $content);
+
+                        $match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
+                        break;
+                    case "link":
+                        $match = @preg_match("/$reg_exp/iu", $link);
+                        break;
+                    case "author":
+                        $match = @preg_match("/$reg_exp/iu", $author);
+                        break;
+                    case "tag":
+                        foreach ($tags as $tag) {
+                            if (@preg_match("/$reg_exp/iu", $tag)) {
+                                $match = true;
+                                break;
+                            }
+                        }
+                        break;
+                }
+
+                if ($rule_inverse) $match = !$match;
+
+                if ($match_any_rule) {
+                    if ($match) {
+                        $filter_match = true;
+                        break;
+                    }
+                } else {
+                    $filter_match = $match;
+                    if (!$match) {
+                        break;
+                    }
+                }
+            }
+
+            if ($inverse) $filter_match = !$filter_match;
+
+            if ($filter_match) {
+                if (is_array($matched_rules)) array_push($matched_rules, $rule);
+                if (is_array($matched_filters)) array_push($matched_filters, $filter);
+
+                foreach ($filter["actions"] as $action) {
+                    array_push($matches, $action);
+
+                    // if Stop action encountered, perform no further processing
+                    if (isset($action["type"]) && $action["type"] == "stop") return $matches;
+                }
+            }
+        }
+
+        return $matches;
+    }
+
+    public static function find_article_filter($filters, $filter_name) {
+        foreach ($filters as $f) {
+            if ($f["type"] == $filter_name) {
+                return $f;
+            };
+        }
+        return false;
+    }
+
+    public static function find_article_filters($filters, $filter_name) {
+        $results = array();
+
+        foreach ($filters as $f) {
+            if ($f["type"] == $filter_name) {
+                array_push($results, $f);
+            };
+        }
+        return $results;
+    }
+
+    public static function calculate_article_score($filters) {
+        $score = 0;
+
+        foreach ($filters as $f) {
+            if ($f["type"] == "score") {
+                $score += $f["param"];
+            };
+        }
+        return $score;
+    }
+
+    public static function labels_contains_caption($labels, $caption) {
+        foreach ($labels as $label) {
+            if ($label[1] == $caption) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static function assign_article_to_label_filters($id, $filters, $owner_uid, $article_labels) {
+        foreach ($filters as $f) {
+            if ($f["type"] == "label") {
+                if (!RSSUtils::labels_contains_caption($article_labels, $f["param"])) {
+                    Labels::add_article($id, $f["param"], $owner_uid);
+                }
+            }
+        }
+    }
+
+    public static function make_guid_from_title($title) {
+        return preg_replace("/[ \"\',.:;]/", "-",
+            mb_strtolower(strip_tags($title), 'utf-8'));
+    }
+
+    public static function cleanup_counters_cache() {
+        $pdo = Db::pdo();
+
+        $res = $pdo->query("DELETE FROM ttrss_counters_cache
 			WHERE feed_id > 0 AND
 			(SELECT COUNT(id) FROM ttrss_feeds WHERE
 				id = feed_id AND
 				ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid) = 0");
 
-		$frows = $res->rowCount();
+        $frows = $res->rowCount();
 
-		$res = $pdo->query("DELETE FROM ttrss_cat_counters_cache
+        $res = $pdo->query("DELETE FROM ttrss_cat_counters_cache
 			WHERE feed_id > 0 AND
 			(SELECT COUNT(id) FROM ttrss_feed_categories WHERE
 				id = feed_id AND
 				ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid) = 0");
 
-		$crows = $res->rowCount();
-
-		Debug::log("removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
-	}
-
-	public static function housekeeping_user($owner_uid) {
-		$tmph = new PluginHost();
-
-		load_user_plugins($owner_uid, $tmph);
-
-		$tmph->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
-	}
-
-	public static function housekeeping_common() {
-		DiskCache::expire();
-
-		RSSUtils::expire_lock_files();
-		RSSUtils::expire_error_log();
-		RSSUtils::expire_feed_archive();
-		RSSUtils::cleanup_feed_browser();
-
-		Article::purge_orphans();
-		RSSUtils::cleanup_counters_cache();
-
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
-	}
-
-	public static function check_feed_favicon($site_url, $feed) {
-		#		print "FAVICON [$site_url]: $favicon_url\n";
-
-		$icon_file = ICONS_DIR . "/$feed.ico";
-
-		if (!file_exists($icon_file)) {
-			$favicon_url = RSSUtils::get_favicon_url($site_url);
-
-			if ($favicon_url) {
-				// Limiting to "image" type misses those served with text/plain
-				$contents = fetch_file_contents($favicon_url); // , "image");
-
-				if ($contents) {
-					// Crude image type matching.
-					// Patterns gleaned from the file(1) source code.
-					if (preg_match('/^\x00\x00\x01\x00/', $contents)) {
-						// 0       string  \000\000\001\000        MS Windows icon resource
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa MS Windows icon resource");
-					}
-					elseif (preg_match('/^GIF8/', $contents)) {
-						// 0       string          GIF8            GIF image data
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa GIF image");
-					}
-					elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
-						// 0       string          \x89PNG\x0d\x0a\x1a\x0a         PNG image data
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa PNG image");
-					}
-					elseif (preg_match('/^\xff\xd8/', $contents)) {
-						// 0       beshort         0xffd8          JPEG image data
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa JPG image");
-					}
-					elseif (preg_match('/^BM/', $contents)) {
-						// 0	string		BM	PC bitmap (OS2, Windows BMP files)
-						//error_log("check_feed_favicon, favicon_url=$favicon_url isa BMP image");
-					}
-					else {
-						//error_log("check_feed_favicon: favicon_url=$favicon_url isa UNKNOWN type");
-						$contents = "";
-					}
-				}
-
-				if ($contents) {
-					$fp = @fopen($icon_file, "w");
-
-					if ($fp) {
-						fwrite($fp, $contents);
-						fclose($fp);
-						chmod($icon_file, 0644);
-					}
-				}
-			}
-			return $icon_file;
-		}
-	}
-
-	public static function is_gzipped($feed_data) {
-		return strpos(substr($feed_data, 0, 3),
-				"\x1f" . "\x8b" . "\x08", 0) === 0;
-	}
-
-	public static function load_filters($feed_id, $owner_uid) {
-		$filters = array();
-
-		$feed_id = (int) $feed_id;
-		$cat_id = (int)Feeds::getFeedCategory($feed_id);
-
-		if ($cat_id == 0)
-			$null_cat_qpart = "cat_id IS NULL OR";
-		else
-			$null_cat_qpart = "";
-
-		$pdo = Db::pdo();
-
-		$sth = $pdo->prepare("SELECT * FROM ttrss_filters2 WHERE
+        $crows = $res->rowCount();
+
+        Debug::log("removed $frows (feeds) $crows (cats) orphaned counter cache entries.");
+    }
+
+    public static function housekeeping_user($owner_uid) {
+        $tmph = new PluginHost();
+
+        load_user_plugins($owner_uid, $tmph);
+
+        $tmph->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
+    }
+
+    public static function housekeeping_common() {
+        DiskCache::expire();
+
+        RSSUtils::expire_lock_files();
+        RSSUtils::expire_error_log();
+        RSSUtils::expire_feed_archive();
+        RSSUtils::cleanup_feed_browser();
+
+        Article::purge_orphans();
+        RSSUtils::cleanup_counters_cache();
+
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
+    }
+
+    public static function check_feed_favicon($site_url, $feed) {
+        #		print "FAVICON [$site_url]: $favicon_url\n";
+
+        $icon_file = ICONS_DIR . "/$feed.ico";
+
+        if (!file_exists($icon_file)) {
+            $favicon_url = RSSUtils::get_favicon_url($site_url);
+
+            if ($favicon_url) {
+                // Limiting to "image" type misses those served with text/plain
+                $contents = fetch_file_contents($favicon_url); // , "image");
+
+                if ($contents) {
+                    // Crude image type matching.
+                    // Patterns gleaned from the file(1) source code.
+                    if (preg_match('/^\x00\x00\x01\x00/', $contents)) {
+                        // 0       string  \000\000\001\000        MS Windows icon resource
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa MS Windows icon resource");
+                    }
+                    elseif (preg_match('/^GIF8/', $contents)) {
+                        // 0       string          GIF8            GIF image data
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa GIF image");
+                    }
+                    elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
+                        // 0       string          \x89PNG\x0d\x0a\x1a\x0a         PNG image data
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa PNG image");
+                    }
+                    elseif (preg_match('/^\xff\xd8/', $contents)) {
+                        // 0       beshort         0xffd8          JPEG image data
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa JPG image");
+                    }
+                    elseif (preg_match('/^BM/', $contents)) {
+                        // 0	string		BM	PC bitmap (OS2, Windows BMP files)
+                        //error_log("check_feed_favicon, favicon_url=$favicon_url isa BMP image");
+                    }
+                    else {
+                        //error_log("check_feed_favicon: favicon_url=$favicon_url isa UNKNOWN type");
+                        $contents = "";
+                    }
+                }
+
+                if ($contents) {
+                    $fp = @fopen($icon_file, "w");
+
+                    if ($fp) {
+                        fwrite($fp, $contents);
+                        fclose($fp);
+                        chmod($icon_file, 0644);
+                    }
+                }
+            }
+            return $icon_file;
+        }
+    }
+
+    public static function is_gzipped($feed_data) {
+        return strpos(substr($feed_data, 0, 3),
+                "\x1f" . "\x8b" . "\x08", 0) === 0;
+    }
+
+    public static function load_filters($feed_id, $owner_uid) {
+        $filters = array();
+
+        $feed_id = (int) $feed_id;
+        $cat_id = (int)Feeds::getFeedCategory($feed_id);
+
+        if ($cat_id == 0)
+            $null_cat_qpart = "cat_id IS NULL OR";
+        else
+            $null_cat_qpart = "";
+
+        $pdo = Db::pdo();
+
+        $sth = $pdo->prepare("SELECT * FROM ttrss_filters2 WHERE
 				owner_uid = ? AND enabled = true ORDER BY order_id, title");
-		$sth->execute([$owner_uid]);
+        $sth->execute([$owner_uid]);
 
-		$check_cats = array_merge(
-			Feeds::getParentCategories($cat_id, $owner_uid),
-			[$cat_id]);
+        $check_cats = array_merge(
+            Feeds::getParentCategories($cat_id, $owner_uid),
+            [$cat_id]);
 
-		$check_cats_str = join(",", $check_cats);
-		$check_cats_fullids = array_map(function($a) { return "CAT:$a"; }, $check_cats);
+        $check_cats_str = join(",", $check_cats);
+        $check_cats_fullids = array_map(function($a) { return "CAT:$a"; }, $check_cats);
 
-		while ($line = $sth->fetch()) {
-			$filter_id = $line["id"];
+        while ($line = $sth->fetch()) {
+            $filter_id = $line["id"];
 
-			$match_any_rule = sql_bool_to_bool($line["match_any_rule"]);
+            $match_any_rule = sql_bool_to_bool($line["match_any_rule"]);
 
-			$sth2 = $pdo->prepare("SELECT
+            $sth2 = $pdo->prepare("SELECT
 					r.reg_exp, r.inverse, r.feed_id, r.cat_id, r.cat_filter, r.match_on, t.name AS type_name
 					FROM ttrss_filters2_rules AS r,
 					ttrss_filter_types AS t
@@ -1611,117 +1611,117 @@ 
 						  (($null_cat_qpart (cat_id IS NULL AND cat_filter = false) OR cat_id IN ($check_cats_str)) AND
 						  (feed_id IS NULL OR feed_id = ?))) AND
 						filter_type = t.id AND filter_id = ?");
-			$sth2->execute([$feed_id, $filter_id]);
+            $sth2->execute([$feed_id, $filter_id]);
 
-			$rules = array();
-			$actions = array();
+            $rules = array();
+            $actions = array();
 
-			while ($rule_line = $sth2->fetch()) {
-				#				print_r($rule_line);
+            while ($rule_line = $sth2->fetch()) {
+                #				print_r($rule_line);
 
-				if ($rule_line["match_on"]) {
-					$match_on = json_decode($rule_line["match_on"], true);
+                if ($rule_line["match_on"]) {
+                    $match_on = json_decode($rule_line["match_on"], true);
 
-					if (in_array("0", $match_on) || in_array($feed_id, $match_on) || count(array_intersect($check_cats_fullids, $match_on)) > 0) {
+                    if (in_array("0", $match_on) || in_array($feed_id, $match_on) || count(array_intersect($check_cats_fullids, $match_on)) > 0) {
 
-						$rule = array();
-						$rule["reg_exp"] = $rule_line["reg_exp"];
-						$rule["type"] = $rule_line["type_name"];
-						$rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
+                        $rule = array();
+                        $rule["reg_exp"] = $rule_line["reg_exp"];
+                        $rule["type"] = $rule_line["type_name"];
+                        $rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
 
-						array_push($rules, $rule);
-					} else if (!$match_any_rule) {
-						// this filter contains a rule that doesn't match to this feed/category combination
-						// thus filter has to be rejected
+                        array_push($rules, $rule);
+                    } else if (!$match_any_rule) {
+                        // this filter contains a rule that doesn't match to this feed/category combination
+                        // thus filter has to be rejected
 
-						$rules = [];
-						break;
-					}
+                        $rules = [];
+                        break;
+                    }
 
-				} else {
+                } else {
 
-					$rule = array();
-					$rule["reg_exp"] = $rule_line["reg_exp"];
-					$rule["type"] = $rule_line["type_name"];
-					$rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
+                    $rule = array();
+                    $rule["reg_exp"] = $rule_line["reg_exp"];
+                    $rule["type"] = $rule_line["type_name"];
+                    $rule["inverse"] = sql_bool_to_bool($rule_line["inverse"]);
 
-					array_push($rules, $rule);
-				}
-			}
+                    array_push($rules, $rule);
+                }
+            }
 
-			if (count($rules) > 0) {
-				$sth2 = $pdo->prepare("SELECT a.action_param,t.name AS type_name
+            if (count($rules) > 0) {
+                $sth2 = $pdo->prepare("SELECT a.action_param,t.name AS type_name
 						FROM ttrss_filters2_actions AS a,
 						ttrss_filter_actions AS t
 						WHERE
 							action_id = t.id AND filter_id = ?");
-				$sth2->execute([$filter_id]);
-
-				while ($action_line = $sth2->fetch()) {
-					#				print_r($action_line);
-
-					$action = array();
-					$action["type"] = $action_line["type_name"];
-					$action["param"] = $action_line["action_param"];
-
-					array_push($actions, $action);
-				}
-			}
-
-			$filter = [];
-			$filter["id"] = $filter_id;
-			$filter["match_any_rule"] = sql_bool_to_bool($line["match_any_rule"]);
-			$filter["inverse"] = sql_bool_to_bool($line["inverse"]);
-			$filter["rules"] = $rules;
-			$filter["actions"] = $actions;
-
-			if (count($rules) > 0 && count($actions) > 0) {
-				array_push($filters, $filter);
-			}
-		}
-
-		return $filters;
-	}
-
-	/**
-	 * Try to determine the favicon URL for a feed.
-	 * adapted from wordpress favicon plugin by Jeff Minard (http://thecodepro.com/)
-	 * http://dev.wp-plugins.org/file/favatars/trunk/favatars.php
-	 *
-	 * @param string $url A feed or page URL
-	 * @access public
-	 * @return mixed The favicon URL, or false if none was found.
-	 */
-	public static function get_favicon_url($url) {
-
-		$favicon_url = false;
-
-		if ($html = @fetch_file_contents($url)) {
-
-			$doc = new DOMDocument();
-			if ($doc->loadHTML($html)) {
-				$xpath = new DOMXPath($doc);
-
-				$base = $xpath->query('/html/head/base[@href]');
-				foreach ($base as $b) {
-					$url = rewrite_relative_url($url, $b->getAttribute("href"));
-					break;
-				}
-
-				$entries = $xpath->query('/html/head/link[@rel="shortcut icon" or @rel="icon"]');
-				if (count($entries) > 0) {
-					foreach ($entries as $entry) {
-						$favicon_url = rewrite_relative_url($url, $entry->getAttribute("href"));
-						break;
-					}
-				}
-			}
-		}
-
-		if (!$favicon_url)
-			$favicon_url = rewrite_relative_url($url, "/favicon.ico");
-
-		return $favicon_url;
-	}
+                $sth2->execute([$filter_id]);
+
+                while ($action_line = $sth2->fetch()) {
+                    #				print_r($action_line);
+
+                    $action = array();
+                    $action["type"] = $action_line["type_name"];
+                    $action["param"] = $action_line["action_param"];
+
+                    array_push($actions, $action);
+                }
+            }
+
+            $filter = [];
+            $filter["id"] = $filter_id;
+            $filter["match_any_rule"] = sql_bool_to_bool($line["match_any_rule"]);
+            $filter["inverse"] = sql_bool_to_bool($line["inverse"]);
+            $filter["rules"] = $rules;
+            $filter["actions"] = $actions;
+
+            if (count($rules) > 0 && count($actions) > 0) {
+                array_push($filters, $filter);
+            }
+        }
+
+        return $filters;
+    }
+
+    /**
+     * Try to determine the favicon URL for a feed.
+     * adapted from wordpress favicon plugin by Jeff Minard (http://thecodepro.com/)
+     * http://dev.wp-plugins.org/file/favatars/trunk/favatars.php
+     *
+     * @param string $url A feed or page URL
+     * @access public
+     * @return mixed The favicon URL, or false if none was found.
+     */
+    public static function get_favicon_url($url) {
+
+        $favicon_url = false;
+
+        if ($html = @fetch_file_contents($url)) {
+
+            $doc = new DOMDocument();
+            if ($doc->loadHTML($html)) {
+                $xpath = new DOMXPath($doc);
+
+                $base = $xpath->query('/html/head/base[@href]');
+                foreach ($base as $b) {
+                    $url = rewrite_relative_url($url, $b->getAttribute("href"));
+                    break;
+                }
+
+                $entries = $xpath->query('/html/head/link[@rel="shortcut icon" or @rel="icon"]');
+                if (count($entries) > 0) {
+                    foreach ($entries as $entry) {
+                        $favicon_url = rewrite_relative_url($url, $entry->getAttribute("href"));
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (!$favicon_url)
+            $favicon_url = rewrite_relative_url($url, "/favicon.ico");
+
+        return $favicon_url;
+    }
 
 }

classes/article.php

Indentation +521 added lines, -521 removed lines

@@ -1,620 +1,620 @@ 
 <?php
 class Article extends Handler_Protected {
 
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("redirect", "editarticletags");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("redirect", "editarticletags");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public function redirect() {
-		$id = clean($_REQUEST['id']);
+    public function redirect() {
+        $id = clean($_REQUEST['id']);
 
-		$sth = $this->pdo->prepare("SELECT link FROM ttrss_entries, ttrss_user_entries
+        $sth = $this->pdo->prepare("SELECT link FROM ttrss_entries, ttrss_user_entries
 						WHERE id = ? AND id = ref_id AND owner_uid = ?
 						LIMIT 1");
         $sth->execute([$id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$article_url = $row['link'];
-			$article_url = str_replace("\n", "", $article_url);
+        if ($row = $sth->fetch()) {
+            $article_url = $row['link'];
+            $article_url = str_replace("\n", "", $article_url);
 
-			header("Location: $article_url");
-			return;
+            header("Location: $article_url");
+            return;
 
-		} else {
-			print_error(__("Article not found."));
-		}
-	}
+        } else {
+            print_error(__("Article not found."));
+        }
+    }
 
-	public static function create_published_article($title, $url, $content, $labels_str,
-			$owner_uid) {
+    public static function create_published_article($title, $url, $content, $labels_str,
+            $owner_uid) {
 
-		$guid = 'SHA1:' . sha1("ttshared:" . $url . $owner_uid); // include owner_uid to prevent global GUID clash
+        $guid = 'SHA1:' . sha1("ttshared:" . $url . $owner_uid); // include owner_uid to prevent global GUID clash
 
-		if (!$content) {
-			$pluginhost = new PluginHost();
-			$pluginhost->load_all(PluginHost::KIND_ALL, $owner_uid);
-			$pluginhost->load_data();
+        if (!$content) {
+            $pluginhost = new PluginHost();
+            $pluginhost->load_all(PluginHost::KIND_ALL, $owner_uid);
+            $pluginhost->load_data();
 
-			foreach ($pluginhost->get_hooks(PluginHost::HOOK_GET_FULL_TEXT) as $p) {
-				$extracted_content = $p->hook_get_full_text($url);
+            foreach ($pluginhost->get_hooks(PluginHost::HOOK_GET_FULL_TEXT) as $p) {
+                $extracted_content = $p->hook_get_full_text($url);
 
-				if ($extracted_content) {
-					$content = $extracted_content;
-					break;
-				}
-			}
-		}
+                if ($extracted_content) {
+                    $content = $extracted_content;
+                    break;
+                }
+            }
+        }
 
-		$content_hash = sha1($content);
+        $content_hash = sha1($content);
 
-		if ($labels_str != "") {
-			$labels = explode(",", $labels_str);
-		} else {
-			$labels = array();
-		}
+        if ($labels_str != "") {
+            $labels = explode(",", $labels_str);
+        } else {
+            $labels = array();
+        }
 
-		$rc = false;
+        $rc = false;
 
-		if (!$title) $title = $url;
-		if (!$title && !$url) return false;
+        if (!$title) $title = $url;
+        if (!$title && !$url) return false;
 
-		if (filter_var($url, FILTER_VALIDATE_URL) === false) return false;
+        if (filter_var($url, FILTER_VALIDATE_URL) === false) return false;
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$pdo->beginTransaction();
+        $pdo->beginTransaction();
 
-		// only check for our user data here, others might have shared this with different content etc
-		$sth = $pdo->prepare("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
+        // only check for our user data here, others might have shared this with different content etc
+        $sth = $pdo->prepare("SELECT id FROM ttrss_entries, ttrss_user_entries WHERE
 			guid = ? AND ref_id = id AND owner_uid = ? LIMIT 1");
-		$sth->execute([$guid, $owner_uid]);
+        $sth->execute([$guid, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
-			$ref_id = $row['id'];
+        if ($row = $sth->fetch()) {
+            $ref_id = $row['id'];
 
-			$sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
+            $sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = ? AND owner_uid = ? LIMIT 1");
             $sth->execute([$ref_id, $owner_uid]);
 
-			if ($row = $sth->fetch()) {
-				$int_id = $row['int_id'];
+            if ($row = $sth->fetch()) {
+                $int_id = $row['int_id'];
 
-				$sth = $pdo->prepare("UPDATE ttrss_entries SET
+                $sth = $pdo->prepare("UPDATE ttrss_entries SET
 					content = ?, content_hash = ? WHERE id = ?");
-				$sth->execute([$content, $content_hash, $ref_id]);
+                $sth->execute([$content, $content_hash, $ref_id]);
 
-				if (DB_TYPE == "pgsql"){
-					$sth = $pdo->prepare("UPDATE ttrss_entries
+                if (DB_TYPE == "pgsql"){
+                    $sth = $pdo->prepare("UPDATE ttrss_entries
 					SET tsvector_combined = to_tsvector( :ts_content)
 					WHERE id = :id");
-					$params = [
-						":ts_content" => mb_substr(strip_tags($content ), 0, 900000),
-						":id" => $ref_id];
-					$sth->execute($params);
-				}
+                    $params = [
+                        ":ts_content" => mb_substr(strip_tags($content ), 0, 900000),
+                        ":id" => $ref_id];
+                    $sth->execute($params);
+                }
 
-				$sth = $pdo->prepare("UPDATE ttrss_user_entries SET published = true,
+                $sth = $pdo->prepare("UPDATE ttrss_user_entries SET published = true,
 						last_published = NOW() WHERE
 						int_id = ? AND owner_uid = ?");
-				$sth->execute([$int_id, $owner_uid]);
+                $sth->execute([$int_id, $owner_uid]);
 
-			} else {
+            } else {
 
-				$sth = $pdo->prepare("INSERT INTO ttrss_user_entries
+                $sth = $pdo->prepare("INSERT INTO ttrss_user_entries
 					(ref_id, uuid, feed_id, orig_feed_id, owner_uid, published, tag_cache, label_cache,
 						last_read, note, unread, last_published)
 					VALUES
 					(?, '', NULL, NULL, ?, true, '', '', NOW(), '', false, NOW())");
-				$sth->execute([$ref_id, $owner_uid]);
-			}
+                $sth->execute([$ref_id, $owner_uid]);
+            }
 
-			if (count($labels) != 0) {
-				foreach ($labels as $label) {
-					Labels::add_article($ref_id, trim($label), $owner_uid);
-				}
-			}
+            if (count($labels) != 0) {
+                foreach ($labels as $label) {
+                    Labels::add_article($ref_id, trim($label), $owner_uid);
+                }
+            }
 
-			$rc = true;
+            $rc = true;
 
-		} else {
-			$sth = $pdo->prepare("INSERT INTO ttrss_entries
+        } else {
+            $sth = $pdo->prepare("INSERT INTO ttrss_entries
 				(title, guid, link, updated, content, content_hash, date_entered, date_updated)
 				VALUES
 				(?, ?, ?, NOW(), ?, ?, NOW(), NOW())");
-			$sth->execute([$title, $guid, $url, $content, $content_hash]);
+            $sth->execute([$title, $guid, $url, $content, $content_hash]);
 
-			$sth = $pdo->prepare("SELECT id FROM ttrss_entries WHERE guid = ?");
-			$sth->execute([$guid]);
+            $sth = $pdo->prepare("SELECT id FROM ttrss_entries WHERE guid = ?");
+            $sth->execute([$guid]);
 
-			if ($row = $sth->fetch()) {
-				$ref_id = $row["id"];
-				if (DB_TYPE == "pgsql"){
-					$sth = $pdo->prepare("UPDATE ttrss_entries
+            if ($row = $sth->fetch()) {
+                $ref_id = $row["id"];
+                if (DB_TYPE == "pgsql"){
+                    $sth = $pdo->prepare("UPDATE ttrss_entries
 					SET tsvector_combined = to_tsvector( :ts_content)
 					WHERE id = :id");
-					$params = [
-						":ts_content" => mb_substr(strip_tags($content ), 0, 900000),
-						":id" => $ref_id];
-					$sth->execute($params);
-				}
-				$sth = $pdo->prepare("INSERT INTO ttrss_user_entries
+                    $params = [
+                        ":ts_content" => mb_substr(strip_tags($content ), 0, 900000),
+                        ":id" => $ref_id];
+                    $sth->execute($params);
+                }
+                $sth = $pdo->prepare("INSERT INTO ttrss_user_entries
 					(ref_id, uuid, feed_id, orig_feed_id, owner_uid, published, tag_cache, label_cache,
 						last_read, note, unread, last_published)
 					VALUES
 					(?, '', NULL, NULL, ?, true, '', '', NOW(), '', false, NOW())");
-				$sth->execute([$ref_id, $owner_uid]);
+                $sth->execute([$ref_id, $owner_uid]);
 
-				if (count($labels) != 0) {
-					foreach ($labels as $label) {
-						Labels::add_article($ref_id, trim($label), $owner_uid);
-					}
-				}
+                if (count($labels) != 0) {
+                    foreach ($labels as $label) {
+                        Labels::add_article($ref_id, trim($label), $owner_uid);
+                    }
+                }
 
-				$rc = true;
-			}
-		}
+                $rc = true;
+            }
+        }
 
-		$pdo->commit();
+        $pdo->commit();
 
-		return $rc;
-	}
+        return $rc;
+    }
 
-	public function editArticleTags() {
+    public function editArticleTags() {
 
-		$param = clean($_REQUEST['param']);
+        $param = clean($_REQUEST['param']);
 
-		$tags = Article::get_article_tags($param);
+        $tags = Article::get_article_tags($param);
 
-		$tags_str = join(", ", $tags);
+        $tags_str = join(", ", $tags);
 
-		print_hidden("id", "$param");
-		print_hidden("op", "article");
-		print_hidden("method", "setArticleTags");
+        print_hidden("id", "$param");
+        print_hidden("op", "article");
+        print_hidden("method", "setArticleTags");
 
-		print "<header class='horizontal'>" . __("Tags for this article (separated by commas):")."</header>";
+        print "<header class='horizontal'>" . __("Tags for this article (separated by commas):")."</header>";
 
-		print "<section>";
-		print "<textarea dojoType='dijit.form.SimpleTextarea' rows='4'
+        print "<section>";
+        print "<textarea dojoType='dijit.form.SimpleTextarea' rows='4'
 			style='height : 100px; font-size : 12px; width : 98%' id='tags_str'
 			name='tags_str'>$tags_str</textarea>
 		<div class='autocomplete' id='tags_choices'
 				style='display:none'></div>";
-		print "</section>";
+        print "</section>";
 
-		print "<footer>";
-		print "<button dojoType='dijit.form.Button'
+        print "<footer>";
+        print "<button dojoType='dijit.form.Button'
 			type='submit' class='alt-primary' onclick=\"dijit.byId('editTagsDlg').execute()\">".__('Save')."</button> ";
-		print "<button dojoType='dijit.form.Button'
+        print "<button dojoType='dijit.form.Button'
 			onclick=\"dijit.byId('editTagsDlg').hide()\">".__('Cancel')."</button>";
-		print "</footer>";
+        print "</footer>";
 
-	}
+    }
 
-	public function setScore() {
-		$ids = explode(",", clean($_REQUEST['id']));
-		$score = (int)clean($_REQUEST['score']);
+    public function setScore() {
+        $ids = explode(",", clean($_REQUEST['id']));
+        $score = (int)clean($_REQUEST['score']);
 
-		$ids_qmarks = arr_qmarks($ids);
+        $ids_qmarks = arr_qmarks($ids);
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 			score = ? WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
 
-		$sth->execute(array_merge([$score], $ids, [$_SESSION['uid']]));
+        $sth->execute(array_merge([$score], $ids, [$_SESSION['uid']]));
 
-		print json_encode(["id" => $ids, "score" => (int)$score]);
-	}
+        print json_encode(["id" => $ids, "score" => (int)$score]);
+    }
 
-	public function getScore() {
-		$id = clean($_REQUEST['id']);
+    public function getScore() {
+        $id = clean($_REQUEST['id']);
 
-		$sth = $this->pdo->prepare("SELECT score FROM ttrss_user_entries WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
-		$row = $sth->fetch();
+        $sth = $this->pdo->prepare("SELECT score FROM ttrss_user_entries WHERE ref_id = ? AND owner_uid = ?");
+        $sth->execute([$id, $_SESSION['uid']]);
+        $row = $sth->fetch();
 
-		$score = $row['score'];
+        $score = $row['score'];
 
-		print json_encode(["id" => $id, "score" => (int)$score]);
-	}
+        print json_encode(["id" => $id, "score" => (int)$score]);
+    }
 
 
-	public function setArticleTags() {
+    public function setArticleTags() {
 
-		$id = clean($_REQUEST["id"]);
+        $id = clean($_REQUEST["id"]);
 
-		$tags_str = clean($_REQUEST["tags_str"]);
-		$tags = array_unique(trim_array(explode(",", $tags_str)));
+        $tags_str = clean($_REQUEST["tags_str"]);
+        $tags = array_unique(trim_array(explode(",", $tags_str)));
 
-		$this->pdo->beginTransaction();
+        $this->pdo->beginTransaction();
 
-		$sth = $this->pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
+        $sth = $this->pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = ? AND owner_uid = ? LIMIT 1");
-		$sth->execute([$id, $_SESSION['uid']]);
+        $sth->execute([$id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			$tags_to_cache = array();
+            $tags_to_cache = array();
 
-			$int_id = $row['int_id'];
+            $int_id = $row['int_id'];
 
-			$sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE
+            $sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE
 				post_int_id = ? AND owner_uid = ?");
-			$sth->execute([$int_id, $_SESSION['uid']]);
+            $sth->execute([$int_id, $_SESSION['uid']]);
 
-			$tags = FeedItem_Common::normalize_categories($tags);
+            $tags = FeedItem_Common::normalize_categories($tags);
 
-			foreach ($tags as $tag) {
-				if ($tag != '') {
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_tags
+            foreach ($tags as $tag) {
+                if ($tag != '') {
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_tags
 								(post_int_id, owner_uid, tag_name)
 								VALUES (?, ?, ?)");
 
-					$sth->execute([$int_id, $_SESSION['uid'], $tag]);
-				}
+                    $sth->execute([$int_id, $_SESSION['uid'], $tag]);
+                }
 
-				array_push($tags_to_cache, $tag);
-			}
+                array_push($tags_to_cache, $tag);
+            }
 
-			/* update tag cache */
+            /* update tag cache */
 
-			$tags_str = join(",", $tags_to_cache);
+            $tags_str = join(",", $tags_to_cache);
 
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
 				SET tag_cache = ? WHERE ref_id = ? AND owner_uid = ?");
-			$sth->execute([$tags_str, $id, $_SESSION['uid']]);
-		}
+            $sth->execute([$tags_str, $id, $_SESSION['uid']]);
+        }
 
-		$this->pdo->commit();
+        $this->pdo->commit();
 
-		$tags = Article::get_article_tags($id);
-		$tags_str = $this->format_tags_string($tags);
-		$tags_str_full = join(", ", $tags);
+        $tags = Article::get_article_tags($id);
+        $tags_str = $this->format_tags_string($tags);
+        $tags_str_full = join(", ", $tags);
 
-		if (!$tags_str_full) $tags_str_full = __("no tags");
+        if (!$tags_str_full) $tags_str_full = __("no tags");
 
-		print json_encode([
-			"id" => (int) $id,
-			"content" => $tags_str,
-			"content_full" => $tags_str_full
-		]);
-	}
+        print json_encode([
+            "id" => (int) $id,
+            "content" => $tags_str,
+            "content_full" => $tags_str_full
+        ]);
+    }
 
 
-	public function completeTags() {
-		$search = clean($_REQUEST["search"]);
+    public function completeTags() {
+        $search = clean($_REQUEST["search"]);
 
-		$sth = $this->pdo->prepare("SELECT DISTINCT tag_name FROM ttrss_tags
+        $sth = $this->pdo->prepare("SELECT DISTINCT tag_name FROM ttrss_tags
 				WHERE owner_uid = ? AND
 				tag_name LIKE ? ORDER BY tag_name
 				LIMIT 10");
 
-		$sth->execute([$_SESSION['uid'], "$search%"]);
+        $sth->execute([$_SESSION['uid'], "$search%"]);
 
-		print "<ul>";
-		while ($line = $sth->fetch()) {
-			print "<li>" . $line["tag_name"] . "</li>";
-		}
-		print "</ul>";
-	}
+        print "<ul>";
+        while ($line = $sth->fetch()) {
+            print "<li>" . $line["tag_name"] . "</li>";
+        }
+        print "</ul>";
+    }
 
-	public function assigntolabel() {
-		return $this->labelops(true);
-	}
+    public function assigntolabel() {
+        return $this->labelops(true);
+    }
 
-	public function removefromlabel() {
-		return $this->labelops(false);
-	}
+    public function removefromlabel() {
+        return $this->labelops(false);
+    }
 
-	private function labelops($assign) {
-		$reply = array();
+    private function labelops($assign) {
+        $reply = array();
 
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$label_id = clean($_REQUEST["lid"]);
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $label_id = clean($_REQUEST["lid"]);
 
-		$label = Labels::find_caption($label_id, $_SESSION["uid"]);
+        $label = Labels::find_caption($label_id, $_SESSION["uid"]);
 
-		$reply["info-for-headlines"] = array();
+        $reply["info-for-headlines"] = array();
 
-		if ($label) {
+        if ($label) {
 
-			foreach ($ids as $id) {
+            foreach ($ids as $id) {
 
-				if ($assign)
-					Labels::add_article($id, $label, $_SESSION["uid"]);
-				else
-					Labels::remove_article($id, $label, $_SESSION["uid"]);
+                if ($assign)
+                    Labels::add_article($id, $label, $_SESSION["uid"]);
+                else
+                    Labels::remove_article($id, $label, $_SESSION["uid"]);
 
-				$labels = $this->get_article_labels($id, $_SESSION["uid"]);
+                $labels = $this->get_article_labels($id, $_SESSION["uid"]);
 
-				array_push($reply["info-for-headlines"],
-				array("id" => $id, "labels" => $this->format_article_labels($labels)));
+                array_push($reply["info-for-headlines"],
+                array("id" => $id, "labels" => $this->format_article_labels($labels)));
 
-			}
-		}
+            }
+        }
 
-		$reply["message"] = "UPDATE_COUNTERS";
+        $reply["message"] = "UPDATE_COUNTERS";
 
-		print json_encode($reply);
-	}
+        print json_encode($reply);
+    }
 
-	public function getArticleFeed($id) {
-		$sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
+    public function getArticleFeed($id) {
+        $sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
+        $sth->execute([$id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			return $row["feed_id"];
-		} else {
-			return 0;
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row["feed_id"];
+        } else {
+            return 0;
+        }
+    }
 
-	public static function format_article_enclosures($id, $always_display_enclosures,
-									   $article_content, $hide_images = false) {
+    public static function format_article_enclosures($id, $always_display_enclosures,
+                                        $article_content, $hide_images = false) {
 
-		$result = Article::get_article_enclosures($id);
-		$rv = '';
+        $result = Article::get_article_enclosures($id);
+        $rv = '';
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ENCLOSURES) as $plugin) {
-			$retval = $plugin->hook_format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images);
-			if (is_array($retval)) {
-				$rv = $retval[0];
-				$result = $retval[1];
-			} else {
-				$rv = $retval;
-			}
-		}
-		unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ENCLOSURES) as $plugin) {
+            $retval = $plugin->hook_format_enclosures($rv, $result, $id, $always_display_enclosures, $article_content, $hide_images);
+            if (is_array($retval)) {
+                $rv = $retval[0];
+                $result = $retval[1];
+            } else {
+                $rv = $retval;
+            }
+        }
+        unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
 
-		if ($rv === '' && !empty($result)) {
-			$entries_html = array();
-			$entries = array();
-			$entries_inline = array();
+        if ($rv === '' && !empty($result)) {
+            $entries_html = array();
+            $entries = array();
+            $entries_inline = array();
 
-			foreach ($result as $line) {
+            foreach ($result as $line) {
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ENCLOSURE_ENTRY) as $plugin) {
-					$line = $plugin->hook_enclosure_entry($line, $id);
-				}
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ENCLOSURE_ENTRY) as $plugin) {
+                    $line = $plugin->hook_enclosure_entry($line, $id);
+                }
 
-				$url = $line["content_url"];
-				$ctype = $line["content_type"];
-				$title = $line["title"];
-				$width = $line["width"];
-				$height = $line["height"];
+                $url = $line["content_url"];
+                $ctype = $line["content_type"];
+                $title = $line["title"];
+                $width = $line["width"];
+                $height = $line["height"];
 
-				if (!$ctype) $ctype = __("unknown type");
+                if (!$ctype) $ctype = __("unknown type");
 
-				//$filename = substr($url, strrpos($url, "/")+1);
-				$filename = basename($url);
+                //$filename = substr($url, strrpos($url, "/")+1);
+                $filename = basename($url);
 
-				$player = format_inline_player($url, $ctype);
+                $player = format_inline_player($url, $ctype);
 
-				if ($player) array_push($entries_inline, $player);
+                if ($player) array_push($entries_inline, $player);
 
 #				$entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\" rel=\"noopener noreferrer\">" .
 #					$filename . " (" . $ctype . ")" . "</a>";
 
-				$entry = "<div onclick=\"popupOpenUrl('".htmlspecialchars($url)."')\"
+                $entry = "<div onclick=\"popupOpenUrl('".htmlspecialchars($url)."')\"
 					dojoType=\"dijit.MenuItem\">$filename ($ctype)</div>";
 
-				array_push($entries_html, $entry);
+                array_push($entries_html, $entry);
 
-				$entry = array();
+                $entry = array();
 
-				$entry["type"] = $ctype;
-				$entry["filename"] = $filename;
-				$entry["url"] = $url;
-				$entry["title"] = $title;
-				$entry["width"] = $width;
-				$entry["height"] = $height;
+                $entry["type"] = $ctype;
+                $entry["filename"] = $filename;
+                $entry["url"] = $url;
+                $entry["title"] = $title;
+                $entry["width"] = $width;
+                $entry["height"] = $height;
 
-				array_push($entries, $entry);
-			}
+                array_push($entries, $entry);
+            }
 
-			if ($_SESSION['uid'] && !get_pref("STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
-				if ($always_display_enclosures ||
-					!preg_match("/<img/i", $article_content)) {
+            if ($_SESSION['uid'] && !get_pref("STRIP_IMAGES") && !$_SESSION["bw_limit"]) {
+                if ($always_display_enclosures ||
+                    !preg_match("/<img/i", $article_content)) {
 
-					foreach ($entries as $entry) {
+                    foreach ($entries as $entry) {
 
-						foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin)
-							$retval = $plugin->hook_render_enclosure($entry, $hide_images);
+                        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin)
+                            $retval = $plugin->hook_render_enclosure($entry, $hide_images);
 
 
-						if ($retval) {
-							$rv .= $retval;
-						} else {
+                        if ($retval) {
+                            $rv .= $retval;
+                        } else {
 
-							if (preg_match("/image/", $entry["type"])) {
+                            if (preg_match("/image/", $entry["type"])) {
 
-								if (!$hide_images) {
-									$encsize = '';
-									if ($entry['height'] > 0)
-										$encsize .= ' height="' . intval($entry['height']) . '"';
-									if ($entry['width'] > 0)
-										$encsize .= ' width="' . intval($entry['width']) . '"';
-									$rv .= "<p><img
+                                if (!$hide_images) {
+                                    $encsize = '';
+                                    if ($entry['height'] > 0)
+                                        $encsize .= ' height="' . intval($entry['height']) . '"';
+                                    if ($entry['width'] > 0)
+                                        $encsize .= ' width="' . intval($entry['width']) . '"';
+                                    $rv .= "<p><img
 										alt=\"".htmlspecialchars($entry["filename"])."\"
 										src=\"" .htmlspecialchars($entry["url"]) . "\"
 										" . $encsize . " /></p>";
-								} else {
-									$rv .= "<p><a target=\"_blank\" rel=\"noopener noreferrer\"
+                                } else {
+                                    $rv .= "<p><a target=\"_blank\" rel=\"noopener noreferrer\"
 										href=\"".htmlspecialchars($entry["url"])."\"
 										>" .htmlspecialchars($entry["url"]) . "</a></p>";
-								}
-
-								if ($entry['title']) {
-									$rv.= "<div class=\"enclosure_title\">${entry['title']}</div>";
-								}
-							}
-						}
-					}
-				}
-			}
-
-			if (count($entries_inline) > 0) {
-				//$rv .= "<hr clear='both'/>";
-				foreach ($entries_inline as $entry) { $rv .= $entry; };
-				$rv .= "<br clear='both'/>";
-			}
-
-			$rv .= "<div class=\"attachments\" dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Attachments')."</span>";
-
-			$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
-
-			foreach ($entries as $entry) {
-				if ($entry["title"])
-					$title = " &mdash; " . truncate_string($entry["title"], 30);
-				else
-					$title = "";
-
-				if ($entry["filename"])
-					$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
-				else
-					$filename = "";
-
-				$rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
+                                }
+
+                                if ($entry['title']) {
+                                    $rv.= "<div class=\"enclosure_title\">${entry['title']}</div>";
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (count($entries_inline) > 0) {
+                //$rv .= "<hr clear='both'/>";
+                foreach ($entries_inline as $entry) { $rv .= $entry; };
+                $rv .= "<br clear='both'/>";
+            }
+
+            $rv .= "<div class=\"attachments\" dojoType=\"fox.form.DropDownButton\">".
+                "<span>" . __('Attachments')."</span>";
+
+            $rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
+
+            foreach ($entries as $entry) {
+                if ($entry["title"])
+                    $title = " &mdash; " . truncate_string($entry["title"], 30);
+                else
+                    $title = "";
+
+                if ($entry["filename"])
+                    $filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
+                else
+                    $filename = "";
+
+                $rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
 					dojoType=\"dijit.MenuItem\">".$filename . $title."</div>";
 
-			};
+            };
 
-			$rv .= "</div>";
-			$rv .= "</div>";
-		}
+            $rv .= "</div>";
+            $rv .= "</div>";
+        }
 
-		return $rv;
-	}
+        return $rv;
+    }
 
-	public static function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
+    public static function get_article_tags($id, $owner_uid = 0, $tag_cache = false) {
 
-		$a_id = $id;
+        $a_id = $id;
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT DISTINCT tag_name,
+        $sth = $pdo->prepare("SELECT DISTINCT tag_name,
 			owner_uid as owner FROM	ttrss_tags
 			WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
 			ref_id = ? AND owner_uid = ? LIMIT 1) ORDER BY tag_name");
 
-		$tags = array();
+        $tags = array();
 
-		/* check cache first */
+        /* check cache first */
 
-		if ($tag_cache === false) {
-			$csth = $pdo->prepare("SELECT tag_cache FROM ttrss_user_entries
+        if ($tag_cache === false) {
+            $csth = $pdo->prepare("SELECT tag_cache FROM ttrss_user_entries
 				WHERE ref_id = ? AND owner_uid = ?");
-			$csth->execute([$id, $owner_uid]);
+            $csth->execute([$id, $owner_uid]);
 
-			if ($row = $csth->fetch()) $tag_cache = $row["tag_cache"];
-		}
+            if ($row = $csth->fetch()) $tag_cache = $row["tag_cache"];
+        }
 
-		if ($tag_cache) {
-			$tags = explode(",", $tag_cache);
-		} else {
+        if ($tag_cache) {
+            $tags = explode(",", $tag_cache);
+        } else {
 
-			/* do it the hard way */
+            /* do it the hard way */
 
-			$sth->execute([$a_id, $owner_uid]);
+            $sth->execute([$a_id, $owner_uid]);
 
-			while ($tmp_line = $sth->fetch()) {
-				array_push($tags, $tmp_line["tag_name"]);
-			}
+            while ($tmp_line = $sth->fetch()) {
+                array_push($tags, $tmp_line["tag_name"]);
+            }
 
-			/* update the cache */
+            /* update the cache */
 
-			$tags_str = join(",", $tags);
+            $tags_str = join(",", $tags);
 
-			$sth = $pdo->prepare("UPDATE ttrss_user_entries
+            $sth = $pdo->prepare("UPDATE ttrss_user_entries
 				SET tag_cache = ? WHERE ref_id = ?
 				AND owner_uid = ?");
-			$sth->execute([$tags_str, $id, $owner_uid]);
-		}
+            $sth->execute([$tags_str, $id, $owner_uid]);
+        }
 
-		return $tags;
-	}
+        return $tags;
+    }
 
-	public static function format_tags_string($tags) {
-		if (!is_array($tags) || count($tags) == 0) {
-			return __("no tags");
-		} else {
-			$maxtags = min(5, count($tags));
-			$tags_str = "";
+    public static function format_tags_string($tags) {
+        if (!is_array($tags) || count($tags) == 0) {
+            return __("no tags");
+        } else {
+            $maxtags = min(5, count($tags));
+            $tags_str = "";
 
-			for ($i = 0; $i < $maxtags; $i++) {
-				$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"Feeds.open({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, ";
-			}
+            for ($i = 0; $i < $maxtags; $i++) {
+                $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"Feeds.open({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, ";
+            }
 
-			$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
+            $tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
 
-			if (count($tags) > $maxtags)
-				$tags_str .= ", &hellip;";
+            if (count($tags) > $maxtags)
+                $tags_str .= ", &hellip;";
 
-			return $tags_str;
-		}
-	}
+            return $tags_str;
+        }
+    }
 
-	public static function format_article_labels($labels) {
+    public static function format_article_labels($labels) {
 
-		if (!is_array($labels)) return '';
+        if (!is_array($labels)) return '';
 
-		$labels_str = "";
+        $labels_str = "";
 
-		foreach ($labels as $l) {
-			$labels_str .= sprintf("<div class='label'
+        foreach ($labels as $l) {
+            $labels_str .= sprintf("<div class='label'
 				style='color : %s; background-color : %s'>%s</div>",
-				$l[2], $l[3], $l[1]);
-		}
+                $l[2], $l[3], $l[1]);
+        }
 
-		return $labels_str;
+        return $labels_str;
 
-	}
+    }
 
-	public static function format_article_note($id, $note, $allow_edit = true) {
+    public static function format_article_note($id, $note, $allow_edit = true) {
 
-		if ($allow_edit) {
-			$onclick = "onclick='Plugins.Note.edit($id)'";
-			$note_class = 'editable';
-		} else {
-			$onclick = '';
-			$note_class = '';
-		}
+        if ($allow_edit) {
+            $onclick = "onclick='Plugins.Note.edit($id)'";
+            $note_class = 'editable';
+        } else {
+            $onclick = '';
+            $note_class = '';
+        }
 
-		return "<div class='article-note $note_class'>
+        return "<div class='article-note $note_class'>
 			<i class='material-icons'>note</i>
 			<div $onclick class='body'>$note</div>
 			</div>";
-	}
+    }
 
-	public static function get_article_enclosures($id) {
+    public static function get_article_enclosures($id) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT * FROM ttrss_enclosures
+        $sth = $pdo->prepare("SELECT * FROM ttrss_enclosures
 			WHERE post_id = ? AND content_url != ''");
-		$sth->execute([$id]);
+        $sth->execute([$id]);
 
-		$rv = array();
+        $rv = array();
 
-		$cache = new DiskCache("images");
+        $cache = new DiskCache("images");
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			if ($cache->exists(sha1($line["content_url"]))) {
-				$line["content_url"] = $cache->getUrl(sha1($line["content_url"]));
-			}
+            if ($cache->exists(sha1($line["content_url"]))) {
+                $line["content_url"] = $cache->getUrl(sha1($line["content_url"]));
+            }
 
-			array_push($rv, $line);
-		}
+            array_push($rv, $line);
+        }
 
-		return $rv;
-	}
+        return $rv;
+    }
 
-	public static function purge_orphans() {
+    public static function purge_orphans() {
 
         // purge orphaned posts in main content table
 
@@ -633,169 +633,169 @@ 
         }
     }
 
-	public static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
+    public static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$ids_qmarks = arr_qmarks($ids);
+        $ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 1) {
-			$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
+        if ($cmode == 1) {
+            $sth = $pdo->prepare("UPDATE ttrss_user_entries SET
 				unread = true
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 2) {
-			$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
+        } else if ($cmode == 2) {
+            $sth = $pdo->prepare("UPDATE ttrss_user_entries SET
 				unread = NOT unread,last_read = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else {
-			$sth = $pdo->prepare("UPDATE ttrss_user_entries SET
+        } else {
+            $sth = $pdo->prepare("UPDATE ttrss_user_entries SET
 				unread = false,last_read = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		}
+        }
 
-		$sth->execute(array_merge($ids, [$owner_uid]));
+        $sth->execute(array_merge($ids, [$owner_uid]));
 
-		/* update ccache */
+        /* update ccache */
 
-		$sth = $pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
+        $sth = $pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
 			WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$owner_uid]));
+        $sth->execute(array_merge($ids, [$owner_uid]));
 
-		while ($line = $sth->fetch()) {
-			CCache::update($line["feed_id"], $owner_uid);
-		}
-	}
+        while ($line = $sth->fetch()) {
+            CCache::update($line["feed_id"], $owner_uid);
+        }
+    }
 
-	public static function getLastArticleId() {
-		$pdo = DB::pdo();
+    public static function getLastArticleId() {
+        $pdo = DB::pdo();
 
-		$sth = $pdo->prepare("SELECT ref_id AS id FROM ttrss_user_entries
+        $sth = $pdo->prepare("SELECT ref_id AS id FROM ttrss_user_entries
 			WHERE owner_uid = ? ORDER BY ref_id DESC LIMIT 1");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			return $row['id'];
-		} else {
-			return -1;
-		}
-	}
+        if ($row = $sth->fetch()) {
+            return $row['id'];
+        } else {
+            return -1;
+        }
+    }
 
-	public static function get_article_labels($id, $owner_uid = false) {
-		$rv = array();
+    public static function get_article_labels($id, $owner_uid = false) {
+        $rv = array();
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+        if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT label_cache FROM
+        $sth = $pdo->prepare("SELECT label_cache FROM
 			ttrss_user_entries WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
-			$label_cache = $row["label_cache"];
+        if ($row = $sth->fetch()) {
+            $label_cache = $row["label_cache"];
 
-			if ($label_cache) {
-				$tmp = json_decode($label_cache, true);
+            if ($label_cache) {
+                $tmp = json_decode($label_cache, true);
 
-				if (!$tmp || $tmp["no-labels"] == 1)
-					return $rv;
-				else
-					return $tmp;
-			}
-		}
+                if (!$tmp || $tmp["no-labels"] == 1)
+                    return $rv;
+                else
+                    return $tmp;
+            }
+        }
 
-		$sth = $pdo->prepare("SELECT DISTINCT label_id,caption,fg_color,bg_color
+        $sth = $pdo->prepare("SELECT DISTINCT label_id,caption,fg_color,bg_color
 				FROM ttrss_labels2, ttrss_user_labels2
 			WHERE id = label_id
 				AND article_id = ?
 				AND owner_uid = ?
 			ORDER BY caption");
-		$sth->execute([$id, $owner_uid]);
-
-		while ($line = $sth->fetch()) {
-			$rk = array(Labels::label_to_feed_id($line["label_id"]),
-				$line["caption"], $line["fg_color"],
-				$line["bg_color"]);
-			array_push($rv, $rk);
-		}
-
-		if (count($rv) > 0)
-			Labels::update_cache($owner_uid, $id, $rv);
-		else
-			Labels::update_cache($owner_uid, $id, array("no-labels" => 1));
-
-		return $rv;
-	}
-
-	public static function get_article_image($enclosures, $content, $site_url) {
-
-		$article_image = "";
-		$article_stream = "";
-
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_IMAGE) as $p) {
-			list ($article_image, $article_stream, $content) = $p->hook_article_image($enclosures, $content, $site_url);
-		}
-
-		if (!$article_image && !$article_stream) {
-			$tmpdoc = new DOMDocument();
-
-			if (@$tmpdoc->loadHTML('<?xml encoding="UTF-8">' . mb_substr($content, 0, 131070))) {
-				$tmpxpath = new DOMXPath($tmpdoc);
-				$elems = $tmpxpath->query('(//img[@src]|//video[@poster]|//iframe[contains(@src , "youtube.com/embed/")])');
-
-				foreach ($elems as $e) {
-					if ($e->nodeName == "iframe") {
-						$matches = [];
-						if (preg_match("/\/embed\/([\w-]+)/", $e->getAttribute("src"), $matches)) {
-							$article_image = "https://img.youtube.com/vi/" . $matches[1] . "/hqdefault.jpg";
-							$article_stream = "https://youtu.be/" . $matches[1];
-							break;
-						}
-					} else if ($e->nodeName == "video") {
-						$article_image = $e->getAttribute("poster");
-
-						$src = $tmpxpath->query("//source[@src]", $e)->item(0);
-
-						if ($src) {
-							$article_stream = $src->getAttribute("src");
-						}
-
-						break;
-					} else if ($e->nodeName == 'img') {
-						if (mb_strpos($e->getAttribute("src"), "data:") !== 0) {
-							$article_image = $e->getAttribute("src");
-						}
-						break;
-					}
-				}
-			}
-
-			if (!$article_image)
-				foreach ($enclosures as $enc) {
-					if (strpos($enc["content_type"], "image/") !== false) {
-						$article_image = $enc["content_url"];
-						break;
-					}
-				}
-
-			if ($article_image)
-				$article_image = rewrite_relative_url($site_url, $article_image);
-
-			if ($article_stream)
-				$article_stream = rewrite_relative_url($site_url, $article_stream);
-		}
-
-		$cache = new DiskCache("images");
-
-		if ($article_image && $cache->exists(sha1($article_image)))
-			$article_image = $cache->getUrl(sha1($article_image));
-
-		if ($article_stream && $cache->exists(sha1($article_stream)))
-			$article_stream = $cache->getUrl(sha1($article_stream));
-
-		return [$article_image, $article_stream];
-	}
+        $sth->execute([$id, $owner_uid]);
+
+        while ($line = $sth->fetch()) {
+            $rk = array(Labels::label_to_feed_id($line["label_id"]),
+                $line["caption"], $line["fg_color"],
+                $line["bg_color"]);
+            array_push($rv, $rk);
+        }
+
+        if (count($rv) > 0)
+            Labels::update_cache($owner_uid, $id, $rv);
+        else
+            Labels::update_cache($owner_uid, $id, array("no-labels" => 1));
+
+        return $rv;
+    }
+
+    public static function get_article_image($enclosures, $content, $site_url) {
+
+        $article_image = "";
+        $article_stream = "";
+
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_IMAGE) as $p) {
+            list ($article_image, $article_stream, $content) = $p->hook_article_image($enclosures, $content, $site_url);
+        }
+
+        if (!$article_image && !$article_stream) {
+            $tmpdoc = new DOMDocument();
+
+            if (@$tmpdoc->loadHTML('<?xml encoding="UTF-8">' . mb_substr($content, 0, 131070))) {
+                $tmpxpath = new DOMXPath($tmpdoc);
+                $elems = $tmpxpath->query('(//img[@src]|//video[@poster]|//iframe[contains(@src , "youtube.com/embed/")])');
+
+                foreach ($elems as $e) {
+                    if ($e->nodeName == "iframe") {
+                        $matches = [];
+                        if (preg_match("/\/embed\/([\w-]+)/", $e->getAttribute("src"), $matches)) {
+                            $article_image = "https://img.youtube.com/vi/" . $matches[1] . "/hqdefault.jpg";
+                            $article_stream = "https://youtu.be/" . $matches[1];
+                            break;
+                        }
+                    } else if ($e->nodeName == "video") {
+                        $article_image = $e->getAttribute("poster");
+
+                        $src = $tmpxpath->query("//source[@src]", $e)->item(0);
+
+                        if ($src) {
+                            $article_stream = $src->getAttribute("src");
+                        }
+
+                        break;
+                    } else if ($e->nodeName == 'img') {
+                        if (mb_strpos($e->getAttribute("src"), "data:") !== 0) {
+                            $article_image = $e->getAttribute("src");
+                        }
+                        break;
+                    }
+                }
+            }
+
+            if (!$article_image)
+                foreach ($enclosures as $enc) {
+                    if (strpos($enc["content_type"], "image/") !== false) {
+                        $article_image = $enc["content_url"];
+                        break;
+                    }
+                }
+
+            if ($article_image)
+                $article_image = rewrite_relative_url($site_url, $article_image);
+
+            if ($article_stream)
+                $article_stream = rewrite_relative_url($site_url, $article_stream);
+        }
+
+        $cache = new DiskCache("images");
+
+        if ($article_image && $cache->exists(sha1($article_image)))
+            $article_image = $cache->getUrl(sha1($article_image));
+
+        if ($article_stream && $cache->exists(sha1($article_stream)))
+            $article_stream = $cache->getUrl(sha1($article_stream));
+
+        return [$article_image, $article_stream];
+    }
 
 }

classes/diskcache.php

Indentation +148 added lines, -148 removed lines

@@ -1,151 +1,151 @@
 <?php
 class DiskCache {
-	private $dir;
-
-	public function __construct($dir) {
-		$this->dir = CACHE_DIR . "/" . clean_filename($dir);
-	}
-
-	public function getDir() {
-		return $this->dir;
-	}
-
-	public function makeDir() {
-		if (!is_dir($this->dir)) {
-			return mkdir($this->dir);
-		}
-	}
-
-	public function isWritable($filename = "") {
-		if ($filename) {
-			if (file_exists($this->getFullPath($filename)))
-				return is_writable($this->getFullPath($filename));
-			else
-				return is_writable($this->dir);
-		} else {
-			return is_writable($this->dir);
-		}
-	}
-
-	public function exists($filename) {
-		return file_exists($this->getFullPath($filename));
-	}
-
-	public function getSize($filename) {
-		if ($this->exists($filename))
-			return filesize($this->getFullPath($filename));
-		else
-			return -1;
-	}
-
-	public function getFullPath($filename) {
-		$filename = clean_filename($filename);
-
-		return $this->dir . "/" . $filename;
-	}
-
-	public function put($filename, $data) {
-		return file_put_contents($this->getFullPath($filename), $data);
-	}
-
-	public function touch($filename) {
-		return touch($this->getFullPath($filename));
-	}
-
-	public function get($filename) {
-		if ($this->exists($filename))
-			return file_get_contents($this->getFullPath($filename));
-		else
-			return null;
-	}
-
-	public function getMimeType($filename) {
-		if ($this->exists($filename))
-			return mime_content_type($this->getFullPath($filename));
-		else
-			return null;
-	}
-
-	public function send($filename) {
-		header("Content-Disposition: inline; filename=\"$filename\"");
-
-		return send_local_file($this->getFullPath($filename));
-	}
-
-	public function getUrl($filename) {
-		return get_self_url_prefix() . "/public.php?op=cached_url&file=" . basename($this->dir) . "/" . $filename;
-	}
-
-	// check for locally cached (media) URLs and rewrite to local versions
-	// this is called separately after sanitize() and plugin render article hooks to allow
-	// plugins work on original source URLs used before caching
-	static public function rewriteUrls($str)
-	{
-		$res = trim($str);
-		if (!$res) return '';
-
-		$doc = new DOMDocument();
-		if ($doc->loadHTML('<?xml encoding="UTF-8">' . $res)) {
-			$xpath = new DOMXPath($doc);
-			$cache = new DiskCache("images");
-
-			$entries = $xpath->query('(//img[@src]|//picture/source[@src]|//video[@poster]|//video/source[@src]|//audio/source[@src])');
-
-			$need_saving = false;
-
-			foreach ($entries as $entry) {
-
-				if ($entry->hasAttribute('src') || $entry->hasAttribute('poster')) {
-
-					// should be already absolutized because this is called after sanitize()
-					$src = $entry->hasAttribute('poster') ? $entry->getAttribute('poster') : $entry->getAttribute('src');
-					$cached_filename = sha1($src);
-
-					if ($cache->exists($cached_filename)) {
-
-						$src = $cache->getUrl(sha1($src));
-
-						if ($entry->hasAttribute('poster'))
-							$entry->setAttribute('poster', $src);
-						else {
-							$entry->setAttribute('src', $src);
-							$entry->removeAttribute("srcset");
-						}
-
-						$need_saving = true;
-					}
-				}
-			}
-
-			if ($need_saving) {
-				$doc->removeChild($doc->firstChild); //remove doctype
-				$res = $doc->saveHTML();
-			}
-		}
-		return $res;
-	}
-
-	public static function expire() {
-		$dirs = array_filter(glob(CACHE_DIR . "/*"), "is_dir");
-
-		foreach ($dirs as $cache_dir) {
-			$num_deleted = 0;
-
-			if (is_writable($cache_dir) && !file_exists("$cache_dir/.no-auto-expiry")) {
-				$files = glob("$cache_dir/*");
-
-				if ($files) {
-					foreach ($files as $file) {
-						if (time() - filemtime($file) > 86400*CACHE_MAX_DAYS) {
-							unlink($file);
-
-							++$num_deleted;
-						}
-					}
-				}
-
-				Debug::log("expired $cache_dir: removed $num_deleted files.");
-			}
-		}
-	}
+    private $dir;
+
+    public function __construct($dir) {
+        $this->dir = CACHE_DIR . "/" . clean_filename($dir);
+    }
+
+    public function getDir() {
+        return $this->dir;
+    }
+
+    public function makeDir() {
+        if (!is_dir($this->dir)) {
+            return mkdir($this->dir);
+        }
+    }
+
+    public function isWritable($filename = "") {
+        if ($filename) {
+            if (file_exists($this->getFullPath($filename)))
+                return is_writable($this->getFullPath($filename));
+            else
+                return is_writable($this->dir);
+        } else {
+            return is_writable($this->dir);
+        }
+    }
+
+    public function exists($filename) {
+        return file_exists($this->getFullPath($filename));
+    }
+
+    public function getSize($filename) {
+        if ($this->exists($filename))
+            return filesize($this->getFullPath($filename));
+        else
+            return -1;
+    }
+
+    public function getFullPath($filename) {
+        $filename = clean_filename($filename);
+
+        return $this->dir . "/" . $filename;
+    }
+
+    public function put($filename, $data) {
+        return file_put_contents($this->getFullPath($filename), $data);
+    }
+
+    public function touch($filename) {
+        return touch($this->getFullPath($filename));
+    }
+
+    public function get($filename) {
+        if ($this->exists($filename))
+            return file_get_contents($this->getFullPath($filename));
+        else
+            return null;
+    }
+
+    public function getMimeType($filename) {
+        if ($this->exists($filename))
+            return mime_content_type($this->getFullPath($filename));
+        else
+            return null;
+    }
+
+    public function send($filename) {
+        header("Content-Disposition: inline; filename=\"$filename\"");
+
+        return send_local_file($this->getFullPath($filename));
+    }
+
+    public function getUrl($filename) {
+        return get_self_url_prefix() . "/public.php?op=cached_url&file=" . basename($this->dir) . "/" . $filename;
+    }
+
+    // check for locally cached (media) URLs and rewrite to local versions
+    // this is called separately after sanitize() and plugin render article hooks to allow
+    // plugins work on original source URLs used before caching
+    static public function rewriteUrls($str)
+    {
+        $res = trim($str);
+        if (!$res) return '';
+
+        $doc = new DOMDocument();
+        if ($doc->loadHTML('<?xml encoding="UTF-8">' . $res)) {
+            $xpath = new DOMXPath($doc);
+            $cache = new DiskCache("images");
+
+            $entries = $xpath->query('(//img[@src]|//picture/source[@src]|//video[@poster]|//video/source[@src]|//audio/source[@src])');
+
+            $need_saving = false;
+
+            foreach ($entries as $entry) {
+
+                if ($entry->hasAttribute('src') || $entry->hasAttribute('poster')) {
+
+                    // should be already absolutized because this is called after sanitize()
+                    $src = $entry->hasAttribute('poster') ? $entry->getAttribute('poster') : $entry->getAttribute('src');
+                    $cached_filename = sha1($src);
+
+                    if ($cache->exists($cached_filename)) {
+
+                        $src = $cache->getUrl(sha1($src));
+
+                        if ($entry->hasAttribute('poster'))
+                            $entry->setAttribute('poster', $src);
+                        else {
+                            $entry->setAttribute('src', $src);
+                            $entry->removeAttribute("srcset");
+                        }
+
+                        $need_saving = true;
+                    }
+                }
+            }
+
+            if ($need_saving) {
+                $doc->removeChild($doc->firstChild); //remove doctype
+                $res = $doc->saveHTML();
+            }
+        }
+        return $res;
+    }
+
+    public static function expire() {
+        $dirs = array_filter(glob(CACHE_DIR . "/*"), "is_dir");
+
+        foreach ($dirs as $cache_dir) {
+            $num_deleted = 0;
+
+            if (is_writable($cache_dir) && !file_exists("$cache_dir/.no-auto-expiry")) {
+                $files = glob("$cache_dir/*");
+
+                if ($files) {
+                    foreach ($files as $file) {
+                        if (time() - filemtime($file) > 86400*CACHE_MAX_DAYS) {
+                            unlink($file);
+
+                            ++$num_deleted;
+                        }
+                    }
+                }
+
+                Debug::log("expired $cache_dir: removed $num_deleted files.");
+            }
+        }
+    }
 }

plugins/af_readability/init.php

Indentation +188 added lines, -188 removed lines

@@ -4,65 +4,65 @@ 
 
 class Af_Readability extends Plugin {
 
-	/* @var PluginHost $host */
-	private $host;
+    /* @var PluginHost $host */
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Try to inline article content using Readability",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Try to inline article content using Readability",
+            "fox");
+    }
 
-	public function flags() {
-		return array("needs_curl" => true);
-	}
+    public function flags() {
+        return array("needs_curl" => true);
+    }
 
-	public function save() {
-		$enable_share_anything = checkbox_to_sql_bool($_POST["enable_share_anything"]);
+    public function save() {
+        $enable_share_anything = checkbox_to_sql_bool($_POST["enable_share_anything"]);
 
-		$this->host->set($this, "enable_share_anything", $enable_share_anything);
+        $this->host->set($this, "enable_share_anything", $enable_share_anything);
 
-		echo __("Data saved.");
-	}
+        echo __("Data saved.");
+    }
 
-	public function init($host)
-	{
-		$this->host = $host;
+    public function init($host)
+    {
+        $this->host = $host;
 
-		if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-			user_error("af_readability requires PHP 7.0", E_USER_WARNING);
-			return;
-		}
+        if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+            user_error("af_readability requires PHP 7.0", E_USER_WARNING);
+            return;
+        }
 
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-		$host->add_hook($host::HOOK_PREFS_TAB, $this);
-		$host->add_hook($host::HOOK_PREFS_EDIT_FEED, $this);
-		$host->add_hook($host::HOOK_PREFS_SAVE_FEED, $this);
+        $host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
+        $host->add_hook($host::HOOK_PREFS_TAB, $this);
+        $host->add_hook($host::HOOK_PREFS_EDIT_FEED, $this);
+        $host->add_hook($host::HOOK_PREFS_SAVE_FEED, $this);
 
-		// Note: we have to install the hook even if disabled because init() is being run before plugin data has loaded
-		// so we can't check for our storage-set options here
-		$host->add_hook($host::HOOK_GET_FULL_TEXT, $this);
+        // Note: we have to install the hook even if disabled because init() is being run before plugin data has loaded
+        // so we can't check for our storage-set options here
+        $host->add_hook($host::HOOK_GET_FULL_TEXT, $this);
 
-		$host->add_filter_action($this, "action_inline", __("Inline content"));
-	}
+        $host->add_filter_action($this, "action_inline", __("Inline content"));
+    }
 
-	public function hook_prefs_tab($args) {
-		if ($args != "prefFeeds") return;
+    public function hook_prefs_tab($args) {
+        if ($args != "prefFeeds") return;
 
-		print "<div dojoType='dijit.layout.AccordionPane'
+        print "<div dojoType='dijit.layout.AccordionPane'
 			title=\"<i class='material-icons'>extension</i> ".__('Readability settings (af_readability)')."\">";
 
-		if (version_compare(PHP_VERSION, '7.0.0', '<')) {
-			print_error("This plugin requires PHP 7.0.");
-		} else {
+        if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+            print_error("This plugin requires PHP 7.0.");
+        } else {
 
-			print "<h2>" . __("Global settings") . "</h2>";
+            print "<h2>" . __("Global settings") . "</h2>";
 
-			print_notice("Enable for specific feeds in the feed editor.");
+            print_notice("Enable for specific feeds in the feed editor.");
 
-			print "<form dojoType='dijit.form.Form'>";
+            print "<form dojoType='dijit.form.Form'>";
 
-			print "<script type='dojo/method' event='onSubmit' args='evt'>
+            print "<script type='dojo/method' event='onSubmit' args='evt'>
 			evt.preventDefault();
 			if (this.validate()) {
 				console.log(dojo.objectToQuery(this.getValues()));
@@ -76,212 +76,212 @@ 
 			}
 			</script>";
 
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "save");
-			print_hidden("plugin", "af_readability");
+            print_hidden("op", "pluginhandler");
+            print_hidden("method", "save");
+            print_hidden("plugin", "af_readability");
 
-			$enable_share_anything = $this->host->get($this, "enable_share_anything");
+            $enable_share_anything = $this->host->get($this, "enable_share_anything");
 
-			print "<fieldset>";
-			print "<label class='checkbox'> ";
-			print_checkbox("enable_share_anything", $enable_share_anything);
-			print " " . __("Provide full-text services to core code (bookmarklets) and other plugins");
-			print "</label>";
-			print "</fieldset>";
+            print "<fieldset>";
+            print "<label class='checkbox'> ";
+            print_checkbox("enable_share_anything", $enable_share_anything);
+            print " " . __("Provide full-text services to core code (bookmarklets) and other plugins");
+            print "</label>";
+            print "</fieldset>";
 
-			print_button("submit", __("Save"), "class='alt-primary'");
-			print "</form>";
+            print_button("submit", __("Save"), "class='alt-primary'");
+            print "</form>";
 
-			$enabled_feeds = $this->host->get($this, "enabled_feeds");
-			if (!is_array($enabled_feeds)) $enabled_feeds = array();
+            $enabled_feeds = $this->host->get($this, "enabled_feeds");
+            if (!is_array($enabled_feeds)) $enabled_feeds = array();
 
-			$enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
-			$this->host->set($this, "enabled_feeds", $enabled_feeds);
+            $enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
+            $this->host->set($this, "enabled_feeds", $enabled_feeds);
 
-			if (count($enabled_feeds) > 0) {
-				print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
+            if (count($enabled_feeds) > 0) {
+                print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
 
-				print "<ul class='panel panel-scrollable list list-unstyled'>";
-				foreach ($enabled_feeds as $f) {
-					print "<li><i class='material-icons'>rss_feed</i> <a href='#'
+                print "<ul class='panel panel-scrollable list list-unstyled'>";
+                foreach ($enabled_feeds as $f) {
+                    print "<li><i class='material-icons'>rss_feed</i> <a href='#'
 						onclick='CommonDialogs.editFeed($f)'>".
-						Feeds::getFeedTitle($f) . "</a></li>";
-				}
-				print "</ul>";
-			}
+                        Feeds::getFeedTitle($f) . "</a></li>";
+                }
+                print "</ul>";
+            }
 
-		}
+        }
 
-		print "</div>";
-	}
+        print "</div>";
+    }
 
-	public function hook_prefs_edit_feed($feed_id) {
-		print "<header>".__("Readability")."</header>";
-		print "<section>";
+    public function hook_prefs_edit_feed($feed_id) {
+        print "<header>".__("Readability")."</header>";
+        print "<section>";
 
-		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!is_array($enabled_feeds)) $enabled_feeds = array();
+        $enabled_feeds = $this->host->get($this, "enabled_feeds");
+        if (!is_array($enabled_feeds)) $enabled_feeds = array();
 
-		$key = array_search($feed_id, $enabled_feeds);
-		$checked = $key !== false ? "checked" : "";
+        $key = array_search($feed_id, $enabled_feeds);
+        $checked = $key !== false ? "checked" : "";
 
-		print "<fieldset>";
+        print "<fieldset>";
 
-		print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='af_readability_enabled'
+        print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='af_readability_enabled'
 			name='af_readability_enabled' $checked>&nbsp;".__('Inline article content')."</label>";
 
-		print "</fieldset>";
+        print "</fieldset>";
 
-		print "</section>";
-	}
+        print "</section>";
+    }
 
-	public function hook_prefs_save_feed($feed_id) {
-		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!is_array($enabled_feeds)) $enabled_feeds = array();
+    public function hook_prefs_save_feed($feed_id) {
+        $enabled_feeds = $this->host->get($this, "enabled_feeds");
+        if (!is_array($enabled_feeds)) $enabled_feeds = array();
 
-		$enable = checkbox_to_sql_bool($_POST["af_readability_enabled"]);
-		$key = array_search($feed_id, $enabled_feeds);
+        $enable = checkbox_to_sql_bool($_POST["af_readability_enabled"]);
+        $key = array_search($feed_id, $enabled_feeds);
 
-		if ($enable) {
-			if ($key === false) {
-				array_push($enabled_feeds, $feed_id);
-			}
-		} else {
-			if ($key !== false) {
-				unset($enabled_feeds[$key]);
-			}
-		}
+        if ($enable) {
+            if ($key === false) {
+                array_push($enabled_feeds, $feed_id);
+            }
+        } else {
+            if ($key !== false) {
+                unset($enabled_feeds[$key]);
+            }
+        }
 
-		$this->host->set($this, "enabled_feeds", $enabled_feeds);
-	}
+        $this->host->set($this, "enabled_feeds", $enabled_feeds);
+    }
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public function hook_article_filter_action($article, $action) {
-		return $this->process_article($article);
-	}
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function hook_article_filter_action($article, $action) {
+        return $this->process_article($article);
+    }
 
-	public function extract_content($url) {
+    public function extract_content($url) {
 
-		global $fetch_effective_url;
+        global $fetch_effective_url;
 
-		$tmp = fetch_file_contents([
-			"url" => $url,
-			"http_accept" => "text/*",
-			"type" => "text/html"]);
+        $tmp = fetch_file_contents([
+            "url" => $url,
+            "http_accept" => "text/*",
+            "type" => "text/html"]);
 
-		if ($tmp && mb_strlen($tmp) < 1024 * 500) {
-			$tmpdoc = new DOMDocument("1.0", "UTF-8");
+        if ($tmp && mb_strlen($tmp) < 1024 * 500) {
+            $tmpdoc = new DOMDocument("1.0", "UTF-8");
 
-			if (!@$tmpdoc->loadHTML($tmp))
-				return false;
+            if (!@$tmpdoc->loadHTML($tmp))
+                return false;
 
-			// this is the worst hack yet :(
-			if (strtolower($tmpdoc->encoding) != 'utf-8') {
-				$tmp = preg_replace("/<meta.*?charset.*?\/?>/i", "", $tmp);
-				if (empty($tmpdoc->encoding)) {
-					$tmp = mb_convert_encoding($tmp, 'utf-8');
-				} else {
-					$tmp = mb_convert_encoding($tmp, 'utf-8', $tmpdoc->encoding);
-				}
-			}
+            // this is the worst hack yet :(
+            if (strtolower($tmpdoc->encoding) != 'utf-8') {
+                $tmp = preg_replace("/<meta.*?charset.*?\/?>/i", "", $tmp);
+                if (empty($tmpdoc->encoding)) {
+                    $tmp = mb_convert_encoding($tmp, 'utf-8');
+                } else {
+                    $tmp = mb_convert_encoding($tmp, 'utf-8', $tmpdoc->encoding);
+                }
+            }
 
-			try {
-				$r = new Readability(new Configuration());
+            try {
+                $r = new Readability(new Configuration());
 
-				if ($r->parse($tmp)) {
+                if ($r->parse($tmp)) {
 
-					$tmpxpath = new DOMXPath($r->getDOMDOcument());
-					$entries = $tmpxpath->query('(//a[@href]|//img[@src])');
+                    $tmpxpath = new DOMXPath($r->getDOMDOcument());
+                    $entries = $tmpxpath->query('(//a[@href]|//img[@src])');
 
-					foreach ($entries as $entry) {
-						if ($entry->hasAttribute("href")) {
-							$entry->setAttribute("href",
-									rewrite_relative_url($fetch_effective_url, $entry->getAttribute("href")));
+                    foreach ($entries as $entry) {
+                        if ($entry->hasAttribute("href")) {
+                            $entry->setAttribute("href",
+                                    rewrite_relative_url($fetch_effective_url, $entry->getAttribute("href")));
 
-						}
+                        }
 
-						if ($entry->hasAttribute("src")) {
-							$entry->setAttribute("src",
-									rewrite_relative_url($fetch_effective_url, $entry->getAttribute("src")));
+                        if ($entry->hasAttribute("src")) {
+                            $entry->setAttribute("src",
+                                    rewrite_relative_url($fetch_effective_url, $entry->getAttribute("src")));
 
-						}
-					}
+                        }
+                    }
 
-					return $r->getContent();
-				}
+                    return $r->getContent();
+                }
 
-			} catch (Exception $e) {
-				return false;
-			}
-		}
+            } catch (Exception $e) {
+                return false;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function process_article($article) {
+    public function process_article($article) {
 
-		$extracted_content = $this->extract_content($article["link"]);
+        $extracted_content = $this->extract_content($article["link"]);
 
-		# let's see if there's anything of value in there
-		$content_test = trim(strip_tags(sanitize($extracted_content)));
+        # let's see if there's anything of value in there
+        $content_test = trim(strip_tags(sanitize($extracted_content)));
 
-		if ($content_test) {
-			$article["content"] = $extracted_content;
-		}
+        if ($content_test) {
+            $article["content"] = $extracted_content;
+        }
 
-		return $article;
-	}
+        return $article;
+    }
 
-	public function hook_article_filter($article) {
+    public function hook_article_filter($article) {
 
-		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!is_array($enabled_feeds)) return $article;
+        $enabled_feeds = $this->host->get($this, "enabled_feeds");
+        if (!is_array($enabled_feeds)) return $article;
 
-		$key = array_search($article["feed"]["id"], $enabled_feeds);
-		if ($key === false) return $article;
+        $key = array_search($article["feed"]["id"], $enabled_feeds);
+        if ($key === false) return $article;
 
-		return $this->process_article($article);
+        return $this->process_article($article);
 
-	}
+    }
 
-	public function hook_get_full_text($link)
-	{
-		$enable_share_anything = $this->host->get($this, "enable_share_anything");
+    public function hook_get_full_text($link)
+    {
+        $enable_share_anything = $this->host->get($this, "enable_share_anything");
 
-		if ($enable_share_anything) {
-			$extracted_content = $this->extract_content($link);
+        if ($enable_share_anything) {
+            $extracted_content = $this->extract_content($link);
 
-			# let's see if there's anything of value in there
-			$content_test = trim(strip_tags(sanitize($extracted_content)));
+            # let's see if there's anything of value in there
+            $content_test = trim(strip_tags(sanitize($extracted_content)));
 
-			if ($content_test) {
-				return $extracted_content;
-			}
-		}
+            if ($content_test) {
+                return $extracted_content;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
-	private function filter_unknown_feeds($enabled_feeds) {
-		$tmp = array();
+    private function filter_unknown_feeds($enabled_feeds) {
+        $tmp = array();
 
-		foreach ($enabled_feeds as $feed) {
+        foreach ($enabled_feeds as $feed) {
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
-			$sth->execute([$feed, $_SESSION['uid']]);
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
+            $sth->execute([$feed, $_SESSION['uid']]);
 
-			if ($row = $sth->fetch()) {
-				array_push($tmp, $feed);
-			}
-		}
+            if ($row = $sth->fetch()) {
+                array_push($tmp, $feed);
+            }
+        }
 
-		return $tmp;
-	}
+        return $tmp;
+    }
 
 }