diff options
Diffstat (limited to 'classes/api.php')
-rw-r--r-- | classes/api.php | 159 |
1 files changed, 99 insertions, 60 deletions
diff --git a/classes/api.php b/classes/api.php index 8267572f4..08c1846d2 100644 --- a/classes/api.php +++ b/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() { |