api: fix wrong sql syntax in getFeeds

[tt-rss.git] / api / index.php

diff --git a/api/index.php b/api/index.php
index dc3d183f828aadfd602b22efbedea187efeb08cf..8e6400a008b0f3cc5ae020fb7e84c081be1c761a 100644 (file)
--- a/api/index.php
+++ b/api/index.php
@@ -111,14 +111,14 @@
                                        id, feed_url, cat_id, title, ".
                                                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);
+                                               " ORDER BY cat_id, title " . $limit_qpart);
                        } else {
                                $result = db_query($link, "SELECT 
                                        id, feed_url, cat_id, title, ".
                                                SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
                                                FROM ttrss_feeds WHERE 
                                                cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . 
-                                               "ORDER BY cat_id, title " . $limit_qpart);
+                                               " ORDER BY cat_id, title " . $limit_qpart);
                        }
 
                        $feeds = array();
@@ -149,7 +149,7 @@
                        /* Labels */
 
                        if (!$cat_id || $cat_id == -2) {
-                               $counters = getLabelCounters($link, false, true);
+                               $counters = getLabelCounters($link, true);
 
                                foreach (array_keys($counters) as $id) {
 
@@ -172,7 +172,7 @@
                        /* Virtual feeds */
 
                        if (!$cat_id || $cat_id == -1) {
-                               foreach (array(-1, -2, -3, -4) as $i) {
+                               foreach (array(-1, -2, -3, -4, 0) as $i) {
                                        $unread = getFeedUnread($link, $i);
 
                                        if ($unread || !$unread_only) {
@@ -223,6 +223,8 @@
                        $is_cat = (bool)db_escape_string($_REQUEST["is_cat"]);
                        $show_excerpt = (bool)db_escape_string($_REQUEST["show_excerpt"]);
                        $show_content = (bool)db_escape_string($_REQUEST["show_content"]);
+                       /* all_articles, unread, adaptive, marked, updated */
+                       $view_mode = db_escape_string($_REQUEST["view_mode"]);
 
                        /* do not rely on params below */
 
@@ -250,6 +252,7 @@
                                                "updated" => strtotime($line["updated"]),
                                                "is_updated" => $is_updated,
                                                "title" => $line["title"],
+                                               "link" => $line["link"],
                                                "feed_id" => $line["feed_id"],
                                        );
 
@@ -269,7 +272,7 @@
 
                        break;
                case "updateArticle":
-                       $article_id = (int) db_escape_string($_GET["article_id"]);
+                       $article_ids = split(",", db_escape_string($_REQUEST["article_ids"]));
                        $mode = (int) db_escape_string($_REQUEST["mode"]);
                        $field_raw = (int)db_escape_string($_REQUEST["field"]);
 
@@ -300,14 +303,17 @@
                                        break;
                        }
 
-                       if ($field && $set_to) {
+                       if ($field && $set_to && count($article_ids) > 0) {
+
+                               $article_ids = join(", ", $article_ids);
+
                                if ($field == "unread") {
                                        $result = db_query($link, "UPDATE ttrss_user_entries SET $field = $set_to,
                                                last_read = NOW()
-                                               WHERE ref_id = '$article_id' AND owner_uid = " . $_SESSION["uid"]);
+                                               WHERE ref_id IN ($article_ids) AND owner_uid = " . $_SESSION["uid"]);
                                } else {
                                        $result = db_query($link, "UPDATE ttrss_user_entries SET $field = $set_to
-                                               WHERE ref_id = '$article_id' AND owner_uid = " . $_SESSION["uid"]);
+                                               WHERE ref_id IN ($article_ids) AND owner_uid = " . $_SESSION["uid"]);
                                }
                        }
 
@@ -373,14 +379,7 @@
                case "updateFeed":
                        $feed_id = db_escape_string($_REQUEST["feed_id"]);
 
-                       $result = db_query($link, 
-                               "SELECT feed_url FROM ttrss_feeds WHERE id = '$feed_id'
-                                       AND owner_uid = " . $_SESSION["uid"]);
-
-                       if (db_num_rows($result) > 0) {                 
-                               $feed_url = db_fetch_result($result, 0, "feed_url");
-                               update_rss_feed($link, $feed_url, $feed_id);
-                       }
+                       update_rss_feed($link, $feed_id, true);
 
                        print json_encode(array("status" => "OK"));