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

search by category (closes #29)

This commit is contained in:
Andrew Dolgov 2006-02-25 20:41:27 +01:00
parent 77d519852a
commit b00058235a
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
backend.php
View File

@ -1244,11 +1244,33 @@
// override query strategy and enable feed display when searching globally // override query strategy and enable feed display when searching globally
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 (sprintf("%d", $feed) == 0) {
$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,";
} else if ($feed >= 0 && $search && $search_mode == "This category") {
$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
$tmp_result = db_query($link, "SELECT id
FROM ttrss_feeds WHERE cat_id =
(SELECT cat_id FROM ttrss_feeds WHERE id = '$feed') AND id != '$feed'");
$cat_siblings = array();
if (db_num_rows($tmp_result) > 0) {
while ($p = db_fetch_assoc($tmp_result)) {
array_push($cat_siblings, "feed_id = " . $p["id"]);
}
$query_strategy_part = sprintf("(feed_id = %d OR %s)",
$feed, implode(" OR ", $cat_siblings));
} else {
$query_strategy_part = "ttrss_entries.id > 0";
}
} else if ($feed >= 0) { } else if ($feed >= 0) {
$tmp_result = db_query($link, "SELECT id $tmp_result = db_query($link, "SELECT id
@ -1264,7 +1286,7 @@
$query_strategy_part = sprintf("(feed_id = %d OR %s)", $query_strategy_part = sprintf("(feed_id = %d OR %s)",
$feed, implode(" OR ", $parent_ids)); $feed, implode(" OR ", $parent_ids));
$vfeed_query_part = "ttrss_feeds.title AS feed_title,"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
} else { } else {
$query_strategy_part = "feed_id = '$feed'"; $query_strategy_part = "feed_id = '$feed'";
@ -3199,7 +3221,11 @@
} else { } else {
print "<option disabled>This feed</option>"; print "<option disabled>This feed</option>";
} }
if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<option>This category</option>";
}
print "</select> print "</select>
<input type=\"submit\" <input type=\"submit\"
class=\"button\" onclick=\"javascript:search()\" value=\"Search\"> class=\"button\" onclick=\"javascript:search()\" value=\"Search\">

6
tt-rss.php
View File

@ -153,10 +153,12 @@ window.onload = init;
<? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?> <? if (get_pref($link, 'ENABLE_SEARCH_TOOLBAR')) { ?>
<input id="searchbox" <input id="searchbox"
onblur="javascript:enableHotkeys()" onfocus="javascript:disableHotkeys()" onblur="javascript:enableHotkeys();" onfocus="javascript:disableHotkeys();">
onchange="javascript:search()">
<select id="searchmodebox"> <select id="searchmodebox">
<option>This feed</option> <option>This feed</option>
<? if (get_pref($link, 'ENABLE_FEED_CATS')) { ?>
<option>This category</option>
<? } ?>
<option>All feeds</option> <option>All feeds</option>
</select> </select>