disable headlines grouping for recently read vfeed

[tt-rss.git] / include / functions2.php

diff --git a/include/functions2.php b/include/functions2.php
index 60c3fe59a2befc5dcfcb3ff513e35337f655770c..ed0963c46e34992f62baafcb472656d61cdff511 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -382,7 +382,7 @@
                return $rv;
        }
 
-       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) {
+       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) {
 
                if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
@@ -583,6 +583,7 @@
                                $query_strategy_part = "unread = false AND last_read IS NOT NULL";
                                $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
                                $allow_archived = true;
+                               $ignore_vfeed_group = true;
 
                                if (!$override_order) $override_order = "last_read DESC";
 
@@ -698,6 +699,13 @@
                                if ($vfeed_query_part)
                                        $vfeed_query_part .= "favicon_avg_color,";
 
+                               if ($start_ts) {
+                                       $start_ts_formatted = date("Y/m/d H:i:s", strtotime($start_ts));
+                                       $start_ts_query_part = "date_entered >= '$start_ts_formatted' AND";
+                               } else {
+                                       $start_ts_query_part = "";
+                               }
+
                                $query = "SELECT DISTINCT
                                                date_entered,
                                                guid,
@@ -726,6 +734,7 @@
                                        ttrss_user_entries.ref_id = ttrss_entries.id AND
                                        ttrss_user_entries.owner_uid = '$owner_uid' AND
                                        $search_query_part
+                                       $start_ts_query_part
                                        $filter_query_part
                                        $view_query_part
                                        $since_id_part
@@ -1779,7 +1788,7 @@
                $doc->loadHTML($content);
                $xpath = new DOMXPath($doc);
                $entries = $xpath->query('/html/head/link[@rel="alternate" and '.
-                       '(contains(@type,"rss") or contains(@type,"atom"))]|/html/head/link[@rel="feed" or @rel="alternate feed"]');
+                       '(contains(@type,"rss") or contains(@type,"atom"))]|/html/head/link[@rel="feed"]');
                $feedUrls = array();
                foreach ($entries as $entry) {
                        if ($entry->hasAttribute('href')) {