Merge remote-tracking branch 'upstream/master'

6 files changed, 27 insertions, 36 deletions

diff --git a/classes/api.php b/classes/api.php
index 92e19e70a..5e7ec6573 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -194,11 +194,10 @@ class API extends Handler {
 
 			$search = db_escape_string($_REQUEST["search"]);
 			$search_mode = db_escape_string($_REQUEST["search_mode"]);
-			$match_on = db_escape_string($_REQUEST["match_on"]);
 
 			$headlines = $this->api_get_headlines($this->link, $feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, false,
-				$include_attachments, $since_id, $search, $search_mode, $match_on,
+				$include_attachments, $since_id, $search, $search_mode,
 				$include_nested, $sanitize_content);
 
 			print $this->wrap(self::STATUS_OK, $headlines);
@@ -584,11 +583,11 @@ class API extends Handler {
 	static function api_get_headlines($link, $feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
 				$include_attachments, $since_id,
-				$search = "", $search_mode = "", $match_on = "",
+				$search = "", $search_mode = "",
 				$include_nested = false, $sanitize_content = true) {
 
 			$qfh_ret = queryFeedHeadlines($link, $feed_id, $limit,
-				$view_mode, $is_cat, $search, $search_mode, $match_on,
+				$view_mode, $is_cat, $search, $search_mode,
 				$order, $offset, 0, false, $since_id, $include_nested);
 
 			$result = $qfh_ret[0];
diff --git a/classes/dlg.php b/classes/dlg.php
index 74eb9f633..3bb2caba4 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -236,8 +236,7 @@ class Dlg extends Handler_Protected {
 
 		print "<div style='float : right'>
 			<img style='display : none'
-				id='feed_add_spinner' src='".
-				theme_image($this->link, 'images/indicator_white.gif')."'></div>";
+				id='feed_add_spinner' src='images/indicator_white.gif'></div>";
 
 		print "<input style=\"font-size : 16px; width : 20em;\"
 			placeHolder=\"".__("Feed or site URL")."\"
@@ -311,8 +310,7 @@ class Dlg extends Handler_Protected {
 		print "<div dojoType=\"dijit.Toolbar\">
 			<div style='float : right'>
 			<img style='display : none'
-				id='feed_browser_spinner' src='".
-				theme_image($this->link, 'images/indicator_white.gif')."'>
+				id='feed_browser_spinner' src='images/indicator_white.gif'>
 			<input name=\"search\" dojoType=\"dijit.form.TextBox\" size=\"20\" type=\"search\"
 				onchange=\"dijit.byId('feedBrowserDlg').update()\" value=\"$browser_search\">
 			<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedBrowserDlg').update()\">".__('Search')."</button>
diff --git a/classes/feeds.php b/classes/feeds.php
index 0568eb985..79aaa8e55 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -22,7 +22,7 @@ class Feeds extends Handler_Protected {
 	}
 
 	private function format_headline_subtoolbar($feed_site_url, $feed_title,
-			$feed_id, $is_cat, $search, $match_on,
+			$feed_id, $is_cat, $search,
 			$search_mode, $view_mode, $error) {
 
 		$page_prev_link = "viewFeedGoPage(-1)";
@@ -50,7 +50,7 @@ class Feeds extends Handler_Protected {
 		if ($is_cat) $cat_q = "&is_cat=$is_cat";
 
 		if ($search) {
-			$search_q = "&q=$search&m=$match_on&smode=$search_mode";
+			$search_q = "&q=$search&smode=$search_mode";
 		} else {
 			$search_q = "";
 		}
@@ -209,7 +209,6 @@ class Feeds extends Handler_Protected {
 		}
 
 		@$search_mode = db_escape_string($_REQUEST["search_mode"]);
-		$match_on = "both"; // deprecated, TODO: remove
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
 
@@ -219,7 +218,7 @@ class Feeds extends Handler_Protected {
 		}
 //		error_log("search_mode: " . $search_mode);
 		$qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,
-			$search, $search_mode, $match_on, $override_order, $offset, 0,
+			$search, $search_mode, $override_order, $offset, 0,
 			false, 0, $include_children);
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
@@ -233,7 +232,7 @@ class Feeds extends Handler_Protected {
 
 		$reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,
 			$feed_title,
-			$feed, $cat_view, $search, $match_on, $search_mode, $view_mode,
+			$feed, $cat_view, $search, $search_mode, $view_mode,
 			$last_error);
 
 		$headlines_count = db_num_rows($result);
@@ -321,24 +320,22 @@ class Feeds extends Handler_Protected {
 
 				if ($line["marked"] == "t" || $line["marked"] == "1") {
 					$marked_pic = "<img id=\"FMPIC-$id\"
-						src=\"".theme_image($this->link, 'images/mark_set.svg')."\"
+						src=\"images/mark_set.svg\"
 						class=\"markedPic\" alt=\"Unstar article\"
 						onclick='javascript:toggleMark($id)'>";
 				} else {
 					$marked_pic = "<img id=\"FMPIC-$id\"
-						src=\"".theme_image($this->link, 'images/mark_unset.svg')."\"
+						src=\"images/mark_unset.svg\"
 						class=\"markedPic\" alt=\"Star article\"
 						onclick='javascript:toggleMark($id)'>";
 				}
 
 				if ($line["published"] == "t" || $line["published"] == "1") {
-					$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($this->link,
-						'images/pub_set.svg')."\"
+					$published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_set.svg\"
 						class=\"markedPic\"
 						alt=\"Unpublish article\" onclick='javascript:togglePub($id)'>";
 				} else {
-					$published_pic = "<img id=\"FPPIC-$id\" src=\"".theme_image($this->link,
-						'images/pub_unset.svg')."\"
+					$published_pic = "<img id=\"FPPIC-$id\" src=\"images/pub_unset.svg\"
 						class=\"markedPic\"
 						alt=\"Publish article\" onclick='javascript:togglePub($id)'>";
 				}
@@ -363,8 +360,7 @@ class Feeds extends Handler_Protected {
 
 				$score = $line["score"];
 
-				$score_pic = theme_image($this->link,
-					"images/" . get_score_pic($score));
+				$score_pic = "images/" . get_score_pic($score);
 
 /*				$score_title = __("(Click to change)");
 				$score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"
@@ -628,14 +624,14 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= "<span id=\"CWRAP-$id\">";
 
-					if (!$expand_cdm) {
-						$reply['content'] .= "<span id=\"CENCW-$id\">";
+//					if (!$expand_cdm) {
+						$reply['content'] .= "<span id=\"CENCW-$id\" style=\"display : none\">";
 						$reply['content'] .= htmlspecialchars($line["content"]);
 						$reply['content'] .= "</span.";
 
-					} else {
-						$reply['content'] .= $line["content"];
-					}
+//					} else {
+//						$reply['content'] .= $line["content"];
+//					}
 
 					$reply['content'] .= "</span>";
 
@@ -650,8 +646,7 @@ class Feeds extends Handler_Protected {
 
 					$tags_str = format_tags_string($line["tags"], $id);
 
-					$reply['content'] .= "<img src='".theme_image($this->link,
-							'images/tag.png')."' alt='Tags' title='Tags'>
+					$reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'>
 						<span id=\"ATSTR-$id\">$tags_str</span>
 						<a title=\"".__('Edit tags for this article')."\"
 						href=\"#\" onclick=\"editArticleTags($id, $feed_id, true)\">(+)</a>";
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 4a9b0c48e..dc1e10049 100644
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -2,7 +2,7 @@
 class Handler_Public extends Handler {
 
 	private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
-		$limit, $offset, $search, $search_mode, $match_on,
+		$limit, $offset, $search, $search_mode,
 		$view_mode = false, $format = 'atom') {
 
 		require_once "lib/MiniTemplator.class.php";
@@ -25,7 +25,7 @@ class Handler_Public extends Handler {
 
 		$qfh_ret = queryFeedHeadlines($this->link, $feed,
 			$limit, $view_mode, $is_cat, $search, $search_mode,
-			$match_on, "$date_sort_field DESC", $offset, $owner_uid,
+			"$date_sort_field DESC", $offset, $owner_uid,
 			false, 0, false, true);
 
 		$result = $qfh_ret[0];
@@ -314,7 +314,6 @@ class Handler_Public extends Handler {
 		$offset = (int)db_escape_string($_REQUEST["offset"]);
 
 		$search = db_escape_string($_REQUEST["q"]);
-		$match_on = db_escape_string($_REQUEST["m"]);
 		$search_mode = db_escape_string($_REQUEST["smode"]);
 		$view_mode = db_escape_string($_REQUEST["view-mode"]);
 
@@ -338,7 +337,7 @@ class Handler_Public extends Handler {
 
 		if ($owner_id) {
 			$this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
-				$offset, $search, $search_mode, $match_on, $view_mode, $format);
+				$offset, $search, $search_mode, $view_mode, $format);
 		} else {
 			header('HTTP/1.1 403 Forbidden');
 		}
diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 20abae1d0..1921f2b97 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -47,7 +47,7 @@ class Pref_Filters extends Handler_Protected {
 		$feed_title = getFeedTitle($this->link, $feed);
 
 		$qfh_ret = queryFeedHeadlines($this->link, -4, 30, "", false, false, false,
-			false, "date_entered DESC", 0, $_SESSION["uid"], $filter);
+			"date_entered DESC", 0, $_SESSION["uid"], $filter);
 
 		$result = $qfh_ret[0];
 
@@ -370,9 +370,9 @@ class Pref_Filters extends Handler_Protected {
 
 		$result = db_query($this->link, "SELECT description FROM ttrss_filter_types
 			WHERE id = ".(int)$rule["filter_type"]);
-		$match_on = db_fetch_result($result, 0, "description");
+		$filter_type = db_fetch_result($result, 0, "description");
 
-		return T_sprintf("%s on %s in %s", strip_tags($rule["reg_exp"]), $match_on, $feed);
+		return T_sprintf("%s on %s in %s", strip_tags($rule["reg_exp"]), $filter_type, $feed);
 	}
 
 	function printRuleName() {
diff --git a/classes/rpc.php b/classes/rpc.php
index b297bbade..139f1fe49 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -663,7 +663,7 @@ class RPC extends Handler_Protected {
 			score = '$score' WHERE ref_id IN ($ids) AND owner_uid = " . $_SESSION["uid"]);
 
 		print json_encode(array("id" => $id,
-			"score_pic" => theme_image($link, get_score_pic($score))));
+			"score_pic" => get_score_pic($score)));
 	}
 
 	function setpanelmode() {