properly persist include_children

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

diff --git a/classes/feeds.php b/classes/feeds.php
index d1ef16738a1db8c1563319cb6452ac2936e12797..a3062565a5e227beff4ff94068fe25d9a125869e 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -119,7 +119,7 @@ class Feeds extends Protected_Handler {
 \r
        private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view,\r
                                        $next_unread_feed, $offset, $vgr_last_feed = false,\r
-                                       $override_order = false) {\r
+                                       $override_order = false, $include_children = false) {\r
 \r
                $disable_cache = false;\r
 \r
@@ -196,7 +196,8 @@ class Feeds extends Protected_Handler {
                }\r
 //             error_log("search_mode: " . $search_mode);\r
                $qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,\r
-                       $search, $search_mode, $match_on, $override_order, $offset);\r
+                       $search, $search_mode, $match_on, $override_order, $offset, 0,\r
+                       false, 0, $include_children);\r
 \r
                if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);\r
 \r
@@ -745,29 +746,6 @@ class Feeds extends Protected_Handler {
                toggle_collapse_cat($this->link, $cat_id, $mode);\r
        }\r
 \r
-       function index() {\r
-               $root = (bool)$_REQUEST["root"];\r
-\r
-               if (!$root) {\r
-                       print json_encode($this->outputFeedList($this->link));\r
-               } else {\r
-\r
-                       $feeds = $this->outputFeedList($this->link, false);\r
-\r
-                       $root = array();\r
-                       $root['id'] = 'root';\r
-                       $root['name'] = __('Feeds');\r
-                       $root['items'] = $feeds['items'];\r
-\r
-                       $fl = array();\r
-                       $fl['identifier'] = 'id';\r
-                       $fl['label'] = 'name';\r
-                       $fl['items'] = array($root);\r
-\r
-                       print json_encode($fl);\r
-               }\r
-       }\r
-\r
        function view() {\r
                $timing_info = getmicrotime();\r
 \r
@@ -781,11 +759,12 @@ class Feeds extends Protected_Handler {
                $method = db_escape_string($_REQUEST["m"]);\r
                $view_mode = db_escape_string($_REQUEST["view_mode"]);\r
                $limit = (int) get_pref($this->link, "DEFAULT_ARTICLE_LIMIT");\r
-               @$cat_view = db_escape_string($_REQUEST["cat"]) == "true";\r
+               @$cat_view = $_REQUEST["cat"] == "true";\r
                @$next_unread_feed = db_escape_string($_REQUEST["nuf"]);\r
                @$offset = db_escape_string($_REQUEST["skip"]);\r
                @$vgroup_last_feed = db_escape_string($_REQUEST["vgrlf"]);\r
                $order_by = db_escape_string($_REQUEST["order_by"]);\r
+               $include_children = $_REQUEST["include_children"] == "true";\r
 \r
                if (is_numeric($feed)) $feed = (int) $feed;\r
 \r
@@ -826,6 +805,7 @@ class Feeds extends Protected_Handler {
                set_pref($this->link, "_DEFAULT_VIEW_MODE", $view_mode);\r
                set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit);\r
                set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);\r
+               set_pref($this->link, "_DEFAULT_INCLUDE_CHILDREN", $include_children);\r
 \r
                if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {\r
                        db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()\r
@@ -879,7 +859,7 @@ class Feeds extends Protected_Handler {
 \r
                $ret = $this->format_headlines_list($feed, $method,\r
                        $view_mode, $limit, $cat_view, $next_unread_feed, $offset,\r
-                       $vgroup_last_feed, $override_order);\r
+                       $vgroup_last_feed, $override_order, $include_children);\r
 \r
                $topmost_article_ids = $ret[0];\r
                $headlines_count = $ret[1];\r