move the following to Feeds:

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

diff --git a/classes/api.php b/classes/api.php
index c3ea627fd88cd51d6cfadc8b0591838217fdfda3..ad3ccea09d34e2ab7ee57c172f5a6660acf809e1 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;
@@ -153,7 +152,7 @@ class API extends Handler {
                                $unread = getFeedUnread($line["id"], true);
 
                                if ($enable_nested)
-                                       $unread += getCategoryChildrenUnread($line["id"]);
+                                       $unread += Feeds::getCategoryChildrenUnread($line["id"]);
 
                                if ($unread || !$unread_only) {
                                        array_push($cats, array("id" => $line["id"],
@@ -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,
@@ -348,10 +347,11 @@ class API extends Handler {
 
                                while ($line = $this->dbh->fetch_assoc($result)) {
 
-                                       $attachments = get_article_enclosures($line['id']);
+                                       $attachments = Article::get_article_enclosures($line['id']);
 
                                        $article = array(
                                                "id" => $line["id"],
+                                               "guid" => $line["guid"],
                                                "title" => $line["title"],
                                                "link" => $line["link"],
                                                "labels" => get_article_labels($line['id']),
@@ -416,7 +416,9 @@ class API extends Handler {
 
                $feed_id = (int) $this->dbh->escape_string($_REQUEST["feed_id"]);
 
-               update_rss_feed($feed_id, true);
+               if (!ini_get("open_basedir")) {
+                       update_rss_feed($feed_id);
+               }
 
                $this->wrap(self::STATUS_OK, array("status" => "OK"));
        }
@@ -425,7 +427,7 @@ class API extends Handler {
                $feed_id = $this->dbh->escape_string($_REQUEST["feed_id"]);
                $is_cat = $this->dbh->escape_string($_REQUEST["is_cat"]);
 
-               catchup_feed($feed_id, $is_cat);
+               Feeds::catchup_feed($feed_id, $is_cat);
 
                $this->wrap(self::STATUS_OK, array("status" => "OK"));
        }
@@ -477,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"]));
@@ -562,7 +564,7 @@ class API extends Handler {
                                        $unread = getFeedUnread($i);
 
                                        if ($unread || !$unread_only) {
-                                               $title = getFeedTitle($i);
+                                               $title = Feeds::getFeedTitle($i);
 
                                                $row = array(
                                                                "id" => $i,
@@ -586,7 +588,7 @@ class API extends Handler {
 
                                while ($line = db_fetch_assoc($result)) {
                                        $unread = getFeedUnread($line["id"], true) +
-                                               getCategoryChildrenUnread($line["id"]);
+                                               Feeds::getCategoryChildrenUnread($line["id"]);
 
                                        if ($unread || !$unread_only) {
                                                $row = array(
@@ -655,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,
@@ -674,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'");
@@ -751,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"]),
@@ -763,7 +769,7 @@ class API extends Handler {
                                        );
 
                                        if ($include_attachments)
-                                               $headline_row['attachments'] = get_article_enclosures(
+                                               $headline_row['attachments'] = Article::get_article_enclosures(
                                                        $line['id']);
 
                                        if ($show_excerpt)
@@ -834,7 +840,7 @@ class API extends Handler {
                $password = $this->dbh->escape_string($_REQUEST["password"]);
 
                if ($feed_url) {
-                       $rc = subscribe_to_feed($feed_url, $category_id, $login, $password);
+                       $rc = Feeds::subscribe_to_feed($feed_url, $category_id, $login, $password);
 
                        $this->wrap(self::STATUS_OK, array("status" => $rc));
                } else {
@@ -882,5 +888,3 @@ class API extends Handler {
 
 
 }
-
-?>