various search-related improvements

3 files changed, 16 insertions, 7 deletions

diff --git a/backend.php b/backend.php
index 2dba06efd..f32b8c214 100644
--- a/backend.php
+++ b/backend.php
@@ -1198,9 +1198,9 @@
 		$feed_title = "";
 
 		if ($search && $search_mode == "All feeds") {
-			$feed_title = "Search results";
+			$feed_title = "Global search results ($search)";
 		} else if (sprintf("%d", $feed) == 0) {
-			$feed_title = $feed;
+			$feed_title = "Feed search results ($search, $feed)";
 		} else if ($feed > 0) {
 			$result = db_query($link, "SELECT title,site_url,last_error FROM ttrss_feeds 
 				WHERE id = '$feed'");
@@ -3047,13 +3047,21 @@
 
 		if ($id == "search") {
 
+			$active_feed_id = db_escape_string($_GET["param"]);
+
 			print "<input id=\"searchbox\" class=\"extSearch\"			
 			onblur=\"javascript:enableHotkeys()\" onfocus=\"javascript:disableHotkeys()\"
 			onchange=\"javascript:search()\">
 			<select id=\"searchmodebox\">
-				<option selected>All feeds</option>
-				<option>This feed</option>
-			</select>		
+				<option selected>All feeds</option>";
+				
+			if ($active_feed_id) {				
+				print "<option>This feed</option>";
+			} else {
+				print "<option disabled>This feed</option>";
+			}
+			
+			print "</select>		
 			<input type=\"submit\" 
 				class=\"button\" onclick=\"javascript:search()\" value=\"Search\">
 			<input class=\"button\"
diff --git a/feedlist.js b/feedlist.js
index 0276fd0e9..8bb3a16b2 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -95,6 +95,7 @@ function viewfeed(feed, skip, subop, doc) {
 	
 		if (search_query != "") {
 			query = query + "&search=" + param_escape(search_query);
+			searchbox.value = "";
 		}
 		
 		var headlines_frame = parent.frames["headlines-frame"];
diff --git a/tt-rss.js b/tt-rss.js
index 36aec2bae..5603c01ce 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -266,7 +266,7 @@ function resetSearch() {
 }
 
 function search() {
-	closeDlg();
+	closeDlg();	
 	viewCurrentFeed(0, "");
 }
 
@@ -411,7 +411,7 @@ function quickMenuGo() {
 	}
 
 	if (opid == "qmcSearch") {
-		displayDlg("search");
+		displayDlg("search", getActiveFeedId());
 		return;
 	}