From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 4 Nov 2010 10:52:16 +0000 (+0300)
Subject: api: getFeeds: fix cat_id handling, allow access to Uncategorized category, reserve... 
X-Git-Tag: 1.5.0~417
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=fb8d17f3fb060279235ee7202fe600454793ea08;p=tt-rss.git

api: getFeeds: fix cat_id handling, allow access to Uncategorized category, reserve -3 and -4 cat_ids for getting flat feed lists
---

diff --git a/functions.php b/functions.php
index 75d5bc06..6eafe808 100644
--- a/functions.php
+++ b/functions.php
@@ -6673,7 +6673,7 @@
 
 			/* Labels */
 
-			if (!$cat_id || $cat_id == -2) {
+			if ($cat_id == -4 || $cat_id == -2) {
 				$counters = getLabelCounters($link, true);
 
 				foreach (array_keys($counters) as $id) {
@@ -6696,7 +6696,7 @@
 
 			/* Virtual feeds */
 
-			if (!$cat_id || $cat_id == -1) {
+			if ($cat_id == -4 || $cat_id == -1) {
 				foreach (array(-1, -2, -3, -4, 0) as $i) {
 					$unread = getFeedUnread($link, $i);
 
@@ -6723,18 +6723,24 @@
 				$limit_qpart = "";
 			}
 
-			if (!$cat_id) {
+			if ($cat_id == -4 || $cat_id == -3) {
 				$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"] . 
 						" ORDER BY cat_id, title " . $limit_qpart);
 			} else {
+
+				if ($cat_id)
+					$cat_qpart = "cat_id = '$cat_id'";
+				else
+					$cat_qpart = "cat_id IS NULL";
+
 				$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_qpart AND owner_uid = " . $_SESSION["uid"] . 
 						" ORDER BY cat_id, title " . $limit_qpart);
 			}