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

support browsing of NULL category, assorted related fixes

This commit is contained in:
Andrew Dolgov 2006-03-04 14:58:15 +01:00
parent 916f788a94
commit 99ff73f404
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
backend.php
View File

@ -585,7 +585,7 @@
print "<li class=\"feedCat\" id=\"FCAT-$cat_id\"> print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
<a href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a> <a href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>
<a href=\"javascript:viewCategory($cat_id)\"> <a href=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">
<span id=\"FCATCTR-$cat_id\" <span id=\"FCATCTR-$cat_id\"
class=\"$catctr_class\">($cat_unread unread)$ellipsis</span></a> class=\"$catctr_class\">($cat_unread unread)$ellipsis</span></a>
<!-- <div style=\"float : right\"> <!-- <div style=\"float : right\">
@ -1061,10 +1061,6 @@
$limit = $_GET["limit"]; $limit = $_GET["limit"];
$cat_view = $_GET["cat"]; $cat_view = $_GET["cat"];
if (!$feed) {
return;
}
if (!$skip) $skip = 0; if (!$skip) $skip = 0;
if ($subop == "undefined") $subop = ""; if ($subop == "undefined") $subop = "";
@ -1119,8 +1115,15 @@
} */ } */
if ($cat_view) { if ($cat_view) {
if ($feed > 0) {
$cat_qpart = "cat_id = '$feed'";
} else {
$cat_qpart = "cat_id IS NULL";
}
$tmp_result = db_query($link, "SELECT feed_url FROM ttrss_feeds $tmp_result = db_query($link, "SELECT feed_url FROM ttrss_feeds
WHERE cat_id = '$feed' AND owner_uid = " . $_SESSION["uid"]); WHERE $cat_qpart AND owner_uid = " . $_SESSION["uid"]);
while ($tmp_line = db_fetch_assoc($tmp_result)) { while ($tmp_line = db_fetch_assoc($tmp_result)) {
$feed_url = $tmp_line["feed_url"]; $feed_url = $tmp_line["feed_url"];
@ -1137,12 +1140,18 @@
if ($subop == "MarkAllRead") { if ($subop == "MarkAllRead") {
if (sprintf("%d", $feed) != 0) { if (preg_match("/^[0-9][0-9]*$/", $feed) != false) {
if ($cat_view) { if ($cat_view) {
if ($feed > 0) {
$cat_qpart = "cat_id = '$feed'";
} else {
$cat_qpart = "cat_id IS NULL";
}
$tmp_result = db_query($link, "SELECT id $tmp_result = db_query($link, "SELECT id
FROM ttrss_feeds WHERE cat_id = '$feed' AND owner_uid = " . FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = " .
$_SESSION["uid"]); $_SESSION["uid"]);
while ($tmp_line = db_fetch_assoc($tmp_result)) { while ($tmp_line = db_fetch_assoc($tmp_result)) {
@ -1289,7 +1298,7 @@
if ($search && $search_mode == "All feeds") { if ($search && $search_mode == "All feeds") {
$query_strategy_part = "ttrss_entries.id > 0"; $query_strategy_part = "ttrss_entries.id > 0";
$vfeed_query_part = "ttrss_feeds.title AS feed_title,"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
} else if (sprintf("%d", $feed) == 0) { } else if (preg_match("/^[0-9][0-9]*$/", $feed) == false) {
$query_strategy_part = "ttrss_entries.id > 0"; $query_strategy_part = "ttrss_entries.id > 0";
$vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE $vfeed_query_part = "(SELECT title FROM ttrss_feeds WHERE
id = feed_id) as feed_title,"; id = feed_id) as feed_title,";
@ -1319,7 +1328,12 @@
if ($cat_view) { if ($cat_view) {
$query_strategy_part = "cat_id = $feed"; if ($feed > 0) {
$query_strategy_part = "cat_id = '$feed'";
} else {
$query_strategy_part = "cat_id IS NULL";
}
$vfeed_query_part = "ttrss_feeds.title AS feed_title,"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
} else { } else {
@ -1405,9 +1419,9 @@
print "<div id=\"headlinesContainer\">"; print "<div id=\"headlinesContainer\">";
if (sprintf("%d", $feed) != 0) { if (preg_match("/^[0-9][0-9]*$/", $feed) != false) {
if ($feed > 0) { if ($feed >= 0) {
$feed_kind = "Feeds"; $feed_kind = "Feeds";
} else { } else {
$feed_kind = "Labels"; $feed_kind = "Labels";

6
feedlist.js
View File

@ -114,7 +114,7 @@ function viewfeed(feed, skip, subop, doc, is_cat) {
if (cat_view_mode) { if (cat_view_mode) {
query = query + "&cat=1"; query = query + "&cat=1";
} }
var headlines_frame = parent.frames["headlines-frame"]; var headlines_frame = parent.frames["headlines-frame"];
// alert(headlines_frame) // alert(headlines_frame)
@ -125,6 +125,8 @@ function viewfeed(feed, skip, subop, doc, is_cat) {
query = query + "&ts=" + timestamp query = query + "&ts=" + timestamp
} }
parent.debug(query);
headlines_frame.location.href = query; headlines_frame.location.href = query;
cleanSelectedList("feedList"); cleanSelectedList("feedList");
@ -192,7 +194,7 @@ function toggleCollapseCat(cat) {
var cat_elem = document.getElementById("FCAT-" + cat); var cat_elem = document.getElementById("FCAT-" + cat);
var cat_list = document.getElementById("FCATLIST-" + cat).parentNode; var cat_list = document.getElementById("FCATLIST-" + cat).parentNode;
var caption = cat_elem.lastChild; var caption = document.getElementById("FCAP-" + cat);
if (cat_list.className.match("invisible")) { if (cat_list.className.match("invisible")) {
cat_list.className = ""; cat_list.className = "";