From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 3 Nov 2010 21:24:18 +0000 (+0300)
Subject: allow generated feeds to use view_mode
X-Git-Tag: 1.5.0~419
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=23d72f39996342b070c34dc4990cd79929305cfd;p=tt-rss.git

allow generated feeds to use view_mode
---

diff --git a/backend.php b/backend.php
index 06c1ecbd..25254816 100644
--- a/backend.php
+++ b/backend.php
@@ -485,6 +485,7 @@
 			$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"]);
 
 			if (SINGLE_USER_MODE) {
 				authenticate_user($link, "admin", null);
@@ -494,11 +495,9 @@
 				authenticate_user($link, $user, $pass);
 			}
 
-			if ($_SESSION["uid"] ||
-				http_authenticate_user($link)) {
-
-					generate_syndicated_feed($link, 0, $feed, $is_cat, $limit,
-						$search, $search_mode, $match_on);
+			if ($_SESSION["uid"] || http_authenticate_user($link)) {
+				generate_syndicated_feed($link, 0, $feed, $is_cat, $limit,
+					$search, $search_mode, $match_on, $view_mode);
 			}
 		break; // rss
 
diff --git a/functions.php b/functions.php
index 0712a8a9..171173e5 100644
--- a/functions.php
+++ b/functions.php
@@ -3376,7 +3376,11 @@
 			if ($view_mode == "marked") {
 				$view_query_part = " marked = true AND ";
 			}
-	
+
+			if ($view_mode == "published") {
+				$view_query_part = " published = true AND ";
+			}
+
 			if ($view_mode == "unread") {
 				$view_query_part = " unread = true AND ";
 			}
@@ -3639,7 +3643,7 @@
 	}
 
 	function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat,
-		$limit, $search, $search_mode, $match_on) {
+		$limit, $search, $search_mode, $match_on, $view_mode = false) {
 
 		$note_style = 	"float : right; background-color : #fff7d5; border-width : 1px; ".
 			"padding : 5px; border-style : dashed; border-color : #e7d796;".
@@ -3648,8 +3652,8 @@
 		if (!$limit) $limit = 30;
 
 		$qfh_ret = queryFeedHeadlines($link, $feed, 
-			$limit, false, $is_cat, $search, $search_mode, $match_on, "date_entered DESC", 0,
-			$owner_uid);
+			$limit, $view_mode, $is_cat, $search, $search_mode, 
+			$match_on, "date_entered DESC", 0, $owner_uid);
 
 		$result = $qfh_ret[0];
 		$feed_title = htmlspecialchars($qfh_ret[1]);
@@ -4141,7 +4145,7 @@
 
 	function print_headline_subtoolbar($link, $feed_site_url, $feed_title, 
 			$feed_id, $is_cat, $search, $match_on,
-			$search_mode) {
+			$search_mode, $view_mode) {
 
 			print "<div class=\"headlinesSubToolbar\">";
 
@@ -4218,11 +4222,10 @@
 			}
 
 			print "
-				<a target=\"_blank\" 
-					href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
-					<img class=\"noborder\" 
-						alt=\"".__('Generated feed')."\" src=\"images/feed-icon-12x12.png\">
-						</a>";
+				<a target=\"_blank\"
+					title=\"".__("RSS feed for this buffer")."\"
+					href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat&view-mode=$view_mode$search_q\">
+					<img class=\"noborder\" src=\"images/feed-icon-12x12.png\"></a>";
 
 			print "</div>";
 
@@ -5116,7 +5119,7 @@
 			}
 
 			print_headline_subtoolbar($link, $feed_site_url, $feed_title,
-				$feed, $cat_view, $search, $match_on, $search_mode);
+				$feed, $cat_view, $search, $match_on, $search_mode, $view_mode);
 
 			print "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
 		}
diff --git a/tt-rss.php b/tt-rss.php
index 0d98c987..b9b6cbe0 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -216,6 +216,7 @@
 			<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
 			<option value="all_articles"><?php echo __('All Articles') ?></option>
 			<option value="marked"><?php echo __('Starred') ?></option>
+			<option value="published"><?php echo __('Published') ?></option>
 			<option value="unread"><?php echo __('Unread') ?></option>
 			<!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
 			<option value="updated"><?php echo __('Updated') ?></option>