move counter cache to a separate class

[tt-rss.git] / classes / handler / public.php

diff --git a/classes/handler/public.php b/classes/handler/public.php
index a6bc3ff6ff3efae9f4f7bb093df47c1771655a1e..d525bc54c001405ac565233c9db842c9a126ad5f 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -37,16 +37,6 @@ class Handler_Public extends Handler {
                        break;
                }
 
-               /*$qfh_ret = queryFeedHeadlines($feed,
-                       1, $view_mode, $is_cat, $search, false,
-                       $date_sort_field, $offset, $owner_uid,
-                       false, 0, true, true, false, false, $start_ts);*/
-
-               //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(
                        "owner_uid" => $owner_uid,
                        "feed" => $feed,
@@ -61,7 +51,7 @@ class Handler_Public extends Handler {
                        "start_ts" => $start_ts
                );
 
-               $qfh_ret = queryFeedHeadlines($params);
+               $qfh_ret = Feeds::queryFeedHeadlines($params);
 
                $result = $qfh_ret[0];
 
@@ -79,11 +69,6 @@ class Handler_Public extends Handler {
                        header("Last-Modified: $last_modified", true);
                }
 
-               /*$qfh_ret = queryFeedHeadlines($feed,
-                       $limit, $view_mode, $is_cat, $search, false,
-                       $date_sort_field, $offset, $owner_uid,
-                       false, 0, true, true, false, false, $start_ts);*/
-
                $params = array(
                        "owner_uid" => $owner_uid,
                        "feed" => $feed,
@@ -98,7 +83,7 @@ class Handler_Public extends Handler {
                        "start_ts" => $start_ts
                );
 
-               $qfh_ret = queryFeedHeadlines($params);
+               $qfh_ret = Feeds::queryFeedHeadlines($params);
 
                $result = $qfh_ret[0];
                $feed_title = htmlspecialchars($qfh_ret[1]);
@@ -166,14 +151,14 @@ class Handler_Public extends Handler {
                                $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url'] ? $line["site_url"] : get_self_url_prefix()), true);
                                $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true);
 
-                               $tags = get_article_tags($line["id"], $owner_uid);
+                               $tags = Article::get_article_tags($line["id"], $owner_uid);
 
                                foreach ($tags as $tag) {
                                        $tpl->setVariable('ARTICLE_CATEGORY', htmlspecialchars($tag), true);
                                        $tpl->addBlock('category');
                                }
 
-                               $enclosures = get_article_enclosures($line["id"]);
+                               $enclosures = Article::get_article_enclosures($line["id"]);
 
                                foreach ($enclosures as $e) {
                                        $type = htmlspecialchars($e['content_type']);
@@ -242,7 +227,7 @@ class Handler_Public extends Handler {
                                if ($line['note']) $article['note'] = $line['note'];
                                if ($article['author']) $article['author'] = $line['author'];
 
-                               $tags = get_article_tags($line["id"], $owner_uid);
+                               $tags = Article::get_article_tags($line["id"], $owner_uid);
 
                                if (count($tags) > 0) {
                                        $article['tags'] = array();
@@ -252,7 +237,7 @@ class Handler_Public extends Handler {
                                        }
                                }
 
-                               $enclosures = get_article_enclosures($line["id"]);
+                               $enclosures = Article::get_article_enclosures($line["id"]);
 
                                if (count($enclosures) > 0) {
                                        $article['enclosures'] = array();
@@ -287,11 +272,11 @@ class Handler_Public extends Handler {
                if ($this->dbh->num_rows($result) == 1) {
                        $uid = $this->dbh->fetch_result($result, 0, "id");
 
-                       print getGlobalUnread($uid);
+                       print Feeds::getGlobalUnread($uid);
 
                        if ($fresh) {
                                print ";";
-                               print getFeedArticles(-3, false, true, $uid);
+                               print Feeds::getFeedArticles(-3, false, true, $uid);
                        }
 
                } else {
@@ -402,7 +387,7 @@ class Handler_Public extends Handler {
                        $id = $this->dbh->fetch_result($result, 0, "ref_id");
                        $owner_uid = $this->dbh->fetch_result($result, 0, "owner_uid");
 
-                       $article = format_article($id, false, true, $owner_uid);
+                       $article = Article::format_article($id, false, true, $owner_uid);
 
                        print_r($article['content']);
 
@@ -671,7 +656,7 @@ class Handler_Public extends Handler {
                                        alt=\"Tiny Tiny RSS\"/>
                                        <h1>".__("Subscribe to feed...")."</h1><div class='content'>";
 
-                       $rc = subscribe_to_feed($feed_url);
+                       $rc = Feeds::subscribe_to_feed($feed_url);
 
                        switch ($rc['code']) {
                        case 0: