API: add order_id to getCategories; add feed_title to getHeadlines; bump api level...

diff --git a/classes/api.php b/classes/api.php
index 1a79ffe2d6c827aa8be1ee2ea7edc88febe48179..2e9c1b9026500fc4ded8f8966d2f60025d34c675 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -2,7 +2,7 @@
 
 class API extends Handler {
 
-       const API_LEVEL  = 2;
+       const API_LEVEL  = 3;
 
        const STATUS_OK  = 0;
        const STATUS_ERR = 1;
@@ -126,7 +126,7 @@ class API extends Handler {
                // TODO do not return empty categories, return Uncategorized and standard virtual cats
 
                $result = db_query($this->link, "SELECT
-                               id, title FROM ttrss_feed_categories
+                               id, title, order_id FROM ttrss_feed_categories
                        WHERE owner_uid = " .
                        $_SESSION["uid"]);
 
@@ -138,7 +138,9 @@ class API extends Handler {
                        if ($unread || !$unread_only) {
                                array_push($cats, array("id" => $line["id"],
                                        "title" => $line["title"],
-                                       "unread" => $unread));
+                                       "unread" => $unread,
+                                       "order_id" => (int) $line["order_id"],
+                               ));
                        }
                }
 

diff --git a/include/functions.php b/include/functions.php
index dc5cbc816ae431bfe4d4ae2f668b44a684725942..909305af633f876567f09658f60e47970b0c1447 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -4510,6 +4510,8 @@
 
                                $headline_row["labels"] = $labels;
 
+                               $headline_row["feed_title"] = $line["feed_title"];
+
                                array_push($headlines, $headline_row);
                        }