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 825ea5e2e6a9ea705fb9a139ba3ef0ab7086d362..7fb2771bdaf495501a2e86ef42a9aa01f938f7ad 100644 (file)
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -3,7 +3,7 @@ class Handler_Public extends Handler {
 
        private function generate_syndicated_feed($owner_uid, $feed, $is_cat,
                $limit, $offset, $search, $search_mode,
-               $view_mode = false, $format = 'atom', $order = false) {
+               $view_mode = false, $format = 'atom', $order = false, $orig_guid = false) {
 
                require_once "lib/MiniTemplator.class.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,20 +85,19 @@ 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($line['link']), true);
+                               $tpl->setVariable('ARTICLE_ID',
+                                       htmlspecialchars($orig_guid ? $line['link'] :
+                                               get_self_url_prefix() .
+                                                       "/public.php?url=" . urlencode($line['link'])), true);
                                $tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
                                $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
-                               if(isset($line["modified_preview"]))
-                                       $tpl->setVariable('ARTICLE_EXCERPT', strip_tags($line["content_preview"]), true);
-                               else
-                                       $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"], false, $owner_uid);
 
@@ -117,6 +116,9 @@ class Handler_Public extends Handler {
 
                                $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true);
 
+                               $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url']), true);
+                               $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title']), true);
+
                                $tags = get_article_tags($line["id"], $owner_uid);
 
                                foreach ($tags as $tag) {
@@ -170,6 +172,7 @@ 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);
                                }
@@ -178,10 +181,7 @@ class Handler_Public extends Handler {
                                $article['id'] = $line['link'];
                                $article['link']        = $line['link'];
                                $article['title'] = $line['title'];
-                               if(isset($line["modified_preview"]))
-                                       $article['excerpt'] = strip_tags($line["content_preview"]);
-                               else
-                                       $article['excerpt'] = truncate_string(strip_tags($line["content_preview"]), 100, '...');
+                               $article['excerpt'] = $line["content_preview"];
                                $article['content'] = sanitize($line["content"], false, $owner_uid);
                                $article['updated'] = date('c', strtotime($line["updated"]));
 
@@ -354,7 +354,7 @@ class Handler_Public extends Handler {
        function rss() {
                $feed = $this->dbh->escape_string($_REQUEST["id"]);
                $key = $this->dbh->escape_string($_REQUEST["key"]);
-               $is_cat = $_REQUEST["is_cat"] != false;
+               $is_cat = sql_bool_to_bool($_REQUEST["is_cat"]);
                $limit = (int)$this->dbh->escape_string($_REQUEST["limit"]);
                $offset = (int)$this->dbh->escape_string($_REQUEST["offset"]);
 
@@ -364,6 +364,7 @@ class Handler_Public extends Handler {
                $order = $this->dbh->escape_string($_REQUEST["order"]);
 
                $format = $this->dbh->escape_string($_REQUEST['format']);
+               $orig_guid = !sql_bool_to_bool($_REQUEST["no_orig_guid"]);
 
                if (!$format) $format = 'atom';
 
@@ -383,20 +384,24 @@ class Handler_Public extends Handler {
 
                if ($owner_id) {
                        $this->generate_syndicated_feed($owner_id, $feed, $is_cat, $limit,
-                               $offset, $search, $search_mode, $view_mode, $format, $order);
+                               $offset, $search, $search_mode, $view_mode, $format, $order, $orig_guid);
                } else {
                        header('HTTP/1.1 403 Forbidden');
                }
        }
 
+       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() {
@@ -555,6 +560,7 @@ class Handler_Public extends Handler {
                                }
                        } else {
                                $_SESSION["login_error_msg"] = __("Incorrect username or password");
+                               user_error("Failed login attempt from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
                        }
 
                        if ($_REQUEST['return']) {