api, also hide uncategorized if empty

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

diff --git a/classes/api.php b/classes/api.php
index 3ec2186715cc99b2fe414e3762001f3598d14356..ea57a61ab256b31612f981994a7068e3af40d987 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -2,7 +2,7 @@
 
 class API extends Handler {
 
-       const API_LEVEL  = 4;
+       const API_LEVEL  = 5;
 
        const STATUS_OK  = 0;
        const STATUS_ERR = 1;
@@ -47,6 +47,9 @@ class API extends Handler {
        }
 
        function login() {
+               @session_destroy();
+               @session_start();
+
                $login = db_escape_string($this->link, $_REQUEST["user"]);
                $password = $_REQUEST["password"];
                $password_base64 = base64_decode($_REQUEST["password"]);
@@ -122,6 +125,7 @@ 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']);
 
                // TODO do not return empty categories, return Uncategorized and standard virtual cats
 
@@ -133,7 +137,10 @@ class API extends Handler {
                $result = db_query($this->link, "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
+                               ttrss_feed_categories.id IS NOT NULL AND cat_id = ttrss_feed_categories.id) AS num_feeds,
+                       (SELECT COUNT(id) FROM
+                               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"]);
@@ -141,7 +148,7 @@ class API extends Handler {
                $cats = array();
 
                while ($line = db_fetch_assoc($result)) {
-                       if ($line["num_feeds"] > 0) {
+                       if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
                                $unread = getFeedUnread($this->link, $line["id"], true);
 
                                if ($enable_nested)
@@ -158,12 +165,14 @@ class API extends Handler {
                }
 
                foreach (array(-2,-1,0) as $cat_id) {
-                       $unread = getFeedUnread($this->link, $cat_id, true);
+                       if ($include_empty || !$this->isCategoryEmpty($cat_id)) {
+                               $unread = getFeedUnread($this->link, $cat_id, true);
 
-                       if ($unread || !$unread_only) {
-                               array_push($cats, array("id" => $cat_id,
-                                       "title" => getCategoryTitle($this->link, $cat_id),
-                                       "unread" => $unread));
+                               if ($unread || !$unread_only) {
+                                       array_push($cats, array("id" => $cat_id,
+                                               "title" => getCategoryTitle($this->link, $cat_id),
+                                               "unread" => $unread));
+                               }
                        }
                }
 
@@ -348,7 +357,9 @@ class API extends Handler {
        }
 
        function updateFeed() {
-               $feed_id = db_escape_string($this->link, $_REQUEST["feed_id"]);
+               require_once "include/rssfuncs.php";
+
+               $feed_id = (int) db_escape_string($this->link, $_REQUEST["feed_id"]);
 
                update_rss_feed($this->link, $feed_id, true);
 
@@ -655,6 +666,8 @@ class API extends Handler {
 
                                $headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]);
 
+                               $headline_row["author"] = $line["author"];
+
                                global $pluginhost;
                                foreach ($pluginhost->get_hooks($pluginhost::HOOK_RENDER_ARTICLE_API) as $p) {
                                        $headline_row = $p->hook_render_article_api($headline_row);
@@ -666,6 +679,75 @@ class API extends Handler {
                        return $headlines;
        }
 
+       function unsubscribeFeed() {
+               $feed_id = (int) db_escape_string($this->link, $_REQUEST["feed_id"]);
+
+               $result = db_query($this->link, "SELECT id FROM ttrss_feeds WHERE
+                       id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
+
+               if (db_num_rows($result) != 0) {
+                       Pref_Feeds::remove_feed($this->link, $feed_id, $_SESSION["uid"]);
+                       print $this->wrap(self::STATUS_OK, array("status" => "OK"));
+               } else {
+                       print $this->wrap(self::STATUS_ERR, array("error" => "FEED_NOT_FOUND"));
+               }
+       }
+
+       function subscribeToFeed() {
+               $feed_url = db_escape_string($this->link, $_REQUEST["feed_url"]);
+               $category_id = (int) db_escape_string($this->link, $_REQUEST["category_id"]);
+               $login = db_escape_string($this->link, $_REQUEST["login"]);
+               $password = db_escape_string($this->link, $_REQUEST["password"]);
+
+               if ($feed_url) {
+                       $rc = subscribe_to_feed($this->link, $feed_url, $category_id,
+                               $login, $password, false);
+
+                       print $this->wrap(self::STATUS_OK, array("status" => $rc));
+               } else {
+                       print $this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
+               }
+       }
+
+       function getFeedTree() {
+               $include_empty = sql_bool_to_bool($_REQUEST['include_empty']);
+
+               $pf = new Pref_Feeds($this->link, $_REQUEST);
+
+               $_REQUEST['mode'] = 2;
+               $_REQUEST['force_show_empty'] = $include_empty;
+
+               if ($pf){
+                       $data = $pf->makefeedtree();
+                       print $this->wrap(self::STATUS_OK, array("categories" => $data));
+               } else {
+                       print $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) {
+                       $result = db_query($this->link, "SELECT COUNT(*) AS count FROM ttrss_labels2
+                               WHERE owner_uid = " . $_SESSION["uid"]);
+
+                       return db_fetch_result($result, 0, "count") == 0;
+
+               } else if ($id == 0) {
+                       $result = db_query($this->link, "SELECT COUNT(*) AS count FROM ttrss_feeds
+                               WHERE cat_id IS NULL AND owner_uid = " . $_SESSION["uid"]);
+
+                       return db_fetch_result($result, 0, "count") == 0;
+
+               }
+
+               return false;
+       }
+
+
 }
 
 ?>