]> git.wh0rd.org - tt-rss.git/blobdiff - classes/api.php
pngcrush.sh
[tt-rss.git] / classes / api.php
old mode 100644 (file)
new mode 100755 (executable)
index e9ffc63..e505dcc
@@ -1,14 +1,17 @@
 <?php
-
 class API extends Handler {
 
-       const API_LEVEL  = 7;
+       const API_LEVEL  = 14;
 
        const STATUS_OK  = 0;
        const STATUS_ERR = 1;
 
        private $seq;
 
+       static function param_to_bool($p) {
+               return $p && ($p !== "f" && $p !== "false");
+       }
+
        function before($method) {
                if (parent::before($method)) {
                        header("Content-Type: text/json");
@@ -23,7 +26,7 @@ class API extends Handler {
                                return false;
                        }
 
-                       $this->seq = (int) $_REQUEST['seq'];
+                       $this->seq = (int) clean($_REQUEST['seq']);
 
                        return true;
                }
@@ -50,16 +53,17 @@ class API extends Handler {
                @session_destroy();
                @session_start();
 
-               $login = $this->dbh->escape_string($_REQUEST["user"]);
-               $password = $_REQUEST["password"];
-               $password_base64 = base64_decode($_REQUEST["password"]);
+               $login = clean($_REQUEST["user"]);
+               $password = clean($_REQUEST["password"]);
+               $password_base64 = base64_decode(clean($_REQUEST["password"]));
 
                if (SINGLE_USER_MODE) $login = "admin";
 
-               $result = $this->dbh->query("SELECT id FROM ttrss_users WHERE login = '$login'");
+               $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
+               $sth->execute([$login]);
 
-               if ($this->dbh->num_rows($result) != 0) {
-                       $uid = $this->dbh->fetch_result($result, 0, "id");
+               if ($row = $sth->fetch()) {
+                       $uid = $row["id"];
                } else {
                        $uid = 0;
                }
@@ -77,6 +81,7 @@ class API extends Handler {
                                $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 {
@@ -95,27 +100,27 @@ class API extends Handler {
        }
 
        function getUnread() {
-               $feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
-               $is_cat = $this->dbh->escape_string($_REQUEST["is_cat"]);
+               $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" => getGlobalUnread()));
+                       $this->wrap(self::STATUS_OK, array("unread" => Feeds::getGlobalUnread()));
                }
        }
 
        /* Method added for ttrss-reader for Android */
        function getCounters() {
-               $this->wrap(self::STATUS_OK, getAllCounters());
+               $this->wrap(self::STATUS_OK, Counters::getAllCounters());
        }
 
        function getFeeds() {
-               $cat_id = $this->dbh->escape_string($_REQUEST["cat_id"]);
-               $unread_only = sql_bool_to_bool($_REQUEST["unread_only"]);
-               $limit = (int) $this->dbh->escape_string($_REQUEST["limit"]);
-               $offset = (int) $this->dbh->escape_string($_REQUEST["offset"]);
-               $include_nested = sql_bool_to_bool($_REQUEST["include_nested"]);
+               $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);
 
@@ -123,9 +128,9 @@ class API extends Handler {
        }
 
        function getCategories() {
-               $unread_only = sql_bool_to_bool($_REQUEST["unread_only"]);
-               $enable_nested = sql_bool_to_bool($_REQUEST["enable_nested"]);
-               $include_empty = sql_bool_to_bool($_REQUEST['include_empty']);
+               $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
 
@@ -134,7 +139,7 @@ class API extends Handler {
                else
                        $nested_qpart = "true";
 
-               $result = $this->dbh->query("SELECT
+               $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,
@@ -142,17 +147,17 @@ class API extends Handler {
                                ttrss_feed_categories AS c2 WHERE
                                c2.parent_cat = ttrss_feed_categories.id) AS num_cats
                        FROM ttrss_feed_categories
-                       WHERE $nested_qpart AND owner_uid = " .
-                       $_SESSION["uid"]);
+                       WHERE $nested_qpart AND owner_uid = ?");
+               $sth->execute([$_SESSION['uid']]);
 
                $cats = array();
 
-               while ($line = $this->dbh->fetch_assoc($result)) {
+               while ($line = $sth->fetch()) {
                        if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
                                $unread = getFeedUnread($line["id"], true);
 
                                if ($enable_nested)
-                                       $unread += getCategoryChildrenUnread($line["id"]);
+                                       $unread += Feeds::getCategoryChildrenUnread($line["id"]);
 
                                if ($unread || !$unread_only) {
                                        array_push($cats, array("id" => $line["id"],
@@ -170,7 +175,7 @@ class API extends Handler {
 
                                if ($unread || !$unread_only) {
                                        array_push($cats, array("id" => $cat_id,
-                                               "title" => getCategoryTitle($cat_id),
+                                               "title" => Feeds::getCategoryTitle($cat_id),
                                                "unread" => $unread));
                                }
                        }
@@ -180,30 +185,45 @@ class API extends Handler {
        }
 
        function getHeadlines() {
-               $feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
-               if ($feed_id != "") {
+               $feed_id = clean($_REQUEST["feed_id"]);
+               if ($feed_id !== "") {
+
+                       if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
 
-                       $limit = (int)$this->dbh->escape_string($_REQUEST["limit"]);
+                       $limit = (int)clean($_REQUEST["limit"]);
 
                        if (!$limit || $limit >= 200) $limit = 200;
 
-                       $offset = (int)$this->dbh->escape_string($_REQUEST["skip"]);
-                       $filter = $this->dbh->escape_string($_REQUEST["filter"]);
-                       $is_cat = sql_bool_to_bool($_REQUEST["is_cat"]);
-                       $show_excerpt = sql_bool_to_bool($_REQUEST["show_excerpt"]);
-                       $show_content = sql_bool_to_bool($_REQUEST["show_content"]);
+                       $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 = $this->dbh->escape_string($_REQUEST["view_mode"]);
-                       $include_attachments = sql_bool_to_bool($_REQUEST["include_attachments"]);
-                       $since_id = (int)$this->dbh->escape_string($_REQUEST["since_id"]);
-                       $include_nested = sql_bool_to_bool($_REQUEST["include_nested"]);
+                       $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"]) ||
-                               sql_bool_to_bool($_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 ($_REQUEST["order_by"]) {
+                       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";
@@ -212,25 +232,28 @@ class API extends Handler {
 
                        /* do not rely on params below */
 
-                       $search = $this->dbh->escape_string($_REQUEST["search"]);
-                       $search_mode = $this->dbh->escape_string($_REQUEST["search_mode"]);
+                       $search = clean($_REQUEST["search"]);
 
-                       $headlines = $this->api_get_headlines($feed_id, $limit, $offset,
+                       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, $search_mode,
-                               $include_nested, $sanitize_content);
+                               $include_attachments, $since_id, $search,
+                               $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id, $skip_first_id_check);
 
-                       $this->wrap(self::STATUS_OK, $headlines);
+                       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'));
                }
        }
 
        function updateArticle() {
-               $article_ids = array_filter(explode(",", $this->dbh->escape_string($_REQUEST["article_ids"])), is_numeric);
-               $mode = (int) $this->dbh->escape_string($_REQUEST["mode"]);
-               $data = $this->dbh->escape_string($_REQUEST["data"]);
-               $field_raw = (int)$this->dbh->escape_string($_REQUEST["field"]);
+               $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 = "";
@@ -264,33 +287,26 @@ class API extends Handler {
                                break;
                }
 
-               if ($field == "note") $set_to = "'$data'";
+               if ($field == "note") $set_to = $this->pdo->quote($data);
 
                if ($field && $set_to && count($article_ids) > 0) {
 
-                       $article_ids = join(", ", $article_ids);
+                       $article_qmarks = arr_qmarks($article_ids);
 
-                       $result = $this->dbh->query("UPDATE ttrss_user_entries SET $field = $set_to $additional_fields WHERE ref_id IN ($article_ids) AND owner_uid = " . $_SESSION["uid"]);
+                       $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']]));
 
-                       $num_updated = $this->dbh->affected_rows($result);
+                       $num_updated = $sth->rowCount();
 
                        if ($num_updated > 0 && $field == "unread") {
-                               $result = $this->dbh->query("SELECT DISTINCT feed_id FROM ttrss_user_entries
-                                       WHERE ref_id IN ($article_ids)");
-
-                               while ($line = $this->dbh->fetch_assoc($result)) {
-                                       ccache_update($line["feed_id"], $_SESSION["uid"]);
-                               }
-                       }
+                               $sth = $this->pdo->prepare("SELECT DISTINCT feed_id FROM ttrss_user_entries
+                                       WHERE ref_id IN ($article_qmarks)");
+                               $sth->execute($article_ids);
 
-                       if ($num_updated > 0 && $field == "published") {
-                               if (PUBSUBHUBBUB_HUB) {
-                                       $rss_link = get_self_url_prefix() .
-                                               "/public.php?op=rss&id=-2&key=" .
-                                               get_feed_access_key(-2, false);
-
-                                       $p = new Publisher(PUBSUBHUBBUB_HUB);
-                                       $pubsub_result = $p->publish_update($rss_link);
+                               while ($line = $sth->fetch()) {
+                                       CCache::update($line["feed_id"], $_SESSION["uid"]);
                                }
                        }
 
@@ -305,54 +321,68 @@ class API extends Handler {
 
        function getArticle() {
 
-               $article_id = join(",", array_filter(explode(",", $this->dbh->escape_string($_REQUEST["article_id"])), is_numeric));
+               $article_ids = explode(",", clean($_REQUEST["article_id"]));
+               $sanitize_content = !isset($_REQUEST["sanitize"]) ||
+                       API::param_to_bool($_REQUEST["sanitize"]);
+
+               if ($article_ids) {
 
-               if ($article_id) {
+                       $article_qmarks = arr_qmarks($article_ids);
 
-                       $query = "SELECT id,title,link,content,feed_id,comments,int_id,
-                               marked,unread,published,score,
+                       $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
+                               author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title,
+                               (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) AS site_url,
+                               (SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) AS hide_images
                                FROM ttrss_entries,ttrss_user_entries
-                               WHERE   id IN ($article_id) AND ref_id = id AND owner_uid = " .
-                                       $_SESSION["uid"] ;
+                               WHERE id IN ($article_qmarks) AND ref_id = id AND owner_uid = ?");
 
-                       $result = $this->dbh->query($query);
+                       $sth->execute(array_merge($article_ids, [$_SESSION['uid']]));
 
                        $articles = array();
 
-                       if ($this->dbh->num_rows($result) != 0) {
-
-                               while ($line = $this->dbh->fetch_assoc($result)) {
-
-                                       $attachments = get_article_enclosures($line['id']);
-
-                                       $article = array(
-                                               "id" => $line["id"],
-                                               "title" => $line["title"],
-                                               "link" => $line["link"],
-                                               "labels" => get_article_labels($line['id']),
-                                               "unread" => sql_bool_to_bool($line["unread"]),
-                                               "marked" => sql_bool_to_bool($line["marked"]),
-                                               "published" => sql_bool_to_bool($line["published"]),
-                                               "comments" => $line["comments"],
-                                               "author" => $line["author"],
-                                               "updated" => (int) strtotime($line["updated"]),
-                                               "content" => $line["content"],
-                                               "feed_id" => $line["feed_id"],
-                                               "attachments" => $attachments,
-                                               "score" => (int)$line["score"],
-                                               "feed_title" => $line["feed_title"]
-                                       );
+                       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));
-                                       }
+                               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
+                                       $article = $p->hook_render_article_api(array("article" => $article));
+                               }
 
+                               $article['content'] = rewrite_cached_urls($article['content']);
 
-                                       array_push($articles, $article);
+                               array_push($articles, $article);
 
-                               }
                        }
 
                        $this->wrap(self::STATUS_OK, $articles);
@@ -368,69 +398,68 @@ class API extends Handler {
 
                $config["daemon_is_running"] = file_is_locked("update_daemon.lock");
 
-               $result = $this->dbh->query("SELECT COUNT(*) AS cf FROM
-                       ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"]);
+               $sth = $this->pdo->prepare("SELECT COUNT(*) AS cf FROM
+                       ttrss_feeds WHERE owner_uid = ?");
+               $sth->execute([$_SESSION['uid']]);
+               $row = $sth->fetch();
 
-               $num_feeds = $this->dbh->fetch_result($result, 0, "cf");
-
-               $config["num_feeds"] = (int)$num_feeds;
+               $config["num_feeds"] = $row["cf"];
 
                $this->wrap(self::STATUS_OK, $config);
        }
 
        function updateFeed() {
-               require_once "include/rssfuncs.php";
-
-               $feed_id = (int) $this->dbh->escape_string($_REQUEST["feed_id"]);
+               $feed_id = (int) clean($_REQUEST["feed_id"]);
 
-               update_rss_feed($feed_id, true);
+               if (!ini_get("open_basedir")) {
+                       RSSUtils::update_rss_feed($feed_id);
+               }
 
                $this->wrap(self::STATUS_OK, array("status" => "OK"));
        }
 
        function catchupFeed() {
-               $feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
-               $is_cat = $this->dbh->escape_string($_REQUEST["is_cat"]);
+               $feed_id = clean($_REQUEST["feed_id"]);
+               $is_cat = clean($_REQUEST["is_cat"]);
 
-               catchup_feed($feed_id, $is_cat);
+               Feeds::catchup_feed($feed_id, $is_cat);
 
                $this->wrap(self::STATUS_OK, array("status" => "OK"));
        }
 
        function getPref() {
-               $pref_name = $this->dbh->escape_string($_REQUEST["pref_name"]);
+               $pref_name = clean($_REQUEST["pref_name"]);
 
                $this->wrap(self::STATUS_OK, array("value" => get_pref($pref_name)));
        }
 
        function getLabels() {
-               //$article_ids = array_filter(explode(",", $this->dbh->escape_string($_REQUEST["article_ids"])), is_numeric);
-
-               $article_id = (int)$_REQUEST['article_id'];
+               $article_id = (int)clean($_REQUEST['article_id']);
 
                $rv = array();
 
-               $result = $this->dbh->query("SELECT id, caption, fg_color, bg_color
+               $sth = $this->pdo->prepare("SELECT id, caption, fg_color, bg_color
                        FROM ttrss_labels2
-                       WHERE owner_uid = '".$_SESSION['uid']."' ORDER BY caption");
+                       WHERE owner_uid = ? ORDER BY caption");
+               $sth->execute([$_SESSION['uid']]);
 
                if ($article_id)
-                       $article_labels = get_article_labels($article_id);
+                       $article_labels = Article::get_article_labels($article_id);
                else
                        $article_labels = array();
 
-               while ($line = $this->dbh->fetch_assoc($result)) {
+               while ($line = $sth->fetch()) {
 
                        $checked = false;
                        foreach ($article_labels as $al) {
-                               if ($al[0] == $line['id']) {
+                               if (Labels::feed_to_label_id($al[0]) == $line['id']) {
                                        $checked = true;
                                        break;
                                }
                        }
 
                        array_push($rv, array(
-                               "id" => (int)label_to_feed_id($line['id']),
+                               "id" => (int)Labels::label_to_feed_id($line['id']),
                                "caption" => $line['caption'],
                                "fg_color" => $line['fg_color'],
                                "bg_color" => $line['bg_color'],
@@ -442,12 +471,11 @@ class API extends Handler {
 
        function setArticleLabel() {
 
-               $article_ids = array_filter(explode(",", $this->dbh->escape_string($_REQUEST["article_ids"])), is_numeric);
-               $label_id = (int) $this->dbh->escape_string($_REQUEST['label_id']);
-               $assign = (bool) $this->dbh->escape_string($_REQUEST['assign']) == "true";
+               $article_ids = explode(",", clean($_REQUEST["article_ids"]));
+               $label_id = (int) clean($_REQUEST['label_id']);
+               $assign = API::param_to_bool(clean($_REQUEST['assign']));
 
-               $label = $this->dbh->escape_string(label_find_caption(
-                       $label_id, $_SESSION["uid"]));
+               $label = Labels::find_caption(Labels::feed_to_label_id($label_id), $_SESSION["uid"]);
 
                $num_updated = 0;
 
@@ -456,9 +484,9 @@ class API extends Handler {
                        foreach ($article_ids as $id) {
 
                                if ($assign)
-                                       label_add_article($id, $label, $_SESSION["uid"]);
+                                       Labels::add_article($id, $label, $_SESSION["uid"]);
                                else
-                                       label_remove_article($id, $label, $_SESSION["uid"]);
+                                       Labels::remove_article($id, $label, $_SESSION["uid"]);
 
                                ++$num_updated;
 
@@ -484,9 +512,9 @@ class API extends Handler {
        }
 
        function shareToPublished() {
-               $title = $this->dbh->escape_string(strip_tags($_REQUEST["title"]));
-               $url = $this->dbh->escape_string(strip_tags($_REQUEST["url"]));
-               $content = $this->dbh->escape_string(strip_tags($_REQUEST["content"]));
+               $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'));
@@ -499,10 +527,16 @@ class API extends Handler {
 
                        $feeds = array();
 
+                       $pdo = Db::pdo();
+
+                       $limit = (int) $limit;
+                       $offset = (int) $offset;
+                       $cat_id = (int) $cat_id;
+
                        /* Labels */
 
                        if ($cat_id == -4 || $cat_id == -2) {
-                               $counters = getLabelCounters(true);
+                               $counters = Counters::getLabelCounters(true);
 
                                foreach (array_values($counters) as $cv) {
 
@@ -511,7 +545,7 @@ class API extends Handler {
                                        if ($unread || !$unread_only) {
 
                                                $row = array(
-                                                               "id" => $cv["id"],
+                                                               "id" => (int) $cv["id"],
                                                                "title" => $cv["description"],
                                                                "unread" => $cv["counter"],
                                                                "cat_id" => -2,
@@ -529,7 +563,7 @@ class API extends Handler {
                                        $unread = getFeedUnread($i);
 
                                        if ($unread || !$unread_only) {
-                                               $title = getFeedTitle($i);
+                                               $title = Feeds::getFeedTitle($i);
 
                                                $row = array(
                                                                "id" => $i,
@@ -546,21 +580,23 @@ class API extends Handler {
                        /* Child cats */
 
                        if ($include_nested && $cat_id) {
-                               $result = db_query("SELECT
-                                       id, title FROM ttrss_feed_categories
-                                       WHERE parent_cat = '$cat_id' AND owner_uid = " . $_SESSION["uid"] .
-                               " ORDER BY id, title");
+                               $sth = $pdo->prepare("SELECT
+                                       id, title, order_id FROM ttrss_feed_categories
+                                       WHERE parent_cat = ? AND owner_uid = ? ORDER BY id, title");
+
+                               $sth->execute([$cat_id, $_SESSION['uid']]);
 
-                               while ($line = db_fetch_assoc($result)) {
+                               while ($line = $sth->fetch()) {
                                        $unread = getFeedUnread($line["id"], true) +
-                                               getCategoryChildrenUnread($line["id"]);
+                                               Feeds::getCategoryChildrenUnread($line["id"]);
 
                                        if ($unread || !$unread_only) {
                                                $row = array(
-                                                               "id" => $line["id"],
+                                                               "id" => (int) $line["id"],
                                                                "title" => $line["title"],
                                                                "unread" => $unread,
                                                                "is_cat" => true,
+                                "order_id" => (int) $line["order_id"]
                                                        );
                                                array_push($feeds, $row);
                                        }
@@ -576,31 +612,30 @@ class API extends Handler {
                        }
 
                        if ($cat_id == -4 || $cat_id == -3) {
-                               $result = db_query("SELECT
+                               $sth = $pdo->prepare("SELECT
                                        id, feed_url, cat_id, title, order_id, ".
                                                SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
-                                               FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] .
-                                               ORDER BY cat_id, title " . $limit_qpart);
-                       } else {
+                                               FROM ttrss_feeds WHERE owner_uid = ?
+                                               ORDER BY cat_id, title " . $limit_qpart);
+                               $sth->execute([$_SESSION['uid']]);
 
-                               if ($cat_id)
-                                       $cat_qpart = "cat_id = '$cat_id'";
-                               else
-                                       $cat_qpart = "cat_id IS NULL";
+                       } else {
 
-                               $result = db_query("SELECT
+                               $sth = $pdo->prepare("SELECT
                                        id, feed_url, cat_id, title, order_id, ".
                                                SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
                                                FROM ttrss_feeds WHERE
-                                               $cat_qpart AND owner_uid = " . $_SESSION["uid"] .
-                                               " ORDER BY cat_id, title " . $limit_qpart);
+                                               (cat_id = :cat OR (:cat = 0 AND cat_id IS NULL))
+                                               AND owner_uid = :uid
+                                               ORDER BY cat_id, title " . $limit_qpart);
+                               $sth->execute([":uid" => $_SESSION['uid'], ":cat" => $cat_id]);
                        }
 
-                       while ($line = db_fetch_assoc($result)) {
+                       while ($line = $sth->fetch()) {
 
                                $unread = getFeedUnread($line["id"]);
 
-                               $has_icon = feed_has_icon($line['id']);
+                               $has_icon = Feeds::feedHasIcon($line['id']);
 
                                if ($unread || !$unread_only) {
 
@@ -622,102 +657,169 @@ class API extends Handler {
                return $feeds;
        }
 
+       /**
+        * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+        */
        static function api_get_headlines($feed_id, $limit, $offset,
                                $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
                                $include_attachments, $since_id,
-                               $search = "", $search_mode = "",
-                               $include_nested = false, $sanitize_content = true) {
+                               $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();
+
+                       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
+                                               FROM ttrss_feeds WHERE id = ?");
+                               $sth->execute([$feed_id]);
 
-                       $qfh_ret = queryFeedHeadlines($feed_id, $limit,
-                               $view_mode, $is_cat, $search, $search_mode,
-                               $order, $offset, 0, false, $since_id, $include_nested);
+                               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'
+                                                       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();
 
-                       while ($line = db_fetch_assoc($result)) {
-                               $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100);
-                               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-                                       $line = $p->hook_query_headlines($line, 100, true);
-                               }
+                       $headlines_header = array(
+                               'id' => $feed_id,
+                               'first_id' => $first_id,
+                               'is_cat' => $is_cat);
 
-                               $is_updated = ($line["last_read"] == "" &&
-                                       ($line["unread"] != "t" && $line["unread"] != "1"));
+                       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;
 
-                               $tags = explode(",", $line["tag_cache"]);
-                               $labels = json_decode($line["label_cache"], true);
+                                       if ($label_cache) {
+                                               $label_cache = json_decode($label_cache, true);
 
-                               //if (!$tags) $tags = get_article_tags($line["id"]);
-                               //if (!$labels) $labels = get_article_labels($line["id"]);
+                                               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(
+                                       $headline_row = array(
                                                "id" => (int)$line["id"],
-                                               "unread" => sql_bool_to_bool($line["unread"]),
-                                               "marked" => sql_bool_to_bool($line["marked"]),
-                                               "published" => sql_bool_to_bool($line["published"]),
-                                               "updated" => (int) strtotime($line["updated"]),
+                                               "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"],
+                                               "feed_id" => $line["feed_id"] ? $line['feed_id'] : 0,
                                                "tags" => $tags,
                                        );
 
-                               if ($include_attachments)
-                                       $headline_row['attachments'] = get_article_enclosures(
-                                               $line['id']);
+                                       if ($include_attachments)
+                                               $headline_row['attachments'] = Article::get_article_enclosures(
+                                                       $line['id']);
 
-                               if (!$show_excerpt)
-                                       $headline_row["excerpt"] = $line["content_preview"];
+                                       if ($show_excerpt)
+                                               $headline_row["excerpt"] = $line["content_preview"];
 
-                               if ($show_content) {
+                                       if ($show_content) {
 
-                                       if ($sanitize_content) {
-                                               $headline_row["content"] = sanitize(
-                                                       $line["content"],
-                                                       sql_bool_to_bool($line['hide_images']),
-                                                       false, $line["site_url"]);
-                                       } else {
-                                               $headline_row["content"] = $line["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();
+                                       // unify label output to ease parsing
+                                       if ($labels["no-labels"] == 1) $labels = array();
 
-                               $headline_row["labels"] = $labels;
+                                       $headline_row["labels"] = $labels;
 
-                               $headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] :
-                                       $feed_title;
+                                       $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["comments_count"] = (int)$line["num_comments"];
+                                       $headline_row["comments_link"] = $line["comments"];
 
-                               $headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]);
+                                       $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["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));
+                                       }
 
-                               array_push($headlines, $headline_row);
+                                       $headline_row['content'] = rewrite_cached_urls($headline_row['content']);
+
+                                       array_push($headlines, $headline_row);
+                               }
+                       } else if (is_numeric($result) && $result == -1) {
+                               $headlines_header['first_id_changed'] = true;
                        }
 
-                       return $headlines;
+                       return array($headlines, $headlines_header);
        }
 
        function unsubscribeFeed() {
-               $feed_id = (int) $this->dbh->escape_string($_REQUEST["feed_id"]);
+               $feed_id = (int) clean($_REQUEST["feed_id"]);
 
-               $result = $this->dbh->query("SELECT id FROM ttrss_feeds WHERE
-                       id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
+               $sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
+                       id = ? AND owner_uid = ?");
+               $sth->execute([$feed_id, $_SESSION['uid']]);
 
-               if ($this->dbh->num_rows($result) != 0) {
+               if ($row = $sth->fetch()) {
                        Pref_Feeds::remove_feed($feed_id, $_SESSION["uid"]);
                        $this->wrap(self::STATUS_OK, array("status" => "OK"));
                } else {
@@ -726,13 +828,13 @@ class API extends Handler {
        }
 
        function subscribeToFeed() {
-               $feed_url = $this->dbh->escape_string($_REQUEST["feed_url"]);
-               $category_id = (int) $this->dbh->escape_string($_REQUEST["category_id"]);
-               $login = $this->dbh->escape_string($_REQUEST["login"]);
-               $password = $this->dbh->escape_string($_REQUEST["password"]);
+               $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 = subscribe_to_feed($feed_url, $category_id, $login, $password);
+                       $rc = Feeds::subscribe_to_feed($feed_url, $category_id, $login, $password);
 
                        $this->wrap(self::STATUS_OK, array("status" => $rc));
                } else {
@@ -741,7 +843,7 @@ class API extends Handler {
        }
 
        function getFeedTree() {
-               $include_empty = sql_bool_to_bool($_REQUEST['include_empty']);
+               $include_empty = API::param_to_bool(clean($_REQUEST['include_empty']));
 
                $pf = new Pref_Feeds($_REQUEST);
 
@@ -762,16 +864,20 @@ class API extends Handler {
        private function isCategoryEmpty($id) {
 
                if ($id == -2) {
-                       $result = $this->dbh->query("SELECT COUNT(*) AS count FROM ttrss_labels2
-                               WHERE owner_uid = " . $_SESSION["uid"]);
+                       $sth = $this->pdo->prepare("SELECT COUNT(id) AS count FROM ttrss_labels2
+                               WHERE owner_uid = ?");
+                       $sth->execute([$_SESSION['uid']]);
+                       $row = $sth->fetch();
 
-                       return $this->dbh->fetch_result($result, 0, "count") == 0;
+                       return $row["count"] == 0;
 
                } else if ($id == 0) {
-                       $result = $this->dbh->query("SELECT COUNT(*) AS count FROM ttrss_feeds
-                               WHERE cat_id IS NULL AND owner_uid = " . $_SESSION["uid"]);
+                       $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();
 
-                       return $this->dbh->fetch_result($result, 0, "count") == 0;
+                       return $row["count"] == 0;
 
                }
 
@@ -780,5 +886,3 @@ class API extends Handler {
 
 
 }
-
-?>