api, also hide uncategorized if empty

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

diff --git a/classes/api.php b/classes/api.php
index cf8b2dcfca93d95dffe395c9d2162b0f380a737f..ea57a61ab256b31612f981994a7068e3af40d987 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -47,6 +47,7 @@ class API extends Handler {
        }
 
        function login() {
+               @session_destroy();
                @session_start();
 
                $login = db_escape_string($this->link, $_REQUEST["user"]);
@@ -124,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
 
@@ -146,7 +148,7 @@ class API extends Handler {
                $cats = array();
 
                while ($line = db_fetch_assoc($result)) {
-                       if ($line["num_feeds"] > 0 || $line["num_cats"] > 0) {
+                       if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
                                $unread = getFeedUnread($this->link, $line["id"], true);
 
                                if ($enable_nested)
@@ -163,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));
+                               }
                        }
                }
 
@@ -662,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);
@@ -703,6 +709,45 @@ class API extends Handler {
                }
        }
 
+       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;
+       }
+
+
 }
 
 ?>