]> git.wh0rd.org - tt-rss.git/blobdiff - classes/feeds.php
implement ttrss_feeds.cache_content
[tt-rss.git] / classes / feeds.php
index 2e9aea6861e7220ded425401b72943e6ddb37add..49adf38795b8381d0182ab43d08e383a051971f7 100644 (file)
@@ -1,47 +1,24 @@
 <?php\r
-class Feeds extends Protected_Handler {\r
+require_once "colors.php";\r
 \r
-       private function feedlist_init_cat($cat_id, $hidden = false) {\r
-               $obj = array();\r
-               $cat_id = (int) $cat_id;\r
+class Feeds extends Handler_Protected {\r
 \r
-               if ($cat_id > 0) {\r
-                       $cat_unread = ccache_find($this->link, $cat_id, $_SESSION["uid"], true);\r
-               } else if ($cat_id == 0 || $cat_id == -2) {\r
-                       $cat_unread = getCategoryUnread($this->link, $cat_id);\r
-               }\r
-\r
-               $obj['id'] = 'CAT:' . $cat_id;\r
-               $obj['items'] = array();\r
-               $obj['name'] = getCategoryTitle($this->link, $cat_id);\r
-               $obj['type'] = 'feed';\r
-               $obj['unread'] = (int) $cat_unread;\r
-               $obj['hidden'] = $hidden;\r
-               $obj['bare_id'] = $cat_id;\r
+       function csrf_ignore($method) {\r
+               $csrf_ignored = array("index");\r
 \r
-               return $obj;\r
+               return array_search($method, $csrf_ignored) !== false;\r
        }\r
 \r
-       private function feedlist_init_feed($feed_id, $title = false, $unread = false, $error = '', $updated = '') {\r
-               $obj = array();\r
-               $feed_id = (int) $feed_id;\r
-\r
-               if (!$title)\r
-                       $title = getFeedTitle($this->link, $feed_id, false);\r
-\r
-               if ($unread === false)\r
-                       $unread = getFeedUnread($this->link, $feed_id, false);\r
+       private function make_gradient($end, $class) {\r
+               $start = $class == "even" ? "#f0f0f0" : "#ffffff";\r
 \r
-               $obj['id'] = 'FEED:' . $feed_id;\r
-               $obj['name'] = $title;\r
-               $obj['unread'] = (int) $unread;\r
-               $obj['type'] = 'feed';\r
-               $obj['error'] = $error;\r
-               $obj['updated'] = $updated;\r
-               $obj['icon'] = getFeedIcon($feed_id);\r
-               $obj['bare_id'] = $feed_id;\r
-\r
-               return $obj;\r
+               return "style='background: linear-gradient(left , $start 6%, $end 100%);\r
+                       background: -o-linear-gradient(left , $start 6%, $end 100%);\r
+                       background: -moz-linear-gradient(left , $start 6%, $end 100%);\r
+                       background: -webkit-linear-gradient(left , $start 6%, $end 100%);\r
+                       background: -ms-linear-gradient(left , $start 6%, $end 100%);\r
+                       background: -webkit-gradient(linear, left top, right top,\r
+                               color-stop(0.06, $start), color-stop(1, $end));'";\r
        }\r
 \r
        private function format_headline_subtoolbar($feed_site_url, $feed_title,\r
@@ -68,6 +45,8 @@ class Feeds extends Protected_Handler {
                $tog_marked_link = "selectionToggleMarked()";\r
                $tog_published_link = "selectionTogglePublished()";\r
 \r
+               $set_score_link = "setSelectionScore()";\r
+\r
                if ($is_cat) $cat_q = "&is_cat=$is_cat";\r
 \r
                if ($search) {\r
@@ -82,6 +61,7 @@ class Feeds extends Protected_Handler {
                // right part\r
 \r
                $reply .= "<span class='r'>";\r
+               $reply .= "<span id='feed_title'>";\r
 \r
                if ($feed_site_url) {\r
                        $target = "target=\"_blank\"";\r
@@ -96,6 +76,8 @@ class Feeds extends Protected_Handler {
                        $reply .= $feed_title;\r
                }\r
 \r
+               $reply .= "</span>";\r
+\r
                $reply .= "\r
                        <a href=\"#\"\r
                                title=\"".__("View as RSS feed")."\"\r
@@ -127,6 +109,7 @@ class Feeds extends Protected_Handler {
                $reply .= "<option value=\"0\" disabled=\"1\">".__('Selection:')."</option>";\r
 \r
                $reply .= "<option value=\"$catchup_sel_link\">".__('Mark as read')."</option>";\r
+               $reply .= "<option value=\"$set_score_link\">".__('Set score')."</option>";\r
 \r
                if ($feed_id != "0") {\r
                        $reply .= "<option value=\"$archive_sel_link\">".__('Archive')."</option>";\r
@@ -156,7 +139,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
@@ -171,25 +154,26 @@ class Feeds extends Protected_Handler {
 \r
                $method_split = explode(":", $method);\r
 \r
-/*             if ($method == "CatchupSelected") {\r
-                       $ids = explode(",", db_escape_string($_REQUEST["ids"]));\r
-                       $cmode = sprintf("%d", $_REQUEST["cmode"]);\r
+               if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {\r
+                       // Update the feed if required with some basic flood control\r
 \r
-                       catchupArticlesById($this->link, $ids, $cmode);\r
-               } */\r
-\r
-               //if ($method == "ForceUpdate" && $feed && is_numeric($feed) > 0) {\r
-               //      update_rss_feed($this->link, $feed, true);\r
-               //}\r
+                       $result = db_query($this->link,\r
+                               "SELECT cache_images,cache_content,".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated\r
+                                       FROM ttrss_feeds WHERE id = '$feed'");\r
 \r
-               if ($method == "MarkAllRead")  {\r
-                       catchup_feed($this->link, $feed, $cat_view);\r
+                               if (db_num_rows($result) != 0) {\r
+                                       $last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));\r
+                                       $cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));\r
+                                       $cache_content = sql_bool_to_bool(db_fetch_result($result, 0, "cache_content"));\r
 \r
-                       if (get_pref($this->link, 'ON_CATCHUP_SHOW_NEXT_FEED')) {\r
-                               if ($next_unread_feed) {\r
-                                       $feed = $next_unread_feed;\r
+                                       if (!$cache_images && !$cache_content && time() - $last_updated > 120 || isset($_REQUEST['DevForceUpdate'])) {\r
+                                               include "rssfuncs.php";\r
+                                               update_rss_feed($this->link, $feed, true, true);\r
+                                       } else {\r
+                                               db_query($this->link, "UPDATE ttrss_feeds SET last_updated = '1970-01-01', last_update_started = '1970-01-01'\r
+                                                       WHERE id = '$feed'");\r
+                                       }\r
                                }\r
-                       }\r
                }\r
 \r
                if ($method_split[0] == "MarkAllReadGR")  {\r
@@ -207,7 +191,7 @@ class Feeds extends Protected_Handler {
                        }\r
                }\r
 \r
-               if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {\r
+               if (is_numeric($feed) && $feed > 0) {\r
 \r
                        $result = db_query($this->link, "SELECT rtl_content FROM ttrss_feeds\r
                                WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]);\r
@@ -235,11 +219,7 @@ class Feeds extends Protected_Handler {
                }\r
 \r
                @$search_mode = db_escape_string($_REQUEST["search_mode"]);\r
-               @$match_on = db_escape_string($_REQUEST["match_on"]);\r
-\r
-               if (!$match_on) {\r
-                       $match_on = "both";\r
-               }\r
+               $match_on = "both"; // deprecated, TODO: remove\r
 \r
                if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);\r
 \r
@@ -249,7 +229,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
@@ -257,21 +238,29 @@ class Feeds extends Protected_Handler {
                $feed_title = $qfh_ret[1];\r
                $feed_site_url = $qfh_ret[2];\r
                $last_error = $qfh_ret[3];\r
+               $cache_content = true;\r
 \r
                $vgroup_last_feed = $vgr_last_feed;\r
 \r
-//             if (!$offset) {\r
-\r
-                       if (db_num_rows($result) > 0) {\r
-                               $reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,\r
-                                       $feed_title,\r
-                                       $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,\r
-                                       $last_error);\r
-                       }\r
-//             }\r
+               $reply['toolbar'] = $this->format_headline_subtoolbar($feed_site_url,\r
+                       $feed_title,\r
+                       $feed, $cat_view, $search, $match_on, $search_mode, $view_mode,\r
+                       $last_error);\r
 \r
                $headlines_count = db_num_rows($result);\r
 \r
+               if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {\r
+                       $button_plugins = array();\r
+                       foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {\r
+                               $pclass = "button_" . trim($p);\r
+\r
+                               if (class_exists($pclass)) {\r
+                                       $plugin = new $pclass($link);\r
+                                       array_push($button_plugins, $plugin);\r
+                               }\r
+                       }\r
+               }\r
+\r
                if (db_num_rows($result) > 0) {\r
 \r
                        $lnum = $offset;\r
@@ -284,13 +273,13 @@ class Feeds extends Protected_Handler {
                        if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);\r
 \r
                        while ($line = db_fetch_assoc($result)) {\r
-\r
                                $class = ($lnum % 2) ? "even" : "odd";\r
 \r
                                $id = $line["id"];\r
                                $feed_id = $line["feed_id"];\r
                                $label_cache = $line["label_cache"];\r
                                $labels = false;\r
+                               $label_row_style = "";\r
 \r
                                if ($label_cache) {\r
                                        $label_cache = json_decode($label_cache, true);\r
@@ -305,6 +294,22 @@ class Feeds extends Protected_Handler {
 \r
                                if (!is_array($labels)) $labels = get_article_labels($this->link, $id);\r
 \r
+                               if (count($labels) > 0) {\r
+                                       for ($i = 0; $i < min(4, count($labels)); $i++) {\r
+                                               $bg = rgb2hsl(_color_unpack($labels[$i][3]));\r
+\r
+                                               if ($bg && $bg[1] > 0) {\r
+                                                       $bg[1] = 0.1;\r
+                                                       $bg[2] = 1;\r
+\r
+                                                       $bg = _color_pack(hsl2rgb($bg));\r
+                                                       $label_row_style = $this->make_gradient($bg, $class);;\r
+\r
+                                                       break;\r
+                                               }\r
+                                       }\r
+                               }\r
+\r
                                $labels_str = "<span id=\"HLLCTR-$id\">";\r
                                $labels_str .= format_article_labels($labels, $id);\r
                                $labels_str .= "</span>";\r
@@ -389,7 +394,7 @@ class Feeds extends Protected_Handler {
                                $score_pic = "<img class='hlScorePic' src=\"images/$score_pic\"\r
                                        onclick=\"adjustArticleScore($id, $score)\" title=\"$score $score_title\">"; */\r
 \r
-                               $score_pic = "<img class='hlScorePic' src=\"$score_pic\"\r
+                               $score_pic = "<img class='hlScorePic' score='$score' onclick='changeScore($id, this)' src=\"$score_pic\"\r
                                        title=\"$score\">";\r
 \r
                                if ($score > 500) {\r
@@ -424,7 +429,7 @@ class Feeds extends Protected_Handler {
 \r
                                                        $cur_feed_title = htmlspecialchars($cur_feed_title);\r
 \r
-                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";\r
+                                                       $vf_catchup_link = "(<a onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";\r
 \r
                                                        $reply['content'] .= "<div class='cdmFeedTitle'>".\r
                                                                "<div style=\"float : right\">$feed_icon_img</div>".\r
@@ -437,7 +442,7 @@ class Feeds extends Protected_Handler {
                                        $mouseover_attrs = "onmouseover='postMouseIn($id)'\r
                                                onmouseout='postMouseOut($id)'";\r
 \r
-                                       $reply['content'] .= "<div class='$class' id='RROW-$id' $mouseover_attrs>";\r
+                                       $reply['content'] .= "<div class='$class' id='RROW-$id' $label_row_style $mouseover_attrs>";\r
 \r
                                        $reply['content'] .= "<div class='hlUpdPic'>$update_pic</div>";\r
 \r
@@ -528,7 +533,7 @@ class Feeds extends Protected_Handler {
                                        $mouseover_attrs = "onmouseover='postMouseIn($id)'\r
                                                onmouseout='postMouseOut($id)'";\r
 \r
-                                       $reply['content'] .= "<div class=\"$class\"\r
+                                       $reply['content'] .= "<div class=\"$class\" $label_row_style\r
                                                id=\"RROW-$id\" $mouseover_attrs'>";\r
 \r
                                        $reply['content'] .= "<div class=\"cdmHeader\">";\r
@@ -543,6 +548,9 @@ class Feeds extends Protected_Handler {
 \r
                                        $reply['content'] .= "</div>";\r
 \r
+                                       $reply['content'] .= "<div id=\"PTITLE-FULL-$id\" style=\"display : none\">" .\r
+                                               htmlspecialchars(strip_tags($line['title'])) . "</div>";\r
+\r
                                        $reply['content'] .= "<span id=\"RTITLE-$id\"\r
                                                onclick=\"return cdmClicked(event, $id);\"\r
                                                class=\"titleWrap$hlc_suffix\">\r
@@ -550,7 +558,7 @@ class Feeds extends Protected_Handler {
                                                title=\"".htmlspecialchars($line['title'])."\"\r
                                                target=\"_blank\" href=\"".\r
                                                htmlspecialchars($line["link"])."\">".\r
-                                               truncate_string($line["title"], 100) .\r
+                                               $line["title"] .\r
                                                " $entry_author</a>";\r
 \r
                                        $reply['content'] .= $labels_str;\r
@@ -616,7 +624,7 @@ class Feeds extends Protected_Handler {
                                                        $reply['content'] .= "&nbsp;";\r
 \r
                                                        $reply['content'] .= "<a target='_blank' href='" . htmlspecialchars($tmp_line['feed_url']) . "'>";\r
-                                                       $reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.gif'></a>";\r
+                                                       $reply['content'] .= "<img title='".__('Feed URL')."'class='tinyFeedIcon' src='images/pub_set.png'></a>";\r
 \r
                                                        $reply['content'] .= "</div>";\r
                                                }\r
@@ -624,6 +632,10 @@ class Feeds extends Protected_Handler {
 \r
                                        $feed_site_url = $line["site_url"];\r
 \r
+                                       if ($cache_content && $line["cached_content"] != "") {\r
+                                               $line["content_preview"] =& $line["cached_content"];\r
+                                       }\r
+\r
                                        $article_content = sanitize($this->link, $line["content_preview"],\r
                                                        false, false, $feed_site_url);\r
 \r
@@ -634,7 +646,7 @@ class Feeds extends Protected_Handler {
                                        $reply['content'] .= "</div>";\r
 \r
                                        $reply['content'] .= "<span id=\"CWRAP-$id\">";\r
-                                       $reply['content'] .= $expand_cdm ? $article_content : '';\r
+                                       $reply['content'] .= $article_content;\r
                                        $reply['content'] .= "</span>";\r
 \r
 /*                                     $tmp_result = db_query($this->link, "SELECT always_display_enclosures FROM\r
@@ -671,14 +683,14 @@ class Feeds extends Protected_Handler {
 \r
                                        if ($num_comments > 0) {\r
                                                if ($line["comments"]) {\r
-                                                       $comments_url = $line["comments"];\r
+                                                       $comments_url = htmlspecialchars($line["comments"]);\r
                                                } else {\r
-                                                       $comments_url = $line["link"];\r
+                                                       $comments_url = htmlspecialchars($line["link"]);\r
                                                }\r
                                                $entry_comments = "<a target='_blank' href=\"$comments_url\">$num_comments comments</a>";\r
                                        } else {\r
                                                if ($line["comments"] && $line["link"] != $line["comments"]) {\r
-                                                       $entry_comments = "<a target='_blank' href=\"".$line["comments"]."\">comments</a>";\r
+                                                       $entry_comments = "<a target='_blank' href=\"".htmlspecialchars($line["comments"])."\">comments</a>";\r
                                                }\r
                                        }\r
 \r
@@ -694,32 +706,14 @@ class Feeds extends Protected_Handler {
 \r
                                        //$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);\r
 \r
-                                       $reply['content'] .= "<img src=\"images/art-pub-note.png\"\r
-                                               style=\"cursor : pointer\" style=\"cursor : pointer\"\r
-                                               onclick=\"editArticleNote($id)\"\r
-                                               alt='PubNote' title='".__('Edit article note')."'>";\r
-\r
-                                       $reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-email.png')."\"\r
-                                               style=\"cursor : pointer\"\r
-                                               onclick=\"emailArticle($id)\"\r
-                                               alt='Zoom' title='".__('Forward by email')."'>";\r
-\r
-                                       if (ENABLE_TWEET_BUTTON) {\r
-                                               $reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-tweet.png')."\"\r
-                                                       class='tagsPic' style=\"cursor : pointer\"\r
-                                                       onclick=\"tweetArticle($id)\"\r
-                                                       alt='Zoom' title='".__('Share on Twitter')."'>";\r
+                                       foreach ($button_plugins as $p) {\r
+                                               $reply['content'] .= $p->render($id, $line);\r
                                        }\r
 \r
-                                       $reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-share.png')."\"\r
-                                               class='tagsPic' style=\"cursor : pointer\"\r
-                                               onclick=\"shareArticle(".$line['int_id'].")\"\r
-                                               alt='Zoom' title='".__('Share by URL')."'>";\r
-\r
                                        $reply['content'] .= "<img src=\"images/digest_checkbox.png\"\r
                                                style=\"cursor : pointer\" style=\"cursor : pointer\"\r
                                                onclick=\"dismissArticle($id)\"\r
-                                               alt='Dismiss' title='".__('Dismiss article')."'>";\r
+                                               title='".__('Close article')."'>";\r
 \r
                                        $reply['content'] .= "</div>";\r
                                        $reply['content'] .= "</div>";\r
@@ -789,171 +783,6 @@ class Feeds extends Protected_Handler {
                        $vgroup_last_feed, $reply);\r
        }\r
 \r
-       private function outputFeedList($special = true) {\r
-\r
-               $feedlist = array();\r
-\r
-               $enable_cats = get_pref($this->link, 'ENABLE_FEED_CATS');\r
-\r
-               $feedlist['identifier'] = 'id';\r
-               $feedlist['label'] = 'name';\r
-               $feedlist['items'] = array();\r
-\r
-               $owner_uid = $_SESSION["uid"];\r
-\r
-               /* virtual feeds */\r
-\r
-               if ($special) {\r
-\r
-                       if ($enable_cats) {\r
-                               $cat_hidden = get_pref($this->link, "_COLLAPSED_SPECIAL");\r
-                               $cat = $this->feedlist_init_cat(-1, $cat_hidden);\r
-                       } else {\r
-                               $cat['items'] = array();\r
-                       }\r
-\r
-                       foreach (array(-4, -3, -1, -2, 0) as $i) {\r
-                               array_push($cat['items'], $this->feedlist_init_feed($i));\r
-                       }\r
-\r
-                       if ($enable_cats) {\r
-                               array_push($feedlist['items'], $cat);\r
-                       } else {\r
-                               $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);\r
-                       }\r
-\r
-                       $result = db_query($this->link, "SELECT * FROM\r
-                               ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption");\r
-\r
-                       if (db_num_rows($result) > 0) {\r
-\r
-                               if (get_pref($this->link, 'ENABLE_FEED_CATS')) {\r
-                                       $cat_hidden = get_pref($this->link, "_COLLAPSED_LABELS");\r
-                                       $cat = $this->feedlist_init_cat(-2, $cat_hidden);\r
-                               } else {\r
-                                       $cat['items'] = array();\r
-                               }\r
-\r
-                               while ($line = db_fetch_assoc($result)) {\r
-\r
-                                       $label_id = -$line['id'] - 11;\r
-                                       $count = getFeedUnread($this->link, $label_id);\r
-\r
-                                       $feed = $this->feedlist_init_feed($label_id, false, $count);\r
-\r
-                                       $feed['fg_color'] = $line['fg_color'];\r
-                                       $feed['bg_color'] = $line['bg_color'];\r
-\r
-                                       array_push($cat['items'], $feed);\r
-                               }\r
-\r
-                               if ($enable_cats) {\r
-                                       array_push($feedlist['items'], $cat);\r
-                               } else {\r
-                                       $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);\r
-                               }\r
-                       }\r
-               }\r
-\r
-/*             if (get_pref($this->link, 'ENABLE_FEED_CATS')) {\r
-                       if (get_pref($this->link, "FEEDS_SORT_BY_UNREAD")) {\r
-                               $order_by_qpart = "order_id,category,unread DESC,title";\r
-                       } else {\r
-                               $order_by_qpart = "order_id,category,title";\r
-                       }\r
-               } else {\r
-                       if (get_pref($this->link, "FEEDS_SORT_BY_UNREAD")) {\r
-                               $order_by_qpart = "unread DESC,title";\r
-                       } else {\r
-                               $order_by_qpart = "title";\r
-                       }\r
-               } */\r
-\r
-               /* real feeds */\r
-\r
-               if ($enable_cats)\r
-                       $order_by_qpart = "ttrss_feed_categories.order_id,category,\r
-                               ttrss_feeds.order_id,title";\r
-               else\r
-                       $order_by_qpart = "title";\r
-\r
-               $age_qpart = getMaxAgeSubquery();\r
-\r
-               $query = "SELECT ttrss_feeds.id, ttrss_feeds.title,\r
-                       ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms,\r
-                       cat_id,last_error,\r
-                       ttrss_feed_categories.title AS category,\r
-                       ttrss_feed_categories.collapsed,\r
-                       value AS unread\r
-                       FROM ttrss_feeds LEFT JOIN ttrss_feed_categories\r
-                               ON (ttrss_feed_categories.id = cat_id)\r
-                       LEFT JOIN ttrss_counters_cache\r
-                               ON\r
-                                       (ttrss_feeds.id = feed_id)\r
-                       WHERE\r
-                               ttrss_feeds.owner_uid = '$owner_uid'\r
-                       ORDER BY $order_by_qpart";\r
-\r
-               $result = db_query($this->link, $query);\r
-\r
-               $actid = $_REQUEST["actid"];\r
-\r
-               if (db_num_rows($result) > 0) {\r
-\r
-                       $category = "";\r
-\r
-                       if (!$enable_cats)\r
-                               $cat['items'] = array();\r
-                       else\r
-                               $cat = false;\r
-\r
-                       while ($line = db_fetch_assoc($result)) {\r
-\r
-                               $feed = htmlspecialchars(trim($line["title"]));\r
-\r
-                               if (!$feed) $feed = "[Untitled]";\r
-\r
-                               $feed_id = $line["id"];\r
-                               $unread = $line["unread"];\r
-\r
-                               $cat_id = $line["cat_id"];\r
-                               $tmp_category = $line["category"];\r
-                               if (!$tmp_category) $tmp_category = __("Uncategorized");\r
-\r
-                               if ($category != $tmp_category && $enable_cats) {\r
-\r
-                                       $category = $tmp_category;\r
-\r
-                                       $collapsed = sql_bool_to_bool($line["collapsed"]);\r
-\r
-                                       // workaround for NULL category\r
-                                       if ($category == __("Uncategorized")) {\r
-                                               $collapsed = get_pref($this->link, "_COLLAPSED_UNCAT");\r
-                                       }\r
-\r
-                                       if ($cat) array_push($feedlist['items'], $cat);\r
-\r
-                                       $cat = $this->feedlist_init_cat($cat_id, $collapsed);\r
-                               }\r
-\r
-                               $updated = make_local_datetime($this->link, $line["updated_noms"], false);\r
-\r
-                               array_push($cat['items'], $this->feedlist_init_feed($feed_id,\r
-                                       $feed, $unread, $line['last_error'], $updated));\r
-                       }\r
-\r
-                       if ($enable_cats) {\r
-                               array_push($feedlist['items'], $cat);\r
-                       } else {\r
-                               $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);\r
-                       }\r
-\r
-               }\r
-\r
-               return $feedlist;\r
-       }\r
-\r
-\r
        function catchupAll() {\r
                db_query($this->link, "UPDATE ttrss_user_entries SET\r
                                                last_read = NOW(),unread = false WHERE owner_uid = " . $_SESSION["uid"]);\r
@@ -966,29 +795,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
@@ -1002,7 +808,7 @@ 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
@@ -1048,7 +854,7 @@ class Feeds extends Protected_Handler {
                set_pref($this->link, "_DEFAULT_VIEW_LIMIT", $limit);\r
                set_pref($this->link, "_DEFAULT_VIEW_ORDER_BY", $order_by);\r
 \r
-               if (!$cat_view && preg_match("/^[0-9][0-9]*$/", $feed)) {\r
+               if (!$cat_view && is_numeric($feed) && $feed > 0) {\r
                        db_query($this->link, "UPDATE ttrss_feeds SET last_viewed = NOW()\r
                                                        WHERE id = '$feed' AND owner_uid = ".$_SESSION["uid"]);\r
                }\r
@@ -1100,7 +906,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, true);\r
 \r
                $topmost_article_ids = $ret[0];\r
                $headlines_count = $ret[1];\r