1.15.3 to fix tag/version mismatch

[tt-rss.git] / classes / api.php

diff --git a/classes/api.php b/classes/api.php
index 97f17cc748c69139ce078955dd307d44b83f852c..3c5d084087ba592ef39b9656688ee0830403f78f 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -2,7 +2,7 @@
 
 class API extends Handler {
 
-       const API_LEVEL  = 9;
+       const API_LEVEL  = 11;
 
        const STATUS_OK  = 0;
        const STATUS_ERR = 1;
@@ -201,6 +201,10 @@ class API extends Handler {
                        $sanitize_content = !isset($_REQUEST["sanitize"]) ||
                                sql_bool_to_bool($_REQUEST["sanitize"]);
                        $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"]);
+
+                       $_SESSION['hasSandbox'] = $has_sandbox;
 
                        $override_order = false;
                        switch ($_REQUEST["order_by"]) {
@@ -223,7 +227,7 @@ class API extends Handler {
                        $headlines = $this->api_get_headlines($feed_id, $limit, $offset,
                                $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order,
                                $include_attachments, $since_id, $search, $search_mode,
-                               $include_nested, $sanitize_content, $force_update);
+                               $include_nested, $sanitize_content, $force_update, $excerpt_length);
 
                        $this->wrap(self::STATUS_OK, $headlines);
                } else {
@@ -633,7 +637,7 @@ class API extends Handler {
                                $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
                                $include_attachments, $since_id,
                                $search = "", $search_mode = "",
-                               $include_nested = false, $sanitize_content = true, $force_update = false) {
+                               $include_nested = false, $sanitize_content = true, $force_update = false, $excerpt_length = 100) {
 
                        if ($force_update && $feed_id > 0 && is_numeric($feed_id)) {
                                // Update the feed if required with some basic flood control
@@ -666,16 +670,31 @@ class API extends Handler {
                        $headlines = array();
 
                        while ($line = db_fetch_assoc($result)) {
-                               $line["content_preview"] = truncate_string(strip_tags($line["content"]), 100);
+                               $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, 100, true);
+                                       $line = $p->hook_query_headlines($line, $excerpt_length, true);
                                }
 
                                $is_updated = ($line["last_read"] == "" &&
                                        ($line["unread"] != "t" && $line["unread"] != "1"));
 
                                $tags = explode(",", $line["tag_cache"]);
-                               $labels = json_decode($line["label_cache"], true);
+
+                               $label_cache = $line["label_cache"];
+                               $labels = false;
+
+                               if ($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 (!$tags) $tags = get_article_tags($line["id"]);
                                //if (!$labels) $labels = get_article_labels($line["id"]);