add api test for labels, api: fix setArticleLabel assign not handled correctly

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

diff --git a/classes/api.php b/classes/api.php
index 9be04cff93cd0fb882b102ef2e38009587ec1dd2..2f1a563c03c5d8d47d21fab69fb0ea0fa5debb0a 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -1,8 +1,7 @@
 <?php
-
 class API extends Handler {
 
-       const API_LEVEL  = 13;
+       const API_LEVEL  = 14;
 
        const STATUS_OK  = 0;
        const STATUS_ERR = 1;
@@ -308,8 +307,8 @@ class API extends Handler {
                                                "/public.php?op=rss&id=-2&key=" .
                                                get_feed_access_key(-2, false);
 
-                                       $p = new Publisher(PUBSUBHUBBUB_HUB);
-                                       $pubsub_result = $p->publish_update($rss_link);
+                                       $p = new pubsubhubbub\publisher\Publisher(PUBSUBHUBBUB_HUB);
+                                       $p->publish_update($rss_link);
                                }
                        }
 
@@ -330,7 +329,7 @@ class API extends Handler {
 
                if ($article_id) {
 
-                       $query = "SELECT id,title,link,content,feed_id,comments,int_id,
+                       $query = "SELECT id,guid,title,link,content,feed_id,comments,int_id,
                                marked,unread,published,score,note,lang,
                                ".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
                                author,(SELECT title FROM ttrss_feeds WHERE id = feed_id) AS feed_title,
@@ -352,6 +351,7 @@ class API extends Handler {
 
                                        $article = array(
                                                "id" => $line["id"],
+                                               "guid" => $line["guid"],
                                                "title" => $line["title"],
                                                "link" => $line["link"],
                                                "labels" => get_article_labels($line['id']),
@@ -417,7 +417,7 @@ class API extends Handler {
                $feed_id = (int) $this->dbh->escape_string($_REQUEST["feed_id"]);
 
                if (!ini_get("open_basedir")) {
-                       update_rss_feed($feed_id, true);
+                       update_rss_feed($feed_id);
                }
 
                $this->wrap(self::STATUS_OK, array("status" => "OK"));
@@ -479,7 +479,7 @@ class API extends Handler {
 
                $article_ids = array_filter(explode(",", $this->dbh->escape_string($_REQUEST["article_ids"])), is_numeric);
                $label_id = (int) $this->dbh->escape_string($_REQUEST['label_id']);
-               $assign = (bool) $this->dbh->escape_string($_REQUEST['assign']) == "true";
+               $assign = (bool) ($this->dbh->escape_string($_REQUEST['assign']) == "true");
 
                $label = $this->dbh->escape_string(label_find_caption(
                        feed_to_label_id($label_id), $_SESSION["uid"]));
@@ -657,6 +657,9 @@ class API extends Handler {
                return $feeds;
        }
 
+       /**
+        * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+        */
        static function api_get_headlines($feed_id, $limit, $offset,
                                $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order,
                                $include_attachments, $since_id,
@@ -676,7 +679,7 @@ class API extends Handler {
 
                                        if (!$cache_images && time() - $last_updated > 120) {
                                                include "rssfuncs.php";
-                                               update_rss_feed($feed_id, true, true);
+                                               update_rss_feed($feed_id, true);
                                        } else {
                                                db_query("UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
                                                        WHERE id = '$feed_id'");
@@ -753,6 +756,7 @@ class API extends Handler {
 
                                        $headline_row = array(
                                                "id" => (int)$line["id"],
+                                               "guid" => $line["guid"],
                                                "unread" => sql_bool_to_bool($line["unread"]),
                                                "marked" => sql_bool_to_bool($line["marked"]),
                                                "published" => sql_bool_to_bool($line["published"]),
@@ -884,5 +888,3 @@ class API extends Handler {
 
 
 }
-
-?>