api: fix wrong sql syntax in getFeeds

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

diff --git a/api/index.php b/api/index.php
index 6126c3628d5bca26e203170d9cff949753de1077..8e6400a008b0f3cc5ae020fb7e84c081be1c761a 100644 (file)
--- a/api/index.php
+++ b/api/index.php
@@ -88,22 +88,37 @@
                        } else {
                                print json_encode(array("unread" => getGlobalUnread($link)));
                        }
+                       break;
+               case "getCounters":
+
+                       /* TODO */
+
                        break;
                case "getFeeds":
                        $cat_id = db_escape_string($_REQUEST["cat_id"]);
                        $unread_only = (bool)db_escape_string($_REQUEST["unread_only"]);
+                       $limit = (int) db_escape_string($_REQUEST["limit"]);
+                       $offset = (int) db_escape_string($_REQUEST["offset"]);
+
+                       if ($limit) {
+                               $limit_qpart = "LIMIT $limit OFFSET $offset";
+                       } else {
+                               $limit_qpart = "";
+                       }
 
                        if (!$cat_id) {
                                $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 owner_uid = " . $_SESSION["uid"]);
+                                               FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . 
+                                               " 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"]);
+                                               cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . 
+                                               " ORDER BY cat_id, title " . $limit_qpart);
                        }
 
                        $feeds = array();
@@ -112,6 +127,9 @@
 
                                $unread = getFeedUnread($link, $line["id"]);
 
+                               $icon_path = "../" . ICONS_DIR . "/" . $line["id"] . ".ico";
+                               $has_icon = file_exists($icon_path) && filesize($icon_path) > 0;
+
                                if ($unread || !$unread_only) {
 
                                        $row = array(
@@ -119,6 +137,7 @@
                                                        "title" => $line["title"],
                                                        "id" => (int)$line["id"],
                                                        "unread" => (int)$unread,
+                                                       "has_icon" => $has_icon,
                                                        "cat_id" => (int)$line["cat_id"],
                                                        "last_updated" => strtotime($line["last_updated"])
                                                );
@@ -130,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) {
 
@@ -153,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) {
@@ -199,9 +218,13 @@
                case "getHeadlines":
                        $feed_id = db_escape_string($_REQUEST["feed_id"]);
                        $limit = (int)db_escape_string($_REQUEST["limit"]);
+                       $offset = (int)db_escape_string($_REQUEST["skip"]);
                        $filter = db_escape_string($_REQUEST["filter"]);
                        $is_cat = (bool)db_escape_string($_REQUEST["is_cat"]);
-                       $show_except = (bool)db_escape_string($_REQUEST["show_excerpt"]);
+                       $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 */
 
@@ -210,7 +233,8 @@
                        $match_on = db_escape_string($_REQUEST["match_on"]);
                        
                        $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit, 
-                               $view_mode, $is_cat, $search, $search_mode, $match_on);
+                               $view_mode, $is_cat, $search, $search_mode, $match_on,
+                               false, $offset);
 
                        $result = $qfh_ret[0];
                        $feed_title = $qfh_ret[1];
@@ -228,11 +252,19 @@
                                                "updated" => strtotime($line["updated"]),
                                                "is_updated" => $is_updated,
                                                "title" => $line["title"],
+                                               "link" => $line["link"],
                                                "feed_id" => $line["feed_id"],
                                        );
 
-                               if ($show_except) $headline_row["excerpt"] = $line["content_preview"];
-                       
+                               if ($show_excerpt) {
+                                       $excerpt = truncate_string(strip_tags($line["content_preview"]), 100);
+                                       $headline_row["excerpt"] = $excerpt;
+                               }
+
+                               if ($show_content) {
+                                       $headline_row["content"] = $line["content_preview"];
+                               }
+
                                array_push($headlines, $headline_row);
                        }
 
@@ -240,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"]);
 
@@ -271,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"]);
                                }
                        }
 
@@ -341,10 +376,24 @@
 
                        break;
 
+               case "updateFeed":
+                       $feed_id = db_escape_string($_REQUEST["feed_id"]);
+
+                       update_rss_feed($link, $feed_id, true);
+
+                       print json_encode(array("status" => "OK"));
+
+                       break;
+
                case "getPref":
                        $pref_name = db_escape_string($_REQUEST["pref_name"]);
                        print json_encode(array("value" => get_pref($link, $pref_name)));
                        break;
+
+               default:
+                       print json_encode(array("error" => 'UNKNOWN_METHOD'));
+                       break;
+
        }
 
        db_close($link);