codysnider / tt-rss

classes/counters.php

Indentation +128 added lines, -128 removed lines

@@ -1,174 +1,174 @@ 
 <?php
 class Counters {
 
-	public static function getAllCounters() {
-		$data = Counters::getGlobalCounters();
+    public static function getAllCounters() {
+        $data = Counters::getGlobalCounters();
 
-		$data = array_merge($data, Counters::getVirtCounters());
-		$data = array_merge($data, Counters::getLabelCounters());
-		$data = array_merge($data, Counters::getFeedCounters());
-		$data = array_merge($data, Counters::getCategoryCounters());
+        $data = array_merge($data, Counters::getVirtCounters());
+        $data = array_merge($data, Counters::getLabelCounters());
+        $data = array_merge($data, Counters::getFeedCounters());
+        $data = array_merge($data, Counters::getCategoryCounters());
 
-		return $data;
-	}
+        return $data;
+    }
 
-	public static function getCategoryCounters() {
-		$ret_arr = array();
+    public static function getCategoryCounters() {
+        $ret_arr = array();
 
-		/* Labels category */
+        /* Labels category */
 
-		$cv = array("id" => -2, "kind" => "cat",
-			"counter" => Feeds::getCategoryUnread(-2));
+        $cv = array("id" => -2, "kind" => "cat",
+            "counter" => Feeds::getCategoryUnread(-2));
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		$pdo = DB::pdo();
+        $pdo = DB::pdo();
 
-		$sth = $pdo->prepare("SELECT ttrss_feed_categories.id AS cat_id, value AS unread,
+        $sth = $pdo->prepare("SELECT ttrss_feed_categories.id AS cat_id, value AS unread,
 			(SELECT COUNT(id) FROM ttrss_feed_categories AS c2
 				WHERE c2.parent_cat = ttrss_feed_categories.id) AS num_children
 			FROM ttrss_feed_categories, ttrss_cat_counters_cache
 			WHERE ttrss_cat_counters_cache.feed_id = ttrss_feed_categories.id AND
 			ttrss_cat_counters_cache.owner_uid = ttrss_feed_categories.owner_uid AND
 			ttrss_feed_categories.owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
-			$line["cat_id"] = (int) $line["cat_id"];
+        while ($line = $sth->fetch()) {
+            $line["cat_id"] = (int) $line["cat_id"];
 
-			if ($line["num_children"] > 0) {
-				$child_counter = Feeds::getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
-			} else {
-				$child_counter = 0;
-			}
+            if ($line["num_children"] > 0) {
+                $child_counter = Feeds::getCategoryChildrenUnread($line["cat_id"], $_SESSION["uid"]);
+            } else {
+                $child_counter = 0;
+            }
 
-			$cv = array("id" => $line["cat_id"], "kind" => "cat",
-				"counter" => $line["unread"] + $child_counter);
+            $cv = array("id" => $line["cat_id"], "kind" => "cat",
+                "counter" => $line["unread"] + $child_counter);
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		/* Special case: NULL category doesn't actually exist in the DB */
+        /* Special case: NULL category doesn't actually exist in the DB */
 
-		$cv = array("id" => 0, "kind" => "cat",
-			"counter" => (int) CCache::find(0, $_SESSION["uid"], true));
+        $cv = array("id" => 0, "kind" => "cat",
+            "counter" => (int) CCache::find(0, $_SESSION["uid"], true));
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getGlobalCounters($global_unread = -1) {
-		$ret_arr = array();
+    public static function getGlobalCounters($global_unread = -1) {
+        $ret_arr = array();
 
-		if ($global_unread == -1) {
-			$global_unread = Feeds::getGlobalUnread();
-		}
+        if ($global_unread == -1) {
+            $global_unread = Feeds::getGlobalUnread();
+        }
 
-		$cv = array("id" => "global-unread",
-			"counter" => (int) $global_unread);
+        $cv = array("id" => "global-unread",
+            "counter" => (int) $global_unread);
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT COUNT(id) AS fn FROM
+        $sth = $pdo->prepare("SELECT COUNT(id) AS fn FROM
 			ttrss_feeds WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-		$row = $sth->fetch();
+        $sth->execute([$_SESSION['uid']]);
+        $row = $sth->fetch();
 
-		$subscribed_feeds = $row["fn"];
+        $subscribed_feeds = $row["fn"];
 
-		$cv = array("id" => "subscribed-feeds",
-			"counter" => (int) $subscribed_feeds);
+        $cv = array("id" => "subscribed-feeds",
+            "counter" => (int) $subscribed_feeds);
 
-		array_push($ret_arr, $cv);
+        array_push($ret_arr, $cv);
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getVirtCounters() {
+    public static function getVirtCounters() {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		for ($i = 0; $i >= -4; $i--) {
+        for ($i = 0; $i >= -4; $i--) {
 
-			$count = getFeedUnread($i);
+            $count = getFeedUnread($i);
 
-			if ($i == 0 || $i == -1 || $i == -2) {
-							$auxctr = Feeds::getFeedArticles($i, false);
-			} else {
-							$auxctr = 0;
-			}
+            if ($i == 0 || $i == -1 || $i == -2) {
+                            $auxctr = Feeds::getFeedArticles($i, false);
+            } else {
+                            $auxctr = 0;
+            }
 
-			$cv = array("id" => $i,
-				"counter" => (int) $count,
-				"auxcounter" => (int) $auxctr);
+            $cv = array("id" => $i,
+                "counter" => (int) $count,
+                "auxcounter" => (int) $auxctr);
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($i)." ".__("total");
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		$feeds = PluginHost::getInstance()->get_feeds(-1);
+        $feeds = PluginHost::getInstance()->get_feeds(-1);
 
-		if (is_array($feeds)) {
-			foreach ($feeds as $feed) {
-				$cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
-					"counter" => $feed['sender']->get_unread($feed['id']));
+        if (is_array($feeds)) {
+            foreach ($feeds as $feed) {
+                $cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
+                    "counter" => $feed['sender']->get_unread($feed['id']));
 
-				if (method_exists($feed['sender'], 'get_total')) {
-									$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
-				}
+                if (method_exists($feed['sender'], 'get_total')) {
+                                    $cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
+                }
 
-				array_push($ret_arr, $cv);
-			}
-		}
+                array_push($ret_arr, $cv);
+            }
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getLabelCounters($descriptions = false) {
+    public static function getLabelCounters($descriptions = false) {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
+        $sth = $pdo->prepare("SELECT id,caption,SUM(CASE WHEN u1.unread = true THEN 1 ELSE 0 END) AS unread, COUNT(u1.unread) AS total
 			FROM ttrss_labels2 LEFT JOIN ttrss_user_labels2 ON
 				(ttrss_labels2.id = label_id)
 				LEFT JOIN ttrss_user_entries AS u1 ON u1.ref_id = article_id
 				WHERE ttrss_labels2.owner_uid = :uid AND u1.owner_uid = :uid
 				GROUP BY ttrss_labels2.id,
 					ttrss_labels2.caption");
-		$sth->execute([":uid" => $_SESSION['uid']]);
+        $sth->execute([":uid" => $_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$id = Labels::label_to_feed_id($line["id"]);
+            $id = Labels::label_to_feed_id($line["id"]);
 
-			$cv = array("id" => $id,
-				"counter" => (int) $line["unread"],
-				"auxcounter" => (int) $line["total"]);
+            $cv = array("id" => $id,
+                "counter" => (int) $line["unread"],
+                "auxcounter" => (int) $line["total"]);
 
-			if ($descriptions) {
-							$cv["description"] = $line["caption"];
-			}
+            if ($descriptions) {
+                            $cv["description"] = $line["caption"];
+            }
 
-			array_push($ret_arr, $cv);
-		}
+            array_push($ret_arr, $cv);
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
-	public static function getFeedCounters($active_feed = false) {
+    public static function getFeedCounters($active_feed = false) {
 
-		$ret_arr = array();
+        $ret_arr = array();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT ttrss_feeds.id,
+        $sth = $pdo->prepare("SELECT ttrss_feeds.id,
 				ttrss_feeds.title,
 				".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated,
 				last_error, value AS count
@@ -176,47 +176,47 @@ 
 			WHERE ttrss_feeds.owner_uid = ?
 				AND ttrss_counters_cache.owner_uid = ttrss_feeds.owner_uid
 				AND ttrss_counters_cache.feed_id = ttrss_feeds.id");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$id = $line["id"];
-			$count = $line["count"];
-			$last_error = htmlspecialchars($line["last_error"]);
+            $id = $line["id"];
+            $count = $line["count"];
+            $last_error = htmlspecialchars($line["last_error"]);
 
-			$last_updated = make_local_datetime($line['last_updated'], false);
+            $last_updated = make_local_datetime($line['last_updated'], false);
 
-			if (Feeds::feedHasIcon($id)) {
-				$has_img = filemtime(Feeds::getIconFile($id));
-			} else {
-				$has_img = false;
-			}
+            if (Feeds::feedHasIcon($id)) {
+                $has_img = filemtime(Feeds::getIconFile($id));
+            } else {
+                $has_img = false;
+            }
 
-			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2) {
-							$last_updated = '';
-			}
+            if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2) {
+                            $last_updated = '';
+            }
 
-			$cv = array("id" => $id,
-				"updated" => $last_updated,
-				"counter" => (int) $count,
-				"has_img" => (int) $has_img);
+            $cv = array("id" => $id,
+                "updated" => $last_updated,
+                "counter" => (int) $count,
+                "has_img" => (int) $has_img);
 
-			if ($last_error) {
-							$cv["error"] = $last_error;
-			}
+            if ($last_error) {
+                            $cv["error"] = $last_error;
+            }
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($id)." ".__("total");
 
-			if ($active_feed && $id == $active_feed) {
-							$cv["title"] = truncate_string($line["title"], 30);
-			}
+            if ($active_feed && $id == $active_feed) {
+                            $cv["title"] = truncate_string($line["title"], 30);
+            }
 
-			array_push($ret_arr, $cv);
+            array_push($ret_arr, $cv);
 
-		}
+        }
 
-		return $ret_arr;
-	}
+        return $ret_arr;
+    }
 
 }

classes/rssutils.php

Indentation +1292 added lines, -1292 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,24 +67,24 @@ 
 					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
@@ -96,32 +96,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
@@ -132,724 +132,724 @@ 
 				$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,
@@ -870,112 +870,112 @@ 
 							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,
@@ -988,642 +988,642 @@ 
 							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
@@ -1632,118 +1632,118 @@ 
 						  (($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;
+    }
 
 }

Switch Indentation +26 added lines, -26 removed lines

@@ -1364,35 +1364,35 @@
 				}
 
 				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);
+				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", $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;
-							}
+					$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;
+					}
+					break;
 				}
 
 				if ($rule_inverse) {

Braces +7 added lines, -2 removed lines

@@ -616,10 +616,15 @@
 				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();
+				if (!$entry_content) {
+				    $entry_content = $item->get_description();
+				}
 
 				if (Debug::get_loglevel() >= 3) {
 					print "content: ";

classes/backend.php

Indentation +96 added lines, -96 removed lines

@@ -1,101 +1,101 @@
 <?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>";
 
-	}
+    }
 }

Switch Indentation +8 added lines, -8 removed lines

@@ -64,14 +64,14 @@
 										$tmp = '';
 										foreach (str_split($keys[$i]) as $c) {
 											switch ($c) {
-												case '*':
-													$tmp .= __('Shift').'+';
-													break;
-												case '^':
-													$tmp .= __('Ctrl').'+';
-													break;
-												default:
-													$tmp .= $c;
+											case '*':
+												$tmp .= __('Shift').'+';
+												break;
+											case '^':
+												$tmp .= __('Ctrl').'+';
+												break;
+											default:
+												$tmp .= $c;
 											}
 										}
 										$keys[$i] = $tmp;

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 				if ($cur_section) {
 				    print "<li>&nbsp;</li>";
 				}
-				print "<li><h3>" . $section . "</h3></li>";
+				print "<li><h3>".$section."</h3></li>";
 				$cur_section = $section;
 
 				foreach ($hotkeys as $action => $description) {

classes/handler/public.php

Indentation +737 added lines, -737 removed lines

@@ -1,336 +1,336 @@ 
 <?php
 class Handler_Public extends Handler {
 
-	private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
-		$limit, $offset, $search,
-		$view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
+    private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
+        $limit, $offset, $search,
+        $view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
 
-		require_once "lib/MiniTemplator.class.php";
+        require_once "lib/MiniTemplator.class.php";
 
-		$note_style = "background-color : #fff7d5;
+        $note_style = "background-color : #fff7d5;
 			border-width : 1px; ".
-			"padding : 5px; border-style : dashed; border-color : #e7d796;".
-			"margin-bottom : 1em; color : #9a8c59;";
-
-		if (!$limit) {
-		    $limit = 60;
-		}
-
-		$date_sort_field = "date_entered DESC, updated DESC";
-
-		if ($feed == -2 && !$is_cat) {
-			$date_sort_field = "last_published DESC";
-		} else if ($feed == -1 && !$is_cat) {
-			$date_sort_field = "last_marked DESC";
-		}
-
-		switch ($order) {
-		case "title":
-			$date_sort_field = "ttrss_entries.title, date_entered, updated";
-			break;
-		case "date_reverse":
-			$date_sort_field = "date_entered, updated";
-			break;
-		case "feed_dates":
-			$date_sort_field = "updated DESC";
-			break;
-		}
-
-		$params = array(
-			"owner_uid" => $owner_uid,
-			"feed" => $feed,
-			"limit" => $limit,
-			"view_mode" => $view_mode,
-			"cat_view" => $is_cat,
-			"search" => $search,
-			"override_order" => $date_sort_field,
-			"include_children" => true,
-			"ignore_vfeed_group" => true,
-			"offset" => $offset,
-			"start_ts" => $start_ts
-		);
-
-		if (!$is_cat && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
-
-			$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
-
-			$tmppluginhost = new PluginHost();
-			$tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
-			$tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
-			$tmppluginhost->load_data();
-
-			$handler = $tmppluginhost->get_feed_handler(
-				PluginHost::feed_to_pfeed_id($feed));
-
-			if ($handler) {
-				$qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed), $params);
-			}
-
-		} else {
-			$qfh_ret = Feeds::queryFeedHeadlines($params);
-		}
-
-		$result = $qfh_ret[0];
-		$feed_title = htmlspecialchars($qfh_ret[1]);
-		$feed_site_url = $qfh_ret[2];
-		/* $last_error = $qfh_ret[3]; */
-
-		$feed_self_url = get_self_url_prefix().
-			"/public.php?op=rss&id=$feed&key=".
-			Feeds::get_feed_access_key($feed, false, $owner_uid);
-
-		if (!$feed_site_url) {
-		    $feed_site_url = get_self_url_prefix();
-		}
-
-		if ($format == 'atom') {
-			$tpl = new MiniTemplator;
-
-			$tpl->readTemplateFromFile("templates/generated_feed.txt");
-
-			$tpl->setVariable('FEED_TITLE', $feed_title, true);
-			$tpl->setVariable('VERSION', get_version(), true);
-			$tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url), true);
-
-			$tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
-			while ($line = $result->fetch()) {
-
-				$line["content_preview"] = sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
-
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-					$line = $p->hook_query_headlines($line);
-				}
+            "padding : 5px; border-style : dashed; border-color : #e7d796;".
+            "margin-bottom : 1em; color : #9a8c59;";
+
+        if (!$limit) {
+            $limit = 60;
+        }
+
+        $date_sort_field = "date_entered DESC, updated DESC";
+
+        if ($feed == -2 && !$is_cat) {
+            $date_sort_field = "last_published DESC";
+        } else if ($feed == -1 && !$is_cat) {
+            $date_sort_field = "last_marked DESC";
+        }
+
+        switch ($order) {
+        case "title":
+            $date_sort_field = "ttrss_entries.title, date_entered, updated";
+            break;
+        case "date_reverse":
+            $date_sort_field = "date_entered, updated";
+            break;
+        case "feed_dates":
+            $date_sort_field = "updated DESC";
+            break;
+        }
+
+        $params = array(
+            "owner_uid" => $owner_uid,
+            "feed" => $feed,
+            "limit" => $limit,
+            "view_mode" => $view_mode,
+            "cat_view" => $is_cat,
+            "search" => $search,
+            "override_order" => $date_sort_field,
+            "include_children" => true,
+            "ignore_vfeed_group" => true,
+            "offset" => $offset,
+            "start_ts" => $start_ts
+        );
+
+        if (!$is_cat && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX && $feed > LABEL_BASE_INDEX) {
+
+            $user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
+
+            $tmppluginhost = new PluginHost();
+            $tmppluginhost->load(PLUGINS, PluginHost::KIND_ALL);
+            $tmppluginhost->load($user_plugins, PluginHost::KIND_USER, $owner_uid);
+            $tmppluginhost->load_data();
+
+            $handler = $tmppluginhost->get_feed_handler(
+                PluginHost::feed_to_pfeed_id($feed));
+
+            if ($handler) {
+                $qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed), $params);
+            }
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
-					$line = $p->hook_article_export_feed($line, $feed, $is_cat);
-				}
+        } else {
+            $qfh_ret = Feeds::queryFeedHeadlines($params);
+        }
 
-				$tpl->setVariable('ARTICLE_ID',
-					htmlspecialchars($orig_guid ? $line['link'] : $this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
-				$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
-				$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
-				$tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
+        $result = $qfh_ret[0];
+        $feed_title = htmlspecialchars($qfh_ret[1]);
+        $feed_site_url = $qfh_ret[2];
+        /* $last_error = $qfh_ret[3]; */
 
-				$content = sanitize($line["content"], false, $owner_uid,
-					$feed_site_url, false, $line["id"]);
+        $feed_self_url = get_self_url_prefix().
+            "/public.php?op=rss&id=$feed&key=".
+            Feeds::get_feed_access_key($feed, false, $owner_uid);
 
-				if ($line['note']) {
-					$content = "<div style=\"$note_style\">Article note: ".$line['note']."</div>".
-						$content;
-					$tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
-				}
+        if (!$feed_site_url) {
+            $feed_site_url = get_self_url_prefix();
+        }
 
-				$tpl->setVariable('ARTICLE_CONTENT', $content, true);
+        if ($format == 'atom') {
+            $tpl = new MiniTemplator;
 
-				$tpl->setVariable('ARTICLE_UPDATED_ATOM',
-					date('c', strtotime($line["updated"])), true);
-				$tpl->setVariable('ARTICLE_UPDATED_RFC822',
-					date(DATE_RFC822, strtotime($line["updated"])), true);
+            $tpl->readTemplateFromFile("templates/generated_feed.txt");
 
-				$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
+            $tpl->setVariable('FEED_TITLE', $feed_title, true);
+            $tpl->setVariable('VERSION', get_version(), true);
+            $tpl->setVariable('FEED_URL', htmlspecialchars($feed_self_url), true);
 
-				$tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
-				$tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
+            $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
+            while ($line = $result->fetch()) {
 
-				$tags = Article::get_article_tags($line["id"], $owner_uid);
+                $line["content_preview"] = sanitize(truncate_string(strip_tags($line["content"]), 100, '...'));
 
-				foreach ($tags as $tag) {
-					$tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
-					$tpl->addBlock('category');
-				}
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                    $line = $p->hook_query_headlines($line);
+                }
 
-				$enclosures = Article::get_article_enclosures($line["id"]);
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
+                    $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+                }
 
-				if (count($enclosures) > 0) {
-					foreach ($enclosures as $e) {
-						$type = htmlspecialchars($e['content_type']);
-						$url = htmlspecialchars($e['content_url']);
-						$length = $e['duration'] ? $e['duration'] : 1;
+                $tpl->setVariable('ARTICLE_ID',
+                    htmlspecialchars($orig_guid ? $line['link'] : $this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
+                $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
+                $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
+                $tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
 
-						$tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
-						$tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
-						$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length, true);
+                $content = sanitize($line["content"], false, $owner_uid,
+                    $feed_site_url, false, $line["id"]);
 
-						$tpl->addBlock('enclosure');
-					}
-				} else {
-					$tpl->setVariable('ARTICLE_ENCLOSURE_URL', null, true);
-					$tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', null, true);
-					$tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', null, true);
-				}
+                if ($line['note']) {
+                    $content = "<div style=\"$note_style\">Article note: ".$line['note']."</div>".
+                        $content;
+                    $tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
+                }
 
-				list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $feed_site_url);
+                $tpl->setVariable('ARTICLE_CONTENT', $content, true);
 
-				$tpl->setVariable('ARTICLE_OG_IMAGE', $og_image, true);
+                $tpl->setVariable('ARTICLE_UPDATED_ATOM',
+                    date('c', strtotime($line["updated"])), true);
+                $tpl->setVariable('ARTICLE_UPDATED_RFC822',
+                    date(DATE_RFC822, strtotime($line["updated"])), true);
 
-				$tpl->addBlock('entry');
-			}
+                $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
 
-			$tmp = "";
+                $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
+                $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
 
-			$tpl->addBlock('feed');
-			$tpl->generateOutputToString($tmp);
+                $tags = Article::get_article_tags($line["id"], $owner_uid);
 
-			if (@!clean($_REQUEST["noxml"])) {
-				header("Content-Type: text/xml; charset=utf-8");
-			} else {
-				header("Content-Type: text/plain; charset=utf-8");
-			}
+                foreach ($tags as $tag) {
+                    $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
+                    $tpl->addBlock('category');
+                }
 
-			print $tmp;
-		} else if ($format == 'json') {
+                $enclosures = Article::get_article_enclosures($line["id"]);
 
-			$feed = array();
+                if (count($enclosures) > 0) {
+                    foreach ($enclosures as $e) {
+                        $type = htmlspecialchars($e['content_type']);
+                        $url = htmlspecialchars($e['content_url']);
+                        $length = $e['duration'] ? $e['duration'] : 1;
 
-			$feed['title'] = $feed_title;
-			$feed['feed_url'] = $feed_self_url;
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_URL', $url, true);
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', $type, true);
+                        $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', $length, true);
 
-			$feed['self_url'] = get_self_url_prefix();
+                        $tpl->addBlock('enclosure');
+                    }
+                } else {
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_URL', null, true);
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_TYPE', null, true);
+                    $tpl->setVariable('ARTICLE_ENCLOSURE_LENGTH', null, true);
+                }
 
-			$feed['articles'] = array();
+                list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $feed_site_url);
 
-			while ($line = $result->fetch()) {
+                $tpl->setVariable('ARTICLE_OG_IMAGE', $og_image, true);
 
-				$line["content_preview"] = sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
+                $tpl->addBlock('entry');
+            }
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-					$line = $p->hook_query_headlines($line, 100);
-				}
+            $tmp = "";
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
-					$line = $p->hook_article_export_feed($line, $feed, $is_cat);
-				}
+            $tpl->addBlock('feed');
+            $tpl->generateOutputToString($tmp);
 
-				$article = array();
+            if (@!clean($_REQUEST["noxml"])) {
+                header("Content-Type: text/xml; charset=utf-8");
+            } else {
+                header("Content-Type: text/plain; charset=utf-8");
+            }
 
-				$article['id'] = $line['link'];
-				$article['link'] = $line['link'];
-				$article['title'] = $line['title'];
-				$article['excerpt'] = $line["content_preview"];
-				$article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
-				$article['updated'] = date('c', strtotime($line["updated"]));
+            print $tmp;
+        } else if ($format == 'json') {
 
-				if ($line['note']) {
-				    $article['note'] = $line['note'];
-				}
-				if ($article['author']) {
-				    $article['author'] = $line['author'];
-				}
+            $feed = array();
 
-				$tags = Article::get_article_tags($line["id"], $owner_uid);
+            $feed['title'] = $feed_title;
+            $feed['feed_url'] = $feed_self_url;
 
-				if (count($tags) > 0) {
-					$article['tags'] = array();
+            $feed['self_url'] = get_self_url_prefix();
 
-					foreach ($tags as $tag) {
-						array_push($article['tags'], $tag);
-					}
-				}
+            $feed['articles'] = array();
 
-				$enclosures = Article::get_article_enclosures($line["id"]);
+            while ($line = $result->fetch()) {
 
-				if (count($enclosures) > 0) {
-					$article['enclosures'] = array();
+                $line["content_preview"] = sanitize(truncate_string(strip_tags($line["content_preview"]), 100, '...'));
 
-					foreach ($enclosures as $e) {
-						$type = $e['content_type'];
-						$url = $e['content_url'];
-						$length = $e['duration'];
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                    $line = $p->hook_query_headlines($line, 100);
+                }
 
-						array_push($article['enclosures'], array("url" => $url, "type" => $type, "length" => $length));
-					}
-				}
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_EXPORT_FEED) as $p) {
+                    $line = $p->hook_article_export_feed($line, $feed, $is_cat);
+                }
+
+                $article = array();
+
+                $article['id'] = $line['link'];
+                $article['link'] = $line['link'];
+                $article['title'] = $line['title'];
+                $article['excerpt'] = $line["content_preview"];
+                $article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
+                $article['updated'] = date('c', strtotime($line["updated"]));
+
+                if ($line['note']) {
+                    $article['note'] = $line['note'];
+                }
+                if ($article['author']) {
+                    $article['author'] = $line['author'];
+                }
+
+                $tags = Article::get_article_tags($line["id"], $owner_uid);
+
+                if (count($tags) > 0) {
+                    $article['tags'] = array();
+
+                    foreach ($tags as $tag) {
+                        array_push($article['tags'], $tag);
+                    }
+                }
+
+                $enclosures = Article::get_article_enclosures($line["id"]);
+
+                if (count($enclosures) > 0) {
+                    $article['enclosures'] = array();
 
-				array_push($feed['articles'], $article);
-			}
+                    foreach ($enclosures as $e) {
+                        $type = $e['content_type'];
+                        $url = $e['content_url'];
+                        $length = $e['duration'];
 
-			header("Content-Type: text/json; charset=utf-8");
-			print json_encode($feed);
+                        array_push($article['enclosures'], array("url" => $url, "type" => $type, "length" => $length));
+                    }
+                }
 
-		} else {
-			header("Content-Type: text/plain; charset=utf-8");
-			print json_encode(array("error" => array("message" => "Unknown format")));
-		}
-	}
+                array_push($feed['articles'], $article);
+            }
 
-	public function getUnread() {
-		$login = clean($_REQUEST["login"]);
-		$fresh = clean($_REQUEST["fresh"]) == "1";
+            header("Content-Type: text/json; charset=utf-8");
+            print json_encode($feed);
 
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
-		$sth->execute([$login]);
+        } else {
+            header("Content-Type: text/plain; charset=utf-8");
+            print json_encode(array("error" => array("message" => "Unknown format")));
+        }
+    }
 
-		if ($row = $sth->fetch()) {
-			$uid = $row["id"];
+    public function getUnread() {
+        $login = clean($_REQUEST["login"]);
+        $fresh = clean($_REQUEST["fresh"]) == "1";
 
-			print Feeds::getGlobalUnread($uid);
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+        $sth->execute([$login]);
 
-			if ($fresh) {
-				print ";";
-				print Feeds::getFeedArticles(-3, false, true, $uid);
-			}
+        if ($row = $sth->fetch()) {
+            $uid = $row["id"];
 
-		} else {
-			print "-1;User not found";
-		}
-	}
+            print Feeds::getGlobalUnread($uid);
 
-	public function getProfiles() {
-		$login = clean($_REQUEST["login"]);
-		$rv = [];
+            if ($fresh) {
+                print ";";
+                print Feeds::getFeedArticles(-3, false, true, $uid);
+            }
 
-		if ($login) {
-			$sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
+        } else {
+            print "-1;User not found";
+        }
+    }
+
+    public function getProfiles() {
+        $login = clean($_REQUEST["login"]);
+        $rv = [];
+
+        if ($login) {
+            $sth = $this->pdo->prepare("SELECT ttrss_settings_profiles.* FROM ttrss_settings_profiles,ttrss_users
 			WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = ? ORDER BY title");
-			$sth->execute([$login]);
+            $sth->execute([$login]);
 
-			$rv = [["value" => 0, "label" => __("Default profile")]];
+            $rv = [["value" => 0, "label" => __("Default profile")]];
 
-			while ($line = $sth->fetch()) {
-				$id = $line["id"];
-				$title = $line["title"];
+            while ($line = $sth->fetch()) {
+                $id = $line["id"];
+                $title = $line["title"];
 
-				array_push($rv, ["label" => $title, "value" => $id]);
-			}
-	    }
+                array_push($rv, ["label" => $title, "value" => $id]);
+            }
+        }
 
-		print json_encode($rv);
-	}
+        print json_encode($rv);
+    }
 
-	public function logout() {
-		logout_user();
-		header("Location: index.php");
-	}
+    public function logout() {
+        logout_user();
+        header("Location: index.php");
+    }
 
-	public function share() {
-		$uuid = clean($_REQUEST["key"]);
+    public function share() {
+        $uuid = clean($_REQUEST["key"]);
 
-		if ($uuid) {
-			$sth = $this->pdo->prepare("SELECT ref_id, owner_uid
+        if ($uuid) {
+            $sth = $this->pdo->prepare("SELECT ref_id, owner_uid
 						FROM ttrss_user_entries WHERE uuid = ?");
-			$sth->execute([$uuid]);
+            $sth->execute([$uuid]);
 
-			if ($row = $sth->fetch()) {
-				header("Content-Type: text/html");
+            if ($row = $sth->fetch()) {
+                header("Content-Type: text/html");
 
-				$id = $row["ref_id"];
-				$owner_uid = $row["owner_uid"];
+                $id = $row["ref_id"];
+                $owner_uid = $row["owner_uid"];
 
-				print $this->format_article($id, $owner_uid);
+                print $this->format_article($id, $owner_uid);
 
-				return;
-			}
-		}
+                return;
+            }
+        }
 
-		header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-		print "Article not found.";
-	}
+        header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+        print "Article not found.";
+    }
 
-	private function format_article($id, $owner_uid) {
+    private function format_article($id, $owner_uid) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang,
+        $sth = $pdo->prepare("SELECT id,title,link,content,feed_id,comments,int_id,lang,
 			".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 			(SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url,
 			(SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title,
@@ -344,26 +344,26 @@ 
 			note
 			FROM ttrss_entries,ttrss_user_entries
 			WHERE	id = ? AND ref_id = id AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		$rv = '';
+        $rv = '';
 
-		if ($line = $sth->fetch()) {
+        if ($line = $sth->fetch()) {
 
-			$line["tags"] = Article::get_article_tags($id, $owner_uid, $line["tag_cache"]);
-			unset($line["tag_cache"]);
+            $line["tags"] = Article::get_article_tags($id, $owner_uid, $line["tag_cache"]);
+            unset($line["tag_cache"]);
 
-			$line["content"] = sanitize($line["content"],
-				$line['hide_images'],
-				$owner_uid, $line["site_url"], false, $line["id"]);
+            $line["content"] = sanitize($line["content"],
+                $line['hide_images'],
+                $owner_uid, $line["site_url"], false, $line["id"]);
 
-			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
-				$line = $p->hook_render_article($line);
-			}
+            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE) as $p) {
+                $line = $p->hook_render_article($line);
+            }
 
-			$line['content'] = DiskCache::rewriteUrls($line['content']);
+            $line['content'] = DiskCache::rewriteUrls($line['content']);
 
-			$enclosures = Article::get_article_enclosures($line["id"]);
+            $enclosures = Article::get_article_enclosures($line["id"]);
 
             header("Content-Type: text/html");
 
@@ -378,13 +378,13 @@ 
             $rv .= "<meta property='og:title' content=\"".htmlspecialchars(html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401))."\"/>\n";
             $rv .= "<meta property='og:description' content=\"".
                 htmlspecialchars(
-                	truncate_string(
-                		preg_replace("/[\r\n\t]/", "",
-							preg_replace("/ {1,}/", " ",
-								strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
-							)
-					), 500, "...")
-				)."\"/>\n";
+                    truncate_string(
+                        preg_replace("/[\r\n\t]/", "",
+                            preg_replace("/ {1,}/", " ",
+                                strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
+                            )
+                    ), 500, "...")
+                )."\"/>\n";
 
             $rv .= "</head>";
 
@@ -397,135 +397,135 @@ 
             $rv .= "<body class='flat ttrss_utility ttrss_zoom'>";
             $rv .= "<div class='container'>";
 
-			if ($line["link"]) {
-				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
+            if ($line["link"]) {
+                $rv .= "<h1><a target='_blank' rel='noopener noreferrer'
 					title=\"".htmlspecialchars($line['title'])."\"
 					href=\"" .htmlspecialchars($line["link"])."\">".$line["title"]."</a></h1>";
-			} else {
-				$rv .= "<h1>".$line["title"]."</h1>";
-			}
+            } else {
+                $rv .= "<h1>".$line["title"]."</h1>";
+            }
 
-			$rv .= "<div class='content post'>";
+            $rv .= "<div class='content post'>";
 
-			/* header */
+            /* header */
 
-			$rv .= "<div class='header'>";
-			$rv .= "<div class='row'>"; # row
+            $rv .= "<div class='header'>";
+            $rv .= "<div class='row'>"; # row
 
-			//$entry_author = $line["author"] ? " - " . $line["author"] : "";
-			$parsed_updated = make_local_datetime($line["updated"], true,
-				$owner_uid, true);
+            //$entry_author = $line["author"] ? " - " . $line["author"] : "";
+            $parsed_updated = make_local_datetime($line["updated"], true,
+                $owner_uid, true);
 
-			$rv .= "<div>".$line['author']."</div>";
+            $rv .= "<div>".$line['author']."</div>";
             $rv .= "<div>$parsed_updated</div>";
 
-			$rv .= "</div>"; # row
+            $rv .= "</div>"; # row
 
-			$rv .= "</div>"; # header
+            $rv .= "</div>"; # header
 
-			/* content */
+            /* content */
 
-			$lang = $line['lang'] ? $line['lang'] : "en";
-			$rv .= "<div class='content' lang='$lang'>";
+            $lang = $line['lang'] ? $line['lang'] : "en";
+            $rv .= "<div class='content' lang='$lang'>";
 
-			/* content body */
+            /* content body */
 
-			$rv .= $line["content"];
+            $rv .= $line["content"];
 
             $rv .= Article::format_article_enclosures($id,
                 $line["always_display_enclosures"],
                 $line["content"],
                 $line["hide_images"]);
 
-			$rv .= "</div>"; # content
+            $rv .= "</div>"; # content
 
-			$rv .= "</div>"; # post
+            $rv .= "</div>"; # post
 
-		}
+        }
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) {
-			$rv = $p->hook_format_article($rv, $line, true);
-		}
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FORMAT_ARTICLE) as $p) {
+            $rv = $p->hook_format_article($rv, $line, true);
+        }
 
-		return $rv;
+        return $rv;
 
-	}
+    }
 
-	public function rss() {
-		$feed = clean($_REQUEST["id"]);
-		$key = clean($_REQUEST["key"]);
-		$is_cat = clean($_REQUEST["is_cat"]);
-		$limit = (int) clean($_REQUEST["limit"]);
-		$offset = (int) clean($_REQUEST["offset"]);
+    public function rss() {
+        $feed = clean($_REQUEST["id"]);
+        $key = clean($_REQUEST["key"]);
+        $is_cat = clean($_REQUEST["is_cat"]);
+        $limit = (int) clean($_REQUEST["limit"]);
+        $offset = (int) clean($_REQUEST["offset"]);
 
-		$search = clean($_REQUEST["q"]);
-		$view_mode = clean($_REQUEST["view-mode"]);
-		$order = clean($_REQUEST["order"]);
-		$start_ts = clean($_REQUEST["ts"]);
+        $search = clean($_REQUEST["q"]);
+        $view_mode = clean($_REQUEST["view-mode"]);
+        $order = clean($_REQUEST["order"]);
+        $start_ts = clean($_REQUEST["ts"]);
 
-		$format = clean($_REQUEST['format']);
-		$orig_guid = clean($_REQUEST["orig_guid"]);
+        $format = clean($_REQUEST['format']);
+        $orig_guid = clean($_REQUEST["orig_guid"]);
 
-		if (!$format) {
-		    $format = 'atom';
-		}
+        if (!$format) {
+            $format = 'atom';
+        }
 
-		if (SINGLE_USER_MODE) {
-			authenticate_user("admin", null);
-		}
+        if (SINGLE_USER_MODE) {
+            authenticate_user("admin", null);
+        }
 
-		$owner_id = false;
+        $owner_id = false;
 
-		if ($key) {
-			$sth = $this->pdo->prepare("SELECT owner_uid FROM
+        if ($key) {
+            $sth = $this->pdo->prepare("SELECT owner_uid FROM
 				ttrss_access_keys WHERE access_key = ? AND feed_id = ?");
-			$sth->execute([$key, $feed]);
-
-			if ($row = $sth->fetch()) {
-							$owner_id = $row["owner_uid"];
-			}
-		}
-
-		if ($owner_id) {
-			$this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
-				$offset, $search, $view_mode, $format, $order, $orig_guid, $start_ts);
-		} else {
-			header('HTTP/1.1 403 Forbidden');
-		}
-	}
-
-	public function updateTask() {
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
-	}
-
-	public function housekeepingTask() {
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
-	}
-
-	public function globalUpdateFeeds() {
-		RPC::updaterandomfeed_real();
-
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
-	}
-
-	public function sharepopup() {
-		if (SINGLE_USER_MODE) {
-			login_sequence();
-		}
-
-		header('Content-Type: text/html; charset=utf-8');
-		?>
+            $sth->execute([$key, $feed]);
+
+            if ($row = $sth->fetch()) {
+                            $owner_id = $row["owner_uid"];
+            }
+        }
+
+        if ($owner_id) {
+            $this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
+                $offset, $search, $view_mode, $format, $order, $orig_guid, $start_ts);
+        } else {
+            header('HTTP/1.1 403 Forbidden');
+        }
+    }
+
+    public function updateTask() {
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+    }
+
+    public function housekeepingTask() {
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", false);
+    }
+
+    public function globalUpdateFeeds() {
+        RPC::updaterandomfeed_real();
+
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", false);
+    }
+
+    public function sharepopup() {
+        if (SINGLE_USER_MODE) {
+            login_sequence();
+        }
+
+        header('Content-Type: text/html; charset=utf-8');
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
 			<title><?php echo __("Share with Tiny Tiny RSS") ?></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 javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls")
-			?>
+            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 javascript_tag("lib/scriptaculous/scriptaculous.js?load=effects,controls")
+            ?>
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
@@ -547,29 +547,29 @@ 
 
 		<?php
 
-		$action = clean($_REQUEST["action"]);
+        $action = clean($_REQUEST["action"]);
 
-		if ($_SESSION["uid"]) {
+        if ($_SESSION["uid"]) {
 
-			if ($action == 'share') {
+            if ($action == 'share') {
 
-				$title = strip_tags(clean($_REQUEST["title"]));
-				$url = strip_tags(clean($_REQUEST["url"]));
-				$content = strip_tags(clean($_REQUEST["content"]));
-				$labels = strip_tags(clean($_REQUEST["labels"]));
+                $title = strip_tags(clean($_REQUEST["title"]));
+                $url = strip_tags(clean($_REQUEST["url"]));
+                $content = strip_tags(clean($_REQUEST["content"]));
+                $labels = strip_tags(clean($_REQUEST["labels"]));
 
-				Article::create_published_article($title, $url, $content, $labels,
-					$_SESSION["uid"]);
+                Article::create_published_article($title, $url, $content, $labels,
+                    $_SESSION["uid"]);
 
-				print "<script type='text/javascript'>";
-				print "window.close();";
-				print "</script>";
+                print "<script type='text/javascript'>";
+                print "window.close();";
+                print "</script>";
 
-			} else {
-				$title = htmlspecialchars(clean($_REQUEST["title"]));
-				$url = htmlspecialchars(clean($_REQUEST["url"]));
+            } else {
+                $title = htmlspecialchars(clean($_REQUEST["title"]));
+                $url = htmlspecialchars(clean($_REQUEST["url"]));
 
-				?>
+                ?>
 				<form id='share_form' name='share_form'>
 
 					<input type="hidden" name="op" value="sharepopup">
@@ -609,12 +609,12 @@ 
 				</form>
 				<?php
 
-			}
+            }
 
-		} else {
+        } else {
 
-			$return = urlencode(make_self_url());
-			print_error("Not logged in"); ?>
+            $return = urlencode(make_self_url());
+            print_error("Not logged in"); ?>
 
 			<form action="public.php?return=<?php echo $return ?>" method="post">
 
@@ -646,91 +646,91 @@ 
 
 			</form>
 			<?php
-		}
+        }
 
-		print "</div></body></html>";
-	}
+        print "</div></body></html>";
+    }
 
-	public function login() {
-		if (!SINGLE_USER_MODE) {
+    public function login() {
+        if (!SINGLE_USER_MODE) {
 
-			$login = clean($_POST["login"]);
-			$password = clean($_POST["password"]);
-			$remember_me = clean($_POST["remember_me"]);
+            $login = clean($_POST["login"]);
+            $password = clean($_POST["password"]);
+            $remember_me = clean($_POST["remember_me"]);
 
-			if ($remember_me) {
-				session_set_cookie_params(SESSION_COOKIE_LIFETIME);
-			} else {
-				session_set_cookie_params(0);
-			}
+            if ($remember_me) {
+                session_set_cookie_params(SESSION_COOKIE_LIFETIME);
+            } else {
+                session_set_cookie_params(0);
+            }
 
-			if (authenticate_user($login, $password)) {
-				$_POST["password"] = "";
+            if (authenticate_user($login, $password)) {
+                $_POST["password"] = "";
 
-				if (get_schema_version() >= 120) {
-					$_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
-				}
+                if (get_schema_version() >= 120) {
+                    $_SESSION["language"] = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
+                }
 
-				$_SESSION["ref_schema_version"] = get_schema_version(true);
-				$_SESSION["bw_limit"] = !!clean($_POST["bw_limit"]);
+                $_SESSION["ref_schema_version"] = get_schema_version(true);
+                $_SESSION["bw_limit"] = !!clean($_POST["bw_limit"]);
 
-				if (clean($_POST["profile"])) {
+                if (clean($_POST["profile"])) {
 
-					$profile = (int) clean($_POST["profile"]);
+                    $profile = (int) clean($_POST["profile"]);
 
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
 						WHERE id = ? AND owner_uid = ?");
-					$sth->execute([$profile, $_SESSION['uid']]);
+                    $sth->execute([$profile, $_SESSION['uid']]);
 
-					if ($sth->fetch()) {
-						$_SESSION["profile"] = $profile;
- 					} else {
-					    $_SESSION["profile"] = null;
+                    if ($sth->fetch()) {
+                        $_SESSION["profile"] = $profile;
+                        } else {
+                        $_SESSION["profile"] = null;
                     }
-				}
-			} else {
+                }
+            } else {
 
-				// start an empty session to deliver login error message
-				@session_start();
+                // start an empty session to deliver login error message
+                @session_start();
 
-				if (!isset($_SESSION["login_error_msg"])) {
-									$_SESSION["login_error_msg"] = __("Incorrect username or password");
-				}
+                if (!isset($_SESSION["login_error_msg"])) {
+                                    $_SESSION["login_error_msg"] = __("Incorrect username or password");
+                }
 
-				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
-			}
+                user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
+            }
 
-			$return = clean($_REQUEST['return']);
+            $return = clean($_REQUEST['return']);
 
-			if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
-				header("Location: ".clean($_REQUEST['return']));
-			} else {
-				header("Location: ".get_self_url_prefix());
-			}
-		}
-	}
+            if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
+                header("Location: ".clean($_REQUEST['return']));
+            } else {
+                header("Location: ".get_self_url_prefix());
+            }
+        }
+    }
 
-	public function subscribe() {
-		if (SINGLE_USER_MODE) {
-			login_sequence();
-		}
+    public function subscribe() {
+        if (SINGLE_USER_MODE) {
+            login_sequence();
+        }
 
-		if ($_SESSION["uid"]) {
+        if ($_SESSION["uid"]) {
 
-			$feed_url = trim(clean($_REQUEST["feed_url"]));
+            $feed_url = trim(clean($_REQUEST["feed_url"]));
 
-			header('Content-Type: text/html; charset=utf-8');
-			?>
+            header('Content-Type: text/html; charset=utf-8');
+            ?>
 			<!DOCTYPE html>
 			<html>
 			<head>
 				<title>Tiny Tiny RSS</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");
+                ?>
 				<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 				<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 				<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
@@ -749,8 +749,8 @@ 
 			<div class='content'>
 			<?php
 
-			if (!$feed_url) {
-				?>
+            if (!$feed_url) {
+                ?>
 				<form method="post">
 					<input type="hidden" name="op" value="subscribe">
 					<fieldset>
@@ -765,101 +765,101 @@ 
 					<a href="index.php"><?php echo __("Return to Tiny Tiny RSS") ?></a>
 				</form>
 				<?php
-			} else {
-
-				$rc = Feeds::subscribe_to_feed($feed_url);
-				$feed_urls = false;
-
-				switch ($rc['code']) {
-					case 0:
-						print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 1:
-						print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 2:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
-						break;
-					case 3:
-						print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
-						break;
-					case 4:
-						$feed_urls = $rc["feeds"];
-						break;
-					case 5:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
-						break;
-				}
-
-				if ($feed_urls) {
-
-					print "<form action='public.php'>";
-					print "<input type='hidden' name='op' value='subscribe'>";
-
-					print "<fieldset>";
-					print "<label style='display : inline'>".__("Multiple feed URLs found:")."</label>";
-					print "<select name='feed_url' dojoType='dijit.form.Select'>";
-
-					foreach ($feed_urls as $url => $name) {
-						$url = htmlspecialchars($url);
-						$name = htmlspecialchars($name);
+            } else {
+
+                $rc = Feeds::subscribe_to_feed($feed_url);
+                $feed_urls = false;
+
+                switch ($rc['code']) {
+                    case 0:
+                        print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+                        break;
+                    case 1:
+                        print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+                        break;
+                    case 2:
+                        print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+                        break;
+                    case 3:
+                        print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
+                        break;
+                    case 4:
+                        $feed_urls = $rc["feeds"];
+                        break;
+                    case 5:
+                        print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
+                        break;
+                }
+
+                if ($feed_urls) {
+
+                    print "<form action='public.php'>";
+                    print "<input type='hidden' name='op' value='subscribe'>";
+
+                    print "<fieldset>";
+                    print "<label style='display : inline'>".__("Multiple feed URLs found:")."</label>";
+                    print "<select name='feed_url' dojoType='dijit.form.Select'>";
+
+                    foreach ($feed_urls as $url => $name) {
+                        $url = htmlspecialchars($url);
+                        $name = htmlspecialchars($name);
+
+                        print "<option value=\"$url\">$name</option>";
+                    }
 
-						print "<option value=\"$url\">$name</option>";
-					}
+                    print "</select>";
+                    print "</fieldset>";
 
-					print "</select>";
-					print "</fieldset>";
+                    print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
+                    print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-					print "<button class='alt-primary' dojoType='dijit.form.Button' type='submit'>".__("Subscribe to selected feed")."</button>";
-					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    print "</form>";
+                }
 
-					print "</form>";
-				}
+                $tp_uri = get_self_url_prefix()."/prefs.php";
 
-				$tp_uri = get_self_url_prefix()."/prefs.php";
-
-				if ($rc['code'] <= 2) {
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                if ($rc['code'] <= 2) {
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 					feed_url = ? AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
-					$row = $sth->fetch();
+                    $sth->execute([$feed_url, $_SESSION['uid']]);
+                    $row = $sth->fetch();
 
-					$feed_id = $row["id"];
-				} else {
-					$feed_id = 0;
-				}
+                    $feed_id = $row["id"];
+                } else {
+                    $feed_id = 0;
+                }
 
-				if ($feed_id) {
-					print "<form method='GET' action=\"$tp_uri\">
+                if ($feed_id) {
+                    print "<form method='GET' action=\"$tp_uri\">
 					<input type='hidden' name='tab' value='feedConfig'>
 					<input type='hidden' name='method' value='editfeed'>
 					<input type='hidden' name='methodparam' value='$feed_id'>
 					<button dojoType='dijit.form.Button' class='alt-info' type='submit'>".__("Edit subscription options")."</button>
 					<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
 					</form>";
-				}
-			}
+                }
+            }
 
-			print "</div></div></body></html>";
+            print "</div></div></body></html>";
 
-		} else {
-			render_login_form();
-		}
-	}
+        } else {
+            render_login_form();
+        }
+    }
 
-	public function index() {
-		header("Content-Type: text/plain");
-		print error_json(13);
-	}
+    public function index() {
+        header("Content-Type: text/plain");
+        print error_json(13);
+    }
 
-	public function forgotpass() {
-		startup_gettext();
-		session_start();
+    public function forgotpass() {
+        startup_gettext();
+        session_start();
 
-		@$hash = clean($_REQUEST["hash"]);
+        @$hash = clean($_REQUEST["hash"]);
 
-		header('Content-Type: text/html; charset=utf-8');
-		?>
+        header('Content-Type: text/html; charset=utf-8');
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
@@ -868,11 +868,11 @@ 
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 			<?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'>
 		<div class='container'>
@@ -887,52 +887,52 @@ 
 		</script>
 		<?php
 
-		print "<h1>".__("Password recovery")."</h1>";
-		print "<div class='content'>";
+        print "<h1>".__("Password recovery")."</h1>";
+        print "<div class='content'>";
 
-		@$method = clean($_POST['method']);
+        @$method = clean($_POST['method']);
 
-		if ($hash) {
-			$login = clean($_REQUEST["login"]);
+        if ($hash) {
+            $login = clean($_REQUEST["login"]);
 
-			if ($login) {
-				$sth = $this->pdo->prepare("SELECT id, resetpass_token FROM ttrss_users
+            if ($login) {
+                $sth = $this->pdo->prepare("SELECT id, resetpass_token FROM ttrss_users
 					WHERE login = ?");
-				$sth->execute([$login]);
+                $sth->execute([$login]);
 
-				if ($row = $sth->fetch()) {
-					$id = $row["id"];
-					$resetpass_token_full = $row["resetpass_token"];
-					list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
+                if ($row = $sth->fetch()) {
+                    $id = $row["id"];
+                    $resetpass_token_full = $row["resetpass_token"];
+                    list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
 
-					if ($timestamp && $resetpass_token &&
-						$timestamp >= time() - 15 * 60 * 60 &&
-						$resetpass_token == $hash) {
+                    if ($timestamp && $resetpass_token &&
+                        $timestamp >= time() - 15 * 60 * 60 &&
+                        $resetpass_token == $hash) {
 
-							$sth = $this->pdo->prepare("UPDATE ttrss_users SET resetpass_token = NULL
+                            $sth = $this->pdo->prepare("UPDATE ttrss_users SET resetpass_token = NULL
 								WHERE id = ?");
-							$sth->execute([$id]);
+                            $sth->execute([$id]);
 
-							Pref_Users::resetUserPassword($id, true);
+                            Pref_Users::resetUserPassword($id, true);
 
-							print "<p>"."Completed."."</p>";
+                            print "<p>"."Completed."."</p>";
 
-					} else {
-						print_error("Some of the information provided is missing or incorrect.");
-					}
-				} else {
-					print_error("Some of the information provided is missing or incorrect.");
-				}
-			} else {
-				print_error("Some of the information provided is missing or incorrect.");
-			}
+                    } else {
+                        print_error("Some of the information provided is missing or incorrect.");
+                    }
+                } else {
+                    print_error("Some of the information provided is missing or incorrect.");
+                }
+            } else {
+                print_error("Some of the information provided is missing or incorrect.");
+            }
 
-			print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+            print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-		} else if (!$method) {
-			print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
+        } else if (!$method) {
+            print_notice(__("You will need to provide valid account name and email. Password reset link will be sent to your email address."));
 
-			print "<form method='POST' action='public.php'>
+            print "<form method='POST' action='public.php'>
 				<input type='hidden' name='method' value='do'>
 				<input type='hidden' name='op' value='forgotpass'>
 
@@ -946,10 +946,10 @@ 
 				<input dojoType='dijit.form.TextBox' type='email' name='email' value='' required>
 				</fieldset>";
 
-			$_SESSION["pwdreset:testvalue1"] = rand(1, 10);
-			$_SESSION["pwdreset:testvalue2"] = rand(1, 10);
+            $_SESSION["pwdreset:testvalue1"] = rand(1, 10);
+            $_SESSION["pwdreset:testvalue2"] = rand(1, 10);
 
-			print "<fieldset>
+            print "<fieldset>
 				<label>".T_sprintf("How much is %d + %d:", $_SESSION["pwdreset:testvalue1"], $_SESSION["pwdreset:testvalue2"])."</label>
 				<input dojoType='dijit.form.TextBox' type='text' name='test' value='' required>
 				</fieldset>
@@ -961,111 +961,111 @@ 
 				</fieldset>
 
 				</form>";
-		} else if ($method == 'do') {
+        } else if ($method == 'do') {
 
-			$login = clean($_POST["login"]);
-			$email = clean($_POST["email"]);
-			$test = clean($_POST["test"]);
+            $login = clean($_POST["login"]);
+            $email = clean($_POST["email"]);
+            $test = clean($_POST["test"]);
 
-			if ($test != ($_SESSION["pwdreset:testvalue1"] + $_SESSION["pwdreset:testvalue2"]) || !$email || !$login) {
-				print_error(__('Some of the required form parameters are missing or incorrect.'));
+            if ($test != ($_SESSION["pwdreset:testvalue1"] + $_SESSION["pwdreset:testvalue2"]) || !$email || !$login) {
+                print_error(__('Some of the required form parameters are missing or incorrect.'));
 
-				print "<form method='GET' action='public.php'>
+                print "<form method='GET' action='public.php'>
 					<input type='hidden' name='op' value='forgotpass'>
 					<button dojoType='dijit.form.Button' type='submit' class='alt-primary'>".__("Go back")."</button>
 					</form>";
 
-			} else {
+            } else {
 
-				// prevent submitting this form multiple times
-				$_SESSION["pwdreset:testvalue1"] = rand(1, 1000);
-				$_SESSION["pwdreset:testvalue2"] = rand(1, 1000);
+                // prevent submitting this form multiple times
+                $_SESSION["pwdreset:testvalue1"] = rand(1, 1000);
+                $_SESSION["pwdreset:testvalue2"] = rand(1, 1000);
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_users
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_users
 					WHERE login = ? AND email = ?");
-				$sth->execute([$login, $email]);
+                $sth->execute([$login, $email]);
 
-				if ($row = $sth->fetch()) {
-					print_notice("Password reset instructions are being sent to your email address.");
+                if ($row = $sth->fetch()) {
+                    print_notice("Password reset instructions are being sent to your email address.");
 
-					$id = $row["id"];
+                    $id = $row["id"];
 
-					if ($id) {
-						$resetpass_token = sha1(get_random_bytes(128));
-						$resetpass_link = get_self_url_prefix()."/public.php?op=forgotpass&hash=".$resetpass_token.
-							"&login=".urlencode($login);
+                    if ($id) {
+                        $resetpass_token = sha1(get_random_bytes(128));
+                        $resetpass_link = get_self_url_prefix()."/public.php?op=forgotpass&hash=".$resetpass_token.
+                            "&login=".urlencode($login);
 
-						require_once "lib/MiniTemplator.class.php";
+                        require_once "lib/MiniTemplator.class.php";
 
-						$tpl = new MiniTemplator;
+                        $tpl = new MiniTemplator;
 
-						$tpl->readTemplateFromFile("templates/resetpass_link_template.txt");
+                        $tpl->readTemplateFromFile("templates/resetpass_link_template.txt");
 
-						$tpl->setVariable('LOGIN', $login);
-						$tpl->setVariable('RESETPASS_LINK', $resetpass_link);
-						$tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
+                        $tpl->setVariable('LOGIN', $login);
+                        $tpl->setVariable('RESETPASS_LINK', $resetpass_link);
+                        $tpl->setVariable('TTRSS_HOST', SELF_URL_PATH);
 
-						$tpl->addBlock('message');
+                        $tpl->addBlock('message');
 
-						$message = "";
+                        $message = "";
 
-						$tpl->generateOutputToString($message);
+                        $tpl->generateOutputToString($message);
 
-						$mailer = new Mailer();
+                        $mailer = new Mailer();
 
-						$rc = $mailer->mail(["to_name" => $login,
-							"to_address" => $email,
-							"subject" => __("[tt-rss] Password reset request"),
-							"message" => $message]);
+                        $rc = $mailer->mail(["to_name" => $login,
+                            "to_address" => $email,
+                            "subject" => __("[tt-rss] Password reset request"),
+                            "message" => $message]);
 
-						if (!$rc) {
-						    print_error($mailer->error());
-						}
+                        if (!$rc) {
+                            print_error($mailer->error());
+                        }
 
-						$resetpass_token_full = time().":".$resetpass_token;
+                        $resetpass_token_full = time().":".$resetpass_token;
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_users
+                        $sth = $this->pdo->prepare("UPDATE ttrss_users
 							SET resetpass_token = ?
 							WHERE login = ? AND email = ?");
 
-						$sth->execute([$resetpass_token_full, $login, $email]);
+                        $sth->execute([$resetpass_token_full, $login, $email]);
 
-					} else {
-						print_error("User ID not found.");
-					}
+                    } else {
+                        print_error("User ID not found.");
+                    }
 
-					print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-				} else {
-					print_error(__("Sorry, login and email combination not found."));
+                } else {
+                    print_error(__("Sorry, login and email combination not found."));
 
-					print "<form method='GET' action='public.php'>
+                    print "<form method='GET' action='public.php'>
 						<input type='hidden' name='op' value='forgotpass'>
 						<button dojoType='dijit.form.Button' type='submit'>".__("Go back")."</button>
 						</form>";
 
-				}
-			}
+                }
+            }
 
-		}
+        }
 
-		print "</div>";
-		print "</div>";
-		print "</body>";
-		print "</html>";
+        print "</div>";
+        print "</div>";
+        print "</body>";
+        print "</html>";
 
-	}
+    }
 
-	public function dbupdate() {
-		startup_gettext();
+    public function dbupdate() {
+        startup_gettext();
 
-		if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
-			$_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
-			render_login_form();
-			exit;
-		}
+        if (!SINGLE_USER_MODE && $_SESSION["access_level"] < 10) {
+            $_SESSION["login_error_msg"] = __("Your access level is insufficient to run this script.");
+            render_login_form();
+            exit;
+        }
 
-		?>
+        ?>
 		<!DOCTYPE html>
 		<html>
 			<head>
@@ -1075,11 +1075,11 @@ 
 			<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 			<link rel="icon" type="image/png" sizes="72x72" href="images/favicon-72px.png">
 			<?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");
+            ?>
 			<style type="text/css">
 				span.ok { color : #009000; font-weight : bold; }
 				span.err { color : #ff0000; font-weight : bold; }
@@ -1106,139 +1106,139 @@ 
 			<div class="content">
 
 			<?php
-				@$op = clean($_REQUEST["subop"]);
-				$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
+                @$op = clean($_REQUEST["subop"]);
+                $updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
-				if ($op == "performupdate") {
-					if ($updater->isUpdateRequired()) {
+                if ($op == "performupdate") {
+                    if ($updater->isUpdateRequired()) {
 
-						print "<h2>".T_sprintf("Performing updates to version %d", SCHEMA_VERSION)."</h2>";
+                        print "<h2>".T_sprintf("Performing updates to version %d", SCHEMA_VERSION)."</h2>";
 
-						for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
-							print "<ul>";
+                        for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+                            print "<ul>";
 
-							print "<li class='text-info'>".T_sprintf("Updating to version %d", $i)."</li>";
+                            print "<li class='text-info'>".T_sprintf("Updating to version %d", $i)."</li>";
 
-							print "<li>";
-							$result = $updater->performUpdateTo($i, true);
-							print "</li>";
+                            print "<li>";
+                            $result = $updater->performUpdateTo($i, true);
+                            print "</li>";
 
-							if (!$result) {
-								print "</ul>";
+                            if (!$result) {
+                                print "</ul>";
 
-								print_error("One of the updates failed. Either retry the process or perform updates manually.");
+                                print_error("One of the updates failed. Either retry the process or perform updates manually.");
 
-								print "<form method='POST'>
+                                print "<form method='POST'>
 									<input type='hidden' name='subop' value='performupdate'>
 									<button type='submit' dojoType='dijit.form.Button' class='alt-danger' onclick='return confirmOP()'>".__("Try again")."</button>
 									<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>
 								</form>";
 
-								return;
-							} else {
-								print "<li class='text-success'>".__("Completed.")."</li>";
-								print "</ul>";
-							}
-						}
+                                return;
+                            } else {
+                                print "<li class='text-success'>".__("Completed.")."</li>";
+                                print "</ul>";
+                            }
+                        }
 
-						print_notice("Your Tiny Tiny RSS database is now updated to the latest version.");
+                        print_notice("Your Tiny Tiny RSS database is now updated to the latest version.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
 
-					} else {
-						print_notice("Tiny Tiny RSS database is up to date.");
+                    } else {
+                        print_notice("Tiny Tiny RSS database is up to date.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
-					}
-				} else {
-					if ($updater->isUpdateRequired()) {
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    }
+                } else {
+                    if ($updater->isUpdateRequired()) {
 
-						print "<h2>".T_sprintf("Tiny Tiny RSS database needs update to the latest version (%d to %d).",
-							$updater->getSchemaVersion(), SCHEMA_VERSION)."</h2>";
+                        print "<h2>".T_sprintf("Tiny Tiny RSS database needs update to the latest version (%d to %d).",
+                            $updater->getSchemaVersion(), SCHEMA_VERSION)."</h2>";
 
-						if (DB_TYPE == "mysql") {
-							print_error("<strong>READ THIS:</strong> Due to MySQL limitations, your database is not completely protected while updating. ".
-								"Errors may put it in an inconsistent state requiring manual rollback. <strong>BACKUP YOUR DATABASE BEFORE CONTINUING.</strong>");
-						} else {
-							print_warning("Please backup your database before proceeding.");
-						}
+                        if (DB_TYPE == "mysql") {
+                            print_error("<strong>READ THIS:</strong> Due to MySQL limitations, your database is not completely protected while updating. ".
+                                "Errors may put it in an inconsistent state requiring manual rollback. <strong>BACKUP YOUR DATABASE BEFORE CONTINUING.</strong>");
+                        } else {
+                            print_warning("Please backup your database before proceeding.");
+                        }
 
-						print "<form method='POST'>
+                        print "<form method='POST'>
 							<input type='hidden' name='subop' value='performupdate'>
 							<button type='submit' dojoType='dijit.form.Button' class='alt-danger' onclick='return confirmOP()'>".__("Perform updates")."</button>
 						</form>";
 
-					} else {
+                    } else {
 
-						print_notice("Tiny Tiny RSS database is up to date.");
+                        print_notice("Tiny Tiny RSS database is up to date.");
 
-						print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
-					}
-				}
-			?>
+                        print "<a href='index.php'>".__("Return to Tiny Tiny RSS")."</a>";
+                    }
+                }
+            ?>
 
 			</div>
 			</div>
 			</body>
 			</html>
 		<?php
-	}
-
-	public function cached_url() {
-		list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
-
-		// we do not allow files with extensions at the moment
-		$filename = str_replace(".", "", $filename);
-
-		$cache = new DiskCache($cache_dir);
-
-		if ($cache->exists($filename)) {
-			$cache->send($filename);
-		} else {
-			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
-			echo "File not found.";
-		}
-	}
-
-	private function make_article_tag_uri($id, $timestamp) {
-
-		$timestamp = date("Y-m-d", strtotime($timestamp));
-
-		return "tag:".parse_url(get_self_url_prefix(), PHP_URL_HOST).",$timestamp:/$id";
-	}
-
-	// this should be used very carefully because this endpoint is exposed to unauthenticated users
-	// plugin data is not loaded because there's no user context and owner_uid/session may or may not be available
-	// in general, don't do anything user-related in here and do not modify $_SESSION
-	public function pluginhandler() {
-		$host = new PluginHost();
-
-		$plugin_name = clean_filename($_REQUEST["plugin"]);
-		$method = clean($_REQUEST["pmethod"]);
-
-		$host->load($plugin_name, PluginHost::KIND_USER, 0);
-		$host->load_data();
-
-		$plugin = $host->get_plugin($plugin_name);
-
-		if ($plugin) {
-			if (method_exists($plugin, $method)) {
-				if ($plugin->is_public_method($method)) {
-					$plugin->$method();
-				} else {
-					user_error("PluginHandler[PUBLIC]: Requested private method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
-					header("Content-Type: text/json");
-					print error_json(6);
-				}
-			} else {
-				user_error("PluginHandler[PUBLIC]: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
-				header("Content-Type: text/json");
-				print error_json(13);
-			}
-		} else {
-			user_error("PluginHandler[PUBLIC]: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
-			header("Content-Type: text/json");
-			print error_json(14);
-		}
-	}
+    }
+
+    public function cached_url() {
+        list ($cache_dir, $filename) = explode("/", $_GET["file"], 2);
+
+        // we do not allow files with extensions at the moment
+        $filename = str_replace(".", "", $filename);
+
+        $cache = new DiskCache($cache_dir);
+
+        if ($cache->exists($filename)) {
+            $cache->send($filename);
+        } else {
+            header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+            echo "File not found.";
+        }
+    }
+
+    private function make_article_tag_uri($id, $timestamp) {
+
+        $timestamp = date("Y-m-d", strtotime($timestamp));
+
+        return "tag:".parse_url(get_self_url_prefix(), PHP_URL_HOST).",$timestamp:/$id";
+    }
+
+    // this should be used very carefully because this endpoint is exposed to unauthenticated users
+    // plugin data is not loaded because there's no user context and owner_uid/session may or may not be available
+    // in general, don't do anything user-related in here and do not modify $_SESSION
+    public function pluginhandler() {
+        $host = new PluginHost();
+
+        $plugin_name = clean_filename($_REQUEST["plugin"]);
+        $method = clean($_REQUEST["pmethod"]);
+
+        $host->load($plugin_name, PluginHost::KIND_USER, 0);
+        $host->load_data();
+
+        $plugin = $host->get_plugin($plugin_name);
+
+        if ($plugin) {
+            if (method_exists($plugin, $method)) {
+                if ($plugin->is_public_method($method)) {
+                    $plugin->$method();
+                } else {
+                    user_error("PluginHandler[PUBLIC]: Requested private method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
+                    header("Content-Type: text/json");
+                    print error_json(6);
+                }
+            } else {
+                user_error("PluginHandler[PUBLIC]: Requested unknown method '$method' of plugin '$plugin_name'.", E_USER_WARNING);
+                header("Content-Type: text/json");
+                print error_json(13);
+            }
+        } else {
+            user_error("PluginHandler[PUBLIC]: Requested method '$method' of unknown plugin '$plugin_name'.", E_USER_WARNING);
+            header("Content-Type: text/json");
+            print error_json(14);
+        }
+    }
 }

classes/ccache.php

Indentation +134 added lines, -134 removed lines

@@ -1,215 +1,215 @@
 <?php
 class CCache {
-	public static function zero_all($owner_uid) {
-		$pdo = Db::pdo();
+    public static function zero_all($owner_uid) {
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("UPDATE ttrss_counters_cache SET
+        $sth = $pdo->prepare("UPDATE ttrss_counters_cache SET
 			value = 0 WHERE owner_uid = ?");
-		$sth->execute([$owner_uid]);
+        $sth->execute([$owner_uid]);
 
-		$sth = $pdo->prepare("UPDATE ttrss_cat_counters_cache SET
+        $sth = $pdo->prepare("UPDATE ttrss_cat_counters_cache SET
 			value = 0 WHERE owner_uid = ?");
-		$sth->execute([$owner_uid]);
-	}
+        $sth->execute([$owner_uid]);
+    }
 
-	public static function remove($feed_id, $owner_uid, $is_cat = false) {
+    public static function remove($feed_id, $owner_uid, $is_cat = false) {
 
-		$feed_id = (int) $feed_id;
+        $feed_id = (int) $feed_id;
 
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
+        if (!$is_cat) {
+            $table = "ttrss_counters_cache";
+        } else {
+            $table = "ttrss_cat_counters_cache";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("DELETE FROM $table WHERE
+        $sth = $pdo->prepare("DELETE FROM $table WHERE
 			feed_id = ? AND owner_uid = ?");
-		$sth->execute([$feed_id, $owner_uid]);
+        $sth->execute([$feed_id, $owner_uid]);
 
-	}
+    }
 
-	public static function update_all($owner_uid) {
+    public static function update_all($owner_uid) {
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if (get_pref('ENABLE_FEED_CATS', $owner_uid)) {
+        if (get_pref('ENABLE_FEED_CATS', $owner_uid)) {
 
-			$sth = $pdo->prepare("SELECT feed_id FROM ttrss_cat_counters_cache
+            $sth = $pdo->prepare("SELECT feed_id FROM ttrss_cat_counters_cache
 				WHERE feed_id > 0 AND owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				CCache::update($line["feed_id"], $owner_uid, true);
-			}
+            while ($line = $sth->fetch()) {
+                CCache::update($line["feed_id"], $owner_uid, true);
+            }
 
-			/* We have to manually include category 0 */
+            /* We have to manually include category 0 */
 
-			CCache::update(0, $owner_uid, true);
+            CCache::update(0, $owner_uid, true);
 
-		} else {
-			$sth = $pdo->prepare("SELECT feed_id FROM ttrss_counters_cache
+        } else {
+            $sth = $pdo->prepare("SELECT feed_id FROM ttrss_counters_cache
 				WHERE feed_id > 0 AND owner_uid = ?");
-			$sth->execute([$owner_uid]);
+            $sth->execute([$owner_uid]);
 
-			while ($line = $sth->fetch()) {
-				print CCache::update($line["feed_id"], $owner_uid);
+            while ($line = $sth->fetch()) {
+                print CCache::update($line["feed_id"], $owner_uid);
 
-			}
+            }
 
-		}
-	}
+        }
+    }
 
-	public static function find($feed_id, $owner_uid, $is_cat = false,
-						 $no_update = false) {
+    public static function find($feed_id, $owner_uid, $is_cat = false,
+                            $no_update = false) {
 
-		// "" (null) is valid and should be cast to 0 (uncategorized)
-		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id) {
-					return;
-		}
+        // "" (null) is valid and should be cast to 0 (uncategorized)
+        // everything else i.e. tags are not
+        if (!is_numeric($feed_id) && $feed_id) {
+                    return;
+        }
 
-		$feed_id = (int) $feed_id;
+        $feed_id = (int) $feed_id;
 
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
+        if (!$is_cat) {
+            $table = "ttrss_counters_cache";
+        } else {
+            $table = "ttrss_cat_counters_cache";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT value FROM $table
+        $sth = $pdo->prepare("SELECT value FROM $table
 			WHERE owner_uid = ? AND feed_id = ?
 			LIMIT 1");
 
-		$sth->execute([$owner_uid, $feed_id]);
+        $sth->execute([$owner_uid, $feed_id]);
 
-		if ($row = $sth->fetch()) {
-			return $row["value"];
-		} else {
-			if ($no_update) {
-				return -1;
-			} else {
-				return CCache::update($feed_id, $owner_uid, $is_cat);
-			}
-		}
+        if ($row = $sth->fetch()) {
+            return $row["value"];
+        } else {
+            if ($no_update) {
+                return -1;
+            } else {
+                return CCache::update($feed_id, $owner_uid, $is_cat);
+            }
+        }
 
-	}
+    }
 
-	public static function update($feed_id, $owner_uid, $is_cat = false,
-						   $update_pcat = true, $pcat_fast = false) {
+    public static function update($feed_id, $owner_uid, $is_cat = false,
+                            $update_pcat = true, $pcat_fast = false) {
 
-		// "" (null) is valid and should be cast to 0 (uncategorized)
-		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id) {
-					return;
-		}
+        // "" (null) is valid and should be cast to 0 (uncategorized)
+        // everything else i.e. tags are not
+        if (!is_numeric($feed_id) && $feed_id) {
+                    return;
+        }
 
-		$feed_id = (int) $feed_id;
+        $feed_id = (int) $feed_id;
 
-		$prev_unread = CCache::find($feed_id, $owner_uid, $is_cat, true);
+        $prev_unread = CCache::find($feed_id, $owner_uid, $is_cat, true);
 
-		/* When updating a label, all we need to do is recalculate feed counters
+        /* When updating a label, all we need to do is recalculate feed counters
 		 * because labels are not cached */
 
-		if ($feed_id < 0) {
-			CCache::update_all($owner_uid);
-			return;
-		}
+        if ($feed_id < 0) {
+            CCache::update_all($owner_uid);
+            return;
+        }
 
-		if (!$is_cat) {
-			$table = "ttrss_counters_cache";
-		} else {
-			$table = "ttrss_cat_counters_cache";
-		}
+        if (!$is_cat) {
+            $table = "ttrss_counters_cache";
+        } else {
+            $table = "ttrss_cat_counters_cache";
+        }
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		if ($is_cat && $feed_id >= 0) {
-			/* Recalculate counters for child feeds */
+        if ($is_cat && $feed_id >= 0) {
+            /* Recalculate counters for child feeds */
 
-			if (!$pcat_fast) {
-				$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
+            if (!$pcat_fast) {
+                $sth = $pdo->prepare("SELECT id FROM ttrss_feeds
 						WHERE owner_uid = :uid AND
 							(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL))");
-				$sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
+                $sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
 
-				while ($line = $sth->fetch()) {
-					CCache::update((int) $line["id"], $owner_uid, false, false);
-				}
-			}
+                while ($line = $sth->fetch()) {
+                    CCache::update((int) $line["id"], $owner_uid, false, false);
+                }
+            }
 
-			$sth = $pdo->prepare("SELECT SUM(value) AS sv
+            $sth = $pdo->prepare("SELECT SUM(value) AS sv
 				FROM ttrss_counters_cache, ttrss_feeds
 				WHERE ttrss_feeds.id = feed_id AND
 				(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL)) AND
 				ttrss_counters_cache.owner_uid = :uid AND
 				ttrss_feeds.owner_uid = :uid");
-			$sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
-			$row = $sth->fetch();
+            $sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
+            $row = $sth->fetch();
 
-			$unread = (int) $row["sv"];
+            $unread = (int) $row["sv"];
 
-		} else {
-			$unread = (int) Feeds::getFeedArticles($feed_id, $is_cat, true, $owner_uid);
-		}
+        } else {
+            $unread = (int) Feeds::getFeedArticles($feed_id, $is_cat, true, $owner_uid);
+        }
 
-		$tr_in_progress = false;
+        $tr_in_progress = false;
 
-		try {
-			$pdo->beginTransaction();
-		} catch (Exception $e) {
-			$tr_in_progress = true;
-		}
+        try {
+            $pdo->beginTransaction();
+        } catch (Exception $e) {
+            $tr_in_progress = true;
+        }
 
-		$sth = $pdo->prepare("SELECT feed_id FROM $table
+        $sth = $pdo->prepare("SELECT feed_id FROM $table
 			WHERE owner_uid = ? AND feed_id = ? LIMIT 1");
-		$sth->execute([$owner_uid, $feed_id]);
+        $sth->execute([$owner_uid, $feed_id]);
 
-		if ($sth->fetch()) {
+        if ($sth->fetch()) {
 
-			$sth = $pdo->prepare("update $table SET
+            $sth = $pdo->prepare("update $table SET
 				value = ?, updated = NOW() WHERE
 				feed_id = ? AND owner_uid = ?");
 
-			$sth->execute([$unread, $feed_id, $owner_uid]);
+            $sth->execute([$unread, $feed_id, $owner_uid]);
 
-		} else {
-			$sth = $pdo->prepare("INSERT INTO $table
+        } else {
+            $sth = $pdo->prepare("INSERT INTO $table
 				(feed_id, value, owner_uid, updated)
 				VALUES
 				(?, ?, ?, NOW())");
-			$sth->execute([$feed_id, $unread, $owner_uid]);
-		}
+            $sth->execute([$feed_id, $unread, $owner_uid]);
+        }
 
-		if (!$tr_in_progress) {
-		    $pdo->commit();
-		}
+        if (!$tr_in_progress) {
+            $pdo->commit();
+        }
 
-		if ($feed_id > 0 && $prev_unread != $unread) {
+        if ($feed_id > 0 && $prev_unread != $unread) {
 
-			if (!$is_cat) {
+            if (!$is_cat) {
 
-				/* Update parent category */
+                /* Update parent category */
 
-				if ($update_pcat) {
+                if ($update_pcat) {
 
-					$sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
+                    $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
 						WHERE owner_uid = ? AND id = ?");
-					$sth->execute([$owner_uid, $feed_id]);
-
-					if ($row = $sth->fetch()) {
-						CCache::update((int) $row["cat_id"], $owner_uid, true, true, true);
-					}
-				}
-			}
-		} else if ($feed_id < 0) {
-			CCache::update_all($owner_uid);
-		}
-
-		return $unread;
-	}
+                    $sth->execute([$owner_uid, $feed_id]);
+
+                    if ($row = $sth->fetch()) {
+                        CCache::update((int) $row["cat_id"], $owner_uid, true, true, true);
+                    }
+                }
+            }
+        } else if ($feed_id < 0) {
+            CCache::update_all($owner_uid);
+        }
+
+        return $unread;
+    }
 
 }

classes/rpc.php

Indentation +396 added lines, -396 removed lines

@@ -1,444 +1,444 @@ 
 <?php
 class RPC extends Handler_Protected {
 
-	public function csrf_ignore($method) {
-		$csrf_ignored = array("sanitycheck", "completelabels", "saveprofile");
+    public function csrf_ignore($method) {
+        $csrf_ignored = array("sanitycheck", "completelabels", "saveprofile");
 
-		return array_search($method, $csrf_ignored) !== false;
-	}
+        return array_search($method, $csrf_ignored) !== false;
+    }
 
-	public function setprofile() {
-		$_SESSION["profile"] = (int) clean($_REQUEST["id"]);
+    public function setprofile() {
+        $_SESSION["profile"] = (int) clean($_REQUEST["id"]);
 
-		// default value
-		if (!$_SESSION["profile"]) {
-		    $_SESSION["profile"] = null;
-		}
-	}
+        // default value
+        if (!$_SESSION["profile"]) {
+            $_SESSION["profile"] = null;
+        }
+    }
 
-	public function remprofiles() {
-		$ids = explode(",", trim(clean($_REQUEST["ids"])));
+    public function remprofiles() {
+        $ids = explode(",", trim(clean($_REQUEST["ids"])));
 
-		foreach ($ids as $id) {
-			if ($_SESSION["profile"] != $id) {
-				$sth = $this->pdo->prepare("DELETE FROM ttrss_settings_profiles WHERE id = ? AND
+        foreach ($ids as $id) {
+            if ($_SESSION["profile"] != $id) {
+                $sth = $this->pdo->prepare("DELETE FROM ttrss_settings_profiles WHERE id = ? AND
 							owner_uid = ?");
-				$sth->execute([$id, $_SESSION['uid']]);
-			}
-		}
-	}
+                $sth->execute([$id, $_SESSION['uid']]);
+            }
+        }
+    }
 
-	// Silent
-	public function addprofile() {
-		$title = trim(clean($_REQUEST["title"]));
+    // Silent
+    public function addprofile() {
+        $title = trim(clean($_REQUEST["title"]));
 
-		if ($title) {
-			$this->pdo->beginTransaction();
+        if ($title) {
+            $this->pdo->beginTransaction();
 
-			$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
+            $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles
 				WHERE title = ? AND owner_uid = ?");
-			$sth->execute([$title, $_SESSION['uid']]);
+            $sth->execute([$title, $_SESSION['uid']]);
 
-			if (!$sth->fetch()) {
+            if (!$sth->fetch()) {
 
-				$sth = $this->pdo->prepare("INSERT INTO ttrss_settings_profiles (title, owner_uid)
+                $sth = $this->pdo->prepare("INSERT INTO ttrss_settings_profiles (title, owner_uid)
 							VALUES (?, ?)");
 
-				$sth->execute([$title, $_SESSION['uid']]);
+                $sth->execute([$title, $_SESSION['uid']]);
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles WHERE
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_settings_profiles WHERE
 					title = ? AND owner_uid = ?");
-				$sth->execute([$title, $_SESSION['uid']]);
+                $sth->execute([$title, $_SESSION['uid']]);
 
-				if ($row = $sth->fetch()) {
-					$profile_id = $row['id'];
+                if ($row = $sth->fetch()) {
+                    $profile_id = $row['id'];
 
-					if ($profile_id) {
-						initialize_user_prefs($_SESSION["uid"], $profile_id);
-					}
-				}
-			}
+                    if ($profile_id) {
+                        initialize_user_prefs($_SESSION["uid"], $profile_id);
+                    }
+                }
+            }
 
-			$this->pdo->commit();
-		}
-	}
+            $this->pdo->commit();
+        }
+    }
 
-	public function saveprofile() {
-		$id = clean($_REQUEST["id"]);
-		$title = trim(clean($_REQUEST["value"]));
+    public function saveprofile() {
+        $id = clean($_REQUEST["id"]);
+        $title = trim(clean($_REQUEST["value"]));
 
-		if ($id == 0) {
-			print __("Default profile");
-			return;
-		}
+        if ($id == 0) {
+            print __("Default profile");
+            return;
+        }
 
-		if ($title) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_settings_profiles
+        if ($title) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_settings_profiles
 				SET title = ? WHERE id = ? AND
 					owner_uid = ?");
 
-			$sth->execute([$title, $id, $_SESSION['uid']]);
-			print $title;
-		}
-	}
+            $sth->execute([$title, $id, $_SESSION['uid']]);
+            print $title;
+        }
+    }
 
-	// Silent
-	public function remarchive() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
+    // Silent
+    public function remarchive() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_archived_feeds WHERE
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_archived_feeds WHERE
 		  		(SELECT COUNT(*) FROM ttrss_user_entries
 					WHERE orig_feed_id = :id) = 0 AND
 						id = :id AND owner_uid = :uid");
 
-		foreach ($ids as $id) {
-			$sth->execute([":id" => $id, ":uid" => $_SESSION['uid']]);
-		}
-	}
+        foreach ($ids as $id) {
+            $sth->execute([":id" => $id, ":uid" => $_SESSION['uid']]);
+        }
+    }
 
-	public function addfeed() {
-		$feed = clean($_REQUEST['feed']);
-		$cat = clean($_REQUEST['cat']);
-		$need_auth = isset($_REQUEST['need_auth']);
-		$login = $need_auth ? clean($_REQUEST['login']) : '';
-		$pass = $need_auth ? trim(clean($_REQUEST['pass'])) : '';
+    public function addfeed() {
+        $feed = clean($_REQUEST['feed']);
+        $cat = clean($_REQUEST['cat']);
+        $need_auth = isset($_REQUEST['need_auth']);
+        $login = $need_auth ? clean($_REQUEST['login']) : '';
+        $pass = $need_auth ? trim(clean($_REQUEST['pass'])) : '';
 
-		$rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass);
+        $rc = Feeds::subscribe_to_feed($feed, $cat, $login, $pass);
 
-		print json_encode(array("result" => $rc));
-	}
+        print json_encode(array("result" => $rc));
+    }
 
-	public function togglepref() {
-		$key = clean($_REQUEST["key"]);
-		set_pref($key, !get_pref($key));
-		$value = get_pref($key);
+    public function togglepref() {
+        $key = clean($_REQUEST["key"]);
+        set_pref($key, !get_pref($key));
+        $value = get_pref($key);
 
-		print json_encode(array("param" =>$key, "value" => $value));
-	}
+        print json_encode(array("param" =>$key, "value" => $value));
+    }
 
-	public function setpref() {
-		// set_pref escapes input, so no need to double escape it here
-		$key = clean($_REQUEST['key']);
-		$value = $_REQUEST['value'];
+    public function setpref() {
+        // set_pref escapes input, so no need to double escape it here
+        $key = clean($_REQUEST['key']);
+        $value = $_REQUEST['value'];
 
-		set_pref($key, $value, false, $key != 'USER_STYLESHEET');
+        set_pref($key, $value, false, $key != 'USER_STYLESHEET');
 
-		print json_encode(array("param" =>$key, "value" => $value));
-	}
+        print json_encode(array("param" =>$key, "value" => $value));
+    }
 
-	public function mark() {
-		$mark = clean($_REQUEST["mark"]);
-		$id = clean($_REQUEST["id"]);
+    public function mark() {
+        $mark = clean($_REQUEST["mark"]);
+        $id = clean($_REQUEST["id"]);
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET marked = ?,
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET marked = ?,
 					last_marked = NOW()
 					WHERE ref_id = ? AND owner_uid = ?");
 
-		$sth->execute([$mark, $id, $_SESSION['uid']]);
+        $sth->execute([$mark, $id, $_SESSION['uid']]);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function delete() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$ids_qmarks = arr_qmarks($ids);
+    public function delete() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $ids_qmarks = arr_qmarks($ids);
 
-		$sth = $this->pdo->prepare("DELETE FROM ttrss_user_entries
+        $sth = $this->pdo->prepare("DELETE FROM ttrss_user_entries
 			WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
-		Article::purge_orphans();
+        Article::purge_orphans();
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function unarchive() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
+    public function unarchive() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			$this->pdo->beginTransaction();
+        foreach ($ids as $id) {
+            $this->pdo->beginTransaction();
 
-			$sth = $this->pdo->prepare("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
+            $sth = $this->pdo->prepare("SELECT feed_url,site_url,title FROM ttrss_archived_feeds
 				WHERE id = (SELECT orig_feed_id FROM ttrss_user_entries WHERE ref_id = :id
 				AND owner_uid = :uid) AND owner_uid = :uid");
-			$sth->execute([":uid" => $_SESSION['uid'], ":id" => $id]);
+            $sth->execute([":uid" => $_SESSION['uid'], ":id" => $id]);
 
-			if ($row = $sth->fetch()) {
-				$feed_url = $row['feed_url'];
-				$site_url = $row['site_url'];
-				$title = $row['title'];
+            if ($row = $sth->fetch()) {
+                $feed_url = $row['feed_url'];
+                $site_url = $row['site_url'];
+                $title = $row['title'];
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
 					AND owner_uid = ?");
-				$sth->execute([$feed_url, $_SESSION['uid']]);
+                $sth->execute([$feed_url, $_SESSION['uid']]);
 
-				if ($row = $sth->fetch()) {
-					$feed_id = $row["id"];
-				} else {
-					if (!$title) {
-					    $title = '[Unknown]';
-					}
+                if ($row = $sth->fetch()) {
+                    $feed_id = $row["id"];
+                } else {
+                    if (!$title) {
+                        $title = '[Unknown]';
+                    }
 
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
 							VALUES (?, ?, ?, ?, NULL, '', '', 0)");
-					$sth->execute([$_SESSION['uid'], $feed_url, $site_url, $title]);
+                    $sth->execute([$_SESSION['uid'], $feed_url, $site_url, $title]);
 
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE feed_url = ?
 						AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
+                    $sth->execute([$feed_url, $_SESSION['uid']]);
 
-					if ($row = $sth->fetch()) {
-						$feed_id = $row['id'];
-					}
-				}
+                    if ($row = $sth->fetch()) {
+                        $feed_id = $row['id'];
+                    }
+                }
 
-				if ($feed_id) {
-					$sth = $this->pdo->prepare("UPDATE ttrss_user_entries
+                if ($feed_id) {
+                    $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
 						SET feed_id = ?, orig_feed_id = NULL
 						WHERE ref_id = ? AND owner_uid = ?");
-					$sth->execute([$feed_id, $id, $_SESSION['uid']]);
-				}
-			}
+                    $sth->execute([$feed_id, $id, $_SESSION['uid']]);
+                }
+            }
 
-			$this->pdo->commit();
-		}
+            $this->pdo->commit();
+        }
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function archive() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
+    public function archive() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
 
-		foreach ($ids as $id) {
-			$this->archive_article($id, $_SESSION["uid"]);
-		}
+        foreach ($ids as $id) {
+            $this->archive_article($id, $_SESSION["uid"]);
+        }
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	private function archive_article($id, $owner_uid) {
-		$this->pdo->beginTransaction();
+    private function archive_article($id, $owner_uid) {
+        $this->pdo->beginTransaction();
 
-		if (!$owner_uid) {
-		    $owner_uid = $_SESSION['uid'];
-		}
+        if (!$owner_uid) {
+            $owner_uid = $_SESSION['uid'];
+        }
 
-		$sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
+        $sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = ? AND owner_uid = ?");
-		$sth->execute([$id, $owner_uid]);
+        $sth->execute([$id, $owner_uid]);
 
-		if ($row = $sth->fetch()) {
+        if ($row = $sth->fetch()) {
 
-			/* prepare the archived table */
+            /* prepare the archived table */
 
-			$feed_id = (int) $row['feed_id'];
+            $feed_id = (int) $row['feed_id'];
 
-			if ($feed_id) {
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_archived_feeds
+            if ($feed_id) {
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_archived_feeds
 					WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$feed_id, $owner_uid]);
+                $sth->execute([$feed_id, $owner_uid]);
 
-				if ($row = $sth->fetch()) {
-					$new_feed_id = $row['id'];
-				} else {
-					$row = $this->pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds")->fetch();
-					$new_feed_id = (int) $row['id'] + 1;
+                if ($row = $sth->fetch()) {
+                    $new_feed_id = $row['id'];
+                } else {
+                    $row = $this->pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds")->fetch();
+                    $new_feed_id = (int) $row['id'] + 1;
 
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_archived_feeds
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
 							SELECT ?, owner_uid, title, feed_url, site_url, NOW() from ttrss_feeds
 							  	WHERE id = ?");
 
-					$sth->execute([$new_feed_id, $feed_id]);
-				}
+                    $sth->execute([$new_feed_id, $feed_id]);
+                }
 
-				$sth = $this->pdo->prepare("UPDATE ttrss_user_entries
+                $sth = $this->pdo->prepare("UPDATE ttrss_user_entries
 					SET orig_feed_id = ?, feed_id = NULL
 					WHERE ref_id = ? AND owner_uid = ?");
-				$sth->execute([$new_feed_id, $id, $owner_uid]);
-			}
-		}
+                $sth->execute([$new_feed_id, $id, $owner_uid]);
+            }
+        }
 
-		$this->pdo->commit();
-	}
+        $this->pdo->commit();
+    }
 
-	public function publ() {
-		$pub = clean($_REQUEST["pub"]);
-		$id = clean($_REQUEST["id"]);
+    public function publ() {
+        $pub = clean($_REQUEST["pub"]);
+        $id = clean($_REQUEST["id"]);
 
-		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 			published = ?, last_published = NOW()
 			WHERE ref_id = ? AND owner_uid = ?");
 
-		$sth->execute([$pub, $id, $_SESSION['uid']]);
+        $sth->execute([$pub, $id, $_SESSION['uid']]);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function getAllCounters() {
-		@$seq = (int) $_REQUEST['seq'];
+    public function getAllCounters() {
+        @$seq = (int) $_REQUEST['seq'];
 
-		$reply = [
-			'counters' => Counters::getAllCounters(),
-			'seq' => $seq
-		];
+        $reply = [
+            'counters' => Counters::getAllCounters(),
+            'seq' => $seq
+        ];
 
-		if ($seq % 2 == 0) {
-					$reply['runtime-info'] = make_runtime_info();
-		}
+        if ($seq % 2 == 0) {
+                    $reply['runtime-info'] = make_runtime_info();
+        }
 
-		print json_encode($reply);
-	}
+        print json_encode($reply);
+    }
 
-	/* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
-	public function catchupSelected() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int) clean($_REQUEST["cmode"]);
+    /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */
+    public function catchupSelected() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $cmode = (int) clean($_REQUEST["cmode"]);
 
-		Article::catchupArticlesById($ids, $cmode);
+        Article::catchupArticlesById($ids, $cmode);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS", "ids" => $ids));
+    }
 
-	public function markSelected() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int) clean($_REQUEST["cmode"]);
+    public function markSelected() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $cmode = (int) clean($_REQUEST["cmode"]);
 
-		$this->markArticlesById($ids, $cmode);
+        $this->markArticlesById($ids, $cmode);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function publishSelected() {
-		$ids = explode(",", clean($_REQUEST["ids"]));
-		$cmode = (int) clean($_REQUEST["cmode"]);
+    public function publishSelected() {
+        $ids = explode(",", clean($_REQUEST["ids"]));
+        $cmode = (int) clean($_REQUEST["cmode"]);
 
-		$this->publishArticlesById($ids, $cmode);
+        $this->publishArticlesById($ids, $cmode);
 
-		print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function sanityCheck() {
-		$_SESSION["hasAudio"] = clean($_REQUEST["hasAudio"]) === "true";
-		$_SESSION["hasSandbox"] = clean($_REQUEST["hasSandbox"]) === "true";
-		$_SESSION["hasMp3"] = clean($_REQUEST["hasMp3"]) === "true";
-		$_SESSION["clientTzOffset"] = clean($_REQUEST["clientTzOffset"]);
+    public function sanityCheck() {
+        $_SESSION["hasAudio"] = clean($_REQUEST["hasAudio"]) === "true";
+        $_SESSION["hasSandbox"] = clean($_REQUEST["hasSandbox"]) === "true";
+        $_SESSION["hasMp3"] = clean($_REQUEST["hasMp3"]) === "true";
+        $_SESSION["clientTzOffset"] = clean($_REQUEST["clientTzOffset"]);
 
-		$reply = array();
+        $reply = array();
 
-		$reply['error'] = sanity_check();
+        $reply['error'] = sanity_check();
 
-		if ($reply['error']['code'] == 0) {
-			$reply['init-params'] = make_init_params();
-			$reply['runtime-info'] = make_runtime_info();
-		}
+        if ($reply['error']['code'] == 0) {
+            $reply['init-params'] = make_init_params();
+            $reply['runtime-info'] = make_runtime_info();
+        }
 
-		print json_encode($reply);
-	}
+        print json_encode($reply);
+    }
 
-	public function completeLabels() {
-		$search = clean($_REQUEST["search"]);
+    public function completeLabels() {
+        $search = clean($_REQUEST["search"]);
 
-		$sth = $this->pdo->prepare("SELECT DISTINCT caption FROM
+        $sth = $this->pdo->prepare("SELECT DISTINCT caption FROM
 				ttrss_labels2
 				WHERE owner_uid = ? AND
 				LOWER(caption) LIKE LOWER(?) ORDER BY caption
 				LIMIT 5");
-		$sth->execute([$_SESSION['uid'], "%$search%"]);
+        $sth->execute([$_SESSION['uid'], "%$search%"]);
 
-		print "<ul>";
-		while ($line = $sth->fetch()) {
-			print "<li>".$line["caption"]."</li>";
-		}
-		print "</ul>";
-	}
+        print "<ul>";
+        while ($line = $sth->fetch()) {
+            print "<li>".$line["caption"]."</li>";
+        }
+        print "</ul>";
+    }
 
-	// Silent
-	public function massSubscribe() {
+    // Silent
+    public function massSubscribe() {
 
-		$payload = json_decode(clean($_REQUEST["payload"]), false);
-		$mode = clean($_REQUEST["mode"]);
+        $payload = json_decode(clean($_REQUEST["payload"]), false);
+        $mode = clean($_REQUEST["mode"]);
 
-		if (!$payload || !is_array($payload)) {
-		    return;
-		}
+        if (!$payload || !is_array($payload)) {
+            return;
+        }
 
-		if ($mode == 1) {
-			foreach ($payload as $feed) {
+        if ($mode == 1) {
+            foreach ($payload as $feed) {
 
-				$title = $feed[0];
-				$feed_url = $feed[1];
+                $title = $feed[0];
+                $feed_url = $feed[1];
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 					feed_url = ? AND owner_uid = ?");
-				$sth->execute([$feed_url, $_SESSION['uid']]);
+                $sth->execute([$feed_url, $_SESSION['uid']]);
 
-				if (!$sth->fetch()) {
-					$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                if (!$sth->fetch()) {
+                    $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 									(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES (?, ?, ?, NULL, '')");
 
-					$sth->execute([$_SESSION['uid'], $feed_url, $title]);
-				}
-			}
-		} else if ($mode == 2) {
-			// feed archive
-			foreach ($payload as $id) {
-				$sth = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
+                    $sth->execute([$_SESSION['uid'], $feed_url, $title]);
+                }
+            }
+        } else if ($mode == 2) {
+            // feed archive
+            foreach ($payload as $id) {
+                $sth = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
 					WHERE id = ? AND owner_uid = ?");
-				$sth->execute([$id, $_SESSION['uid']]);
+                $sth->execute([$id, $_SESSION['uid']]);
 
-				if ($row = $sth->fetch()) {
-					$site_url = $row['site_url'];
-					$feed_url = $row['feed_url'];
-					$title = $row['title'];
+                if ($row = $sth->fetch()) {
+                    $site_url = $row['site_url'];
+                    $feed_url = $row['feed_url'];
+                    $title = $row['title'];
 
-					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                    $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 						feed_url = ? AND owner_uid = ?");
-					$sth->execute([$feed_url, $_SESSION['uid']]);
+                    $sth->execute([$feed_url, $_SESSION['uid']]);
 
-					if (!$sth->fetch()) {
-						$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
+                    if (!$sth->fetch()) {
+                        $sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 								(owner_uid,feed_url,title,cat_id,site_url)
 									VALUES (?, ?, ?, NULL, ?)");
 
-						$sth->execute([$_SESSION['uid'], $feed_url, $title, $site_url]);
-					}
-				}
-			}
-		}
-	}
+                        $sth->execute([$_SESSION['uid'], $feed_url, $title, $site_url]);
+                    }
+                }
+            }
+        }
+    }
 
-	public function catchupFeed() {
-		$feed_id = clean($_REQUEST['feed_id']);
-		$is_cat = clean($_REQUEST['is_cat']) == "true";
-		$mode = clean($_REQUEST['mode']);
-		$search_query = clean($_REQUEST['search_query']);
-		$search_lang = clean($_REQUEST['search_lang']);
+    public function catchupFeed() {
+        $feed_id = clean($_REQUEST['feed_id']);
+        $is_cat = clean($_REQUEST['is_cat']) == "true";
+        $mode = clean($_REQUEST['mode']);
+        $search_query = clean($_REQUEST['search_query']);
+        $search_lang = clean($_REQUEST['search_lang']);
 
-		Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
+        Feeds::catchup_feed($feed_id, $is_cat, false, $mode, [$search_query, $search_lang]);
 
-		// return counters here synchronously so that frontend can figure out next unread feed properly
-		print json_encode(['counters' => Counters::getAllCounters()]);
+        // return counters here synchronously so that frontend can figure out next unread feed properly
+        print json_encode(['counters' => Counters::getAllCounters()]);
 
-		//print json_encode(array("message" => "UPDATE_COUNTERS"));
-	}
+        //print json_encode(array("message" => "UPDATE_COUNTERS"));
+    }
 
-	public function setpanelmode() {
-		$wide = (int) clean($_REQUEST["wide"]);
+    public function setpanelmode() {
+        $wide = (int) clean($_REQUEST["wide"]);
 
-		setcookie("ttrss_widescreen", $wide,
-			time() + COOKIE_LIFETIME_LONG);
+        setcookie("ttrss_widescreen", $wide,
+            time() + COOKIE_LIFETIME_LONG);
 
-		print json_encode(array("wide" => $wide));
-	}
+        print json_encode(array("wide" => $wide));
+    }
 
-	public static function updaterandomfeed_real() {
+    public static function updaterandomfeed_real() {
 
-		// Test if the feed need a update (update interval exceded).
-		if (DB_TYPE == "pgsql") {
-			$update_limit_qpart = "AND ((
+        // Test if the feed need a update (update interval exceded).
+        if (DB_TYPE == "pgsql") {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_user_prefs.value || ' minutes') AS INTERVAL)
 				) OR (
@@ -446,8 +446,8 @@ 
 					AND ttrss_feeds.last_updated < NOW() - CAST((ttrss_feeds.update_interval || ' minutes') AS INTERVAL)
 				) OR ttrss_feeds.last_updated IS NULL
 				OR last_updated = '1970-01-01 00:00:00')";
-		} else {
-			$update_limit_qpart = "AND ((
+        } else {
+            $update_limit_qpart = "AND ((
 					ttrss_feeds.update_interval = 0
 					AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL CONVERT(ttrss_user_prefs.value, SIGNED INTEGER) MINUTE)
 				) OR (
@@ -455,28 +455,28 @@ 
 					AND ttrss_feeds.last_updated < DATE_SUB(NOW(), INTERVAL ttrss_feeds.update_interval MINUTE)
 				) OR ttrss_feeds.last_updated IS NULL
 				OR last_updated = '1970-01-01 00:00:00')";
-		}
+        }
 
-		// 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 '5 minutes')";
-		} else {
-			$updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 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 '5 minutes')";
+        } else {
+            $updstart_thresh_qpart = "AND (ttrss_feeds.last_update_started IS NULL OR ttrss_feeds.last_update_started < DATE_SUB(NOW(), INTERVAL 5 MINUTE))";
+        }
 
-		$random_qpart = sql_random_function();
+        $random_qpart = sql_random_function();
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		// we could be invoked from public.php with no active session
-		if ($_SESSION["uid"]) {
-			$owner_check_qpart = "AND ttrss_feeds.owner_uid = ".$pdo->quote($_SESSION["uid"]);
-		} else {
-			$owner_check_qpart = "";
-		}
+        // we could be invoked from public.php with no active session
+        if ($_SESSION["uid"]) {
+            $owner_check_qpart = "AND ttrss_feeds.owner_uid = ".$pdo->quote($_SESSION["uid"]);
+        } else {
+            $owner_check_qpart = "";
+        }
 
-		// We search for feed needing update.
-		$res = $pdo->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
+        // We search for feed needing update.
+        $res = $pdo->query("SELECT ttrss_feeds.feed_url,ttrss_feeds.id
 			FROM
 				ttrss_feeds, ttrss_users, ttrss_user_prefs
 			WHERE
@@ -488,139 +488,139 @@ 
 				$updstart_thresh_qpart
 			ORDER BY $random_qpart LIMIT 30");
 
-		$num_updated = 0;
+        $num_updated = 0;
 
-		$tstart = time();
+        $tstart = time();
 
-		while ($line = $res->fetch()) {
-			$feed_id = $line["id"];
+        while ($line = $res->fetch()) {
+            $feed_id = $line["id"];
 
-			if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
-				RSSUtils::update_rss_feed($feed_id, true);
-				++$num_updated;
-			} else {
-				break;
-			}
-		}
+            if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
+                RSSUtils::update_rss_feed($feed_id, true);
+                ++$num_updated;
+            } else {
+                break;
+            }
+        }
 
-		// Purge orphans and cleanup tags
-		Article::purge_orphans();
-		//cleanup_tags(14, 50000);
+        // Purge orphans and cleanup tags
+        Article::purge_orphans();
+        //cleanup_tags(14, 50000);
 
-		if ($num_updated > 0) {
-			print json_encode(array("message" => "UPDATE_COUNTERS",
-				"num_updated" => $num_updated));
-		} else {
-			print json_encode(array("message" => "NOTHING_TO_UPDATE"));
-		}
+        if ($num_updated > 0) {
+            print json_encode(array("message" => "UPDATE_COUNTERS",
+                "num_updated" => $num_updated));
+        } else {
+            print json_encode(array("message" => "NOTHING_TO_UPDATE"));
+        }
 
-	}
+    }
 
-	public function updaterandomfeed() {
-		RPC::updaterandomfeed_real();
-	}
+    public function updaterandomfeed() {
+        RPC::updaterandomfeed_real();
+    }
 
-	private function markArticlesById($ids, $cmode) {
+    private function markArticlesById($ids, $cmode) {
 
-		$ids_qmarks = arr_qmarks($ids);
+        $ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 0) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        if ($cmode == 0) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = false, last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 1) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else if ($cmode == 1) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = true, last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				marked = NOT marked,last_marked = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		}
+        }
 
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
-	}
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
+    }
 
-	private function publishArticlesById($ids, $cmode) {
+    private function publishArticlesById($ids, $cmode) {
 
-		$ids_qmarks = arr_qmarks($ids);
+        $ids_qmarks = arr_qmarks($ids);
 
-		if ($cmode == 0) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        if ($cmode == 0) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = false, last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else if ($cmode == 1) {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else if ($cmode == 1) {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = true, last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		} else {
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        } else {
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				published = NOT published,last_published = NOW()
 					WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?");
-		}
+        }
 
-		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
-	}
+        $sth->execute(array_merge($ids, [$_SESSION['uid']]));
+    }
 
-	public function getlinktitlebyid() {
-		$id = clean($_REQUEST['id']);
+    public function getlinktitlebyid() {
+        $id = clean($_REQUEST['id']);
 
-		$sth = $this->pdo->prepare("SELECT link, title FROM ttrss_entries, ttrss_user_entries
+        $sth = $this->pdo->prepare("SELECT link, title FROM ttrss_entries, ttrss_user_entries
 			WHERE ref_id = ? AND ref_id = id AND owner_uid = ?");
-		$sth->execute([$id, $_SESSION['uid']]);
+        $sth->execute([$id, $_SESSION['uid']]);
 
-		if ($row = $sth->fetch()) {
-			$link = $row['link'];
-			$title = $row['title'];
+        if ($row = $sth->fetch()) {
+            $link = $row['link'];
+            $title = $row['title'];
 
-			echo json_encode(array("link" => $link, "title" => $title));
-		} else {
-			echo json_encode(array("error" => "ARTICLE_NOT_FOUND"));
-		}
-	}
+            echo json_encode(array("link" => $link, "title" => $title));
+        } else {
+            echo json_encode(array("error" => "ARTICLE_NOT_FOUND"));
+        }
+    }
 
-	public function log() {
-		$msg = clean($_REQUEST['msg']);
-		$file = clean_filename($_REQUEST['file']);
-		$line = (int) clean($_REQUEST['line']);
-		$context = clean($_REQUEST['context']);
+    public function log() {
+        $msg = clean($_REQUEST['msg']);
+        $file = clean_filename($_REQUEST['file']);
+        $line = (int) clean($_REQUEST['line']);
+        $context = clean($_REQUEST['context']);
 
-		if ($msg) {
-			Logger::get()->log_error(E_USER_WARNING,
-				$msg, 'client-js:'.$file, $line, $context);
+        if ($msg) {
+            Logger::get()->log_error(E_USER_WARNING,
+                $msg, 'client-js:'.$file, $line, $context);
 
-			echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
-		} else {
-			echo json_encode(array("error" => "MESSAGE_NOT_FOUND"));
-		}
+            echo json_encode(array("message" => "HOST_ERROR_LOGGED"));
+        } else {
+            echo json_encode(array("error" => "MESSAGE_NOT_FOUND"));
+        }
 
-	}
+    }
 
-	public function checkforupdates() {
-		$rv = [];
+    public function checkforupdates() {
+        $rv = [];
 
-		$git_timestamp = false;
-		$git_commit = false;
+        $git_timestamp = false;
+        $git_commit = false;
 
-		get_version($git_commit, $git_timestamp);
+        get_version($git_commit, $git_timestamp);
 
-		if (CHECK_FOR_UPDATES && $_SESSION["access_level"] >= 10 && $git_timestamp) {
-			$content = @fetch_file_contents(["url" => "https://srv.tt-rss.org/version.json"]);
+        if (CHECK_FOR_UPDATES && $_SESSION["access_level"] >= 10 && $git_timestamp) {
+            $content = @fetch_file_contents(["url" => "https://srv.tt-rss.org/version.json"]);
 
-			if ($content) {
-				$content = json_decode($content, true);
+            if ($content) {
+                $content = json_decode($content, true);
 
-				if ($content && isset($content["changeset"])) {
-					if ($git_timestamp < (int) $content["changeset"]["timestamp"] &&
-						$git_commit != $content["changeset"]["id"]) {
+                if ($content && isset($content["changeset"])) {
+                    if ($git_timestamp < (int) $content["changeset"]["timestamp"] &&
+                        $git_commit != $content["changeset"]["id"]) {
 
-						$rv = $content["changeset"];
-					}
-				}
-			}
-		}
+                        $rv = $content["changeset"];
+                    }
+                }
+            }
+        }
 
-		print json_encode($rv);
-	}
+        print json_encode($rv);
+    }
 
 }

classes/logger/syslog.php

Indentation +24 added lines, -24 removed lines

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

classes/pluginhost.php

Indentation +516 added lines, -516 removed lines

@@ -1,545 +1,545 @@
 <?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/feeditem/atom.php

Indentation +147 added lines, -147 removed lines

@@ -1,162 +1,162 @@
 <?php
 class FeedItem_Atom extends FeedItem_Common {
-	const NS_XML = "http://www.w3.org/XML/1998/namespace";
+    const NS_XML = "http://www.w3.org/XML/1998/namespace";
 
-	public function get_id() {
-		$id = $this->elem->getElementsByTagName("id")->item(0);
-
-		if ($id) {
-			return $id->nodeValue;
-		} else {
-			return clean($this->get_link());
-		}
-	}
-
-	public function get_date() {
-		$updated = $this->elem->getElementsByTagName("updated")->item(0);
+    public function get_id() {
+        $id = $this->elem->getElementsByTagName("id")->item(0);
+
+        if ($id) {
+            return $id->nodeValue;
+        } else {
+            return clean($this->get_link());
+        }
+    }
+
+    public function get_date() {
+        $updated = $this->elem->getElementsByTagName("updated")->item(0);
 
-		if ($updated) {
-			return strtotime($updated->nodeValue);
-		}
+        if ($updated) {
+            return strtotime($updated->nodeValue);
+        }
 
-		$published = $this->elem->getElementsByTagName("published")->item(0);
+        $published = $this->elem->getElementsByTagName("published")->item(0);
 
-		if ($published) {
-			return strtotime($published->nodeValue);
-		}
+        if ($published) {
+            return strtotime($published->nodeValue);
+        }
 
-		$date = $this->xpath->query("dc:date", $this->elem)->item(0);
+        $date = $this->xpath->query("dc:date", $this->elem)->item(0);
 
-		if ($date) {
-			return strtotime($date->nodeValue);
-		}
-	}
+        if ($date) {
+            return strtotime($date->nodeValue);
+        }
+    }
 
 
-	public function get_link() {
-		$links = $this->elem->getElementsByTagName("link");
+    public function get_link() {
+        $links = $this->elem->getElementsByTagName("link");
 
-		foreach ($links as $link) {
-			if ($link && $link->hasAttribute("href") &&
-				(!$link->hasAttribute("rel")
-					|| $link->getAttribute("rel") == "alternate"
-					|| $link->getAttribute("rel") == "standout")) {
-				$base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
+        foreach ($links as $link) {
+            if ($link && $link->hasAttribute("href") &&
+                (!$link->hasAttribute("rel")
+                    || $link->getAttribute("rel") == "alternate"
+                    || $link->getAttribute("rel") == "standout")) {
+                $base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
 
-				if ($base) {
-									return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
-				} else {
-									return clean(trim($link->getAttribute("href")));
-				}
+                if ($base) {
+                                    return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
+                } else {
+                                    return clean(trim($link->getAttribute("href")));
+                }
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	public function get_title() {
-		$title = $this->elem->getElementsByTagName("title")->item(0);
-
-		if ($title) {
-			return clean(trim($title->nodeValue));
-		}
-	}
-
-	public function get_content() {
-		$content = $this->elem->getElementsByTagName("content")->item(0);
-
-		if ($content) {
-			if ($content->hasAttribute('type')) {
-				if ($content->getAttribute('type') == 'xhtml') {
-					for ($i = 0; $i < $content->childNodes->length; $i++) {
-						$child = $content->childNodes->item($i);
-
-						if ($child->hasChildNodes()) {
-							return $this->doc->saveHTML($child);
-						}
-					}
-				}
-			}
-
-			return $this->subtree_or_text($content);
-		}
-	}
-
-	public function get_description() {
-		$content = $this->elem->getElementsByTagName("summary")->item(0);
-
-		if ($content) {
-			if ($content->hasAttribute('type')) {
-				if ($content->getAttribute('type') == 'xhtml') {
-					for ($i = 0; $i < $content->childNodes->length; $i++) {
-						$child = $content->childNodes->item($i);
-
-						if ($child->hasChildNodes()) {
-							return $this->doc->saveHTML($child);
-						}
-					}
-				}
-			}
-
-			return $this->subtree_or_text($content);
-		}
-
-	}
-
-	public function get_categories() {
-		$categories = $this->elem->getElementsByTagName("category");
-		$cats = [];
-
-		foreach ($categories as $cat) {
-			if ($cat->hasAttribute("term")) {
-							array_push($cats, $cat->getAttribute("term"));
-			}
-		}
-
-		$categories = $this->xpath->query("dc:subject", $this->elem);
-
-		foreach ($categories as $cat) {
-			array_push($cats, $cat->nodeValue);
-		}
-
-		return $this->normalize_categories($cats);
-	}
-
-	public function get_enclosures() {
-		$links = $this->elem->getElementsByTagName("link");
-
-		$encs = array();
-
-		foreach ($links as $link) {
-			if ($link && $link->hasAttribute("href") && $link->hasAttribute("rel")) {
-				if ($link->getAttribute("rel") == "enclosure") {
-					$enc = new FeedEnclosure();
-
-					$enc->type = clean($link->getAttribute("type"));
-					$enc->link = clean($link->getAttribute("href"));
-					$enc->length = clean($link->getAttribute("length"));
-
-					array_push($encs, $enc);
-				}
-			}
-		}
-
-		$encs = array_merge($encs, parent::get_enclosures());
-
-		return $encs;
-	}
-
-	public function get_language() {
-		$lang = $this->elem->getAttributeNS(self::NS_XML, "lang");
-
-		if (!empty($lang)) {
-			return clean($lang);
-		} else {
-			// Fall back to the language declared on the feed, if any.
-			foreach ($this->doc->childNodes as $child) {
-				if (method_exists($child, "getAttributeNS")) {
-					return clean($child->getAttributeNS(self::NS_XML, "lang"));
-				}
-			}
-		}
-	}
+    public function get_title() {
+        $title = $this->elem->getElementsByTagName("title")->item(0);
+
+        if ($title) {
+            return clean(trim($title->nodeValue));
+        }
+    }
+
+    public function get_content() {
+        $content = $this->elem->getElementsByTagName("content")->item(0);
+
+        if ($content) {
+            if ($content->hasAttribute('type')) {
+                if ($content->getAttribute('type') == 'xhtml') {
+                    for ($i = 0; $i < $content->childNodes->length; $i++) {
+                        $child = $content->childNodes->item($i);
+
+                        if ($child->hasChildNodes()) {
+                            return $this->doc->saveHTML($child);
+                        }
+                    }
+                }
+            }
+
+            return $this->subtree_or_text($content);
+        }
+    }
+
+    public function get_description() {
+        $content = $this->elem->getElementsByTagName("summary")->item(0);
+
+        if ($content) {
+            if ($content->hasAttribute('type')) {
+                if ($content->getAttribute('type') == 'xhtml') {
+                    for ($i = 0; $i < $content->childNodes->length; $i++) {
+                        $child = $content->childNodes->item($i);
+
+                        if ($child->hasChildNodes()) {
+                            return $this->doc->saveHTML($child);
+                        }
+                    }
+                }
+            }
+
+            return $this->subtree_or_text($content);
+        }
+
+    }
+
+    public function get_categories() {
+        $categories = $this->elem->getElementsByTagName("category");
+        $cats = [];
+
+        foreach ($categories as $cat) {
+            if ($cat->hasAttribute("term")) {
+                            array_push($cats, $cat->getAttribute("term"));
+            }
+        }
+
+        $categories = $this->xpath->query("dc:subject", $this->elem);
+
+        foreach ($categories as $cat) {
+            array_push($cats, $cat->nodeValue);
+        }
+
+        return $this->normalize_categories($cats);
+    }
+
+    public function get_enclosures() {
+        $links = $this->elem->getElementsByTagName("link");
+
+        $encs = array();
+
+        foreach ($links as $link) {
+            if ($link && $link->hasAttribute("href") && $link->hasAttribute("rel")) {
+                if ($link->getAttribute("rel") == "enclosure") {
+                    $enc = new FeedEnclosure();
+
+                    $enc->type = clean($link->getAttribute("type"));
+                    $enc->link = clean($link->getAttribute("href"));
+                    $enc->length = clean($link->getAttribute("length"));
+
+                    array_push($encs, $enc);
+                }
+            }
+        }
+
+        $encs = array_merge($encs, parent::get_enclosures());
+
+        return $encs;
+    }
+
+    public function get_language() {
+        $lang = $this->elem->getAttributeNS(self::NS_XML, "lang");
+
+        if (!empty($lang)) {
+            return clean($lang);
+        } else {
+            // Fall back to the language declared on the feed, if any.
+            foreach ($this->doc->childNodes as $child) {
+                if (method_exists($child, "getAttributeNS")) {
+                    return clean($child->getAttributeNS(self::NS_XML, "lang"));
+                }
+            }
+        }
+    }
 }