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

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

This commit is contained in:
Andrew Dolgov 2010-11-04 13:52:16 +03:00
parent 9c5b98adaa
commit fb8d17f3fb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
functions.php
View File

@ -6673,7 +6673,7 @@
/* Labels */ /* Labels */
if (!$cat_id || $cat_id == -2) { if ($cat_id == -4 || $cat_id == -2) {
$counters = getLabelCounters($link, true); $counters = getLabelCounters($link, true);
foreach (array_keys($counters) as $id) { foreach (array_keys($counters) as $id) {
@ -6696,7 +6696,7 @@
/* Virtual feeds */ /* Virtual feeds */
if (!$cat_id || $cat_id == -1) { if ($cat_id == -4 || $cat_id == -1) {
foreach (array(-1, -2, -3, -4, 0) as $i) { foreach (array(-1, -2, -3, -4, 0) as $i) {
$unread = getFeedUnread($link, $i); $unread = getFeedUnread($link, $i);
@ -6723,18 +6723,24 @@
$limit_qpart = ""; $limit_qpart = "";
} }
if (!$cat_id) { if ($cat_id == -4 || $cat_id == -3) {
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id, feed_url, cat_id, title, ". id, feed_url, cat_id, title, ".
SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] .
" ORDER BY cat_id, title " . $limit_qpart); " ORDER BY cat_id, title " . $limit_qpart);
} else { } else {
if ($cat_id)
$cat_qpart = "cat_id = '$cat_id'";
else
$cat_qpart = "cat_id IS NULL";
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id, feed_url, cat_id, title, ". id, feed_url, cat_id, title, ".
SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds WHERE 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); " ORDER BY cat_id, title " . $limit_qpart);
} }