Merge pull request #286 from jordidg/master

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

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 0d6ef11c0896988525c99d3066e649b76ef0591b..7fb2771bdaf495501a2e86ef42a9aa01f938f7ad 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -65,8 +65,8 @@ class Handler_Public extends Handler {
                $last_error = $qfh_ret[3];
 
                $feed_self_url = get_self_url_prefix() .
-                       "/public.php?op=rss&id=-2&key=" .
-                       get_feed_access_key(-2, false, $owner_uid);
+                       "/public.php?op=rss&id=$feed&key=" .
+                       get_feed_access_key($feed, false, $owner_uid);
 
                if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
 
@@ -85,8 +85,11 @@ class Handler_Public extends Handler {
                        }
 
                        $tpl->setVariable('SELF_URL', htmlspecialchars(get_self_url_prefix()), true);
-
+                       $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
                        while ($line = $this->dbh->fetch_assoc($result)) {
+                               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                                       $line = $p->hook_query_headlines($line);
+                               }
 
                                $tpl->setVariable('ARTICLE_ID',
                                        htmlspecialchars($orig_guid ? $line['link'] :
@@ -94,10 +97,9 @@ class Handler_Public extends Handler {
                                                        "/public.php?url=" . urlencode($line['link'])), true);
                                $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
                                $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
-                               $tpl->setVariable('ARTICLE_EXCERPT',
-                                       truncate_string(strip_tags($line["content_preview"]), 100, '...'), true);
+                               $tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
 
-                               $content = sanitize($line["content_preview"], false, $owner_uid);
+                               $content = sanitize($line["content"], false, $owner_uid);
 
                                if ($line['note']) {
                                        $content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
@@ -170,13 +172,17 @@ class Handler_Public extends Handler {
                        $feed['articles'] = array();
 
                        while ($line = $this->dbh->fetch_assoc($result)) {
+                               $line["content_preview"] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
+                               foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
+                                       $line = $p->hook_query_headlines($line, 100);
+                               }
                                $article = array();
 
                                $article['id'] = $line['link'];
                                $article['link']        = $line['link'];
                                $article['title'] = $line['title'];
-                               $article['excerpt'] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
-                               $article['content'] = sanitize($line["content_preview"], false, $owner_uid);
+                               $article['excerpt'] = $line["content_preview"];
+                               $article['content'] = sanitize($line["content"], false, $owner_uid);
                                $article['updated'] = date('c', strtotime($line["updated"]));
 
                                if ($line['note']) $article['note'] = $line['note'];
@@ -384,14 +390,18 @@ class Handler_Public extends Handler {
                }
        }
 
+       function updateTask() {
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+       }
+
+       function housekeepingTask() {
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", $op);
+       }
+
        function globalUpdateFeeds() {
-               include "rssfuncs.php";
-               // Update all feeds needing a update.
-               update_daemon_common(0, true, false);
-               housekeeping_common(false);
+               RPC::updaterandomfeed_real($this->dbh);
 
                PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
-
        }
 
        function sharepopup() {