codysnider / tt-rss

classes/api.php

Indentation +769 added lines, -769 removed lines

@@ -1,148 +1,148 @@ 
 <?php
 class API extends Handler {
 
-	const API_LEVEL  = 14;
-
-	const STATUS_OK  = 0;
-	const STATUS_ERR = 1;
-
-	private $seq;
-
-	public static function param_to_bool($p) {
-		return $p && ($p !== "f" && $p !== "false");
-	}
-
-	public function before($method) {
-		if (parent::before($method)) {
-			header("Content-Type: text/json");
-
-			if (!$_SESSION["uid"] && $method != "login" && $method != "isloggedin") {
-				$this->wrap(self::STATUS_ERR, array("error" => 'NOT_LOGGED_IN'));
-				return false;
-			}
-
-			if ($_SESSION["uid"] && $method != "logout" && !get_pref('ENABLE_API_ACCESS')) {
-				$this->wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
-				return false;
-			}
-
-			$this->seq = (int) clean($_REQUEST['seq']);
-
-			return true;
-		}
-		return false;
-	}
-
-	public function wrap($status, $reply) {
-		print json_encode(array("seq" => $this->seq,
-			"status" => $status,
-			"content" => $reply));
-	}
-
-	public function getVersion() {
-		$rv = array("version" => VERSION);
-		$this->wrap(self::STATUS_OK, $rv);
-	}
-
-	public function getApiLevel() {
-		$rv = array("level" => self::API_LEVEL);
-		$this->wrap(self::STATUS_OK, $rv);
-	}
-
-	public function login() {
-		@session_destroy();
-		@session_start();
-
-		$login = clean($_REQUEST["user"]);
-		$password = clean($_REQUEST["password"]);
-		$password_base64 = base64_decode(clean($_REQUEST["password"]));
-
-		if (SINGLE_USER_MODE) {
-		    $login = "admin";
-		}
-
-		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
-		$sth->execute([$login]);
-
-		if ($row = $sth->fetch()) {
-			$uid = $row["id"];
-		} else {
-			$uid = 0;
-		}
-
-		if (!$uid) {
-			$this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
-			return;
-		}
-
-		if (get_pref("ENABLE_API_ACCESS", $uid)) {
-			if (authenticate_user($login, $password, false, Auth_Base::AUTH_SERVICE_API)) {               // try login with normal password
-				$this->wrap(self::STATUS_OK, array("session_id" => session_id(),
-					"api_level" => self::API_LEVEL));
-			} else if (authenticate_user($login, $password_base64, false, Auth_Base::AUTH_SERVICE_API)) { // else try with base64_decoded password
-				$this->wrap(self::STATUS_OK, array("session_id" => session_id(),
-					"api_level" => self::API_LEVEL));
-			} else {                                                         // else we are not logged in
-				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
-				$this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
-			}
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => "API_DISABLED"));
-		}
-
-	}
-
-	public function logout() {
-		logout_user();
-		$this->wrap(self::STATUS_OK, array("status" => "OK"));
-	}
-
-	public function isLoggedIn() {
-		$this->wrap(self::STATUS_OK, array("status" => $_SESSION["uid"] != ''));
-	}
-
-	public function getUnread() {
-		$feed_id = clean($_REQUEST["feed_id"]);
-		$is_cat = clean($_REQUEST["is_cat"]);
-
-		if ($feed_id) {
-			$this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
-		} else {
-			$this->wrap(self::STATUS_OK, array("unread" => Feeds::getGlobalUnread()));
-		}
-	}
-
-	/* Method added for ttrss-reader for Android */
-	public function getCounters() {
-		$this->wrap(self::STATUS_OK, Counters::getAllCounters());
-	}
-
-	public function getFeeds() {
-		$cat_id = clean($_REQUEST["cat_id"]);
-		$unread_only = API::param_to_bool(clean($_REQUEST["unread_only"]));
-		$limit = (int) clean($_REQUEST["limit"]);
-		$offset = (int) clean($_REQUEST["offset"]);
-		$include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
-
-		$feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested);
-
-		$this->wrap(self::STATUS_OK, $feeds);
-	}
-
-	public function getCategories() {
-		$unread_only = API::param_to_bool(clean($_REQUEST["unread_only"]));
-		$enable_nested = API::param_to_bool(clean($_REQUEST["enable_nested"]));
-		$include_empty = API::param_to_bool(clean($_REQUEST['include_empty']));
-
-		// TODO do not return empty categories, return Uncategorized and standard virtual cats
-
-		if ($enable_nested) {
-					$nested_qpart = "parent_cat IS NULL";
-		} else {
-					$nested_qpart = "true";
-		}
-
-		$sth = $this->pdo->prepare("SELECT
+    const API_LEVEL  = 14;
+
+    const STATUS_OK  = 0;
+    const STATUS_ERR = 1;
+
+    private $seq;
+
+    public static function param_to_bool($p) {
+        return $p && ($p !== "f" && $p !== "false");
+    }
+
+    public function before($method) {
+        if (parent::before($method)) {
+            header("Content-Type: text/json");
+
+            if (!$_SESSION["uid"] && $method != "login" && $method != "isloggedin") {
+                $this->wrap(self::STATUS_ERR, array("error" => 'NOT_LOGGED_IN'));
+                return false;
+            }
+
+            if ($_SESSION["uid"] && $method != "logout" && !get_pref('ENABLE_API_ACCESS')) {
+                $this->wrap(self::STATUS_ERR, array("error" => 'API_DISABLED'));
+                return false;
+            }
+
+            $this->seq = (int) clean($_REQUEST['seq']);
+
+            return true;
+        }
+        return false;
+    }
+
+    public function wrap($status, $reply) {
+        print json_encode(array("seq" => $this->seq,
+            "status" => $status,
+            "content" => $reply));
+    }
+
+    public function getVersion() {
+        $rv = array("version" => VERSION);
+        $this->wrap(self::STATUS_OK, $rv);
+    }
+
+    public function getApiLevel() {
+        $rv = array("level" => self::API_LEVEL);
+        $this->wrap(self::STATUS_OK, $rv);
+    }
+
+    public function login() {
+        @session_destroy();
+        @session_start();
+
+        $login = clean($_REQUEST["user"]);
+        $password = clean($_REQUEST["password"]);
+        $password_base64 = base64_decode(clean($_REQUEST["password"]));
+
+        if (SINGLE_USER_MODE) {
+            $login = "admin";
+        }
+
+        $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+        $sth->execute([$login]);
+
+        if ($row = $sth->fetch()) {
+            $uid = $row["id"];
+        } else {
+            $uid = 0;
+        }
+
+        if (!$uid) {
+            $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
+            return;
+        }
+
+        if (get_pref("ENABLE_API_ACCESS", $uid)) {
+            if (authenticate_user($login, $password, false, Auth_Base::AUTH_SERVICE_API)) {               // try login with normal password
+                $this->wrap(self::STATUS_OK, array("session_id" => session_id(),
+                    "api_level" => self::API_LEVEL));
+            } else if (authenticate_user($login, $password_base64, false, Auth_Base::AUTH_SERVICE_API)) { // else try with base64_decoded password
+                $this->wrap(self::STATUS_OK, array("session_id" => session_id(),
+                    "api_level" => self::API_LEVEL));
+            } else {                                                         // else we are not logged in
+                user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
+                $this->wrap(self::STATUS_ERR, array("error" => "LOGIN_ERROR"));
+            }
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => "API_DISABLED"));
+        }
+
+    }
+
+    public function logout() {
+        logout_user();
+        $this->wrap(self::STATUS_OK, array("status" => "OK"));
+    }
+
+    public function isLoggedIn() {
+        $this->wrap(self::STATUS_OK, array("status" => $_SESSION["uid"] != ''));
+    }
+
+    public function getUnread() {
+        $feed_id = clean($_REQUEST["feed_id"]);
+        $is_cat = clean($_REQUEST["is_cat"]);
+
+        if ($feed_id) {
+            $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
+        } else {
+            $this->wrap(self::STATUS_OK, array("unread" => Feeds::getGlobalUnread()));
+        }
+    }
+
+    /* Method added for ttrss-reader for Android */
+    public function getCounters() {
+        $this->wrap(self::STATUS_OK, Counters::getAllCounters());
+    }
+
+    public function getFeeds() {
+        $cat_id = clean($_REQUEST["cat_id"]);
+        $unread_only = API::param_to_bool(clean($_REQUEST["unread_only"]));
+        $limit = (int) clean($_REQUEST["limit"]);
+        $offset = (int) clean($_REQUEST["offset"]);
+        $include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
+
+        $feeds = $this->api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested);
+
+        $this->wrap(self::STATUS_OK, $feeds);
+    }
+
+    public function getCategories() {
+        $unread_only = API::param_to_bool(clean($_REQUEST["unread_only"]));
+        $enable_nested = API::param_to_bool(clean($_REQUEST["enable_nested"]));
+        $include_empty = API::param_to_bool(clean($_REQUEST['include_empty']));
+
+        // TODO do not return empty categories, return Uncategorized and standard virtual cats
+
+        if ($enable_nested) {
+                    $nested_qpart = "parent_cat IS NULL";
+        } else {
+                    $nested_qpart = "true";
+        }
+
+        $sth = $this->pdo->prepare("SELECT
 				id, title, order_id, (SELECT COUNT(id) FROM
 				ttrss_feeds WHERE
 				ttrss_feed_categories.id IS NOT NULL AND cat_id = ttrss_feed_categories.id) AS num_feeds,
@@ -151,191 +151,191 @@ 
 				c2.parent_cat = ttrss_feed_categories.id) AS num_cats
 			FROM ttrss_feed_categories
 			WHERE $nested_qpart AND owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-
-		$cats = array();
-
-		while ($line = $sth->fetch()) {
-			if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
-				$unread = getFeedUnread($line["id"], true);
-
-				if ($enable_nested) {
-									$unread += Feeds::getCategoryChildrenUnread($line["id"]);
-				}
-
-				if ($unread || !$unread_only) {
-					array_push($cats, array("id" => $line["id"],
-						"title" => $line["title"],
-						"unread" => $unread,
-						"order_id" => (int) $line["order_id"],
-					));
-				}
-			}
-		}
-
-		foreach (array(-2, -1, 0) as $cat_id) {
-			if ($include_empty || !$this->isCategoryEmpty($cat_id)) {
-				$unread = getFeedUnread($cat_id, true);
-
-				if ($unread || !$unread_only) {
-					array_push($cats, array("id" => $cat_id,
-						"title" => Feeds::getCategoryTitle($cat_id),
-						"unread" => $unread));
-				}
-			}
-		}
-
-		$this->wrap(self::STATUS_OK, $cats);
-	}
-
-	public function getHeadlines() {
-		$feed_id = clean($_REQUEST["feed_id"]);
-		if ($feed_id !== "") {
-
-			if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
-
-			$limit = (int) clean($_REQUEST["limit"]);
-
-			if (!$limit || $limit >= 200) $limit = 200;
-
-			$offset = (int) clean($_REQUEST["skip"]);
-			$filter = clean($_REQUEST["filter"]);
-			$is_cat = API::param_to_bool(clean($_REQUEST["is_cat"]));
-			$show_excerpt = API::param_to_bool(clean($_REQUEST["show_excerpt"]));
-			$show_content = API::param_to_bool(clean($_REQUEST["show_content"]));
-			/* all_articles, unread, adaptive, marked, updated */
-			$view_mode = clean($_REQUEST["view_mode"]);
-			$include_attachments = API::param_to_bool(clean($_REQUEST["include_attachments"]));
-			$since_id = (int) clean($_REQUEST["since_id"]);
-			$include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
-			$sanitize_content = !isset($_REQUEST["sanitize"]) ||
-				API::param_to_bool($_REQUEST["sanitize"]);
-			$force_update = API::param_to_bool(clean($_REQUEST["force_update"]));
-			$has_sandbox = API::param_to_bool(clean($_REQUEST["has_sandbox"]));
-			$excerpt_length = (int) clean($_REQUEST["excerpt_length"]);
-			$check_first_id = (int) clean($_REQUEST["check_first_id"]);
-			$include_header = API::param_to_bool(clean($_REQUEST["include_header"]));
-
-			$_SESSION['hasSandbox'] = $has_sandbox;
-
-			$skip_first_id_check = false;
-
-			$override_order = false;
-			switch (clean($_REQUEST["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;
-			}
-
-			/* do not rely on params below */
-
-			$search = clean($_REQUEST["search"]);
-
-			list($headlines, $headlines_header) = $this->api_get_headlines($feed_id, $limit, $offset,
-				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
-				$include_attachments, $since_id, $search,
-				$include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id, $skip_first_id_check);
-
-			if ($include_header) {
-				$this->wrap(self::STATUS_OK, array($headlines_header, $headlines));
-			} else {
-				$this->wrap(self::STATUS_OK, $headlines);
-			}
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
-		}
-	}
-
-	public function updateArticle() {
-		$article_ids = explode(",", clean($_REQUEST["article_ids"]));
-		$mode = (int) clean($_REQUEST["mode"]);
-		$data = clean($_REQUEST["data"]);
-		$field_raw = (int) clean($_REQUEST["field"]);
-
-		$field = "";
-		$set_to = "";
-
-		switch ($field_raw) {
-			case 0:
-				$field = "marked";
-				$additional_fields = ",last_marked = NOW()";
-				break;
-			case 1:
-				$field = "published";
-				$additional_fields = ",last_published = NOW()";
-				break;
-			case 2:
-				$field = "unread";
-				$additional_fields = ",last_read = NOW()";
-				break;
-			case 3:
-				$field = "note";
-		};
-
-		switch ($mode) {
-			case 1:
-				$set_to = "true";
-				break;
-			case 0:
-				$set_to = "false";
-				break;
-			case 2:
-				$set_to = "not $field";
-				break;
-		}
-
-		if ($field == "note") {
-		    $set_to = $this->pdo->quote($data);
-		}
-
-		if ($field && $set_to && count($article_ids) > 0) {
-
-			$article_qmarks = arr_qmarks($article_ids);
-
-			$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
+        $sth->execute([$_SESSION['uid']]);
+
+        $cats = array();
+
+        while ($line = $sth->fetch()) {
+            if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
+                $unread = getFeedUnread($line["id"], true);
+
+                if ($enable_nested) {
+                                    $unread += Feeds::getCategoryChildrenUnread($line["id"]);
+                }
+
+                if ($unread || !$unread_only) {
+                    array_push($cats, array("id" => $line["id"],
+                        "title" => $line["title"],
+                        "unread" => $unread,
+                        "order_id" => (int) $line["order_id"],
+                    ));
+                }
+            }
+        }
+
+        foreach (array(-2, -1, 0) as $cat_id) {
+            if ($include_empty || !$this->isCategoryEmpty($cat_id)) {
+                $unread = getFeedUnread($cat_id, true);
+
+                if ($unread || !$unread_only) {
+                    array_push($cats, array("id" => $cat_id,
+                        "title" => Feeds::getCategoryTitle($cat_id),
+                        "unread" => $unread));
+                }
+            }
+        }
+
+        $this->wrap(self::STATUS_OK, $cats);
+    }
+
+    public function getHeadlines() {
+        $feed_id = clean($_REQUEST["feed_id"]);
+        if ($feed_id !== "") {
+
+            if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
+
+            $limit = (int) clean($_REQUEST["limit"]);
+
+            if (!$limit || $limit >= 200) $limit = 200;
+
+            $offset = (int) clean($_REQUEST["skip"]);
+            $filter = clean($_REQUEST["filter"]);
+            $is_cat = API::param_to_bool(clean($_REQUEST["is_cat"]));
+            $show_excerpt = API::param_to_bool(clean($_REQUEST["show_excerpt"]));
+            $show_content = API::param_to_bool(clean($_REQUEST["show_content"]));
+            /* all_articles, unread, adaptive, marked, updated */
+            $view_mode = clean($_REQUEST["view_mode"]);
+            $include_attachments = API::param_to_bool(clean($_REQUEST["include_attachments"]));
+            $since_id = (int) clean($_REQUEST["since_id"]);
+            $include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
+            $sanitize_content = !isset($_REQUEST["sanitize"]) ||
+                API::param_to_bool($_REQUEST["sanitize"]);
+            $force_update = API::param_to_bool(clean($_REQUEST["force_update"]));
+            $has_sandbox = API::param_to_bool(clean($_REQUEST["has_sandbox"]));
+            $excerpt_length = (int) clean($_REQUEST["excerpt_length"]);
+            $check_first_id = (int) clean($_REQUEST["check_first_id"]);
+            $include_header = API::param_to_bool(clean($_REQUEST["include_header"]));
+
+            $_SESSION['hasSandbox'] = $has_sandbox;
+
+            $skip_first_id_check = false;
+
+            $override_order = false;
+            switch (clean($_REQUEST["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;
+            }
+
+            /* do not rely on params below */
+
+            $search = clean($_REQUEST["search"]);
+
+            list($headlines, $headlines_header) = $this->api_get_headlines($feed_id, $limit, $offset,
+                $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
+                $include_attachments, $since_id, $search,
+                $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id, $skip_first_id_check);
+
+            if ($include_header) {
+                $this->wrap(self::STATUS_OK, array($headlines_header, $headlines));
+            } else {
+                $this->wrap(self::STATUS_OK, $headlines);
+            }
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+        }
+    }
+
+    public function updateArticle() {
+        $article_ids = explode(",", clean($_REQUEST["article_ids"]));
+        $mode = (int) clean($_REQUEST["mode"]);
+        $data = clean($_REQUEST["data"]);
+        $field_raw = (int) clean($_REQUEST["field"]);
+
+        $field = "";
+        $set_to = "";
+
+        switch ($field_raw) {
+            case 0:
+                $field = "marked";
+                $additional_fields = ",last_marked = NOW()";
+                break;
+            case 1:
+                $field = "published";
+                $additional_fields = ",last_published = NOW()";
+                break;
+            case 2:
+                $field = "unread";
+                $additional_fields = ",last_read = NOW()";
+                break;
+            case 3:
+                $field = "note";
+        };
+
+        switch ($mode) {
+            case 1:
+                $set_to = "true";
+                break;
+            case 0:
+                $set_to = "false";
+                break;
+            case 2:
+                $set_to = "not $field";
+                break;
+        }
+
+        if ($field == "note") {
+            $set_to = $this->pdo->quote($data);
+        }
+
+        if ($field && $set_to && count($article_ids) > 0) {
+
+            $article_qmarks = arr_qmarks($article_ids);
+
+            $sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET
 				$field = $set_to $additional_fields
 				WHERE ref_id IN ($article_qmarks) AND owner_uid = ?");
-			$sth->execute(array_merge($article_ids, [$_SESSION['uid']]));
+            $sth->execute(array_merge($article_ids, [$_SESSION['uid']]));
 
-			$num_updated = $sth->rowCount();
+            $num_updated = $sth->rowCount();
 
-			if ($num_updated > 0 && $field == "unread") {
-				$sth = $this->pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
+            if ($num_updated > 0 && $field == "unread") {
+                $sth = $this->pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
 					WHERE ref_id IN ($article_qmarks)");
-				$sth->execute($article_ids);
+                $sth->execute($article_ids);
 
-				while ($line = $sth->fetch()) {
-					CCache::update($line["feed_id"], $_SESSION["uid"]);
-				}
-			}
+                while ($line = $sth->fetch()) {
+                    CCache::update($line["feed_id"], $_SESSION["uid"]);
+                }
+            }
 
-			$this->wrap(self::STATUS_OK, array("status" => "OK",
-				"updated" => $num_updated));
+            $this->wrap(self::STATUS_OK, array("status" => "OK",
+                "updated" => $num_updated));
 
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
-		}
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+        }
 
-	}
+    }
 
-	public function getArticle() {
+    public function getArticle() {
 
-		$article_ids = explode(",", clean($_REQUEST["article_id"]));
-		$sanitize_content = !isset($_REQUEST["sanitize"]) ||
-			API::param_to_bool($_REQUEST["sanitize"]);
+        $article_ids = explode(",", clean($_REQUEST["article_id"]));
+        $sanitize_content = !isset($_REQUEST["sanitize"]) ||
+            API::param_to_bool($_REQUEST["sanitize"]);
 
-		if ($article_ids) {
+        if ($article_ids) {
 
-			$article_qmarks = arr_qmarks($article_ids);
+            $article_qmarks = arr_qmarks($article_ids);
 
-			$sth = $this->pdo->prepare("SELECT id,guid,title,link,content,feed_id,comments,int_id,
+            $sth = $this->pdo->prepare("SELECT id,guid,title,link,content,feed_id,comments,int_id,
 				marked,unread,published,score,note,lang,
 				".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
 				author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title,
@@ -344,567 +344,567 @@ 
 				FROM ttrss_entries,ttrss_user_entries
 				WHERE id IN ($article_qmarks) AND ref_id = id AND owner_uid = ?");
 
-			$sth->execute(array_merge($article_ids, [$_SESSION['uid']]));
-
-			$articles = array();
-
-			while ($line = $sth->fetch()) {
-
-				$attachments = Article::get_article_enclosures($line['id']);
-
-				$article = array(
-					"id" => $line["id"],
-					"guid" => $line["guid"],
-					"title" => $line["title"],
-					"link" => $line["link"],
-					"labels" => Article::get_article_labels($line['id']),
-					"unread" => API::param_to_bool($line["unread"]),
-					"marked" => API::param_to_bool($line["marked"]),
-					"published" => API::param_to_bool($line["published"]),
-					"comments" => $line["comments"],
-					"author" => $line["author"],
-					"updated" => (int) strtotime($line["updated"]),
-					"feed_id" => $line["feed_id"],
-					"attachments" => $attachments,
-					"score" => (int) $line["score"],
-					"feed_title" => $line["feed_title"],
-					"note" => $line["note"],
-					"lang" => $line["lang"]
-				);
-
-				if ($sanitize_content) {
-					$article["content"] = sanitize(
-						$line["content"],
-						API::param_to_bool($line['hide_images']),
-						false, $line["site_url"], false, $line["id"]);
-				} else {
-					$article["content"] = $line["content"];
-				}
-
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
-					$article = $p->hook_render_article_api(array("article" => $article));
-				}
-
-				$article['content'] = DiskCache::rewriteUrls($article['content']);
-
-				array_push($articles, $article);
-
-			}
-
-			$this->wrap(self::STATUS_OK, $articles);
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
-		}
-	}
-
-	public function getConfig() {
-		$config = array(
-			"icons_dir" => ICONS_DIR,
-			"icons_url" => ICONS_URL);
-
-		$config["daemon_is_running"] = file_is_locked("update_daemon.lock");
-
-		$sth = $this->pdo->prepare("SELECT COUNT(*) AS cf FROM
+            $sth->execute(array_merge($article_ids, [$_SESSION['uid']]));
+
+            $articles = array();
+
+            while ($line = $sth->fetch()) {
+
+                $attachments = Article::get_article_enclosures($line['id']);
+
+                $article = array(
+                    "id" => $line["id"],
+                    "guid" => $line["guid"],
+                    "title" => $line["title"],
+                    "link" => $line["link"],
+                    "labels" => Article::get_article_labels($line['id']),
+                    "unread" => API::param_to_bool($line["unread"]),
+                    "marked" => API::param_to_bool($line["marked"]),
+                    "published" => API::param_to_bool($line["published"]),
+                    "comments" => $line["comments"],
+                    "author" => $line["author"],
+                    "updated" => (int) strtotime($line["updated"]),
+                    "feed_id" => $line["feed_id"],
+                    "attachments" => $attachments,
+                    "score" => (int) $line["score"],
+                    "feed_title" => $line["feed_title"],
+                    "note" => $line["note"],
+                    "lang" => $line["lang"]
+                );
+
+                if ($sanitize_content) {
+                    $article["content"] = sanitize(
+                        $line["content"],
+                        API::param_to_bool($line['hide_images']),
+                        false, $line["site_url"], false, $line["id"]);
+                } else {
+                    $article["content"] = $line["content"];
+                }
+
+                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
+                    $article = $p->hook_render_article_api(array("article" => $article));
+                }
+
+                $article['content'] = DiskCache::rewriteUrls($article['content']);
+
+                array_push($articles, $article);
+
+            }
+
+            $this->wrap(self::STATUS_OK, $articles);
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+        }
+    }
+
+    public function getConfig() {
+        $config = array(
+            "icons_dir" => ICONS_DIR,
+            "icons_url" => ICONS_URL);
+
+        $config["daemon_is_running"] = file_is_locked("update_daemon.lock");
+
+        $sth = $this->pdo->prepare("SELECT COUNT(*) AS cf FROM
 			ttrss_feeds WHERE owner_uid = ?");
-		$sth->execute([$_SESSION['uid']]);
-		$row = $sth->fetch();
+        $sth->execute([$_SESSION['uid']]);
+        $row = $sth->fetch();
 
-		$config["num_feeds"] = $row["cf"];
+        $config["num_feeds"] = $row["cf"];
 
-		$this->wrap(self::STATUS_OK, $config);
-	}
+        $this->wrap(self::STATUS_OK, $config);
+    }
 
-	public function updateFeed() {
-		$feed_id = (int) clean($_REQUEST["feed_id"]);
+    public function updateFeed() {
+        $feed_id = (int) clean($_REQUEST["feed_id"]);
 
-		if (!ini_get("open_basedir")) {
-			RSSUtils::update_rss_feed($feed_id);
-		}
+        if (!ini_get("open_basedir")) {
+            RSSUtils::update_rss_feed($feed_id);
+        }
 
-		$this->wrap(self::STATUS_OK, array("status" => "OK"));
-	}
+        $this->wrap(self::STATUS_OK, array("status" => "OK"));
+    }
 
-	public function catchupFeed() {
-		$feed_id = clean($_REQUEST["feed_id"]);
-		$is_cat = clean($_REQUEST["is_cat"]);
+    public function catchupFeed() {
+        $feed_id = clean($_REQUEST["feed_id"]);
+        $is_cat = clean($_REQUEST["is_cat"]);
 
-		Feeds::catchup_feed($feed_id, $is_cat);
+        Feeds::catchup_feed($feed_id, $is_cat);
 
-		$this->wrap(self::STATUS_OK, array("status" => "OK"));
-	}
+        $this->wrap(self::STATUS_OK, array("status" => "OK"));
+    }
 
-	public function getPref() {
-		$pref_name = clean($_REQUEST["pref_name"]);
+    public function getPref() {
+        $pref_name = clean($_REQUEST["pref_name"]);
 
-		$this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
-	}
+        $this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
+    }
 
-	public function getLabels() {
-		$article_id = (int) clean($_REQUEST['article_id']);
+    public function getLabels() {
+        $article_id = (int) clean($_REQUEST['article_id']);
 
-		$rv = array();
+        $rv = array();
 
-		$sth = $this->pdo->prepare("SELECT id, caption, fg_color, bg_color
+        $sth = $this->pdo->prepare("SELECT id, caption, fg_color, bg_color
 			FROM ttrss_labels2
 			WHERE owner_uid = ? ORDER BY caption");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		if ($article_id) {
-					$article_labels = Article::get_article_labels($article_id);
-		} else {
-					$article_labels = array();
-		}
+        if ($article_id) {
+                    $article_labels = Article::get_article_labels($article_id);
+        } else {
+                    $article_labels = array();
+        }
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$checked = false;
-			foreach ($article_labels as $al) {
-				if (Labels::feed_to_label_id($al[0]) == $line['id']) {
-					$checked = true;
-					break;
-				}
-			}
+            $checked = false;
+            foreach ($article_labels as $al) {
+                if (Labels::feed_to_label_id($al[0]) == $line['id']) {
+                    $checked = true;
+                    break;
+                }
+            }
 
-			array_push($rv, array(
-				"id" => (int) Labels::label_to_feed_id($line['id']),
-				"caption" => $line['caption'],
-				"fg_color" => $line['fg_color'],
-				"bg_color" => $line['bg_color'],
-				"checked" => $checked));
-		}
+            array_push($rv, array(
+                "id" => (int) Labels::label_to_feed_id($line['id']),
+                "caption" => $line['caption'],
+                "fg_color" => $line['fg_color'],
+                "bg_color" => $line['bg_color'],
+                "checked" => $checked));
+        }
 
-		$this->wrap(self::STATUS_OK, $rv);
-	}
+        $this->wrap(self::STATUS_OK, $rv);
+    }
 
-	public function setArticleLabel() {
+    public function setArticleLabel() {
 
-		$article_ids = explode(",", clean($_REQUEST["article_ids"]));
-		$label_id = (int) clean($_REQUEST['label_id']);
-		$assign = API::param_to_bool(clean($_REQUEST['assign']));
+        $article_ids = explode(",", clean($_REQUEST["article_ids"]));
+        $label_id = (int) clean($_REQUEST['label_id']);
+        $assign = API::param_to_bool(clean($_REQUEST['assign']));
 
-		$label = Labels::find_caption(Labels::feed_to_label_id($label_id), $_SESSION["uid"]);
+        $label = Labels::find_caption(Labels::feed_to_label_id($label_id), $_SESSION["uid"]);
 
-		$num_updated = 0;
+        $num_updated = 0;
 
-		if ($label) {
+        if ($label) {
 
-			foreach ($article_ids as $id) {
+            foreach ($article_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"]);
+                }
 
-				++$num_updated;
+                ++$num_updated;
 
-			}
-		}
+            }
+        }
 
-		$this->wrap(self::STATUS_OK, array("status" => "OK",
-			"updated" => $num_updated));
+        $this->wrap(self::STATUS_OK, array("status" => "OK",
+            "updated" => $num_updated));
 
-	}
+    }
 
-	public function index($method) {
-		$plugin = PluginHost::getInstance()->get_api_method(strtolower($method));
+    public function index($method) {
+        $plugin = PluginHost::getInstance()->get_api_method(strtolower($method));
 
-		if ($plugin && method_exists($plugin, $method)) {
-			$reply = $plugin->$method();
+        if ($plugin && method_exists($plugin, $method)) {
+            $reply = $plugin->$method();
 
-			$this->wrap($reply[0], $reply[1]);
+            $this->wrap($reply[0], $reply[1]);
 
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD', "method" => $method));
-		}
-	}
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'UNKNOWN_METHOD', "method" => $method));
+        }
+    }
 
-	public function shareToPublished() {
-		$title = strip_tags(clean($_REQUEST["title"]));
-		$url = strip_tags(clean($_REQUEST["url"]));
-		$content = strip_tags(clean($_REQUEST["content"]));
+    public function shareToPublished() {
+        $title = strip_tags(clean($_REQUEST["title"]));
+        $url = strip_tags(clean($_REQUEST["url"]));
+        $content = strip_tags(clean($_REQUEST["content"]));
 
-		if (Article::create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
-			$this->wrap(self::STATUS_OK, array("status" => 'OK'));
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
-		}
-	}
+        if (Article::create_published_article($title, $url, $content, "", $_SESSION["uid"])) {
+            $this->wrap(self::STATUS_OK, array("status" => 'OK'));
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'Publishing failed'));
+        }
+    }
 
-	public static function api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested = false) {
+    public static function api_get_feeds($cat_id, $unread_only, $limit, $offset, $include_nested = false) {
 
-			$feeds = array();
+            $feeds = array();
 
-			$pdo = Db::pdo();
+            $pdo = Db::pdo();
 
-			$limit = (int) $limit;
-			$offset = (int) $offset;
-			$cat_id = (int) $cat_id;
+            $limit = (int) $limit;
+            $offset = (int) $offset;
+            $cat_id = (int) $cat_id;
 
-			/* Labels */
+            /* Labels */
 
-			/* API only: -4 All feeds, including virtual feeds */
-			if ($cat_id == -4 || $cat_id == -2) {
-				$counters = Counters::getLabelCounters(true);
+            /* API only: -4 All feeds, including virtual feeds */
+            if ($cat_id == -4 || $cat_id == -2) {
+                $counters = Counters::getLabelCounters(true);
 
-				foreach (array_values($counters) as $cv) {
+                foreach (array_values($counters) as $cv) {
 
-					$unread = $cv["counter"];
+                    $unread = $cv["counter"];
 
-					if ($unread || !$unread_only) {
+                    if ($unread || !$unread_only) {
 
-						$row = array(
-								"id" => (int) $cv["id"],
-								"title" => $cv["description"],
-								"unread" => $cv["counter"],
-								"cat_id" => -2,
-							);
+                        $row = array(
+                                "id" => (int) $cv["id"],
+                                "title" => $cv["description"],
+                                "unread" => $cv["counter"],
+                                "cat_id" => -2,
+                            );
 
-						array_push($feeds, $row);
-					}
-				}
-			}
+                        array_push($feeds, $row);
+                    }
+                }
+            }
 
-			/* Virtual feeds */
+            /* Virtual feeds */
 
-			if ($cat_id == -4 || $cat_id == -1) {
-				foreach (array(-1, -2, -3, -4, -6, 0) as $i) {
-					$unread = getFeedUnread($i);
+            if ($cat_id == -4 || $cat_id == -1) {
+                foreach (array(-1, -2, -3, -4, -6, 0) as $i) {
+                    $unread = getFeedUnread($i);
 
-					if ($unread || !$unread_only) {
-						$title = Feeds::getFeedTitle($i);
+                    if ($unread || !$unread_only) {
+                        $title = Feeds::getFeedTitle($i);
 
-						$row = array(
-								"id" => $i,
-								"title" => $title,
-								"unread" => $unread,
-								"cat_id" => -1,
-							);
-						array_push($feeds, $row);
-					}
+                        $row = array(
+                                "id" => $i,
+                                "title" => $title,
+                                "unread" => $unread,
+                                "cat_id" => -1,
+                            );
+                        array_push($feeds, $row);
+                    }
 
-				}
-			}
+                }
+            }
 
-			/* Child cats */
+            /* Child cats */
 
-			if ($include_nested && $cat_id) {
-				$sth = $pdo->prepare("SELECT
+            if ($include_nested && $cat_id) {
+                $sth = $pdo->prepare("SELECT
 					id, title, order_id FROM ttrss_feed_categories
 					WHERE parent_cat = ? AND owner_uid = ? ORDER BY order_id, title");
 
-				$sth->execute([$cat_id, $_SESSION['uid']]);
+                $sth->execute([$cat_id, $_SESSION['uid']]);
 
-				while ($line = $sth->fetch()) {
-					$unread = getFeedUnread($line["id"], true) +
-						Feeds::getCategoryChildrenUnread($line["id"]);
+                while ($line = $sth->fetch()) {
+                    $unread = getFeedUnread($line["id"], true) +
+                        Feeds::getCategoryChildrenUnread($line["id"]);
 
-					if ($unread || !$unread_only) {
-						$row = array(
-								"id" => (int) $line["id"],
-								"title" => $line["title"],
-								"unread" => $unread,
-								"is_cat" => true,
+                    if ($unread || !$unread_only) {
+                        $row = array(
+                                "id" => (int) $line["id"],
+                                "title" => $line["title"],
+                                "unread" => $unread,
+                                "is_cat" => true,
                                 "order_id" => (int) $line["order_id"]
-							);
-						array_push($feeds, $row);
-					}
-				}
-			}
-
-			/* Real feeds */
-
-			if ($limit) {
-				$limit_qpart = "limit $limit OFFSET $offset";
-			} else {
-				$limit_qpart = "";
-			}
-
-			/* API only: -3 All feeds, excluding virtual feeds (e.g. Labels and such) */
-			if ($cat_id == -4 || $cat_id == -3) {
-				$sth = $pdo->prepare("SELECT
+                            );
+                        array_push($feeds, $row);
+                    }
+                }
+            }
+
+            /* Real feeds */
+
+            if ($limit) {
+                $limit_qpart = "limit $limit OFFSET $offset";
+            } else {
+                $limit_qpart = "";
+            }
+
+            /* API only: -3 All feeds, excluding virtual feeds (e.g. Labels and such) */
+            if ($cat_id == -4 || $cat_id == -3) {
+                $sth = $pdo->prepare("SELECT
 					id, feed_url, cat_id, title, order_id, ".
-						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+                        SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 						FROM ttrss_feeds WHERE owner_uid = ?
 						ORDER BY order_id, title " . $limit_qpart);
-				$sth->execute([$_SESSION['uid']]);
+                $sth->execute([$_SESSION['uid']]);
 
-			} else {
+            } else {
 
-				$sth = $pdo->prepare("SELECT
+                $sth = $pdo->prepare("SELECT
 					id, feed_url, cat_id, title, order_id, ".
-						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+                        SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 						FROM ttrss_feeds WHERE
 						(cat_id = :cat OR (:cat = 0 AND cat_id IS NULL))
 						AND owner_uid = :uid
 						ORDER BY order_id, title " . $limit_qpart);
-				$sth->execute([":uid" => $_SESSION['uid'], ":cat" => $cat_id]);
-			}
+                $sth->execute([":uid" => $_SESSION['uid'], ":cat" => $cat_id]);
+            }
 
-			while ($line = $sth->fetch()) {
+            while ($line = $sth->fetch()) {
 
-				$unread = getFeedUnread($line["id"]);
+                $unread = getFeedUnread($line["id"]);
 
-				$has_icon = Feeds::feedHasIcon($line['id']);
+                $has_icon = Feeds::feedHasIcon($line['id']);
 
-				if ($unread || !$unread_only) {
+                if ($unread || !$unread_only) {
 
-					$row = array(
-							"feed_url" => $line["feed_url"],
-							"title" => $line["title"],
-							"id" => (int) $line["id"],
-							"unread" => (int) $unread,
-							"has_icon" => $has_icon,
-							"cat_id" => (int) $line["cat_id"],
-							"last_updated" => (int) strtotime($line["last_updated"]),
-							"order_id" => (int) $line["order_id"],
-						);
+                    $row = array(
+                            "feed_url" => $line["feed_url"],
+                            "title" => $line["title"],
+                            "id" => (int) $line["id"],
+                            "unread" => (int) $unread,
+                            "has_icon" => $has_icon,
+                            "cat_id" => (int) $line["cat_id"],
+                            "last_updated" => (int) strtotime($line["last_updated"]),
+                            "order_id" => (int) $line["order_id"],
+                        );
 
-					array_push($feeds, $row);
-				}
-			}
+                    array_push($feeds, $row);
+                }
+            }
 
-		return $feeds;
-	}
+        return $feeds;
+    }
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	public static function api_get_headlines($feed_id, $limit, $offset,
-				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
-				$include_attachments, $since_id,
-				$search = "", $include_nested = false, $sanitize_content = true,
-				$force_update = false, $excerpt_length = 100, $check_first_id = false, $skip_first_id_check = false) {
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public static function api_get_headlines($feed_id, $limit, $offset,
+                $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
+                $include_attachments, $since_id,
+                $search = "", $include_nested = false, $sanitize_content = true,
+                $force_update = false, $excerpt_length = 100, $check_first_id = false, $skip_first_id_check = false) {
 
-			$pdo = Db::pdo();
+            $pdo = Db::pdo();
 
-			if ($force_update && $feed_id > 0 && is_numeric($feed_id)) {
-				// Update the feed if required with some basic flood control
+            if ($force_update && $feed_id > 0 && is_numeric($feed_id)) {
+                // Update the feed if required with some basic flood control
 
-				$sth = $pdo->prepare(
-					"SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+                $sth = $pdo->prepare(
+                    "SELECT cache_images,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 						FROM ttrss_feeds WHERE id = ?");
-				$sth->execute([$feed_id]);
+                $sth->execute([$feed_id]);
 
-				if ($row = $sth->fetch()) {
-					$last_updated = strtotime($row["last_updated"]);
-					$cache_images = API::param_to_bool($row["cache_images"]);
+                if ($row = $sth->fetch()) {
+                    $last_updated = strtotime($row["last_updated"]);
+                    $cache_images = API::param_to_bool($row["cache_images"]);
 
-					if (!$cache_images && time() - $last_updated > 120) {
-						RSSUtils::update_rss_feed($feed_id, true);
-					} else {
-						$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
+                    if (!$cache_images && time() - $last_updated > 120) {
+                        RSSUtils::update_rss_feed($feed_id, true);
+                    } else {
+                        $sth = $pdo->prepare("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
 							WHERE id = ?");
-						$sth->execute([$feed_id]);
-					}
-				}
-			}
-
-			$params = array(
-				"feed" => $feed_id,
-				"limit" => $limit,
-				"view_mode" => $view_mode,
-				"cat_view" => $is_cat,
-				"search" => $search,
-				"override_order" => $order,
-				"offset" => $offset,
-				"since_id" => $since_id,
-				"include_children" => $include_nested,
-				"check_first_id" => $check_first_id,
-				"skip_first_id_check" => $skip_first_id_check
-			);
-
-			$qfh_ret = Feeds::queryFeedHeadlines($params);
-
-			$result = $qfh_ret[0];
-			$feed_title = $qfh_ret[1];
-			$first_id = $qfh_ret[6];
-
-			$headlines = array();
-
-			$headlines_header = array(
-				'id' => $feed_id,
-				'first_id' => $first_id,
-				'is_cat' => $is_cat);
-
-			if (!is_numeric($result)) {
-				while ($line = $result->fetch()) {
-					$line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length);
-					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-						$line = $p->hook_query_headlines($line, $excerpt_length, true);
-					}
-
-					$is_updated = ($line["last_read"] == "" &&
-						($line["unread"] != "t" && $line["unread"] != "1"));
-
-					$tags = explode(",", $line["tag_cache"]);
-
-					$label_cache = $line["label_cache"];
-					$labels = false;
-
-					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 (!is_array($labels)) {
-					    $labels = Article::get_article_labels($line["id"]);
-					}
-
-					$headline_row = array(
-						"id" => (int) $line["id"],
-						"guid" => $line["guid"],
-						"unread" => API::param_to_bool($line["unread"]),
-						"marked" => API::param_to_bool($line["marked"]),
-						"published" => API::param_to_bool($line["published"]),
-						"updated" => (int) strtotime($line["updated"]),
-						"is_updated" => $is_updated,
-						"title" => $line["title"],
-						"link" => $line["link"],
-						"feed_id" => $line["feed_id"] ? $line['feed_id'] : 0,
-						"tags" => $tags,
-					);
-
-					$enclosures = Article::get_article_enclosures($line['id']);
-
-					if ($include_attachments) {
-											$headline_row['attachments'] = $enclosures;
-					}
-
-					if ($show_excerpt) {
-											$headline_row["excerpt"] = $line["content_preview"];
-					}
-
-					if ($show_content) {
-
-						if ($sanitize_content) {
-							$headline_row["content"] = sanitize(
-								$line["content"],
-								API::param_to_bool($line['hide_images']),
-								false, $line["site_url"], false, $line["id"]);
-						} else {
-							$headline_row["content"] = $line["content"];
-						}
-					}
-
-					// unify label output to ease parsing
-					if ($labels["no-labels"] == 1) {
-					    $labels = array();
-					}
-
-					$headline_row["labels"] = $labels;
-
-					$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] : $feed_title;
-
-					$headline_row["comments_count"] = (int) $line["num_comments"];
-					$headline_row["comments_link"] = $line["comments"];
-
-					$headline_row["always_display_attachments"] = API::param_to_bool($line["always_display_enclosures"]);
+                        $sth->execute([$feed_id]);
+                    }
+                }
+            }
+
+            $params = array(
+                "feed" => $feed_id,
+                "limit" => $limit,
+                "view_mode" => $view_mode,
+                "cat_view" => $is_cat,
+                "search" => $search,
+                "override_order" => $order,
+                "offset" => $offset,
+                "since_id" => $since_id,
+                "include_children" => $include_nested,
+                "check_first_id" => $check_first_id,
+                "skip_first_id_check" => $skip_first_id_check
+            );
+
+            $qfh_ret = Feeds::queryFeedHeadlines($params);
+
+            $result = $qfh_ret[0];
+            $feed_title = $qfh_ret[1];
+            $first_id = $qfh_ret[6];
+
+            $headlines = array();
+
+            $headlines_header = array(
+                'id' => $feed_id,
+                'first_id' => $first_id,
+                'is_cat' => $is_cat);
+
+            if (!is_numeric($result)) {
+                while ($line = $result->fetch()) {
+                    $line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length);
+                    foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                        $line = $p->hook_query_headlines($line, $excerpt_length, true);
+                    }
+
+                    $is_updated = ($line["last_read"] == "" &&
+                        ($line["unread"] != "t" && $line["unread"] != "1"));
+
+                    $tags = explode(",", $line["tag_cache"]);
+
+                    $label_cache = $line["label_cache"];
+                    $labels = false;
+
+                    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 (!is_array($labels)) {
+                        $labels = Article::get_article_labels($line["id"]);
+                    }
+
+                    $headline_row = array(
+                        "id" => (int) $line["id"],
+                        "guid" => $line["guid"],
+                        "unread" => API::param_to_bool($line["unread"]),
+                        "marked" => API::param_to_bool($line["marked"]),
+                        "published" => API::param_to_bool($line["published"]),
+                        "updated" => (int) strtotime($line["updated"]),
+                        "is_updated" => $is_updated,
+                        "title" => $line["title"],
+                        "link" => $line["link"],
+                        "feed_id" => $line["feed_id"] ? $line['feed_id'] : 0,
+                        "tags" => $tags,
+                    );
+
+                    $enclosures = Article::get_article_enclosures($line['id']);
+
+                    if ($include_attachments) {
+                                            $headline_row['attachments'] = $enclosures;
+                    }
+
+                    if ($show_excerpt) {
+                                            $headline_row["excerpt"] = $line["content_preview"];
+                    }
+
+                    if ($show_content) {
+
+                        if ($sanitize_content) {
+                            $headline_row["content"] = sanitize(
+                                $line["content"],
+                                API::param_to_bool($line['hide_images']),
+                                false, $line["site_url"], false, $line["id"]);
+                        } else {
+                            $headline_row["content"] = $line["content"];
+                        }
+                    }
+
+                    // unify label output to ease parsing
+                    if ($labels["no-labels"] == 1) {
+                        $labels = array();
+                    }
+
+                    $headline_row["labels"] = $labels;
+
+                    $headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] : $feed_title;
+
+                    $headline_row["comments_count"] = (int) $line["num_comments"];
+                    $headline_row["comments_link"] = $line["comments"];
+
+                    $headline_row["always_display_attachments"] = API::param_to_bool($line["always_display_enclosures"]);
 
-					$headline_row["author"] = $line["author"];
+                    $headline_row["author"] = $line["author"];
 
-					$headline_row["score"] = (int) $line["score"];
-					$headline_row["note"] = $line["note"];
-					$headline_row["lang"] = $line["lang"];
+                    $headline_row["score"] = (int) $line["score"];
+                    $headline_row["note"] = $line["note"];
+                    $headline_row["lang"] = $line["lang"];
 
-					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
-						$headline_row = $p->hook_render_article_api(array("headline" => $headline_row));
-					}
+                    foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
+                        $headline_row = $p->hook_render_article_api(array("headline" => $headline_row));
+                    }
 
-					$headline_row["content"] = DiskCache::rewriteUrls($headline_row['content']);
+                    $headline_row["content"] = DiskCache::rewriteUrls($headline_row['content']);
 
-					list ($flavor_image, $flavor_stream) = Article::get_article_image($enclosures, $line["content"], $line["site_url"]);
+                    list ($flavor_image, $flavor_stream) = Article::get_article_image($enclosures, $line["content"], $line["site_url"]);
 
-					$headline_row["flavor_image"] = $flavor_image;
-					$headline_row["flavor_stream"] = $flavor_stream;
+                    $headline_row["flavor_image"] = $flavor_image;
+                    $headline_row["flavor_stream"] = $flavor_stream;
 
-					array_push($headlines, $headline_row);
-				}
-			} else if (is_numeric($result) && $result == -1) {
-				$headlines_header['first_id_changed'] = true;
-			}
+                    array_push($headlines, $headline_row);
+                }
+            } else if (is_numeric($result) && $result == -1) {
+                $headlines_header['first_id_changed'] = true;
+            }
 
-			return array($headlines, $headlines_header);
-	}
+            return array($headlines, $headlines_header);
+    }
 
-	public function unsubscribeFeed() {
-		$feed_id = (int) clean($_REQUEST["feed_id"]);
+    public function unsubscribeFeed() {
+        $feed_id = (int) clean($_REQUEST["feed_id"]);
 
-		$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_id, $_SESSION['uid']]);
-
-		if ($sth->fetch()) {
-			Pref_Feeds::remove_feed($feed_id, $_SESSION["uid"]);
-			$this->wrap(self::STATUS_OK, array("status" => "OK"));
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
-		}
-	}
-
-	public function subscribeToFeed() {
-		$feed_url = clean($_REQUEST["feed_url"]);
-		$category_id = (int) clean($_REQUEST["category_id"]);
-		$login = clean($_REQUEST["login"]);
-		$password = clean($_REQUEST["password"]);
-
-		if ($feed_url) {
-			$rc = Feeds::subscribe_to_feed($feed_url, $category_id, $login, $password);
-
-			$this->wrap(self::STATUS_OK, array("status" => $rc));
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
-		}
-	}
-
-	public function getFeedTree() {
-		$include_empty = API::param_to_bool(clean($_REQUEST['include_empty']));
-
-		$pf = new Pref_Feeds($_REQUEST);
-
-		$_REQUEST['mode'] = 2;
-		$_REQUEST['force_show_empty'] = $include_empty;
-
-		if ($pf) {
-			$data = $pf->makefeedtree();
-			$this->wrap(self::STATUS_OK, array("categories" => $data));
-		} else {
-			$this->wrap(self::STATUS_ERR, array("error" =>
-				'UNABLE_TO_INSTANTIATE_OBJECT'));
-		}
-
-	}
-
-	// only works for labels or uncategorized for the time being
-	private function isCategoryEmpty($id) {
-
-		if ($id == -2) {
-			$sth = $this->pdo->prepare("SELECT COUNT(id) AS count FROM ttrss_labels2
+        $sth->execute([$feed_id, $_SESSION['uid']]);
+
+        if ($sth->fetch()) {
+            Pref_Feeds::remove_feed($feed_id, $_SESSION["uid"]);
+            $this->wrap(self::STATUS_OK, array("status" => "OK"));
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
+        }
+    }
+
+    public function subscribeToFeed() {
+        $feed_url = clean($_REQUEST["feed_url"]);
+        $category_id = (int) clean($_REQUEST["category_id"]);
+        $login = clean($_REQUEST["login"]);
+        $password = clean($_REQUEST["password"]);
+
+        if ($feed_url) {
+            $rc = Feeds::subscribe_to_feed($feed_url, $category_id, $login, $password);
+
+            $this->wrap(self::STATUS_OK, array("status" => $rc));
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+        }
+    }
+
+    public function getFeedTree() {
+        $include_empty = API::param_to_bool(clean($_REQUEST['include_empty']));
+
+        $pf = new Pref_Feeds($_REQUEST);
+
+        $_REQUEST['mode'] = 2;
+        $_REQUEST['force_show_empty'] = $include_empty;
+
+        if ($pf) {
+            $data = $pf->makefeedtree();
+            $this->wrap(self::STATUS_OK, array("categories" => $data));
+        } else {
+            $this->wrap(self::STATUS_ERR, array("error" =>
+                'UNABLE_TO_INSTANTIATE_OBJECT'));
+        }
+
+    }
+
+    // only works for labels or uncategorized for the time being
+    private function isCategoryEmpty($id) {
+
+        if ($id == -2) {
+            $sth = $this->pdo->prepare("SELECT COUNT(id) AS count FROM ttrss_labels2
 				WHERE owner_uid = ?");
-			$sth->execute([$_SESSION['uid']]);
-			$row = $sth->fetch();
+            $sth->execute([$_SESSION['uid']]);
+            $row = $sth->fetch();
 
-			return $row["count"] == 0;
+            return $row["count"] == 0;
 
-		} else if ($id == 0) {
-			$sth = $this->pdo->prepare("SELECT COUNT(id) AS count FROM ttrss_feeds
+        } else if ($id == 0) {
+            $sth = $this->pdo->prepare("SELECT COUNT(id) AS count FROM ttrss_feeds
 				WHERE cat_id IS NULL AND owner_uid = ?");
-			$sth->execute([$_SESSION['uid']]);
-			$row = $sth->fetch();
+            $sth->execute([$_SESSION['uid']]);
+            $row = $sth->fetch();
 
-			return $row["count"] == 0;
+            return $row["count"] == 0;
 
-		}
+        }
 
-		return false;
-	}
+        return false;
+    }
 
 
 }

install/index.php

Indentation +263 added lines, -263 removed lines

@@ -1,28 +1,28 @@ 
 <?php
-	function stylesheet_tag($filename, $id = false) {
-		$timestamp = filemtime($filename);
+    function stylesheet_tag($filename, $id = false) {
+        $timestamp = filemtime($filename);
 
-		$id_part = $id ? "id=\"$id\"" : "";
+        $id_part = $id ? "id=\"$id\"" : "";
 
-		return "<link rel=\"stylesheet\" $id_part type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
-	}
+        return "<link rel=\"stylesheet\" $id_part type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
+    }
 
-	function javascript_tag($filename) {
-		$query = "";
+    function javascript_tag($filename) {
+        $query = "";
 
-		if (!(strpos($filename, "?") === false)) {
-			$query = substr($filename, strpos($filename, "?") + 1);
-			$filename = substr($filename, 0, strpos($filename, "?"));
-		}
+        if (!(strpos($filename, "?") === false)) {
+            $query = substr($filename, strpos($filename, "?") + 1);
+            $filename = substr($filename, 0, strpos($filename, "?"));
+        }
 
-		$timestamp = filemtime($filename);
+        $timestamp = filemtime($filename);
 
-		if ($query) {
-		    $timestamp .= "&$query";
-		}
+        if ($query) {
+            $timestamp .= "&$query";
+        }
 
-		return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
-	}
+        return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
+    }
 ?>
 <!DOCTYPE html>
 <html>
@@ -33,11 +33,11 @@ 
 		textarea { font-size : 12px; }
 	</style>
 	<?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 installer">
 
@@ -52,149 +52,149 @@ 
 
 <?php
 
-	// could be needed because of existing config.php
-	function define_default($param, $value) {
-		//
-	}
+    // could be needed because of existing config.php
+    function define_default($param, $value) {
+        //
+    }
 
-	function make_password($length = 12) {
-		$password = "";
-		$possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ*%+^";
+    function make_password($length = 12) {
+        $password = "";
+        $possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ*%+^";
 
-		$i = 0;
+        $i = 0;
 
-		while ($i < $length) {
+        while ($i < $length) {
 
-			try {
-				$idx = function_exists("random_int") ? random_int(0, strlen($possible) - 1) : mt_rand(0, strlen($possible) - 1);
-			} catch (Exception $e) {
-				$idx = mt_rand(0, strlen($possible) - 1);
-			}
+            try {
+                $idx = function_exists("random_int") ? random_int(0, strlen($possible) - 1) : mt_rand(0, strlen($possible) - 1);
+            } catch (Exception $e) {
+                $idx = mt_rand(0, strlen($possible) - 1);
+            }
 
-			$char = substr($possible, $idx, 1);
+            $char = substr($possible, $idx, 1);
 
-			if (!strstr($password, $char)) {
-				$password .= $char;
-				$i++;
-			}
-		}
+            if (!strstr($password, $char)) {
+                $password .= $char;
+                $i++;
+            }
+        }
 
-		return $password;
-	}
+        return $password;
+    }
 
 
-	function sanity_check($db_type) {
-		$errors = array();
+    function sanity_check($db_type) {
+        $errors = array();
 
-		if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-			array_push($errors, "PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".");
-		}
+        if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+            array_push($errors, "PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".");
+        }
 
-		if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
-			array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
-		}
+        if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
+            array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
+        }
 
-		if (!function_exists("json_encode")) {
-			array_push($errors, "PHP support for JSON is required, but was not found.");
-		}
+        if (!function_exists("json_encode")) {
+            array_push($errors, "PHP support for JSON is required, but was not found.");
+        }
 
-		if (!class_exists("PDO")) {
-			array_push($errors, "PHP support for PDO is required but was not found.");
-		}
+        if (!class_exists("PDO")) {
+            array_push($errors, "PHP support for PDO is required but was not found.");
+        }
 
-		if (!function_exists("mb_strlen")) {
-			array_push($errors, "PHP support for mbstring functions is required but was not found.");
-		}
+        if (!function_exists("mb_strlen")) {
+            array_push($errors, "PHP support for mbstring functions is required but was not found.");
+        }
 
-		if (!function_exists("hash")) {
-			array_push($errors, "PHP support for hash() function is required but was not found.");
-		}
+        if (!function_exists("hash")) {
+            array_push($errors, "PHP support for hash() function is required but was not found.");
+        }
 
-		if (!function_exists("iconv")) {
-			array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
-		}
+        if (!function_exists("iconv")) {
+            array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
+        }
 
-		if (ini_get("safe_mode")) {
-			array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
-		}
+        if (ini_get("safe_mode")) {
+            array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
+        }
 
-		if (!class_exists("DOMDocument")) {
-			array_push($errors, "PHP support for DOMDocument is required, but was not found.");
-		}
+        if (!class_exists("DOMDocument")) {
+            array_push($errors, "PHP support for DOMDocument is required, but was not found.");
+        }
 
-		return $errors;
-	}
+        return $errors;
+    }
 
-	function print_error($msg) {
-		print "<div class='alert alert-error'>$msg</div>";
-	}
+    function print_error($msg) {
+        print "<div class='alert alert-error'>$msg</div>";
+    }
 
-	function print_notice($msg) {
-		print "<div class=\"alert alert-info\">$msg</div>";
-	}
+    function print_notice($msg) {
+        print "<div class=\"alert alert-info\">$msg</div>";
+    }
 
-	function pdo_connect($host, $user, $pass, $db, $type, $port = false) {
+    function pdo_connect($host, $user, $pass, $db, $type, $port = false) {
 
-		$db_port = $port ? ';port='.$port : '';
-		$db_host = $host ? ';host='.$host : '';
+        $db_port = $port ? ';port='.$port : '';
+        $db_host = $host ? ';host='.$host : '';
 
-		try {
-			$pdo = new PDO($type.':dbname='.$db.$db_host.$db_port,
-				$user,
-				$pass);
+        try {
+            $pdo = new PDO($type.':dbname='.$db.$db_host.$db_port,
+                $user,
+                $pass);
 
-			return $pdo;
-		} catch (Exception $e) {
-		    print "<div class='alert alert-danger'>".$e->getMessage()."</div>";
-		    return null;
+            return $pdo;
+        } catch (Exception $e) {
+            print "<div class='alert alert-danger'>".$e->getMessage()."</div>";
+            return null;
         }
-	}
-
-	function make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
-			$DB_PORT, $SELF_URL_PATH) {
-
-		$data = explode("\n", file_get_contents("../config.php-dist"));
-
-		$rv = "";
-
-		$finished = false;
-
-		foreach ($data as $line) {
-			if (preg_match("/define\('DB_TYPE'/", $line)) {
-				$rv .= "\tdefine('DB_TYPE', '$DB_TYPE');\n";
-			} else if (preg_match("/define\('DB_HOST'/", $line)) {
-				$rv .= "\tdefine('DB_HOST', '$DB_HOST');\n";
-			} else if (preg_match("/define\('DB_USER'/", $line)) {
-				$rv .= "\tdefine('DB_USER', '$DB_USER');\n";
-			} else if (preg_match("/define\('DB_NAME'/", $line)) {
-				$rv .= "\tdefine('DB_NAME', '$DB_NAME');\n";
-			} else if (preg_match("/define\('DB_PASS'/", $line)) {
-				$rv .= "\tdefine('DB_PASS', '$DB_PASS');\n";
-			} else if (preg_match("/define\('DB_PORT'/", $line)) {
-				$rv .= "\tdefine('DB_PORT', '$DB_PORT');\n";
-			} else if (preg_match("/define\('SELF_URL_PATH'/", $line)) {
-				$rv .= "\tdefine('SELF_URL_PATH', '$SELF_URL_PATH');\n";
-			} else if (!$finished) {
-				$rv .= "$line\n";
-			}
-
-			if (preg_match("/\?\>/", $line)) {
-				$finished = true;
-			}
-		}
-
-		return $rv;
-	}
-
-	function is_server_https() {
-		return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
-	}
-
-	function make_self_url_path() {
-		$url_path = (is_server_https() ? 'https://' : 'http://').$_SERVER["HTTP_HOST"].parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
-
-		return $url_path;
-	}
+    }
+
+    function make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
+            $DB_PORT, $SELF_URL_PATH) {
+
+        $data = explode("\n", file_get_contents("../config.php-dist"));
+
+        $rv = "";
+
+        $finished = false;
+
+        foreach ($data as $line) {
+            if (preg_match("/define\('DB_TYPE'/", $line)) {
+                $rv .= "\tdefine('DB_TYPE', '$DB_TYPE');\n";
+            } else if (preg_match("/define\('DB_HOST'/", $line)) {
+                $rv .= "\tdefine('DB_HOST', '$DB_HOST');\n";
+            } else if (preg_match("/define\('DB_USER'/", $line)) {
+                $rv .= "\tdefine('DB_USER', '$DB_USER');\n";
+            } else if (preg_match("/define\('DB_NAME'/", $line)) {
+                $rv .= "\tdefine('DB_NAME', '$DB_NAME');\n";
+            } else if (preg_match("/define\('DB_PASS'/", $line)) {
+                $rv .= "\tdefine('DB_PASS', '$DB_PASS');\n";
+            } else if (preg_match("/define\('DB_PORT'/", $line)) {
+                $rv .= "\tdefine('DB_PORT', '$DB_PORT');\n";
+            } else if (preg_match("/define\('SELF_URL_PATH'/", $line)) {
+                $rv .= "\tdefine('SELF_URL_PATH', '$SELF_URL_PATH');\n";
+            } else if (!$finished) {
+                $rv .= "$line\n";
+            }
+
+            if (preg_match("/\?\>/", $line)) {
+                $finished = true;
+            }
+        }
+
+        return $rv;
+    }
+
+    function is_server_https() {
+        return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
+    }
+
+    function make_self_url_path() {
+        $url_path = (is_server_https() ? 'https://' : 'http://').$_SERVER["HTTP_HOST"].parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+
+        return $url_path;
+    }
 
 ?>
 
@@ -204,32 +204,32 @@ 
 
 <?php
 
-	if (file_exists("../config.php")) {
-		require "../config.php";
+    if (file_exists("../config.php")) {
+        require "../config.php";
 
-		if (!defined('_INSTALLER_IGNORE_CONFIG_CHECK')) {
-			print_error("Error: config.php already exists in tt-rss directory; aborting.");
+        if (!defined('_INSTALLER_IGNORE_CONFIG_CHECK')) {
+            print_error("Error: config.php already exists in tt-rss directory; aborting.");
 
-			print "<form method='GET' action='../index.php'>
+            print "<form method='GET' action='../index.php'>
 				<button type='submit' dojoType='dijit.form.Button' class='alt-primary'>Return to Tiny Tiny RSS</button>
 				</form>";
-			exit;
-		}
-	}
-
-	@$op = $_REQUEST['op'];
-
-	@$DB_HOST = strip_tags($_POST['DB_HOST']);
-	@$DB_TYPE = strip_tags($_POST['DB_TYPE']);
-	@$DB_USER = strip_tags($_POST['DB_USER']);
-	@$DB_NAME = strip_tags($_POST['DB_NAME']);
-	@$DB_PASS = strip_tags($_POST['DB_PASS']);
-	@$DB_PORT = strip_tags($_POST['DB_PORT']);
-	@$SELF_URL_PATH = strip_tags($_POST['SELF_URL_PATH']);
-
-	if (!$SELF_URL_PATH) {
-		$SELF_URL_PATH = preg_replace("/\/install\/$/", "/", make_self_url_path());
-	}
+            exit;
+        }
+    }
+
+    @$op = $_REQUEST['op'];
+
+    @$DB_HOST = strip_tags($_POST['DB_HOST']);
+    @$DB_TYPE = strip_tags($_POST['DB_TYPE']);
+    @$DB_USER = strip_tags($_POST['DB_USER']);
+    @$DB_NAME = strip_tags($_POST['DB_NAME']);
+    @$DB_PASS = strip_tags($_POST['DB_PASS']);
+    @$DB_PORT = strip_tags($_POST['DB_PORT']);
+    @$SELF_URL_PATH = strip_tags($_POST['SELF_URL_PATH']);
+
+    if (!$SELF_URL_PATH) {
+        $SELF_URL_PATH = preg_replace("/\/install\/$/", "/", make_self_url_path());
+    }
 ?>
 
 <form action="" method="post">
@@ -238,9 +238,9 @@ 
 	<h2>Database settings</h2>
 
 	<?php
-		$issel_pgsql = $DB_TYPE == "pgsql" ? "selected='selected'" : "";
-		$issel_mysql = $DB_TYPE == "mysql" ? "selected='selected'" : "";
-	?>
+        $issel_pgsql = $DB_TYPE == "pgsql" ? "selected='selected'" : "";
+        $issel_mysql = $DB_TYPE == "mysql" ? "selected='selected'" : "";
+    ?>
 
 	<fieldset>
 		<label>Database type:</label>
@@ -294,87 +294,87 @@ 
 	<h2>Checking configuration</h2>
 
 	<?php
-		$errors = sanity_check($DB_TYPE);
+        $errors = sanity_check($DB_TYPE);
 
-		if (count($errors) > 0) {
-			print "<p>Some configuration tests failed. Please correct them before continuing.</p>";
+        if (count($errors) > 0) {
+            print "<p>Some configuration tests failed. Please correct them before continuing.</p>";
 
-			print "<ul>";
+            print "<ul>";
 
-			foreach ($errors as $error) {
-				print "<li style='color : red'>$error</li>";
-			}
+            foreach ($errors as $error) {
+                print "<li style='color : red'>$error</li>";
+            }
 
-			print "</ul>";
+            print "</ul>";
 
-			exit;
-		}
+            exit;
+        }
 
-		$notices = array();
+        $notices = array();
 
-		if (!function_exists("curl_init")) {
-			array_push($notices, "It is highly recommended to enable support for CURL in PHP.");
-		}
+        if (!function_exists("curl_init")) {
+            array_push($notices, "It is highly recommended to enable support for CURL in PHP.");
+        }
 
-		if (function_exists("curl_init") && ini_get("open_basedir")) {
-			array_push($notices, "CURL and open_basedir combination breaks support for HTTP redirects. See the FAQ for more information.");
-		}
+        if (function_exists("curl_init") && ini_get("open_basedir")) {
+            array_push($notices, "CURL and open_basedir combination breaks support for HTTP redirects. See the FAQ for more information.");
+        }
 
-		if (!function_exists("idn_to_ascii")) {
-			array_push($notices, "PHP support for Internationalization Functions is required to handle Internationalized Domain Names.");
-		}
+        if (!function_exists("idn_to_ascii")) {
+            array_push($notices, "PHP support for Internationalization Functions is required to handle Internationalized Domain Names.");
+        }
 
         if ($DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
             array_push($notices, "PHP extension for MySQL (mysqli) is missing. This may prevent legacy plugins from working.");
         }
 
         if ($DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
-			array_push($notices, "PHP extension for PostgreSQL is missing. This may prevent legacy plugins from working.");
+            array_push($notices, "PHP extension for PostgreSQL is missing. This may prevent legacy plugins from working.");
         }
 
-		if (count($notices) > 0) {
-			print_notice("Configuration check succeeded with minor problems:");
+        if (count($notices) > 0) {
+            print_notice("Configuration check succeeded with minor problems:");
 
-			print "<ul>";
+            print "<ul>";
 
-			foreach ($notices as $notice) {
-				print "<li>$notice</li>";
-			}
+            foreach ($notices as $notice) {
+                print "<li>$notice</li>";
+            }
 
-			print "</ul>";
-		} else {
-			print_notice("Configuration check succeeded.");
-		}
+            print "</ul>";
+        } else {
+            print_notice("Configuration check succeeded.");
+        }
 
-	?>
+    ?>
 
 	<h2>Checking database</h2>
 
 	<?php
-		$pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
+        $pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
 
-		if (!$pdo) {
-			print_error("Unable to connect to database using specified parameters (driver: $DB_TYPE).");
-			exit;
-		}
+        if (!$pdo) {
+            print_error("Unable to connect to database using specified parameters (driver: $DB_TYPE).");
+            exit;
+        }
 
-		print_notice("Database test succeeded.");
-	?>
+        print_notice("Database test succeeded.");
+    ?>
 
 	<h2>Initialize database</h2>
 
 	<p>Before you can start using tt-rss, database needs to be initialized. Click on the button below to do that now.</p>
 
 	<?php
-		$res = $pdo->query("SELECT true FROM ttrss_feeds");
+        $res = $pdo->query("SELECT true FROM ttrss_feeds");
 
-		if ($res && $res->fetch()) {
-			print_error("Some tt-rss data already exists in this database. If you continue with database initialization your current data <b>WILL BE LOST</b>.");
-			$need_confirm = true;
-		} else {
-			$need_confirm = false;
-		}
-	?>
+        if ($res && $res->fetch()) {
+            print_error("Some tt-rss data already exists in this database. If you continue with database initialization your current data <b>WILL BE LOST</b>.");
+            $need_confirm = true;
+        } else {
+            $need_confirm = false;
+        }
+    ?>
 
 	<table><tr><td>
 	<form method="post">
@@ -417,44 +417,44 @@ 
 
 	<?php
 
-		} else if ($op == 'installschema' || $op == 'skipschema') {
+        } else if ($op == 'installschema' || $op == 'skipschema') {
 
-			$pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
+            $pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
 
-			if (!$pdo) {
-				print_error("Unable to connect to database using specified parameters.");
-				exit;
-			}
+            if (!$pdo) {
+                print_error("Unable to connect to database using specified parameters.");
+                exit;
+            }
 
-			if ($op == 'installschema') {
+            if ($op == 'installschema') {
 
-				print "<h2>Initializing database...</h2>";
+                print "<h2>Initializing database...</h2>";
 
-				$lines = explode(";", preg_replace("/[\r\n]/", "",
+                $lines = explode(";", preg_replace("/[\r\n]/", "",
                     file_get_contents("../schema/ttrss_schema_".basename($DB_TYPE).".sql")));
 
-				foreach ($lines as $line) {
-					if (strpos($line, "--") !== 0 && $line) {
-						$res = $pdo->query($line);
+                foreach ($lines as $line) {
+                    if (strpos($line, "--") !== 0 && $line) {
+                        $res = $pdo->query($line);
 
-						if (!$res) {
-							print_notice("Query: $line");
-							print_error("Error: ".implode(", ", $pdo->errorInfo()));
+                        if (!$res) {
+                            print_notice("Query: $line");
+                            print_error("Error: ".implode(", ", $pdo->errorInfo()));
                         }
-					}
-				}
+                    }
+                }
 
-				print_notice("Database initialization completed.");
+                print_notice("Database initialization completed.");
 
-			} else {
-				print_notice("Database initialization skipped.");
-			}
+            } else {
+                print_notice("Database initialization skipped.");
+            }
 
-			print "<h2>Generated configuration file</h2>";
+            print "<h2>Generated configuration file</h2>";
 
-			print "<p>Copy following text and save as <code>config.php</code> in tt-rss main directory. It is suggested to read through the file to the end in case you need any options changed fom default values.</p>";
+            print "<p>Copy following text and save as <code>config.php</code> in tt-rss main directory. It is suggested to read through the file to the end in case you need any options changed fom default values.</p>";
 
-			print "<p>After copying the file, you will be able to login with default username and password combination: <code>admin</code> and <code>password</code>. Don't forget to change the password immediately!</p>"; ?>
+            print "<p>After copying the file, you will be able to login with default username and password combination: <code>admin</code> and <code>password</code>. Don't forget to change the password immediately!</p>"; ?>
 
 			<form action="" method="post">
 				<input type="hidden" name="op" value="saveconfig">
@@ -466,9 +466,9 @@ 
 				<input type="hidden" name="DB_TYPE" value="<?php echo $DB_TYPE ?>"/>
 				<input type="hidden" name="SELF_URL_PATH" value="<?php echo $SELF_URL_PATH ?>"/>
 			<?php print "<textarea rows='20' style='width : 100%'>";
-			echo make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
-				$DB_PORT, $SELF_URL_PATH);
-			print "</textarea>"; ?>
+            echo make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
+                $DB_PORT, $SELF_URL_PATH);
+            print "</textarea>"; ?>
 
 			<hr/>
 
@@ -478,40 +478,40 @@ 
 				<p><button type="submit" dojoType='dijit.form.Button' class='alt-primary'>Save configuration</button></p>
 				</form>
 			<?php } else {
-				print_error("Unfortunately, parent directory is not writable, so we're unable to save config.php automatically.");
-			}
+                print_error("Unfortunately, parent directory is not writable, so we're unable to save config.php automatically.");
+            }
 
-		   print_notice("You can generate the file again by changing the form above.");
+            print_notice("You can generate the file again by changing the form above.");
 
-		} else if ($op == "saveconfig") {
+        } else if ($op == "saveconfig") {
 
-			print "<h2>Saving configuration file to parent directory...</h2>";
+            print "<h2>Saving configuration file to parent directory...</h2>";
 
-			if (!file_exists("../config.php")) {
+            if (!file_exists("../config.php")) {
 
-				$fp = fopen("../config.php", "w");
+                $fp = fopen("../config.php", "w");
 
-				if ($fp) {
-					$written = fwrite($fp, make_config($DB_TYPE, $DB_HOST,
-						$DB_USER, $DB_NAME, $DB_PASS,
-						$DB_PORT, $SELF_URL_PATH));
+                if ($fp) {
+                    $written = fwrite($fp, make_config($DB_TYPE, $DB_HOST,
+                        $DB_USER, $DB_NAME, $DB_PASS,
+                        $DB_PORT, $SELF_URL_PATH));
 
-					if ($written > 0) {
-						print_notice("Successfully saved config.php. You can try <a href=\"..\">loading tt-rss now</a>.");
+                    if ($written > 0) {
+                        print_notice("Successfully saved config.php. You can try <a href=\"..\">loading tt-rss now</a>.");
 
-					} else {
-						print_notice("Unable to write into config.php in tt-rss directory.");
-					}
+                    } else {
+                        print_notice("Unable to write into config.php in tt-rss directory.");
+                    }
 
-					fclose($fp);
-				} else {
-					print_error("Unable to open config.php in tt-rss directory for writing.");
-				}
-			} else {
-				print_error("config.php already present in tt-rss directory, refusing to overwrite.");
-			}
-		}
-	?>
+                    fclose($fp);
+                } else {
+                    print_error("Unable to open config.php in tt-rss directory for writing.");
+                }
+            } else {
+                print_error("config.php already present in tt-rss directory, refusing to overwrite.");
+            }
+        }
+    ?>
 
 </div>
 

opml.php

Indentation +26 added lines, -26 removed lines

@@ -1,37 +1,37 @@
 <?php
-	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
-		get_include_path());
+    set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
+        get_include_path());
 
-	require_once "autoload.php";
-	require_once "functions.php";
-	require_once "sessions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db.php";
-	require_once "db-prefs.php";
+    require_once "autoload.php";
+    require_once "functions.php";
+    require_once "sessions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db.php";
+    require_once "db-prefs.php";
 
-	if (!init_plugins()) {
-	    return;
-	}
+    if (!init_plugins()) {
+        return;
+    }
 
-	$op = $_REQUEST['op'];
+    $op = $_REQUEST['op'];
 
-	if ($op == "publish") {
-		$key = $_REQUEST["key"];
-		$pdo = Db::pdo();
+    if ($op == "publish") {
+        $key = $_REQUEST["key"];
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT owner_uid
+        $sth = $pdo->prepare("SELECT owner_uid
 				FROM ttrss_access_keys WHERE
 				access_key = ? AND feed_id = 'OPML:Publish'");
-		$sth->execute([$key]);
+        $sth->execute([$key]);
 
-		if ($row = $sth->fetch()) {
-			$owner_uid = $row['owner_uid'];
+        if ($row = $sth->fetch()) {
+            $owner_uid = $row['owner_uid'];
 
-			$opml = new Opml($_REQUEST);
-			$opml->opml_export("", $owner_uid, true, false);
+            $opml = new Opml($_REQUEST);
+            $opml->opml_export("", $owner_uid, true, false);
 
-		} else {
-			print "<error>User not found</error>";
-		}
-	}
+        } else {
+            print "<error>User not found</error>";
+        }
+    }

include/controls.php

Indentation +214 added lines, -214 removed lines

@@ -1,361 +1,361 @@
 <?php
 
 function print_select($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) {
-	    $name = $id;
-	}
-
-	print "<select name=\"$name\" id=\"$id\" $attributes>";
-	foreach ($values as $v) {
-		if ($v == $default) {
-					$sel = "selected=\"1\"";
-		} else {
-					$sel = "";
-		}
-
-		$v = trim($v);
-
-		print "<option value=\"$v\" $sel>$v</option>";
-	}
-	print "</select>";
+    if (!$name) {
+        $name = $id;
+    }
+
+    print "<select name=\"$name\" id=\"$id\" $attributes>";
+    foreach ($values as $v) {
+        if ($v == $default) {
+                    $sel = "selected=\"1\"";
+        } else {
+                    $sel = "";
+        }
+
+        $v = trim($v);
+
+        print "<option value=\"$v\" $sel>$v</option>";
+    }
+    print "</select>";
 }
 
 function print_select_hash($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) {
-	    $name = $id;
-	}
+    if (!$name) {
+        $name = $id;
+    }
 
-	print "<select name=\"$name\" id='$id' $attributes>";
-	foreach (array_keys($values) as $v) {
-		if ($v == $default) {
-					$sel = 'selected="selected"';
-		} else {
-					$sel = "";
-		}
+    print "<select name=\"$name\" id='$id' $attributes>";
+    foreach (array_keys($values) as $v) {
+        if ($v == $default) {
+                    $sel = 'selected="selected"';
+        } else {
+                    $sel = "";
+        }
 
-		$v = trim($v);
+        $v = trim($v);
 
-		print "<option $sel value=\"$v\">".$values[$v]."</option>";
-	}
+        print "<option $sel value=\"$v\">".$values[$v]."</option>";
+    }
 
-	print "</select>";
+    print "</select>";
 }
 
 function print_hidden($name, $value) {
-	print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"$name\" value=\"$value\">";
+    print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"$name\" value=\"$value\">";
 }
 
 function print_checkbox($id, $checked, $value = "", $attributes = "") {
-	$checked_str = $checked ? "checked" : "";
-	$value_str = $value ? "value=\"$value\"" : "";
+    $checked_str = $checked ? "checked" : "";
+    $value_str = $value ? "value=\"$value\"" : "";
 
-	print "<input dojoType=\"dijit.form.CheckBox\" id=\"$id\" $value_str $checked_str $attributes name=\"$id\">";
+    print "<input dojoType=\"dijit.form.CheckBox\" id=\"$id\" $value_str $checked_str $attributes name=\"$id\">";
 }
 
 function print_button($type, $value, $attributes = "") {
-	print "<p><button dojoType=\"dijit.form.Button\" $attributes type=\"$type\">$value</button>";
+    print "<p><button dojoType=\"dijit.form.Button\" $attributes type=\"$type\">$value</button>";
 }
 
 function print_radio($id, $default, $true_is, $values, $attributes = "") {
-	foreach ($values as $v) {
+    foreach ($values as $v) {
 
-		if ($v == $default) {
-					$sel = "checked";
-		} else {
-					$sel = "";
-		}
+        if ($v == $default) {
+                    $sel = "checked";
+        } else {
+                    $sel = "";
+        }
 
-		if ($v == $true_is) {
-			$sel .= " value=\"1\"";
-		} else {
-			$sel .= " value=\"0\"";
-		}
+        if ($v == $true_is) {
+            $sel .= " value=\"1\"";
+        } else {
+            $sel .= " value=\"0\"";
+        }
 
-		print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
+        print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
 				type=\"radio\" $sel $attributes name=\"$id\">&nbsp;$v&nbsp;";
 
-	}
+    }
 }
 
 function print_feed_multi_select($id, $default_ids = [],
-						   $attributes = "", $include_all_feeds = true,
-						   $root_id = null, $nest_level = 0) {
+                            $attributes = "", $include_all_feeds = true,
+                            $root_id = null, $nest_level = 0) {
 
-	$pdo = DB::pdo();
+    $pdo = DB::pdo();
 
-	print_r(in_array("CAT:6", $default_ids));
+    print_r(in_array("CAT:6", $default_ids));
 
-	if (!$root_id) {
-		print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
-		if ($include_all_feeds) {
-			$is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : "";
-			print "<option $is_selected value=\"0\">".__('All feeds')."</option>";
-		}
-	}
+    if (!$root_id) {
+        print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
+        if ($include_all_feeds) {
+            $is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : "";
+            print "<option $is_selected value=\"0\">".__('All feeds')."</option>";
+        }
+    }
 
-	if (get_pref('ENABLE_FEED_CATS')) {
+    if (get_pref('ENABLE_FEED_CATS')) {
 
-		if (!$root_id) {
-		    $root_id = null;
-		}
+        if (!$root_id) {
+            $root_id = null;
+        }
 
-		$sth = $pdo->prepare("SELECT id,title,
+        $sth = $pdo->prepare("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
 					c2.parent_cat = ttrss_feed_categories.id) AS num_children
 				FROM ttrss_feed_categories
 				WHERE owner_uid = :uid AND
 				(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
 
-		$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
+        $sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			for ($i = 0; $i < $nest_level; $i++) {
-							$line["title"] = " - " . $line["title"];
-			}
+            for ($i = 0; $i < $nest_level; $i++) {
+                            $line["title"] = " - " . $line["title"];
+            }
 
-			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
+            $is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
 
-			printf("<option $is_selected value='CAT:%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
+            printf("<option $is_selected value='CAT:%d'>%s</option>",
+                $line["id"], htmlspecialchars($line["title"]));
 
-			if ($line["num_children"] > 0) {
-							print_feed_multi_select($id, $default_ids, $attributes,
-					$include_all_feeds, $line["id"], $nest_level+1);
-			}
+            if ($line["num_children"] > 0) {
+                            print_feed_multi_select($id, $default_ids, $attributes,
+                    $include_all_feeds, $line["id"], $nest_level+1);
+            }
 
-			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+            $f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
 					WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
 
-			$f_sth->execute([$line['id'], $_SESSION['uid']]);
+            $f_sth->execute([$line['id'], $_SESSION['uid']]);
 
-			while ($fline = $f_sth->fetch()) {
-				$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
+            while ($fline = $f_sth->fetch()) {
+                $is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
 
-				$fline["title"] = " + " . $fline["title"];
+                $fline["title"] = " + " . $fline["title"];
 
-				for ($i = 0; $i < $nest_level; $i++) {
-									$fline["title"] = " - " . $fline["title"];
-				}
+                for ($i = 0; $i < $nest_level; $i++) {
+                                    $fline["title"] = " - " . $fline["title"];
+                }
 
-				printf("<option $is_selected value='%d'>%s</option>",
-					$fline["id"], htmlspecialchars($fline["title"]));
-			}
-		}
+                printf("<option $is_selected value='%d'>%s</option>",
+                    $fline["id"], htmlspecialchars($fline["title"]));
+            }
+        }
 
-		if (!$root_id) {
-			$is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : "";
+        if (!$root_id) {
+            $is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : "";
 
-			printf("<option $is_selected value='CAT:0'>%s</option>",
-				__("Uncategorized"));
+            printf("<option $is_selected value='CAT:0'>%s</option>",
+                __("Uncategorized"));
 
-			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+            $f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
 					WHERE cat_id IS NULL AND owner_uid = ? ORDER BY title");
-			$f_sth->execute([$_SESSION['uid']]);
+            $f_sth->execute([$_SESSION['uid']]);
 
-			while ($fline = $f_sth->fetch()) {
-				$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
+            while ($fline = $f_sth->fetch()) {
+                $is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
 
-				$fline["title"] = " + " . $fline["title"];
+                $fline["title"] = " + " . $fline["title"];
 
-				for ($i = 0; $i < $nest_level; $i++) {
-									$fline["title"] = " - " . $fline["title"];
-				}
+                for ($i = 0; $i < $nest_level; $i++) {
+                                    $fline["title"] = " - " . $fline["title"];
+                }
 
-				printf("<option $is_selected value='%d'>%s</option>",
-					$fline["id"], htmlspecialchars($fline["title"]));
-			}
-		}
+                printf("<option $is_selected value='%d'>%s</option>",
+                    $fline["id"], htmlspecialchars($fline["title"]));
+            }
+        }
 
-	} else {
-		$sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+    } else {
+        $sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
 				WHERE owner_uid = ? ORDER BY title");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
+            $is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
 
-			printf("<option $is_selected value='%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
-		}
-	}
+            printf("<option $is_selected value='%d'>%s</option>",
+                $line["id"], htmlspecialchars($line["title"]));
+        }
+    }
 
-	if (!$root_id) {
-		print "</select>";
-	}
+    if (!$root_id) {
+        print "</select>";
+    }
 }
 
 function print_feed_cat_select($id, $default_id,
-							   $attributes, $include_all_cats = true, $root_id = null, $nest_level = 0) {
+                                $attributes, $include_all_cats = true, $root_id = null, $nest_level = 0) {
 
-	if (!$root_id) {
-		print "<select id=\"$id\" name=\"$id\" default=\"$default_id\" $attributes>";
-	}
+    if (!$root_id) {
+        print "<select id=\"$id\" name=\"$id\" default=\"$default_id\" $attributes>";
+    }
 
-	$pdo = DB::pdo();
+    $pdo = DB::pdo();
 
-	if (!$root_id) {
-	    $root_id = null;
-	}
+    if (!$root_id) {
+        $root_id = null;
+    }
 
-	$sth = $pdo->prepare("SELECT id,title,
+    $sth = $pdo->prepare("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
 					c2.parent_cat = ttrss_feed_categories.id) AS num_children
 				FROM ttrss_feed_categories
 				WHERE owner_uid = :uid AND
 				  (parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
-	$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
-
-	$found = 0;
-
-	while ($line = $sth->fetch()) {
-		++$found;
-
-		if ($line["id"] == $default_id) {
-			$is_selected = "selected=\"1\"";
-		} else {
-			$is_selected = "";
-		}
-
-		for ($i = 0; $i < $nest_level; $i++) {
-					$line["title"] = " - " . $line["title"];
-		}
-
-		if ($line["title"]) {
-					printf("<option $is_selected value='%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
-		}
-
-		if ($line["num_children"] > 0) {
-					print_feed_cat_select($id, $default_id, $attributes,
-				$include_all_cats, $line["id"], $nest_level+1);
-		}
-	}
-
-	if (!$root_id) {
-		if ($include_all_cats) {
-			if ($found > 0) {
-				print "<option disabled=\"1\">--------</option>";
-			}
-
-			if ($default_id == 0) {
-				$is_selected = "selected=\"1\"";
-			} else {
-				$is_selected = "";
-			}
-
-			print "<option $is_selected value=\"0\">".__('Uncategorized')."</option>";
-		}
-		print "</select>";
-	}
+    $sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
+
+    $found = 0;
+
+    while ($line = $sth->fetch()) {
+        ++$found;
+
+        if ($line["id"] == $default_id) {
+            $is_selected = "selected=\"1\"";
+        } else {
+            $is_selected = "";
+        }
+
+        for ($i = 0; $i < $nest_level; $i++) {
+                    $line["title"] = " - " . $line["title"];
+        }
+
+        if ($line["title"]) {
+                    printf("<option $is_selected value='%d'>%s</option>",
+                $line["id"], htmlspecialchars($line["title"]));
+        }
+
+        if ($line["num_children"] > 0) {
+                    print_feed_cat_select($id, $default_id, $attributes,
+                $include_all_cats, $line["id"], $nest_level+1);
+        }
+    }
+
+    if (!$root_id) {
+        if ($include_all_cats) {
+            if ($found > 0) {
+                print "<option disabled=\"1\">--------</option>";
+            }
+
+            if ($default_id == 0) {
+                $is_selected = "selected=\"1\"";
+            } else {
+                $is_selected = "";
+            }
+
+            print "<option $is_selected value=\"0\">".__('Uncategorized')."</option>";
+        }
+        print "</select>";
+    }
 }
 
 function stylesheet_tag($filename, $id = false) {
-	$timestamp = filemtime($filename);
+    $timestamp = filemtime($filename);
 
-	$id_part = $id ? "id=\"$id\"" : "";
+    $id_part = $id ? "id=\"$id\"" : "";
 
-	return "<link rel=\"stylesheet\" $id_part type=\"text/css\" data-orig-href=\"$filename\" href=\"$filename?$timestamp\"/>\n";
+    return "<link rel=\"stylesheet\" $id_part type=\"text/css\" data-orig-href=\"$filename\" href=\"$filename?$timestamp\"/>\n";
 }
 
 function javascript_tag($filename) {
-	$query = "";
+    $query = "";
 
-	if (!(strpos($filename, "?") === false)) {
-		$query = substr($filename, strpos($filename, "?") + 1);
-		$filename = substr($filename, 0, strpos($filename, "?"));
-	}
+    if (!(strpos($filename, "?") === false)) {
+        $query = substr($filename, strpos($filename, "?") + 1);
+        $filename = substr($filename, 0, strpos($filename, "?"));
+    }
 
-	$timestamp = filemtime($filename);
+    $timestamp = filemtime($filename);
 
-	if ($query) {
-	    $timestamp .= "&$query";
-	}
+    if ($query) {
+        $timestamp .= "&$query";
+    }
 
-	return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
+    return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
 }
 
 function format_warning($msg, $id = "") {
-	return "<div class=\"alert\" id=\"$id\">$msg</div>";
+    return "<div class=\"alert\" id=\"$id\">$msg</div>";
 }
 
 function format_notice($msg, $id = "") {
-	return "<div class=\"alert alert-info\" id=\"$id\">$msg</div>";
+    return "<div class=\"alert alert-info\" id=\"$id\">$msg</div>";
 }
 
 function format_error($msg, $id = "") {
-	return "<div class=\"alert alert-danger\" id=\"$id\">$msg</div>";
+    return "<div class=\"alert alert-danger\" id=\"$id\">$msg</div>";
 }
 
 function print_notice($msg) {
-	return print format_notice($msg);
+    return print format_notice($msg);
 }
 
 function print_warning($msg) {
-	return print format_warning($msg);
+    return print format_warning($msg);
 }
 
 function print_error($msg) {
-	return print format_error($msg);
+    return print format_error($msg);
 }
 
 function format_inline_player($url, $ctype) {
 
-	$entry = "";
+    $entry = "";
 
-	$url = htmlspecialchars($url);
+    $url = htmlspecialchars($url);
 
-	if (strpos($ctype, "audio/") === 0) {
+    if (strpos($ctype, "audio/") === 0) {
 
-		$entry .= "<div class='inline-player'>";
+        $entry .= "<div class='inline-player'>";
 
-		if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
-				$_SESSION["hasMp3"])) {
+        if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
+                $_SESSION["hasMp3"])) {
 
-			$entry .= "<audio preload=\"none\" controls>
+            $entry .= "<audio preload=\"none\" controls>
 					<source type=\"$ctype\" src=\"$url\"/>
 					</audio> ";
 
-		}
+        }
 
-		if ($entry) {
-		    $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
+        if ($entry) {
+            $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
 				href=\"$url\">" . basename($url) . "</a>";
-		}
+        }
 
-		$entry .= "</div>";
+        $entry .= "</div>";
 
-		return $entry;
+        return $entry;
 
-	}
+    }
 
-	return "";
+    return "";
 }
 
 function print_label_select($name, $value, $attributes = "") {
 
-	$pdo = Db::pdo();
+    $pdo = Db::pdo();
 
-	$sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
+    $sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
 			WHERE owner_uid = ? ORDER BY caption");
-	$sth->execute([$_SESSION['uid']]);
+    $sth->execute([$_SESSION['uid']]);
 
-	print "<select default=\"$value\" name=\"".htmlspecialchars($name).
-		"\" $attributes>";
+    print "<select default=\"$value\" name=\"".htmlspecialchars($name).
+        "\" $attributes>";
 
-	while ($line = $sth->fetch()) {
+    while ($line = $sth->fetch()) {
 
-		$issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
+        $issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
 
-		print "<option value=\"".htmlspecialchars($line["caption"])."\"
+        print "<option value=\"".htmlspecialchars($line["caption"])."\"
 				$issel>".htmlspecialchars($line["caption"])."</option>";
 
-	}
+    }
 
 #		print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
 
-	print "</select>";
+    print "</select>";
 
 
 }

include/sanity_check.php

Indentation +145 added lines, -145 removed lines

@@ -1,190 +1,190 @@ 
 <?php
 
-	function make_self_url() {
-		$proto = is_server_https() ? 'https' : 'http';
+    function make_self_url() {
+        $proto = is_server_https() ? 'https' : 'http';
 
-		return $proto.'://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
-	}
+        return $proto.'://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
+    }
 
-	function make_self_url_path() {
-		$proto = is_server_https() ? 'https' : 'http';
-		$url_path = $proto.'://'.$_SERVER["HTTP_HOST"].parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+    function make_self_url_path() {
+        $proto = is_server_https() ? 'https' : 'http';
+        $url_path = $proto.'://'.$_SERVER["HTTP_HOST"].parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
 
-		return $url_path;
-	}
+        return $url_path;
+    }
 
-	function check_mysql_tables() {
-		$pdo = Db::pdo();
+    function check_mysql_tables() {
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT engine, table_name FROM information_schema.tables WHERE
+        $sth = $pdo->prepare("SELECT engine, table_name FROM information_schema.tables WHERE
 				table_schema = ? AND table_name LIKE 'ttrss_%' AND engine != 'InnoDB'");
-		$sth->execute([DB_NAME]);
+        $sth->execute([DB_NAME]);
 
-		$bad_tables = [];
+        $bad_tables = [];
 
-		while ($line = $sth->fetch()) {
-			array_push($bad_tables, $line);
-		}
+        while ($line = $sth->fetch()) {
+            array_push($bad_tables, $line);
+        }
 
-		return $bad_tables;
-	}
+        return $bad_tables;
+    }
 
-	function initial_sanity_check() {
+    function initial_sanity_check() {
 
-		$errors = array();
+        $errors = array();
 
-		if (!file_exists("config.php")) {
-			array_push($errors, "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.");
-		} else {
+        if (!file_exists("config.php")) {
+            array_push($errors, "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.");
+        } else {
 
-			require_once "sanity_config.php";
+            require_once "sanity_config.php";
 
-			if (file_exists("install") && !file_exists("config.php")) {
-				array_push($errors, "Please copy config.php-dist to config.php or run the installer in install/");
-			}
+            if (file_exists("install") && !file_exists("config.php")) {
+                array_push($errors, "Please copy config.php-dist to config.php or run the installer in install/");
+            }
 
-			if (strpos(PLUGINS, "auth_") === false) {
-				array_push($errors, "Please enable at least one authentication module via PLUGINS constant in config.php");
-			}
+            if (strpos(PLUGINS, "auth_") === false) {
+                array_push($errors, "Please enable at least one authentication module via PLUGINS constant in config.php");
+            }
 
-			if (function_exists('posix_getuid') && posix_getuid() == 0) {
-				array_push($errors, "Please don't run this script as root.");
-			}
+            if (function_exists('posix_getuid') && posix_getuid() == 0) {
+                array_push($errors, "Please don't run this script as root.");
+            }
 
-			if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-				array_push($errors, "PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".");
-			}
+            if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+                array_push($errors, "PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".");
+            }
 
-			if (!class_exists("UConverter")) {
-				array_push($errors, "PHP UConverter class is missing, it's provided by the Internationalization (intl) module.");
-			}
+            if (!class_exists("UConverter")) {
+                array_push($errors, "PHP UConverter class is missing, it's provided by the Internationalization (intl) module.");
+            }
 
-			if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
-				array_push($errors, "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value.");
-			}
+            if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
+                array_push($errors, "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value.");
+            }
 
-			if (!is_writable(CACHE_DIR."/images")) {
-				array_push($errors, "Image cache is not writable (chmod -R 777 ".CACHE_DIR."/images)");
-			}
+            if (!is_writable(CACHE_DIR."/images")) {
+                array_push($errors, "Image cache is not writable (chmod -R 777 ".CACHE_DIR."/images)");
+            }
 
-			if (!is_writable(CACHE_DIR."/upload")) {
-				array_push($errors, "Upload cache is not writable (chmod -R 777 ".CACHE_DIR."/upload)");
-			}
+            if (!is_writable(CACHE_DIR."/upload")) {
+                array_push($errors, "Upload cache is not writable (chmod -R 777 ".CACHE_DIR."/upload)");
+            }
 
-			if (!is_writable(CACHE_DIR."/export")) {
-				array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
-			}
+            if (!is_writable(CACHE_DIR."/export")) {
+                array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
+            }
 
-			if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) {
-				array_push($errors,
-					"Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh");
-			}
+            if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) {
+                array_push($errors,
+                    "Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh");
+            }
 
-			foreach ($required_defines as $d) {
-				if (!defined($d)) {
-					array_push($errors,
-						"Required configuration file parameter $d is not defined in config.php. You might need to copy it from config.php-dist.");
-				}
-			}
+            foreach ($required_defines as $d) {
+                if (!defined($d)) {
+                    array_push($errors,
+                        "Required configuration file parameter $d is not defined in config.php. You might need to copy it from config.php-dist.");
+                }
+            }
 
-			if (SINGLE_USER_MODE && class_exists("PDO")) {
-			    $pdo = DB::pdo();
+            if (SINGLE_USER_MODE && class_exists("PDO")) {
+                $pdo = DB::pdo();
 
-				$res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
+                $res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
 
-				if (!$res->fetch()) {
-					array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
-				}
-			}
+                if (!$res->fetch()) {
+                    array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
+                }
+            }
 
-			$ref_self_url_path = make_self_url_path();
-			$ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path);
+            $ref_self_url_path = make_self_url_path();
+            $ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path);
 
-			if (SELF_URL_PATH == "http://example.org/tt-rss/") {
-				array_push($errors,
-						"Please set SELF_URL_PATH to the correct value for your server (possible value: <b>$ref_self_url_path</b>)");
-			}
+            if (SELF_URL_PATH == "http://example.org/tt-rss/") {
+                array_push($errors,
+                        "Please set SELF_URL_PATH to the correct value for your server (possible value: <b>$ref_self_url_path</b>)");
+            }
 
-			if (isset($_SERVER["HTTP_HOST"]) &&
-				(!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) &&
-				SELF_URL_PATH != $ref_self_url_path && SELF_URL_PATH != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path) - 1)) {
-				array_push($errors,
-					"Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b>");
-			}
+            if (isset($_SERVER["HTTP_HOST"]) &&
+                (!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) &&
+                SELF_URL_PATH != $ref_self_url_path && SELF_URL_PATH != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path) - 1)) {
+                array_push($errors,
+                    "Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b>");
+            }
 
-			if (!is_writable(ICONS_DIR)) {
-				array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".ICONS_DIR.").\n");
-			}
+            if (!is_writable(ICONS_DIR)) {
+                array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".ICONS_DIR.").\n");
+            }
 
-			if (!is_writable(LOCK_DIRECTORY)) {
-				array_push($errors, "LOCK_DIRECTORY defined in config.php is not writable (chmod -R 777 ".LOCK_DIRECTORY.").\n");
-			}
+            if (!is_writable(LOCK_DIRECTORY)) {
+                array_push($errors, "LOCK_DIRECTORY defined in config.php is not writable (chmod -R 777 ".LOCK_DIRECTORY.").\n");
+            }
 
-			if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
-				array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
-			}
+            if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
+                array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
+            }
 
-			if (!function_exists("json_encode")) {
-				array_push($errors, "PHP support for JSON is required, but was not found.");
-			}
+            if (!function_exists("json_encode")) {
+                array_push($errors, "PHP support for JSON is required, but was not found.");
+            }
 
-			if (DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
-				array_push($errors, "PHP support for MySQL is required for configured DB_TYPE in config.php.");
-			}
+            if (DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
+                array_push($errors, "PHP support for MySQL is required for configured DB_TYPE in config.php.");
+            }
 
-			if (DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
-				array_push($errors, "PHP support for PostgreSQL is required for configured DB_TYPE in config.php");
-			}
+            if (DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
+                array_push($errors, "PHP support for PostgreSQL is required for configured DB_TYPE in config.php");
+            }
 
-			if (!class_exists("PDO")) {
-				array_push($errors, "PHP support for PDO is required but was not found.");
-			}
+            if (!class_exists("PDO")) {
+                array_push($errors, "PHP support for PDO is required but was not found.");
+            }
 
-			if (!function_exists("mb_strlen")) {
-				array_push($errors, "PHP support for mbstring functions is required but was not found.");
-			}
+            if (!function_exists("mb_strlen")) {
+                array_push($errors, "PHP support for mbstring functions is required but was not found.");
+            }
 
-			if (!function_exists("hash")) {
-				array_push($errors, "PHP support for hash() function is required but was not found.");
-			}
+            if (!function_exists("hash")) {
+                array_push($errors, "PHP support for hash() function is required but was not found.");
+            }
 
-			if (ini_get("safe_mode")) {
-				array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
-			}
+            if (ini_get("safe_mode")) {
+                array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
+            }
 
-			if (!function_exists("mime_content_type")) {
-				array_push($errors, "PHP function mime_content_type() is missing, try enabling fileinfo module.");
-			}
+            if (!function_exists("mime_content_type")) {
+                array_push($errors, "PHP function mime_content_type() is missing, try enabling fileinfo module.");
+            }
 
-			if (!class_exists("DOMDocument")) {
-				array_push($errors, "PHP support for DOMDocument is required, but was not found.");
-			}
+            if (!class_exists("DOMDocument")) {
+                array_push($errors, "PHP support for DOMDocument is required, but was not found.");
+            }
 
-			if (DB_TYPE == "mysql") {
-				$bad_tables = check_mysql_tables();
+            if (DB_TYPE == "mysql") {
+                $bad_tables = check_mysql_tables();
 
-				if (count($bad_tables) > 0) {
-					$bad_tables_fmt = [];
+                if (count($bad_tables) > 0) {
+                    $bad_tables_fmt = [];
 
-					foreach ($bad_tables as $bt) {
-						array_push($bad_tables_fmt, sprintf("%s (%s)", $bt['table_name'], $bt['engine']));
-					}
+                    foreach ($bad_tables as $bt) {
+                        array_push($bad_tables_fmt, sprintf("%s (%s)", $bt['table_name'], $bt['engine']));
+                    }
 
-					$msg = "<p>The following tables use an unsupported MySQL engine: <b>".
-						implode(", ", $bad_tables_fmt)."</b>.</p>";
+                    $msg = "<p>The following tables use an unsupported MySQL engine: <b>".
+                        implode(", ", $bad_tables_fmt)."</b>.</p>";
 
-					$msg .= "<p>The only supported engine on MySQL is InnoDB. MyISAM lacks functionality to run
+                    $msg .= "<p>The only supported engine on MySQL is InnoDB. MyISAM lacks functionality to run
 						tt-rss.
 						Please backup your data (via OPML) and re-import the schema before continuing.</p>
 						<p><b>WARNING: importing the schema would mean LOSS OF ALL YOUR DATA.</b></p>";
 
 
-					array_push($errors, $msg);
-				}
-			}
-		}
+                    array_push($errors, $msg);
+                }
+            }
+        }
 
-		if (count($errors) > 0 && $_SERVER['REQUEST_URI']) { ?>
+        if (count($errors) > 0 && $_SERVER['REQUEST_URI']) { ?>
 			<!DOCTYPE html>
 			<html>
 			<head>
@@ -211,22 +211,22 @@ 
 		</html>
 
 		<?php
-			die;
-		} else if (count($errors) > 0) {
-			echo "Tiny Tiny RSS was unable to start properly. This usually means a misconfiguration or an incomplete upgrade.\n";
-			echo "Please fix errors indicated by the following messages:\n\n";
+            die;
+        } else if (count($errors) > 0) {
+            echo "Tiny Tiny RSS was unable to start properly. This usually means a misconfiguration or an incomplete upgrade.\n";
+            echo "Please fix errors indicated by the following messages:\n\n";
 
-			foreach ($errors as $error) {
-				echo " * $error\n";
-			}
+            foreach ($errors as $error) {
+                echo " * $error\n";
+            }
 
-			echo "\nYou might want to check tt-rss wiki or the forums for more information.\n";
-			echo "Please search the forums before creating new topic for your question.\n";
+            echo "\nYou might want to check tt-rss wiki or the forums for more information.\n";
+            echo "Please search the forums before creating new topic for your question.\n";
 
-			exit(-1);
-		}
-	}
+            exit(-1);
+        }
+    }
 
-	initial_sanity_check();
+    initial_sanity_check();
 
 ?>

include/functions.php

Indentation +8 added lines, -8 removed lines

@@ -390,8 +390,8 @@ 
 
         // TODO: should this support POST requests or not? idk
 
-         $context_options = array(
-              'http' => array(
+            $context_options = array(
+                'http' => array(
                     'header' => array(
                         'Connection: close'
                     ),
@@ -399,7 +399,7 @@ 
                     'ignore_errors' => true,
                     'timeout' => $timeout ? $timeout : FILE_FETCH_TIMEOUT,
                     'protocol_version'=> 1.1)
-              );
+                );
 
         if (!$post_query && $last_modified) {
                     array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
@@ -681,7 +681,7 @@ 
 function logout_user() {
     @session_destroy();
     if (isset($_COOKIE[session_name()])) {
-       setcookie(session_name(), '', time() - 42000, '/');
+        setcookie(session_name(), '', time() - 42000, '/');
     }
     session_commit();
 }
@@ -725,7 +725,7 @@ 
             if (AUTH_AUTO_LOGIN && authenticate_user(null, null)) {
                 $_SESSION["ref_schema_version"] = get_schema_version(true);
             } else {
-                 authenticate_user(null, null, true);
+                    authenticate_user(null, null, true);
             }
 
             if (!$_SESSION["uid"]) {
@@ -1012,9 +1012,9 @@ 
     $params = array();
 
     foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
-                 "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
-                 "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
-                 "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
+                    "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
+                    "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
+                    "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
 
         $params[strtolower($param)] = (int) get_pref($param);
     }

include/errorhandler.php

Indentation +59 added lines, -59 removed lines

@@ -1,80 +1,80 @@
 <?php
 function format_backtrace($trace) {
-	$rv = "";
-	$idx = 1;
-
-	if (is_array($trace)) {
-		foreach ($trace as $e) {
-			if (isset($e["file"]) && isset($e["line"])) {
-				$fmt_args = [];
-
-				if (is_array($e["args"])) {
-					foreach ($e["args"] as $a) {
-						if (!is_object($a)) {
-							array_push($fmt_args, $a);
-						} else {
-							array_push($fmt_args, "[".get_class($a)."]");
-						}
-					}
-				}
-
-				$filename = str_replace(dirname(__DIR__)."/", "", $e["file"]);
-
-				$rv .= sprintf("%d. %s(%s): %s(%s)\n",
-					$idx, $filename, $e["line"], $e["function"], implode(", ", $fmt_args));
-
-				$idx++;
-			}
-		}
-	}
-
-	return $rv;
+    $rv = "";
+    $idx = 1;
+
+    if (is_array($trace)) {
+        foreach ($trace as $e) {
+            if (isset($e["file"]) && isset($e["line"])) {
+                $fmt_args = [];
+
+                if (is_array($e["args"])) {
+                    foreach ($e["args"] as $a) {
+                        if (!is_object($a)) {
+                            array_push($fmt_args, $a);
+                        } else {
+                            array_push($fmt_args, "[".get_class($a)."]");
+                        }
+                    }
+                }
+
+                $filename = str_replace(dirname(__DIR__)."/", "", $e["file"]);
+
+                $rv .= sprintf("%d. %s(%s): %s(%s)\n",
+                    $idx, $filename, $e["line"], $e["function"], implode(", ", $fmt_args));
+
+                $idx++;
+            }
+        }
+    }
+
+    return $rv;
 }
 
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
-	if (error_reporting() == 0 || !$errno) {
-	    return false;
-	}
+    if (error_reporting() == 0 || !$errno) {
+        return false;
+    }
 
-	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
+    $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-	$context = format_backtrace(debug_backtrace());
-	$errstr = truncate_middle($errstr, 16384, " (...) ");
+    $context = format_backtrace(debug_backtrace());
+    $errstr = truncate_middle($errstr, 16384, " (...) ");
 
-	if (class_exists("Logger")) {
-			return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
-	}
-	}
+    if (class_exists("Logger")) {
+            return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+    }
+    }
 
 function ttrss_fatal_handler() {
-	global $last_query;
+    global $last_query;
 
-	$error = error_get_last();
+    $error = error_get_last();
 
-	if ($error !== null) {
-		$errno = $error["type"];
-		$file = $error["file"];
-		$line = $error["line"];
-		$errstr = $error["message"];
+    if ($error !== null) {
+        $errno = $error["type"];
+        $file = $error["file"];
+        $line = $error["line"];
+        $errstr = $error["message"];
 
-		if (!$errno) {
-		    return false;
-		}
+        if (!$errno) {
+            return false;
+        }
 
-		$context = format_backtrace(debug_backtrace());
+        $context = format_backtrace(debug_backtrace());
 
-		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
+        $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-		if ($last_query) {
-		    $errstr .= " [Last query: $last_query]";
-		}
+        if ($last_query) {
+            $errstr .= " [Last query: $last_query]";
+        }
 
-		if (class_exists("Logger")) {
-					return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
-		}
-	}
+        if (class_exists("Logger")) {
+                    return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+        }
+    }
 
-	return false;
+    return false;
 }
 
 register_shutdown_function('ttrss_fatal_handler');

include/db.php

Indentation +9 added lines, -9 removed lines

@@ -1,38 +1,38 @@
 <?php
 
 function db_escape_string($s, $strip_tags = true) {
-	return Db::get()->escape_string($s, $strip_tags);
+    return Db::get()->escape_string($s, $strip_tags);
 }
 
 function db_query($query, $die_on_error = true) {
-	return Db::get()->query($query, $die_on_error);
+    return Db::get()->query($query, $die_on_error);
 }
 
 function db_fetch_assoc($result) {
-	return Db::get()->fetch_assoc($result);
+    return Db::get()->fetch_assoc($result);
 }
 
 
 function db_num_rows($result) {
-	return Db::get()->num_rows($result);
+    return Db::get()->num_rows($result);
 }
 
 function db_fetch_result($result, $row, $param) {
-	return Db::get()->fetch_result($result, $row, $param);
+    return Db::get()->fetch_result($result, $row, $param);
 }
 
 function db_affected_rows($result) {
-	return Db::get()->affected_rows($result);
+    return Db::get()->affected_rows($result);
 }
 
 function db_last_error() {
-	return Db::get()->last_error();
+    return Db::get()->last_error();
 }
 
 function db_last_query_error() {
-	return Db::get()->last_query_error();
+    return Db::get()->last_query_error();
 }
 
 function db_quote($str) {
-	return Db::get()->quote($str);
+    return Db::get()->quote($str);
 }

include/autoload.php

Indentation +20 added lines, -20 removed lines

@@ -1,28 +1,28 @@
 <?php
-	require_once "functions.php";
+    require_once "functions.php";
 
-	spl_autoload_register(function($class) {
-		$namespace = '';
-		$class_name = $class;
+    spl_autoload_register(function($class) {
+        $namespace = '';
+        $class_name = $class;
 
-		if (strpos($class, '\\') !== false) {
-					list ($namespace, $class_name) = explode('\\', $class, 2);
-		}
+        if (strpos($class, '\\') !== false) {
+                    list ($namespace, $class_name) = explode('\\', $class, 2);
+        }
 
-		$root_dir = dirname(__DIR__); // we're in tt-rss/include
+        $root_dir = dirname(__DIR__); // we're in tt-rss/include
 
-		// 1. third party libraries with namespaces are loaded from vendor/
-		// 2. internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces
-		// 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?)
+        // 1. third party libraries with namespaces are loaded from vendor/
+        // 2. internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces
+        // 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?)
 
-		if ($namespace && $class_name) {
-			$class_file = "$root_dir/vendor/$namespace/".str_replace('\\', '/', $class_name).".php";
-		} else {
-			$class_file = "$root_dir/classes/".str_replace("_", "/", strtolower($class)).".php";
-		}
+        if ($namespace && $class_name) {
+            $class_file = "$root_dir/vendor/$namespace/".str_replace('\\', '/', $class_name).".php";
+        } else {
+            $class_file = "$root_dir/classes/".str_replace("_", "/", strtolower($class)).".php";
+        }
 
-		if (file_exists($class_file)) {
-					include $class_file;
-		}
+        if (file_exists($class_file)) {
+                    include $class_file;
+        }
 
-	});
+    });