include subcategories in generated category feeds

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

diff --git a/classes/handler/public.php b/classes/handler/public.php
index 1a586fe7a5a23dcac32f4bde51ae8bd457fefc34..34d57744151ea20cf8912284ecef46a5b013debb 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, $orig_guid = false) {
+               $view_mode = false, $format = 'atom', $order = false, $orig_guid = false, $start_ts = false) {
 
                require_once "lib/MiniTemplator.class.php";
 
@@ -37,10 +37,12 @@ class Handler_Public extends Handler {
                        break;
                }
 
+               //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) {
+
                $qfh_ret = queryFeedHeadlines($feed,
                        1, $view_mode, $is_cat, $search, $search_mode,
                        $date_sort_field, $offset, $owner_uid,
-                       false, 0, false, true);
+                       false, 0, true, true, false, false, $start_ts);
 
                $result = $qfh_ret[0];
 
@@ -61,7 +63,7 @@ class Handler_Public extends Handler {
                $qfh_ret = queryFeedHeadlines($feed,
                        $limit, $view_mode, $is_cat, $search, $search_mode,
                        $date_sort_field, $offset, $owner_uid,
-                       false, 0, false, true);
+                       false, 0, true, true, false, false, $start_ts);
 
 
                $result = $qfh_ret[0];
@@ -105,7 +107,8 @@ class Handler_Public extends Handler {
                                $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
                                $tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
 
-                               $content = sanitize($line["content"], false, $owner_uid);
+                               $content = sanitize($line["content"], false, $owner_uid,
+                                       $feed_site_url);
 
                                if ($line['note']) {
                                        $content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
@@ -375,6 +378,7 @@ class Handler_Public extends Handler {
                $search_mode = $this->dbh->escape_string($_REQUEST["smode"]);
                $view_mode = $this->dbh->escape_string($_REQUEST["view-mode"]);
                $order = $this->dbh->escape_string($_REQUEST["order"]);
+               $start_ts = $this->dbh->escape_string($_REQUEST["ts"]);
 
                $format = $this->dbh->escape_string($_REQUEST['format']);
                $orig_guid = sql_bool_to_bool($_REQUEST["orig_guid"]);
@@ -397,7 +401,7 @@ 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, $orig_guid);
+                               $offset, $search, $search_mode, $view_mode, $format, $order, $orig_guid, $start_ts);
                } else {
                        header('HTTP/1.1 403 Forbidden');
                }