codysnider / tt-rss

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"));
+                }
+            }
+        }
+    }
 }

classes/feeds.php

Indentation +1650 added lines, -1650 removed lines

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

Switch Indentation +140 added lines, -140 removed lines

@@ -412,21 +412,21 @@ 
 					$message = $query_error_override;
 				} else {
 					switch ($view_mode) {
-						case "unread":
-							$message = __("No unread articles found to display.");
-							break;
-						case "updated":
-							$message = __("No updated articles found to display.");
-							break;
-						case "marked":
-							$message = __("No starred articles found to display.");
-							break;
-						default:
-							if ($feed < LABEL_BASE_INDEX) {
-								$message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter.");
-							} else {
-								$message = __("No articles found to display.");
-							}
+					case "unread":
+						$message = __("No unread articles found to display.");
+						break;
+					case "updated":
+						$message = __("No updated articles found to display.");
+						break;
+					case "marked":
+						$message = __("No starred articles found to display.");
+						break;
+					default:
+						if ($feed < LABEL_BASE_INDEX) {
+							$message = __("No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter.");
+						} else {
+							$message = __("No articles found to display.");
+						}
 					}
 				}
 
@@ -893,29 +893,29 @@ 
 		// TODO: all this interval stuff needs some generic generator function
 
 		switch ($mode) {
-			case "1day":
-				if (DB_TYPE == "pgsql") {
-					$date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
-				} else {
-					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
-				}
-				break;
-			case "1week":
-				if (DB_TYPE == "pgsql") {
-					$date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
-				} else {
-					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
-				}
-				break;
-			case "2week":
-				if (DB_TYPE == "pgsql") {
-					$date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
-				} else {
-					$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
-				}
-				break;
-			default:
-				$date_qpart = "true";
+		case "1day":
+			if (DB_TYPE == "pgsql") {
+				$date_qpart = "date_entered < NOW() - INTERVAL '1 day' ";
+			} else {
+				$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY) ";
+			}
+			break;
+		case "1week":
+			if (DB_TYPE == "pgsql") {
+				$date_qpart = "date_entered < NOW() - INTERVAL '1 week' ";
+			} else {
+				$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 WEEK) ";
+			}
+			break;
+		case "2week":
+			if (DB_TYPE == "pgsql") {
+				$date_qpart = "date_entered < NOW() - INTERVAL '2 week' ";
+			} else {
+				$date_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 2 WEEK) ";
+			}
+			break;
+		default:
+			$date_qpart = "true";
 		}
 
 		if (is_numeric($feed)) {
@@ -1237,28 +1237,28 @@ 
 
 	public static function getFeedIcon($id) {
 		switch ($id) {
-			case 0:
-				return "archive";
-			case -1:
-				return "star";
-			case -2:
-				return "rss_feed";
-			case -3:
-				return "whatshot";
-			case -4:
-				return "inbox";
-			case -6:
-				return "restore";
-			default:
-				if ($id < LABEL_BASE_INDEX) {
-					return "label";
-				} else {
-					$icon = self::getIconFile($id);
+		case 0:
+			return "archive";
+		case -1:
+			return "star";
+		case -2:
+			return "rss_feed";
+		case -3:
+			return "whatshot";
+		case -4:
+			return "inbox";
+		case -6:
+			return "restore";
+		default:
+			if ($id < LABEL_BASE_INDEX) {
+				return "label";
+			} else {
+				$icon = self::getIconFile($id);
 
                     if ($icon && file_exists($icon)) {
-						return ICONS_URL."/".basename($icon)."?".filemtime($icon);
-					}
+					return ICONS_URL."/".basename($icon)."?".filemtime($icon);
 				}
+			}
 		}
 
 		return false;
@@ -2263,104 +2263,104 @@ 
 			$commandpair = explode(":", mb_strtolower($k), 2);
 
 			switch ($commandpair[0]) {
-				case "title":
-					if ($commandpair[1]) {
-						array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
-							$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+			case "title":
+				if ($commandpair[1]) {
+					array_push($query_keywords, "($not (LOWER(ttrss_entries.title) LIKE ".
+						$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						array_push($search_words, $k);
-					}
-					break;
-				case "author":
-					if ($commandpair[1]) {
-						array_push($query_keywords, "($not (LOWER(author) LIKE ".
-							$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+					array_push($search_words, $k);
+				}
+				break;
+			case "author":
+				if ($commandpair[1]) {
+					array_push($query_keywords, "($not (LOWER(author) LIKE ".
+						$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						array_push($search_words, $k);
-					}
-					break;
-				case "note":
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-						else if ($commandpair[1] == "false")
-							array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-						else
-							array_push($query_keywords, "($not (LOWER(note) LIKE ".
-								$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+					array_push($search_words, $k);
+				}
+				break;
+			case "note":
+				if ($commandpair[1]) {
+					if ($commandpair[1] == "true")
+						array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+					else if ($commandpair[1] == "false")
+						array_push($query_keywords, "($not (note IS NULL OR note = ''))");
+					else
+						array_push($query_keywords, "($not (LOWER(note) LIKE ".
+							$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				case "star":
-
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (marked = true))");
-						else
-							array_push($query_keywords, "($not (marked = false))");
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+					if (!$not) array_push($search_words, $k);
+				}
+				break;
+			case "star":
+
+				if ($commandpair[1]) {
+					if ($commandpair[1] == "true")
+						array_push($query_keywords, "($not (marked = true))");
+					else
+						array_push($query_keywords, "($not (marked = false))");
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				case "pub":
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (published = true))");
-						else
-							array_push($query_keywords, "($not (published = false))");
+					if (!$not) array_push($search_words, $k);
+				}
+				break;
+			case "pub":
+				if ($commandpair[1]) {
+					if ($commandpair[1] == "true")
+						array_push($query_keywords, "($not (published = true))");
+					else
+						array_push($query_keywords, "($not (published = false))");
 
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				case "unread":
-					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (unread = true))");
-						else
-							array_push($query_keywords, "($not (unread = false))");
+					if (!$not) array_push($search_words, $k);
+				}
+				break;
+			case "unread":
+				if ($commandpair[1]) {
+					if ($commandpair[1] == "true")
+						array_push($query_keywords, "($not (unread = true))");
+					else
+						array_push($query_keywords, "($not (unread = false))");
 
-					} else {
-						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+				} else {
+					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
-					}
-					break;
-				default:
-					if (strpos($k, "@") === 0) {
+					if (!$not) array_push($search_words, $k);
+				}
+				break;
+			default:
+				if (strpos($k, "@") === 0) {
 
-						$user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
-						$orig_ts = strtotime(substr($k, 1));
-						$k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
+					$user_tz_string = get_pref('USER_TIMEZONE', $_SESSION['uid']);
+					$orig_ts = strtotime(substr($k, 1));
+					$k = date("Y-m-d", convert_timestamp($orig_ts, $user_tz_string, 'UTC'));
 
-						//$k = date("Y-m-d", strtotime(substr($k, 1)));
+					//$k = date("Y-m-d", strtotime(substr($k, 1)));
 
-						array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
-					} else {
+					array_push($query_keywords, "(".SUBSTRING_FOR_DATE."(updated,1,LENGTH('$k')) $not = '$k')");
+				} else {
 
-						if (DB_TYPE == "pgsql") {
-							$k = mb_strtolower($k);
-							array_push($search_query_leftover, $not ? "!$k" : $k);
-						} else {
-							array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
+					if (DB_TYPE == "pgsql") {
+						$k = mb_strtolower($k);
+						array_push($search_query_leftover, $not ? "!$k" : $k);
+					} else {
+						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						}
+					}
 
-						if (!$not) {
-						    array_push($search_words, $k);
-						}
+					if (!$not) {
+					    array_push($search_words, $k);
 					}
+				}
 			}
 		}
 

Braces +37 added lines, -24 removed lines

@@ -50,8 +50,9 @@ 
 			$reply .= strip_tags($feed_title);
 		}
 
-		if ($error)
-			$reply .= " <i title=\"".htmlspecialchars($error)."\" class='material-icons icon-error'>error</i>";
+		if ($error) {
+					$reply .= " <i title=\"".htmlspecialchars($error)."\" class='material-icons icon-error'>error</i>";
+		}
 
 		$reply .= "</span>";
 		$reply .= "<span id='feed_current_unread' style='display: none'></span>";
@@ -2285,56 +2286,68 @@ 
 					break;
 				case "note":
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-						else if ($commandpair[1] == "false")
-							array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-						else
-							array_push($query_keywords, "($not (LOWER(note) LIKE ".
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+						} else if ($commandpair[1] == "false") {
+													array_push($query_keywords, "($not (note IS NULL OR note = ''))");
+						} else {
+													array_push($query_keywords, "($not (LOWER(note) LIKE ".
 								$pdo->quote('%'.mb_strtolower($commandpair[1]).'%')."))");
+						}
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+						    array_push($search_words, $k);
+						}
 					}
 					break;
 				case "star":
 
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (marked = true))");
-						else
-							array_push($query_keywords, "($not (marked = false))");
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (marked = true))");
+						} else {
+													array_push($query_keywords, "($not (marked = false))");
+						}
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+						    array_push($search_words, $k);
+						}
 					}
 					break;
 				case "pub":
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (published = true))");
-						else
-							array_push($query_keywords, "($not (published = false))");
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (published = true))");
+						} else {
+													array_push($query_keywords, "($not (published = false))");
+						}
 
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+						    array_push($search_words, $k);
+						}
 					}
 					break;
 				case "unread":
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (unread = true))");
-						else
-							array_push($query_keywords, "($not (unread = false))");
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (unread = true))");
+						} else {
+													array_push($query_keywords, "($not (unread = false))");
+						}
 
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+						    array_push($search_words, $k);
+						}
 					}
 					break;
 				default:

classes/mailer.php

Indentation +38 added lines, -38 removed lines

@@ -1,55 +1,55 @@
 <?php
 class Mailer {
-	// TODO: support HTML mail (i.e. MIME messages)
+    // TODO: support HTML mail (i.e. MIME messages)
 
-	private $last_error = "Unable to send mail: check local configuration.";
+    private $last_error = "Unable to send mail: check local configuration.";
 
-	public function mail($params) {
+    public function mail($params) {
 
-		$to_name = $params["to_name"];
-		$to_address = $params["to_address"];
-		$subject = $params["subject"];
-		$message = $params["message"];
-		$from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME;
-		$from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS;
+        $to_name = $params["to_name"];
+        $to_address = $params["to_address"];
+        $subject = $params["subject"];
+        $message = $params["message"];
+        $from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME;
+        $from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS;
 
-		$additional_headers = $params["headers"] ? $params["headers"] : [];
+        $additional_headers = $params["headers"] ? $params["headers"] : [];
 
-		$from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
-		$to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
+        $from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
+        $to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
 
-		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) {
-					Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
-		}
+        if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) {
+                    Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+        }
 
-		// HOOK_SEND_MAIL plugin instructions:
-		// 1. return 1 or true if mail is handled
-		// 2. return -1 if there's been a fatal error and no further action is allowed
-		// 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function
-		// 4. set error message if needed via passed Mailer instance function set_error()
+        // HOOK_SEND_MAIL plugin instructions:
+        // 1. return 1 or true if mail is handled
+        // 2. return -1 if there's been a fatal error and no further action is allowed
+        // 3. any other return value will allow cycling to the next handler and, eventually, to default mail() function
+        // 4. set error message if needed via passed Mailer instance function set_error()
 
-		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
-			$rc = $p->hook_send_mail($this, $params);
+        foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
+            $rc = $p->hook_send_mail($this, $params);
 
-			if ($rc == 1) {
-							return $rc;
-			}
+            if ($rc == 1) {
+                            return $rc;
+            }
 
-			if ($rc == -1) {
-							return 0;
-			}
-		}
+            if ($rc == -1) {
+                            return 0;
+            }
+        }
 
-		$headers = ["From: $from_combined", "Content-Type: text/plain; charset=UTF-8"];
+        $headers = ["From: $from_combined", "Content-Type: text/plain; charset=UTF-8"];
 
-		return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
-	}
+        return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
+    }
 
-	public function set_error($message) {
-		$this->last_error = $message;
-	}
+    public function set_error($message) {
+        $this->last_error = $message;
+    }
 
-	public function error() {
-		return $this->last_error;
-	}
+    public function error() {
+        return $this->last_error;
+    }
 }

classes/dlg.php

Indentation +127 added lines, -127 removed lines

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

classes/article.php

Indentation +565 added lines, -565 removed lines

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

Braces +17 added lines, -13 removed lines

@@ -445,10 +445,12 @@ 
 
 								if (!$hide_images) {
 									$encsize = '';
-									if ($entry['height'] > 0)
-										$encsize .= ' height="'.intval($entry['height']).'"';
-									if ($entry['width'] > 0)
-										$encsize .= ' width="'.intval($entry['width']).'"';
+									if ($entry['height'] > 0) {
+																			$encsize .= ' height="'.intval($entry['height']).'"';
+									}
+									if ($entry['width'] > 0) {
+																			$encsize .= ' width="'.intval($entry['width']).'"';
+									}
 									$rv .= "<p><img
 										alt=\"".htmlspecialchars($entry["filename"])."\"
 										src=\"" .htmlspecialchars($entry["url"])."\"
@@ -480,15 +482,17 @@ 
 			$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 
 			foreach ($entries as $entry) {
-				if ($entry["title"])
-					$title = " &mdash; ".truncate_string($entry["title"], 30);
-				else
-					$title = "";
-
-				if ($entry["filename"])
-					$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
-				else
-					$filename = "";
+				if ($entry["title"]) {
+									$title = " &mdash; ".truncate_string($entry["title"], 30);
+				} else {
+									$title = "";
+				}
+
+				if ($entry["filename"]) {
+									$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
+				} else {
+									$filename = "";
+				}
 
 				$rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
 					dojoType=\"dijit.MenuItem\">".$filename.$title."</div>";

classes/auth/base.php

Indentation +34 added lines, -34 removed lines

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