fixes for first_id stuff

2 files changed, 13 insertions, 10 deletions

diff --git a/classes/api.php b/classes/api.php
index 648d6ca6e..08c1846d2 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -205,7 +205,7 @@ 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_top_id = (int)$this->dbh->escape_string($_REQUEST["check_top_id"]);
+			$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;
@@ -230,7 +230,7 @@ class API extends Handler {
 			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, $check_top_id);
+				$include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id);
 
 			if ($include_header) {
 				$this->wrap(self::STATUS_OK, array($headlines_header, $headlines));
@@ -644,7 +644,7 @@ class API extends Handler {
 				$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, $check_top_id = false) {
+				$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
@@ -686,18 +686,20 @@ class API extends Handler {
 				"offset" => $offset,
 				"since_id" => $since_id,
 				"include_children" => $include_nested,
-				"check_top_id" => $check_top_id
+				"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();
 
 			$headlines_header = array(
 				'id' => $feed_id,
+				'first_id' => $first_id,
 				'is_cat' => $is_cat);
 
 			if (!is_numeric($result)) {
@@ -789,7 +791,7 @@ class API extends Handler {
 					array_push($headlines, $headline_row);
 				}
 			} else if (is_numeric($result) && $result == -1) {
-				$headlines_header['top_id_changed'] = true;
+				$headlines_header['first_id_changed'] = true;
 			}
 
 			return array($headlines, $headlines_header);
diff --git a/classes/feeds.php b/classes/feeds.php
index 508ad988a..9608290ca 100644
--- a/classes/feeds.php
+++ b/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, $check_top_id = false) {
+					$override_order = false, $include_children = false, $check_first_id = false) {
 
 		$disable_cache = false;
 
@@ -250,7 +250,7 @@ class Feeds extends Handler_Protected {
 				"override_order" => $override_order,
 				"offset" => $offset,
 				"include_children" => $include_children,
-				"check_top_id" => $check_top_id
+				"check_first_id" => $check_first_id
 			);
 
 			$qfh_ret = queryFeedHeadlines($params);
@@ -267,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;
 
@@ -801,7 +802,7 @@ class Feeds extends Handler_Protected {
 			}
 		} else if (is_numeric($result) && $result == -1) {
 			$reply['content'] = '';
-			$reply['top_id_changed'] = true;
+			$reply['first_id_changed'] = true;
 		}
 
 		if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H2", $timing_info);
@@ -832,7 +833,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_top_id = $this->dbh->escape_string($_REQUEST["topid"]);
+		$check_first_id = $this->dbh->escape_string($_REQUEST["fid"]);
 
 		if (is_numeric($feed)) $feed = (int) $feed;
 
@@ -905,7 +906,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, $check_top_id);
+			$vgroup_last_feed, $override_order, true, $check_first_id);
 
 		//$topmost_article_ids = $ret[0];
 		$headlines_count = $ret[1];