valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: add include_empty to getCategories/getFeedTree

This commit is contained in:
Andrew Dolgov 2013-03-28 15:28:37 +04:00
parent eb734e5225
commit 66ca7c3097
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/api.php
View File

@ -125,6 +125,7 @@ class API extends Handler {
function getCategories() { function getCategories() {
$unread_only = sql_bool_to_bool($_REQUEST["unread_only"]); $unread_only = sql_bool_to_bool($_REQUEST["unread_only"]);
$enable_nested = sql_bool_to_bool($_REQUEST["enable_nested"]); $enable_nested = sql_bool_to_bool($_REQUEST["enable_nested"]);
$include_empty = (int)$_REQUEST['include_empty'];
// TODO do not return empty categories, return Uncategorized and standard virtual cats // TODO do not return empty categories, return Uncategorized and standard virtual cats
@ -147,7 +148,7 @@ class API extends Handler {
$cats = array(); $cats = array();
while ($line = db_fetch_assoc($result)) { 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); $unread = getFeedUnread($this->link, $line["id"], true);
if ($enable_nested) if ($enable_nested)
@ -705,9 +706,12 @@ class API extends Handler {
} }
function getFeedTree() { function getFeedTree() {
$include_empty = (int)$_REQUEST['include_empty'];
$pf = new Pref_Feeds($this->link, $_REQUEST); $pf = new Pref_Feeds($this->link, $_REQUEST);
$_REQUEST['mode'] = 2; $_REQUEST['mode'] = 2;
$_REQUEST['force_show_empty'] = $include_empty;
if ($pf){ if ($pf){
$data = $pf->makefeedtree(); $data = $pf->makefeedtree();

11
classes/pref/feeds.php
View File

@ -33,8 +33,10 @@ class Pref_Feeds extends Handler_Protected {
if ($search) $search_qpart = " AND LOWER(title) LIKE LOWER('%$search%')"; if ($search) $search_qpart = " AND LOWER(title) LIKE LOWER('%$search%')";
$show_empty_cats = $_REQUEST['mode'] != 2 && !$search && // first one is set by API
get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS'); $show_empty_cats = $_REQUEST['force_show_empty'] ||
($_REQUEST['mode'] != 2 && !$search &&
get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS'));
$items = array(); $items = array();
@ -183,8 +185,9 @@ class Pref_Feeds extends Handler_Protected {
} }
if ($enable_cats) { if ($enable_cats) {
$show_empty_cats = $_REQUEST['mode'] != 2 && !$search && $show_empty_cats = $_REQUEST['force_show_empty'] ||
get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS'); ($_REQUEST['mode'] != 2 && !$search &&
get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS'));
$result = db_query($this->link, "SELECT id, title FROM ttrss_feed_categories $result = db_query($this->link, "SELECT id, title FROM ttrss_feed_categories
WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat IS NULL ORDER BY order_id, title"); WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat IS NULL ORDER BY order_id, title");