modify sorting by date_entered: set date_entered per-batch; use updated as a secondar...

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

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 92bfaa02384e8d86242c87f1745c1e248dfdb320..73fe757c3dfac0d930d265de7a41ffe6b5c28c4f 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -224,6 +224,8 @@
 
                $simplepie_cache_dir = CACHE_DIR . "/simplepie";
 
+               $date_feed_processed = date('Y-m-d H:i');
+
                if (!is_dir($simplepie_cache_dir)) {
                        mkdir($simplepie_cache_dir);
                }
@@ -435,7 +437,7 @@
 
                                $entry_timestamp = strtotime($item->get_date());
 
-                               if ($entry_timestamp == -1 || !$entry_timestamp) {
+                               if ($entry_timestamp == -1 || !$entry_timestamp || $entry_timestamp > time()) {
                                        $entry_timestamp = time();
                                        $no_orig_date = 'true';
                                } else {
@@ -626,7 +628,7 @@
                                                        '',
                                                        $no_orig_date,
                                                        NOW(),
-                                                       NOW(),
+                                                       '$date_feed_processed',
                                                        '$entry_comments',
                                                        '$num_comments',
                                                        '$entry_plugin_data',
@@ -1165,11 +1167,13 @@
 
                foreach ($filters as $filter) {
                        $match_any_rule = $filter["match_any_rule"];
+                       $inverse = $filter["inverse"];
                        $filter_match = false;
 
                        foreach ($filter["rules"] as $rule) {
                                $match = false;
                                $reg_exp = $rule["reg_exp"];
+                               $rule_inverse = $rule["inverse"];
 
                                if (!$reg_exp)
                                        continue;
@@ -1202,6 +1206,8 @@
                                        break;
                                }
 
+                               if ($rule_inverse) $match = !$match;
+
                                if ($match_any_rule) {
                                        if ($match) {
                                                $filter_match = true;
@@ -1215,6 +1221,8 @@
                                }
                        }
 
+                       if ($inverse) $filter_match = !$filter_match;
+
                        if ($filter_match) {
                                foreach ($filter["actions"] AS $action) {
                                        array_push($matches, $action);