Merge branch 'master' of git.fakecake.org:tt-rss

Conflicts:
	classes/pref/filters.php

classes/api.php

@@ -2,7 +2,7 @@
 
 class API extends Handler {
 
-	const API_LEVEL  = 11;
+	const API_LEVEL  = 12;
 
 	const STATUS_OK  = 0;
 	const STATUS_ERR = 1;
@@ -184,6 +184,8 @@ class API extends Handler {
 		$feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
 		if ($feed_id != "") {
 
+			if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
+
 			$limit = (int)$this->dbh->escape_string($_REQUEST["limit"]);
 
 			if (!$limit || $limit >= 200) $limit = 200;
@@ -203,6 +205,8 @@ class API extends Handler {
 			$force_update = sql_bool_to_bool($_REQUEST["force_update"]);
 			$has_sandbox = sql_bool_to_bool($_REQUEST["has_sandbox"]);
 			$excerpt_length = (int)$this->dbh->escape_string($_REQUEST["excerpt_length"]);
+			$check_first_id = (int)$this->dbh->escape_string($_REQUEST["check_first_id"]);
+			$include_header = sql_bool_to_bool($_REQUEST["include_header"]);
 
 			$_SESSION['hasSandbox'] = $has_sandbox;
 
@@ -223,12 +227,16 @@ class API extends Handler {
 
 			$search = $this->dbh->escape_string($_REQUEST["search"]);
 
-			$headlines = $this->api_get_headlines($feed_id, $limit, $offset,
+			list($headlines, $headlines_header) = $this->api_get_headlines($feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
 				$include_attachments, $since_id, $search,
-				$include_nested, $sanitize_content, $force_update, $excerpt_length);
+				$include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id);
 
-			$this->wrap(self::STATUS_OK, $headlines);
+			if ($include_header) {
+				$this->wrap(self::STATUS_OK, array($headlines_header, $headlines));
+			} else {
+				$this->wrap(self::STATUS_OK, $headlines);
+			}
 		} else {
 			$this->wrap(self::STATUS_ERR, array("error" => 'INCORRECT_USAGE'));
 		}
@@ -635,7 +643,8 @@ class API extends Handler {
 	static function api_get_headlines($feed_id, $limit, $offset,
 				$filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
 				$include_attachments, $since_id,
-				$search = "", $include_nested = false, $sanitize_content = true, $force_update = false, $excerpt_length = 100) {
+				$search = "", $include_nested = false, $sanitize_content = true,
+				$force_update = false, $excerpt_length = 100, $check_first_id = false) {
 
 			if ($force_update && $feed_id > 0 && is_numeric($feed_id)) {
 				// Update the feed if required with some basic flood control
@@ -658,51 +667,78 @@ class API extends Handler {
 				}
 			}
 
-			$qfh_ret = queryFeedHeadlines($feed_id, $limit,
+			/*$qfh_ret = queryFeedHeadlines($feed_id, $limit,
 				$view_mode, $is_cat, $search, false,
-				$order, $offset, 0, false, $since_id, $include_nested);
+				$order, $offset, 0, false, $since_id, $include_nested);*/
+
+			//function queryFeedHeadlines($feed, $limit,
+			// $view_mode, $cat_view, $search, $search_mode,
+			// $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false,
+			// $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false, $check_top_id = false) {
+
+			$params = array(
+				"feed" => $feed_id,
+				"limit" => $limit,
+				"view_mode" => $view_mode,
+				"cat_view" => $is_cat,
+				"search" => $search,
+				"override_order" => $order,
+				"offset" => $offset,
+				"since_id" => $since_id,
+				"include_children" => $include_nested,
+				"check_first_id" => $check_first_id
+			);
+
+			$qfh_ret = queryFeedHeadlines($params);
 
 			$result = $qfh_ret[0];
 			$feed_title = $qfh_ret[1];
+			$first_id = $qfh_ret[6];
 
 			$headlines = array();
 
-			while ($line = db_fetch_assoc($result)) {
-				$line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length);
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
-					$line = $p->hook_query_headlines($line, $excerpt_length, true);
-				}
+			$headlines_header = array(
+				'id' => $feed_id,
+				'first_id' => $first_id,
+				'is_cat' => $is_cat);
 
-				$is_updated = ($line["last_read"] == "" &&
-					($line["unread"] != "t" && $line["unread"] != "1"));
+			if (!is_numeric($result)) {
+				while ($line = db_fetch_assoc($result)) {
+					$line["content_preview"] = truncate_string(strip_tags($line["content"]), $excerpt_length);
+					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+						$line = $p->hook_query_headlines($line, $excerpt_length, true);
+					}
 
-				$tags = explode(",", $line["tag_cache"]);
+					$is_updated = ($line["last_read"] == "" &&
+						($line["unread"] != "t" && $line["unread"] != "1"));
 
-				$label_cache = $line["label_cache"];
-				$labels = false;
+					$tags = explode(",", $line["tag_cache"]);
 
-				if ($label_cache) {
-					$label_cache = json_decode($label_cache, true);
+					$label_cache = $line["label_cache"];
+					$labels = false;
 
 					if ($label_cache) {
-						if ($label_cache["no-labels"] == 1)
-							$labels = array();
-						else
-							$labels = $label_cache;
+						$label_cache = json_decode($label_cache, true);
+
+						if ($label_cache) {
+							if ($label_cache["no-labels"] == 1)
+								$labels = array();
+							else
+								$labels = $label_cache;
+						}
 					}
-				}
 
-				if (!is_array($labels)) $labels = get_article_labels($line["id"]);
+					if (!is_array($labels)) $labels = get_article_labels($line["id"]);
 
-				//if (!$tags) $tags = get_article_tags($line["id"]);
-				//if (!$labels) $labels = get_article_labels($line["id"]);
+					//if (!$tags) $tags = get_article_tags($line["id"]);
+					//if (!$labels) $labels = get_article_labels($line["id"]);
 
-				$headline_row = array(
+					$headline_row = array(
 						"id" => (int)$line["id"],
 						"unread" => sql_bool_to_bool($line["unread"]),
 						"marked" => sql_bool_to_bool($line["marked"]),
 						"published" => sql_bool_to_bool($line["published"]),
-						"updated" => (int) strtotime($line["updated"]),
+						"updated" => (int)strtotime($line["updated"]),
 						"is_updated" => $is_updated,
 						"title" => $line["title"],
 						"link" => $line["link"],
@@ -710,52 +746,55 @@ class API extends Handler {
 						"tags" => $tags,
 					);
 
-				if ($include_attachments)
-					$headline_row['attachments'] = get_article_enclosures(
-						$line['id']);
+					if ($include_attachments)
+						$headline_row['attachments'] = get_article_enclosures(
+							$line['id']);
 
-				if ($show_excerpt)
-					$headline_row["excerpt"] = $line["content_preview"];
+					if ($show_excerpt)
+						$headline_row["excerpt"] = $line["content_preview"];
 
-				if ($show_content) {
+					if ($show_content) {
 
-					if ($sanitize_content) {
-						$headline_row["content"] = sanitize(
-							$line["content"],
-							sql_bool_to_bool($line['hide_images']),
-							false, $line["site_url"], false, $line["id"]);
-					} else {
-						$headline_row["content"] = $line["content"];
+						if ($sanitize_content) {
+							$headline_row["content"] = sanitize(
+								$line["content"],
+								sql_bool_to_bool($line['hide_images']),
+								false, $line["site_url"], false, $line["id"]);
+						} else {
+							$headline_row["content"] = $line["content"];
+						}
 					}
-				}
 
-				// unify label output to ease parsing
-				if ($labels["no-labels"] == 1) $labels = array();
+					// unify label output to ease parsing
+					if ($labels["no-labels"] == 1) $labels = array();
 
-				$headline_row["labels"] = $labels;
+					$headline_row["labels"] = $labels;
 
-				$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] :
-					$feed_title;
+					$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] :
+						$feed_title;
 
-				$headline_row["comments_count"] = (int)$line["num_comments"];
-				$headline_row["comments_link"] = $line["comments"];
+					$headline_row["comments_count"] = (int)$line["num_comments"];
+					$headline_row["comments_link"] = $line["comments"];
 
-				$headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]);
+					$headline_row["always_display_attachments"] = sql_bool_to_bool($line["always_display_enclosures"]);
 
-				$headline_row["author"] = $line["author"];
+					$headline_row["author"] = $line["author"];
 
-				$headline_row["score"] = (int)$line["score"];
-				$headline_row["note"] = $line["note"];
-				$headline_row["lang"] = $line["lang"];
+					$headline_row["score"] = (int)$line["score"];
+					$headline_row["note"] = $line["note"];
+					$headline_row["lang"] = $line["lang"];
 
-				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
-					$headline_row = $p->hook_render_article_api(array("headline" => $headline_row));
-				}
+					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_API) as $p) {
+						$headline_row = $p->hook_render_article_api(array("headline" => $headline_row));
+					}
 
-				array_push($headlines, $headline_row);
+					array_push($headlines, $headline_row);
+				}
+			} else if (is_numeric($result) && $result == -1) {
+				$headlines_header['first_id_changed'] = true;
 			}
 
-			return $headlines;
+			return array($headlines, $headlines_header);
 	}
 
 	function unsubscribeFeed() {

classes/feeds.php

@@ -148,7 +148,7 @@ class Feeds extends Handler_Protected {
 
 	private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,
 					$next_unread_feed, $offset, $vgr_last_feed = false,
-					$override_order = false, $include_children = false) {
+					$override_order = false, $include_children = false, $check_first_id = false) {
 
 		$disable_cache = false;
 
@@ -232,9 +232,28 @@ class Feeds extends Handler_Protected {
 			}
 
 		} else {
-			$qfh_ret = queryFeedHeadlines($feed, $limit, $view_mode, $cat_view,
+			/*$qfh_ret = queryFeedHeadlines($feed, $limit, $view_mode, $cat_view,
 				$search, false, $override_order, $offset, 0,
-				false, 0, $include_children);
+				false, 0, $include_children, $topid);*/
+
+			//function queryFeedHeadlines($feed, $limit,
+			// $view_mode, $cat_view, $search, $search_mode,
+			// $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false,
+			// $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false, $check_top_id = false) {
+
+			$params = array(
+				"feed" => $feed,
+				"limit" => $limit,
+				"view_mode" => $view_mode,
+				"cat_view" => $cat_view,
+				"search" => $search,
+				"override_order" => $override_order,
+				"offset" => $offset,
+				"include_children" => $include_children,
+				"check_first_id" => $check_first_id
+			);
+
+			$qfh_ret = queryFeedHeadlines($params);
 		}
 
 		$vfeed_group_enabled = get_pref("VFEED_GROUP_BY_FEED") && $feed != -6;
@@ -248,6 +267,7 @@ class Feeds extends Handler_Protected {
 		$last_updated = strpos($qfh_ret[4], '1970-') === FALSE ?
 			make_local_datetime($qfh_ret[4], false) : __("Never");
 		$highlight_words = $qfh_ret[5];
+		$reply['first_id'] = $qfh_ret[6];
 
 		$vgroup_last_feed = $vgr_last_feed;
 
@@ -276,7 +296,7 @@ class Feeds extends Handler_Protected {
 			}
 		}
 
-		if ($this->dbh->num_rows($result) > 0) {
+		if (!is_numeric($result) && $this->dbh->num_rows($result) > 0) {
 
 			$lnum = $offset;
 
@@ -287,7 +307,11 @@ class Feeds extends Handler_Protected {
 
 			$expand_cdm = get_pref('CDM_EXPANDED');
 
+			$reply['content'] = array();
+
 			while ($line = $this->dbh->fetch_assoc($result)) {
+				$headline_row = '';
+
 				$line["content_preview"] =  "— " . truncate_string(strip_tags($line["content"]), 250);
 
 				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
@@ -428,76 +452,79 @@ class Feeds extends Handler_Protected {
 
 							$vf_catchup_link = "<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark feed as read')."</a>";
 
-							$reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
+							$feed_title_row = "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
 								"<div style='float : right'>$feed_icon_img</div>".
-								"<a class='title' href=\"#\" onclick=\"viewfeed($feed_id)\">".								$line["feed_title"]."</a>
+								"<a class='title' href=\"#\" onclick=\"viewfeed($feed_id)\">".
+								$line["feed_title"]."</a>
 								$vf_catchup_link</div>";
 
+							array_push($reply['content'], array('id' => 0, 'kind' => 'feed_title', 'html' => $feed_title_row));
+
 						}
 					}
 
 					$mouseover_attrs = "onmouseover='postMouseIn(event, $id)'
 						onmouseout='postMouseOut($id)'";
 
-					$reply['content'] .= "<div class='hl $class' orig-feed-id='$feed_id' id='RROW-$id' $mouseover_attrs>";
+					$headline_row .= "<div class='hl $class' orig-feed-id='$feed_id' id='RROW-$id' $mouseover_attrs>";
 
-					$reply['content'] .= "<div class='hlLeft'>";
+					$headline_row .= "<div class='hlLeft'>";
 
-					$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
+					$headline_row .= "<input dojoType=\"dijit.form.CheckBox\"
 							type=\"checkbox\" onclick=\"toggleSelectRow2(this)\"
 							class='rchk'>";
 
-					$reply['content'] .= "$marked_pic";
-					$reply['content'] .= "$published_pic";
+					$headline_row .= "$marked_pic";
+					$headline_row .= "$published_pic";
 
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
 
-					$reply['content'] .= "<div onclick='return hlClicked(event, $id)'
+					$headline_row .= "<div onclick='return hlClicked(event, $id)'
 						class=\"hlTitle\"><span class='hlContent $hlc_suffix'>";
-					$reply['content'] .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\"
+					$headline_row .= "<a id=\"RTITLE-$id\" class=\"title $hlc_suffix\"
 						href=\"" . htmlspecialchars($line["link"]) . "\"
 						onclick=\"\">" .
 						truncate_string($line["title"], 200);
 
 					if (get_pref('SHOW_CONTENT_PREVIEW')) {
-							$reply['content'] .= "<span class=\"contentPreview\">" . $line["content_preview"] . "</span>";
+							$headline_row .= "<span class=\"contentPreview\">" . $line["content_preview"] . "</span>";
 					}
 
-					$reply['content'] .= "</a></span>";
+					$headline_row .= "</a></span>";
 
-					$reply['content'] .= $labels_str;
+					$headline_row .= $labels_str;
 
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
 
 					if (!$vfeed_group_enabled) {
 						if (@$line["feed_title"]) {
 							$rgba = @$rgba_cache[$feed_id];
 
-							$reply['content'] .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed($feed_id)\">".
+							$headline_row .= "<span class=\"hlFeed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"viewfeed($feed_id)\">".
 								truncate_string($line["feed_title"],30)."</a></span>";
 						}
 					}
 
 
-					$reply['content'] .= "<span class=\"hlUpdated\">";
+					$headline_row .= "<span class=\"hlUpdated\">";
 
-					$reply['content'] .= "<div title='$date_entered_fmt'>$updated_fmt</div>
+					$headline_row .= "<div title='$date_entered_fmt'>$updated_fmt</div>
 						</span>";
 
-					$reply['content'] .= "<div class=\"hlRight\">";
+					$headline_row .= "<div class=\"hlRight\">";
 
-					$reply['content'] .= $score_pic;
+					$headline_row .= $score_pic;
 
 					if ($line["feed_title"] && !$vfeed_group_enabled) {
 
-						$reply['content'] .= "<span onclick=\"viewfeed($feed_id)\"
+						$headline_row .= "<span onclick=\"viewfeed($feed_id)\"
 							style=\"cursor : pointer\"
 							title=\"".htmlspecialchars($line['feed_title'])."\">
 							$feed_icon_img</span>";
 					}
 
-					$reply['content'] .= "</div>";
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
+					$headline_row .= "</div>";
 
 				} else {
 
@@ -531,10 +558,12 @@ class Feeds extends Handler_Protected {
 								//$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
 							}
 
-							$reply['content'] .= "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
+							$feed_title_row = "<div id='FTITLE-$feed_id' class='cdmFeedTitle'>".
 								"<div style=\"float : right\">$feed_icon_img</div>".
 								"<a href=\"#\" class='title' onclick=\"viewfeed($feed_id)\">".
 								$line["feed_title"]."</a> $vf_catchup_link</div>";
+
+							array_push($reply['content'], array('id' => 0, 'kind' => 'feed_title', 'html' => $feed_title_row));
 						}
 					}
 
@@ -543,20 +572,20 @@ class Feeds extends Handler_Protected {
 
 					$expanded_class = $expand_cdm ? "expanded" : "expandable";
 
-					$reply['content'] .= "<div class=\"cdm $hlc_suffix $expanded_class $class\"
+					$headline_row .= "<div class=\"cdm $hlc_suffix $expanded_class $class\"
 						id=\"RROW-$id\" orig-feed-id='$feed_id' $mouseover_attrs>";
 
-					$reply['content'] .= "<div class=\"cdmHeader\">";
-					$reply['content'] .= "<div style=\"vertical-align : middle\">";
+					$headline_row .= "<div class=\"cdmHeader\">";
+					$headline_row .= "<div style=\"vertical-align : middle\">";
 
-					$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
+					$headline_row .= "<input dojoType=\"dijit.form.CheckBox\"
 							type=\"checkbox\" onclick=\"toggleSelectRow2(this, false, true)\"
 							class='rchk'>";
 
-					$reply['content'] .= "$marked_pic";
-					$reply['content'] .= "$published_pic";
+					$headline_row .= "$marked_pic";
+					$headline_row .= "$published_pic";
 
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
 
 					if ($highlight_words && count($highlight_words > 0)) {
 						foreach ($highlight_words as $word) {
@@ -565,7 +594,7 @@ class Feeds extends Handler_Protected {
 						}
 					}
 
-					$reply['content'] .= "<span id=\"RTITLE-$id\"
+					$headline_row .= "<span id=\"RTITLE-$id\"
 						onclick=\"return cdmClicked(event, $id);\"
 						class=\"titleWrap $hlc_suffix\">
 						<a class=\"title $hlc_suffix\"
@@ -575,9 +604,9 @@ class Feeds extends Handler_Protected {
 						$line["title"] .
 						"</a> <span class=\"author\">$entry_author</span>";
 
-					$reply['content'] .= $labels_str;
+					$headline_row .= $labels_str;
 
-					$reply['content'] .= "<span class='collapseBtn' style='display : none'>
+					$headline_row .= "<span class='collapseBtn' style='display : none'>
 						<img src=\"images/collapse.png\" onclick=\"cdmCollapseArticle(event, $id)\"
 						title=\"".__("Collapse article")."\"/></span>";
 
@@ -586,15 +615,15 @@ class Feeds extends Handler_Protected {
 					else
 						$excerpt_hidden = "style=\"display : none\"";
 
-					$reply['content'] .= "<span $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\">" . $content_preview . "</span>";
+					$headline_row .= "<span $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\">" . $content_preview . "</span>";
 
-					$reply['content'] .= "</span>";
+					$headline_row .= "</span>";
 
 					if (!$vfeed_group_enabled) {
 						if (@$line["feed_title"]) {
 							$rgba = @$rgba_cache[$feed_id];
 
-							$reply['content'] .= "<div class=\"hlFeed\">
+							$headline_row .= "<div class=\"hlFeed\">
 								<a href=\"#\" style=\"background-color: rgba($rgba,0.3)\"
 								onclick=\"viewfeed($feed_id)\">".
 								truncate_string($line["feed_title"],30)."</a>
@@ -602,34 +631,34 @@ class Feeds extends Handler_Protected {
 						}
 					}
 
-					$reply['content'] .= "<span class='updated' title='$date_entered_fmt'>
+					$headline_row .= "<span class='updated' title='$date_entered_fmt'>
 						$updated_fmt</span>";
 
-					$reply['content'] .= "<div class='scoreWrap' style=\"vertical-align : middle\">";
-					$reply['content'] .= "$score_pic";
+					$headline_row .= "<div class='scoreWrap' style=\"vertical-align : middle\">";
+					$headline_row .= "$score_pic";
 
 					if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
-						$reply['content'] .= "<span style=\"cursor : pointer\"
+						$headline_row .= "<span style=\"cursor : pointer\"
 							title=\"".htmlspecialchars($line["feed_title"])."\"
 							onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
 					}
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
 
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
 
-					$reply['content'] .= "<div class=\"cdmContent\" $content_hidden
+					$headline_row .= "<div class=\"cdmContent\" $content_hidden
 						onclick=\"return cdmClicked(event, $id);\"
 						id=\"CICD-$id\">";
 
-					$reply['content'] .= "<div id=\"POSTNOTE-$id\">";
+					$headline_row .= "<div id=\"POSTNOTE-$id\">";
 					if ($line['note']) {
-						$reply['content'] .= format_article_note($id, $line['note']);
+						$headline_row .= format_article_note($id, $line['note']);
 					}
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
 
 					if (!$line['lang']) $line['lang'] = 'en';
 
-					$reply['content'] .= "<div class=\"cdmContentInner\" lang=\"".$line['lang']."\">";
+					$headline_row .= "<div class=\"cdmContentInner\" lang=\"".$line['lang']."\">";
 
 			if ($line["orig_feed_id"]) {
 
@@ -638,54 +667,54 @@ class Feeds extends Handler_Protected {
 
 						if ($this->dbh->num_rows($tmp_result) != 0) {
 
-							$reply['content'] .= "<div clear='both'>";
-							$reply['content'] .= __("Originally from:");
+							$headline_row .= "<div clear='both'>";
+							$headline_row .= __("Originally from:");
 
-							$reply['content'] .= "&nbsp;";
+							$headline_row .= "&nbsp;";
 
 							$tmp_line = $this->dbh->fetch_assoc($tmp_result);
 
-							$reply['content'] .= "<a target='_blank'
+							$headline_row .= "<a target='_blank'
 								href=' " . htmlspecialchars($tmp_line['site_url']) . "'>" .
 								$tmp_line['title'] . "</a>";
 
-							$reply['content'] .= "&nbsp;";
+							$headline_row .= "&nbsp;";
 
-							$reply['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
-							$reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.png'></a>";
+							$headline_row .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";
+							$headline_row .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_unset.png'></a>";
 
-							$reply['content'] .= "</div>";
+							$headline_row .= "</div>";
 						}
 					}
 
-					$reply['content'] .= "<span id=\"CWRAP-$id\">";
+					$headline_row .= "<span id=\"CWRAP-$id\">";
 
 //					if (!$expand_cdm) {
-						$reply['content'] .= "<span id=\"CENCW-$id\" style=\"display : none\">";
-						$reply['content'] .= htmlspecialchars($line["content"]);
-						$reply['content'] .= "</span.";
+						$headline_row .= "<span id=\"CENCW-$id\" style=\"display : none\">";
+						$headline_row .= htmlspecialchars($line["content"]);
+						$headline_row .= "</span.";
 
 //					} else {
-//						$reply['content'] .= $line["content"];
+//						$headline_row .= $line["content"];
 //					}
 
-					$reply['content'] .= "</span>";
+					$headline_row .= "</span>";
 
 					$always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
 
-					$reply['content'] .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
+					$headline_row .= format_article_enclosures($id, $always_display_enclosures, $line["content"], sql_bool_to_bool($line["hide_images"]));
 
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
 
-					$reply['content'] .= "<div class=\"cdmFooter\" onclick=\"cdmFooterClick(event)\">";
+					$headline_row .= "<div class=\"cdmFooter\" onclick=\"cdmFooterClick(event)\">";
 
 					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
-						$reply['content'] .= $p->hook_article_left_button($line);
+						$headline_row .= $p->hook_article_left_button($line);
 					}
 
 					$tags_str = format_tags_string($tags, $id);
 
-					$reply['content'] .= "<img src='images/tag.png' alt='Tags' title='Tags'>
+					$headline_row .= "<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)\">(+)</a>";
@@ -709,32 +738,34 @@ class Feeds extends Handler_Protected {
 						}
 					}
 
-					if ($entry_comments) $reply['content'] .= "&nbsp;($entry_comments)";
+					if ($entry_comments) $headline_row .= "&nbsp;($entry_comments)";
 
-					$reply['content'] .= "<div style=\"float : right\">";
+					$headline_row .= "<div style=\"float : right\">";
 
-//					$reply['content'] .= "$marked_pic";
-//					$reply['content'] .= "$published_pic";
+//					$headline_row .= "$marked_pic";
+//					$headline_row .= "$published_pic";
 
 					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
-						$reply['content'] .= $p->hook_article_button($line);
+						$headline_row .= $p->hook_article_button($line);
 					}
 
-					$reply['content'] .= "</div>";
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
+					$headline_row .= "</div>";
 
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
 
-					$reply['content'] .= "</div>";
+					$headline_row .= "</div>";
 
 				}
 
+				array_push($reply['content'], array("id" => (int)$line['id'], 'html' => $headline_row));
+
 				++$lnum;
 			}
 
 			if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PE", $timing_info);
 
-		} else {
+		} else if (!is_numeric($result)) {
 			$message = "";
 
 			switch ($view_mode) {
@@ -780,6 +811,9 @@ class Feeds extends Handler_Protected {
 				}
 				$reply['content'] .= "</span></p></div>";
 			}
+		} else if (is_numeric($result) && $result == -1) {
+			$reply['content'] = '';
+			$reply['first_id_changed'] = true;
 		}
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H2", $timing_info);
@@ -810,6 +844,7 @@ class Feeds extends Handler_Protected {
 		@$offset = $this->dbh->escape_string($_REQUEST["skip"]);
 		@$vgroup_last_feed = $this->dbh->escape_string($_REQUEST["vgrlf"]);
 		$order_by = $this->dbh->escape_string($_REQUEST["order_by"]);
+		$check_first_id = $this->dbh->escape_string($_REQUEST["fid"]);
 
 		if (is_numeric($feed)) $feed = (int) $feed;
 
@@ -864,13 +899,6 @@ class Feeds extends Handler_Protected {
 
 		$reply['headlines'] = array();
 
-		if (!$next_unread_feed)
-			$reply['headlines']['id'] = $feed;
-		else
-			$reply['headlines']['id'] = $next_unread_feed;
-
-		$reply['headlines']['is_cat'] = (bool) $cat_view;
-
 		$override_order = false;
 
 		switch ($order_by) {
@@ -889,7 +917,7 @@ class Feeds extends Handler_Protected {
 
 		$ret = $this->format_headlines_list($feed, $method,
 			$view_mode, $limit, $cat_view, $next_unread_feed, $offset,
-			$vgroup_last_feed, $override_order, true);
+			$vgroup_last_feed, $override_order, true, $check_first_id);
 
 		//$topmost_article_ids = $ret[0];
 		$headlines_count = $ret[1];
@@ -897,8 +925,17 @@ class Feeds extends Handler_Protected {
 		$disable_cache = $ret[3];
 		$vgroup_last_feed = $ret[4];
 
-		$reply['headlines']['content'] =& $ret[5]['content'];
-		$reply['headlines']['toolbar'] =& $ret[5]['toolbar'];
+		//$reply['headlines']['content'] =& $ret[5]['content'];
+		//$reply['headlines']['toolbar'] =& $ret[5]['toolbar'];
+
+		$reply['headlines'] =& $ret[5];
+
+		if (!$next_unread_feed)
+			$reply['headlines']['id'] = $feed;
+		else
+			$reply['headlines']['id'] = $next_unread_feed;
+
+		$reply['headlines']['is_cat'] = (bool) $cat_view;
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("05", $timing_info);
 

classes/handler/public.php

@@ -37,10 +37,31 @@ class Handler_Public extends Handler {
 			break;
 		}
 
-		$qfh_ret = queryFeedHeadlines($feed,
+		/*$qfh_ret = queryFeedHeadlines($feed,
 			1, $view_mode, $is_cat, $search, false,
 			$date_sort_field, $offset, $owner_uid,
-			false, 0, true, true, false, false, $start_ts);
+			false, 0, true, true, false, false, $start_ts);*/
+
+		//function queryFeedHeadlines($feed,
+		// $limit, $view_mode, $cat_view, $search, $search_mode,
+		// $override_order = false, $offset = 0, $owner_uid = 0,
+		// $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false, $check_top_id = false) {
+
+		$params = array(
+			"owner_uid" => $owner_uid,
+			"feed" => $feed,
+			"limit" => 1,
+			"view_mode" => $view_mode,
+			"cat_view" => $is_cat,
+			"search" => $search,
+			"override_order" => $date_sort_field,
+			"include_children" => true,
+			"ignore_vfeed_group" => true,
+			"offset" => $offset,
+			"start_ts" => $start_ts
+		);
+
+		$qfh_ret = queryFeedHeadlines($params);
 
 		$result = $qfh_ret[0];
 
@@ -58,11 +79,26 @@ class Handler_Public extends Handler {
 			header("Last-Modified: $last_modified", true);
 		}
 
-		$qfh_ret = queryFeedHeadlines($feed,
+		/*$qfh_ret = queryFeedHeadlines($feed,
 			$limit, $view_mode, $is_cat, $search, false,
 			$date_sort_field, $offset, $owner_uid,
-			false, 0, true, true, false, false, $start_ts);
-
+			false, 0, true, true, false, false, $start_ts);*/
+
+		$params = array(
+			"owner_uid" => $owner_uid,
+			"feed" => $feed,
+			"limit" => $limit,
+			"view_mode" => $view_mode,
+			"cat_view" => $is_cat,
+			"search" => $search,
+			"override_order" => $date_sort_field,
+			"include_children" => true,
+			"ignore_vfeed_group" => true,
+			"offset" => $offset,
+			"start_ts" => $start_ts
+		);
+
+		$qfh_ret = queryFeedHeadlines($params);
 
 		$result = $qfh_ret[0];
 		$feed_title = htmlspecialchars($qfh_ret[1]);
@@ -496,7 +532,7 @@ class Handler_Public extends Handler {
 					</div>
 					<button type="submit"><?php echo __('Share') ?></button>
 					<button onclick="return window.close()"><?php echo __('Cancel') ?></button>
-					</div>
+					</td>
 
 				</form>
 				</td></tr></table>

classes/pref/filters.php

@@ -114,6 +114,7 @@ class Pref_Filters extends Handler_Protected {
 			$result = db_query("SELECT ttrss_entries.id,
 					ttrss_entries.title,
 					ttrss_feeds.id AS feed_id,
+					ttrss_feeds.title AS feed_title,
 					ttrss_feed_categories.id AS cat_id,
 					content,
 					link,
@@ -152,7 +153,7 @@ class Pref_Filters extends Handler_Protected {
 						checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
 					print "<td>";
 
-					foreach ($filter['rules'] as $rule) {
+					/*foreach ($filter['rules'] as $rule) {
 						$reg_exp = $rule['reg_exp'];
 						$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
 
@@ -161,7 +162,7 @@ class Pref_Filters extends Handler_Protected {
 
 						$content_preview = preg_replace("/($reg_exp)/i",
 							"<span class=\"highlight\">$1</span>", $content_preview);
-					}
+					}*/
 
 					print $line["title"];
 					print "&nbsp;(";

css/cdm.css

@@ -213,17 +213,14 @@ div.cdmContent div.postEnclosures {
 }
 
 div.cdmFeedTitle {
-	border-color : #a0a0a0;
+	border-color : #4684ff;
 	border-width : 0px 0px 1px 0px;
 	border-style : solid;
 	padding : 5px 3px 5px 5px;
-	background : url("../images/toolbar.png") bottom left;
-	background-repeat : repeat-x;
 }
 
 div.cdmFeedTitle a.title {
 	color : #555;
-	font-style : italic;
 	font-weight : bold;
 }
 
@@ -264,6 +261,7 @@ div.cdmContentInner p {
 
 div.cdmContentInner iframe {
 	min-width : 50%;
+	max-width : 98%;
 }
 
 div.cdmHeader span.author {

css/tt-rss.css

@@ -1012,6 +1012,7 @@ div.postContent p {
 
 div.postContent iframe {
 	min-width : 50%;
+	max-width : 98%;
 }
 
 div.postHeader span.author {

include/functions2.php

@@ -426,11 +426,29 @@
 	}
 
 	// $search_mode is obsolete/unused
-	function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false) {
-
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+	//function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false, $start_ts = false, $check_top_id = false) {
+	function queryFeedHeadlines($params) {
+
+		$feed = $params["feed"];
+		$limit = isset($params["limit"]) ? $params["limit"] : 30;
+		$view_mode = $params["view_mode"];
+		$cat_view = isset($params["cat_view"]) ? $params["cat_view"] : false;
+		$search = isset($params["search"]) ? $params["search"] : false;
+		$override_order = isset($params["override_order"]) ? $params["override_order"] : false;
+		$offset = isset($params["offset"]) ? $params["offset"] : 0;
+		$owner_uid = isset($params["owner_uid"]) ? $params["owner_uid"] : $_SESSION["uid"];
+		$filter = isset($params["filter"]) ? $params["filter"] : 0;
+		$since_id = isset($params["since_id"]) ? $params["since_id"] : 0;
+		$include_children = isset($params["include_children"]) ? $params["include_children"] : false;
+		$ignore_vfeed_group = isset($params["ignore_vfeed_group"]) ? $params["ignore_vfeed_group"] : false;
+		$override_strategy = isset($params["override_strategy"]) ? $params["override_strategy"] : false;
+		$override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false;
+		$start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false;
+		$check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false;
 
 		$ext_tables_part = "";
+		$query_strategy_part = "";
+
 		$search_words = array();
 
 			if ($search) {
@@ -711,6 +729,50 @@
 					$start_ts_query_part = "";
 				}
 
+				$first_id = 0;
+				$first_id_query_strategy_part = $query_strategy_part;
+
+				if ($feed == -3)
+					$first_id_query_strategy_part = "true";
+
+				// if previous topmost article id changed that means our current pagination is no longer valid
+				$query = "SELECT DISTINCT
+						ttrss_feeds.title,
+						date_entered,
+						guid,
+						ttrss_entries.id,
+						ttrss_entries.title,
+						updated,
+						score,
+						marked,
+						published,
+						last_marked,
+						last_published
+					FROM
+						$from_qpart
+					WHERE
+					$feed_check_qpart
+					ttrss_user_entries.ref_id = ttrss_entries.id AND
+					ttrss_user_entries.owner_uid = '$owner_uid' AND
+					$search_query_part
+					$start_ts_query_part
+					$filter_query_part
+					$since_id_part
+					$first_id_query_strategy_part ORDER BY $order_by LIMIT 1";
+
+					if ($_REQUEST["debug"]) {
+						print $query;
+					}
+
+					$result = db_query($query);
+					if ($result && db_num_rows($result) > 0) {
+						$first_id = (int) db_fetch_result($result, 0, "id");
+
+						if ($offset > 0 && $first_id && $check_first_id && $first_id != $check_first_id) {
+							return array(-1, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id);
+						}
+					}
+
 				$query = "SELECT DISTINCT
 						date_entered,
 						guid,
@@ -794,7 +856,7 @@
 				$result = db_query($query);
 			}
 
-			return array($result, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words);
+			return array($result, $feed_title, $feed_site_url, $last_error, $last_updated, $search_words, $first_id);
 
 	}
 
@@ -1139,7 +1201,7 @@
 				$_SESSION["hasMp3"])) {
 
 				$entry .= "<audio preload=\"none\" controls>
-					<source type=\"$ctype\" src=\"$url\"></source>
+					<source type=\"$ctype\" src=\"$url\"/>
 					</audio>";
 
 			} else {
@@ -1421,7 +1483,7 @@
 
 		$tag = mb_strtolower($tag, 'utf-8');
 
-		$tag = preg_replace('/[\'\"\+\>\<]/', "", $tag);
+		$tag = preg_replace('/[,\'\"\+\>\<]/', "", $tag);
 
 		if (DB_TYPE == "mysql") {
 			$tag = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $tag);
@@ -1564,6 +1626,7 @@
 			return __("no tags");
 		} else {
 			$maxtags = min(5, count($tags));
+			$tags_str = "";
 
 			for ($i = 0; $i < $maxtags; $i++) {
 				$tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"viewfeed('".$tags[$i]."')\">" . $tags[$i] . "</a>, ";

index.php

@@ -140,7 +140,6 @@
 
 <div id="notify" class="notify"></div>
 <div id="cmdline" style="display : none"></div>
-<div id="headlines-tmp" style="display : none"></div>
 
 <div id="main" dojoType="dijit.layout.BorderContainer">
 

js/feedlist.js

@@ -99,6 +99,12 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req, can_w
 			query = query + "&m=" + param_escape(method);
 		}
 
+		if (offset > 0) {
+			if (current_first_id) {
+				query = query + "&fid=" + param_escape(current_first_id);
+			}
+		}
+
 		if (!background) {
 			if (_search_query) {
 				force_nocache = true;

js/viewfeed.js

@@ -13,6 +13,7 @@ var catchup_timeout_id = false;
 var cids_requested = [];
 var loaded_article_ids = [];
 var _last_headlines_update = 0;
+var current_first_id = 0;
 
 var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
 
@@ -77,6 +78,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 				_infscroll_disable = 0;
 			}
 
+			current_first_id = reply['headlines']['first_id'];
 			var counters = reply['counters'];
 			var articles = reply['articles'];
 			//var runtime_info = reply['runtime-info'];
@@ -84,22 +86,23 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 			if (infscroll_req == false) {
 				loaded_article_ids = [];
 
-				dijit.byId("headlines-frame").attr('content',
-					reply['headlines']['content']);
-
-				//dijit.byId("headlines-toolbar").attr('content',
-				//	reply['headlines']['toolbar']);
-
 				dojo.html.set($("headlines-toolbar"),
 						reply['headlines']['toolbar'],
 						{parseContent: true});
 
-				$$("#headlines-frame > div[id*=RROW]").each(function(row) {
-					if (loaded_article_ids.indexOf(row.id) != -1) {
-						row.parentNode.removeChild(row);
-					} else {
+				dijit.byId("headlines-frame").attr("content", "");
+
+				reply['headlines']['content'].each(function(row) {
+					if (loaded_article_ids.indexOf(row.id) == -1) {
 						loaded_article_ids.push(row.id);
 					}
+
+					var tmp = new Element("div");
+					tmp.innerHTML = row.html;
+
+					dojo.parser.parse(tmp.firstChild);
+					dijit.byId("headlines-frame").domNode.appendChild(tmp.firstChild);
+
 				});
 
 				var hsp = $("headlines-spacer");
@@ -125,40 +128,32 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
 					var c = dijit.byId("headlines-frame");
 					var ids = getSelectedArticleIds2();
-					var new_elems = [];
-
-					$("headlines-tmp").innerHTML = reply['headlines']['content'];
 
 					var hsp = $("headlines-spacer");
 
 					if (hsp)
 						c.domNode.removeChild(hsp);
 
-					$$("#headlines-tmp > div").each(function(row) {
-						if (row.className == 'cdmFeedTitle') {
-							row.style.display = 'none';
-							c.domNode.appendChild(row);
-							new_elems.push(row);
-						} else if (loaded_article_ids.indexOf(row.id) == -1) {
-							row.style.display = 'none';
-							c.domNode.appendChild(row);
-							new_elems.push(row);
+					reply['headlines']['content'].each(function(row) {
+						if (loaded_article_ids.indexOf(row.id) == -1 || row.kind == 'feed_title') {
 							loaded_article_ids.push(row.id);
-						} else {
-							row.parentNode.removeChild(row);
+
+							var tmp = new Element("div");
+							tmp.innerHTML = row.html;
+
+							dojo.parser.parse(tmp.firstChild);
+							dijit.byId("headlines-frame").domNode.appendChild(tmp.firstChild);
+
 						}
 					});
 
-					if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
 
-//					if (getInitParam("cdm_auto_catchup") == 1) {
-						c.domNode.appendChild(hsp);
-//					}
+					if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
+					c.domNode.appendChild(hsp);
 
-					console.log("added " + new_elems.size() + " headlines");
+					console.log("added " + reply['headlines']['content'].size() + " headlines");
 
-					if (new_elems.size() == 0)
-						_infscroll_disable = true;
+					if (reply['headlines']['content'].size() == 0) _infscroll_disable = true;
 
 					console.log("restore selected ids: " + ids);
 
@@ -168,20 +163,30 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
 					initHeadlinesMenu();
 
-					new_elems.each(function(child) {
-						dojo.parser.parse(child);
-
-						if (!Element.visible(child))
-							new Effect.Appear(child, { duration : 0.5 });
-					});
+					if (_infscroll_disable) {
+						hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
+						__("Click to open next unread feed.") + "</a>";
+					}
 
 				} else {
 					console.log("no new headlines received");
 
+					var first_id_changed = reply['headlines']['first_id_changed'];
+					console.log("first id changed:" + first_id_changed);
+
 					var hsp = $("headlines-spacer");
 
-					if (hsp) hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
-						__("Click to open next unread feed.") + "</a>";
+					if (hsp) {
+						if (first_id_changed) {
+							hsp.innerHTML = "<a href='#' onclick='viewCurrentFeed()'>" +
+							__("New articles found, reload feed to continue.") + "</a>";
+						} else {
+							hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
+							__("Click to open next unread feed.") + "</a>";
+						}
+
+					}
+
 				}
 			}
 
@@ -330,18 +335,6 @@ function article_callback2(transport, id) {
 		var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
 		request_counters(unread_in_buffer == 0);
 
-		//headlines_scroll_handler($("headlines-frame"));
-
-/*		try {
-			if (!_infscroll_disable &&
-					$$("#headlines-frame > div[id*=RROW]").last().hasClassName("Selected")) {
-
-				loadMoreHeadlines();
-			}
-		} catch (e) {
-			console.warn(e);
-		} */
-
 		notify("");
 	} catch (e) {
 		exception_error("article_callback2", e, transport);
@@ -407,19 +400,6 @@ function view(id, activefeed, noexpand) {
 			// if we don't need to request any relative ids, we might as well skip
 			// the server roundtrip altogether
 			if (cids_to_request.length == 0) {
-
-/*				try {
-					if (!_infscroll_disable &&
-						$$("#headlines-frame > div[id*=RROW]").last().hasClassName("Selected")) {
-
-							loadMoreHeadlines();
-					}
-				} catch (e) {
-					console.warn(e);
-				} */
-
-				//headlines_scroll_handler($("headlines-frame"));
-
 				return;
 			}
 		}
@@ -1196,7 +1176,7 @@ function editArticleTags(id) {
 					}});
 				}
 			},
-			href: query,
+			href: query
 		});
 
 		var tmph = dojo.connect(dialog, 'onLoad', function() {
@@ -1319,13 +1299,14 @@ function headlines_scroll_handler(e) {
 				return;
 
 			}
-		} else {
-			if (hsp)
+		/*} else {
+			if (hsp) {
 				if (_infscroll_disable)
 					hsp.innerHTML = "<a href='#' onclick='openNextUnreadFeed()'>" +
 						__("Click to open next unread feed.") + "</a>";
 				else
 					hsp.innerHTML = "";
+			}*/
 		}
 
 		if (isCdmMode()) {
@@ -2088,12 +2069,12 @@ function headlinesMenuCommon(menu, base_id) {
 
 			menu.addChild(new dijit.PopupMenuItem({
 				label: __("Assign label"),
-				popup: labelAddMenu,
+				popup: labelAddMenu
 			}));
 
 			menu.addChild(new dijit.PopupMenuItem({
 				label: __("Remove label"),
-				popup: labelDelMenu,
+				popup: labelDelMenu
 			}));
 
 		}
@@ -2123,7 +2104,7 @@ function initHeadlinesMenu() {
 
 		var menu = new dijit.Menu({
 			id: "headlinesMenu",
-			targetNodeIds: ids,
+			targetNodeIds: ids
 		});
 
 		var tmph = dojo.connect(menu, '_openMyself', function (event) {
@@ -2158,7 +2139,7 @@ function initHeadlinesMenu() {
 
 			var menu = new dijit.Menu({
 				id: "headlinesFeedTitleMenu",
-				targetNodeIds: ids,
+				targetNodeIds: ids
 			});
 
 			var tmph = dojo.connect(menu, '_openMyself', function (event) {

plugins/af_redditimgur/init.php

@@ -80,6 +80,10 @@ class Af_RedditImgur extends Plugin {
 
 				$matches = array();
 
+				if (preg_match("/\.gfycat.com\/([a-z]+)?(\.[a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
+					$entry->setAttribute("href", "http://www.gfycat.com/".$matches[1]);
+				}
+
 				if (preg_match("/https?:\/\/(www\.)?gfycat.com\/([a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
 
 					$tmp = fetch_file_contents($entry->getAttribute("href"));
@@ -112,6 +116,12 @@ class Af_RedditImgur extends Plugin {
 
 				}
 
+				// imgur .gif -> .gifv
+				if (preg_match("/i\.imgur\.com\/(.*?)\.gif$/i", $entry->getAttribute("href"))) {
+					$entry->setAttribute("href",
+						str_replace(".gif", ".gifv", $entry->getAttribute("href")));
+				}
+
 				if (preg_match("/\.(gifv)$/i", $entry->getAttribute("href"))) {
 
 					$source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
@@ -159,44 +169,10 @@ class Af_RedditImgur extends Plugin {
 					$found = true;
 				}
 
-				// links to imgur pages
-				$matches = array();
-				if (preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
-
-					$token = $matches[2];
-
-					$album_content = fetch_file_contents($entry->getAttribute("href"),
-						false, false, false, false, 10);
-
-					if ($album_content && $token) {
-						$adoc = new DOMDocument();
-						@$adoc->loadHTML($album_content);
-
-						if ($adoc) {
-							$axpath = new DOMXPath($adoc);
-							$aentries = $axpath->query('(//img[@src])');
-
-							foreach ($aentries as $aentry) {
-								if (preg_match("/\/\/i.imgur.com\/$token\./", $aentry->getAttribute("src"))) {
-									$img = $doc->createElement('img');
-									$img->setAttribute("src", $aentry->getAttribute("src"));
-
-									$br = $doc->createElement('br');
-
-									$entry->parentNode->insertBefore($img, $entry);
-									$entry->parentNode->insertBefore($br, $entry);
-
-									$found = true;
-
-									break;
-								}
-							}
-						}
-					}
-				}
+				// linked albums & pages
 
-				// linked albums, ffs
-				if (preg_match("/^https?:\/\/imgur.com\/(a|album|gallery)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) {
+				if (preg_match("/^https?:\/\/(m\.)?imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches) ||
+					preg_match("/^https?:\/\/imgur.com\/(a|album|gallery)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) {
 
 					$album_content = fetch_file_contents($entry->getAttribute("href"),
 						false, false, false, false, 10);
@@ -214,7 +190,7 @@ class Af_RedditImgur extends Plugin {
 
 								if (!in_array($aentry->getAttribute("content"), $urls)) {
 									$img = $doc->createElement('img');
-									$img->setAttribute("src", $aentry->getAttribute("content"));
+									$img->setAttribute("src", str_replace("?fb", "", $aentry->getAttribute("content")));
 									$entry->parentNode->insertBefore($doc->createElement('br'), $entry);
 
 									$br = $doc->createElement('br');

plugins/vf_shared/init.php

@@ -35,7 +35,7 @@ class VF_Shared extends Plugin {
 	//function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false) {
 
 	function get_headlines($feed_id, $options) {
-		$qfh_ret = queryFeedHeadlines(-4,
+		/*$qfh_ret = queryFeedHeadlines(-4,
 			$options['limit'],
 			$this->get_unread(-1) > 0 ? "adaptive" : "all_articles",
 			false,
@@ -49,8 +49,23 @@ class VF_Shared extends Plugin {
 			$options['include_children'],
 			false,
 			"uuid != ''",
-			"ttrss_feeds.title AS feed_title,");
+			"ttrss_feeds.title AS feed_title,"); */
 
+		$params = array(
+			"feed" => -4,
+			"limit" => $options["limit"],
+			"view_mode" => $this->get_unread(-1) > 0 ? "adaptive" : "all_articles",
+			"search" => $options['search'],
+			"override_order" => $options['override_order'],
+			"offset" => $options["offset"],
+			"filter" => $options["filter"],
+			"since_id" => $options["since_id"],
+			"include_children" => $options["include_children"],
+			"override_strategy" => "uuid != ''",
+			"override_vfeed" => "ttrss_feeds.title AS feed_title,"
+		);
+
+		$qfh_ret = queryFeedHeadlines($params);
 		$qfh_ret[1] = __("Shared articles");
 
 		return $qfh_ret;