disable SORT_HEADLINES_BY_FEED_DATE; replace with a toolbar newest first order

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

diff --git a/classes/feeds.php b/classes/feeds.php
index f38e621f734317808e970529544b6c10bbee47f6..fcac6e4d6ee856671e6579326f03c6bd82f8034e 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -217,9 +217,38 @@ class Feeds extends Handler_Protected {
                    $search_mode = $method;
                }
 //             error_log("search_mode: " . $search_mode);
-               $qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,
-                       $search, $search_mode, $override_order, $offset, 0,
-                       false, 0, $include_children);
+
+               if (!$cat_view && is_numeric($feed) && $feed < PLUGIN_FEED_BASE_INDEX) {
+                       global $pluginhost;
+
+                       $handler = $pluginhost->get_feed_handler(
+                               PluginHost::feed_to_pfeed_id($feed));
+
+               //      function queryFeedHeadlines($link, $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) {
+
+                       if ($handler) {
+                               $options = array(
+                                       "limit" => $limit,
+                                       "view_mode" => $view_mode,
+                                       "cat_view" => $cat_view,
+                                       "search" => $search,
+                                       "search_mode" => $search_mode,
+                                       "override_order" => $override_order,
+                                       "offset" => $offset,
+                                       "owner_uid" => $_SESSION["uid"],
+                                       "filter" => false,
+                                       "since_id" => 0,
+                                       "include_children" => $include_children);
+
+                               $qfh_ret = $handler->get_headlines(PluginHost::feed_to_pfeed_id($feed),
+                                       $options);
+                       }
+
+               } else {
+                       $qfh_ret = queryFeedHeadlines($this->link, $feed, $limit, $view_mode, $cat_view,
+                               $search, $search_mode, $override_order, $offset, 0,
+                               false, 0, $include_children);
+               }
 
                if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
 
@@ -715,7 +744,7 @@ class Feeds extends Handler_Protected {
                        if (!$offset && $message) {
                                $reply['content'] .= "<div class='whiteBox'>$message";
 
-                               $reply['content'] .= "<p class=\"small\"><span class=\"insensitive\">";
+                               $reply['content'] .= "<p><span class=\"insensitive\">";
 
                                $result = db_query($this->link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
                                        WHERE owner_uid = " . $_SESSION['uid']);
@@ -833,35 +862,12 @@ class Feeds extends Handler_Protected {
 
                $override_order = false;
 
-               if (get_pref($this->link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
-                       $date_sort_field = "updated";
-               } else {
-                       $date_sort_field = "date_entered";
-               }
-
                switch ($order_by) {
-                       case "date":
-                               if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
-                                       $override_order = "$date_sort_field";
-                               } else {
-                                       $override_order = "$date_sort_field DESC";
-                               }
-                               break;
-
-                       case "title":
-                               if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
-                                       $override_order = "title DESC, $date_sort_field";
-                               } else {
-                                       $override_order = "title, $date_sort_field DESC";
-                               }
+                       case "date_reverse":
+                               $override_order = "date_entered DESC, updated";
                                break;
-
-                       case "score":
-                               if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
-                                       $override_order = "score, $date_sort_field";
-                               } else {
-                                       $override_order = "score DESC, $date_sort_field DESC";
-                               }
+                       case "feed_dates":
+                               $override_order = "updated DESC";
                                break;
                }
 
@@ -903,7 +909,7 @@ class Feeds extends Handler_Protected {
                $reply['headlines']['toolbar'] = '';
                $reply['headlines']['content'] = "<div class='whiteBox'>".__('No feed selected.');
 
-               $reply['headlines']['content'] .= "<p class=\"small\"><span class=\"insensitive\">";
+               $reply['headlines']['content'] .= "<p><span class=\"insensitive\">";
 
                $result = db_query($link, "SELECT ".SUBSTRING_FOR_DATE."(MAX(last_updated), 1, 19) AS last_updated FROM ttrss_feeds
                        WHERE owner_uid = " . $_SESSION['uid']);