move get_article_labels to Article

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

diff --git a/classes/api.php b/classes/api.php
index da164aca1480ac1838f2fae8dea4a0da211a0c0c..cb035c86be8b20119025773b9a2ea15754b552f7 100644 (file)
--- a/classes/api.php
+++ b/classes/api.php
@@ -1,5 +1,4 @@
 <?php
-
 class API extends Handler {
 
        const API_LEVEL  = 14;
@@ -102,7 +101,7 @@ class API extends Handler {
                if ($feed_id) {
                        $this->wrap(self::STATUS_OK, array("unread" => getFeedUnread($feed_id, $is_cat)));
                } else {
-                       $this->wrap(self::STATUS_OK, array("unread" => getGlobalUnread()));
+                       $this->wrap(self::STATUS_OK, array("unread" => Feeds::getGlobalUnread()));
                }
        }
 
@@ -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"],
@@ -171,7 +170,7 @@ class API extends Handler {
 
                                if ($unread || !$unread_only) {
                                        array_push($cats, array("id" => $cat_id,
-                                               "title" => getCategoryTitle($cat_id),
+                                               "title" => Feeds::getCategoryTitle($cat_id),
                                                "unread" => $unread));
                                }
                        }
@@ -298,7 +297,7 @@ class API extends Handler {
                                        WHERE ref_id IN ($article_ids)");
 
                                while ($line = $this->dbh->fetch_assoc($result)) {
-                                       ccache_update($line["feed_id"], $_SESSION["uid"]);
+                                       CCache::update($line["feed_id"], $_SESSION["uid"]);
                                }
                        }
 
@@ -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);
                                }
                        }
 
@@ -348,14 +347,14 @@ 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']),
+                                               "labels" => Article::get_article_labels($line['id']),
                                                "unread" => sql_bool_to_bool($line["unread"]),
                                                "marked" => sql_bool_to_bool($line["marked"]),
                                                "published" => sql_bool_to_bool($line["published"]),
@@ -418,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"));
@@ -428,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"));
        }
@@ -451,7 +450,7 @@ class API extends Handler {
                        WHERE owner_uid = '".$_SESSION['uid']."' ORDER BY caption");
 
                if ($article_id)
-                       $article_labels = get_article_labels($article_id);
+                       $article_labels = Article::get_article_labels($article_id);
                else
                        $article_labels = array();
 
@@ -480,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"]));
@@ -565,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,
@@ -589,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(
@@ -658,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,
@@ -677,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'");
@@ -685,15 +687,6 @@ class API extends Handler {
                                }
                        }
 
-                       /*$qfh_ret = queryFeedHeadlines($feed_id, $limit,
-                               $view_mode, $is_cat, $search, false,
-                               $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,
@@ -708,7 +701,7 @@ class API extends Handler {
                                "skip_first_id_check" => $skip_first_id_check
                        );
 
-                       $qfh_ret = queryFeedHeadlines($params);
+                       $qfh_ret = Feeds::queryFeedHeadlines($params);
 
                        $result = $qfh_ret[0];
                        $feed_title = $qfh_ret[1];
@@ -747,10 +740,7 @@ class API extends Handler {
                                                }
                                        }
 
-                                       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 (!is_array($labels)) $labels = Article::get_article_labels($line["id"]);
 
                                        $headline_row = array(
                                                "id" => (int)$line["id"],
@@ -767,7 +757,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)
@@ -838,7 +828,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 {
@@ -886,5 +876,3 @@ class API extends Handler {
 
 
 }
-
-?>