force refetch feed when clicking update/clicking on same feed in the tree

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

diff --git a/classes/feeds.php b/classes/feeds.php
index 836bbb060ce604e7f37414e66b6400bd6fb514d9..df206c2efadbbe20118cf0fc51932cb69536ec10 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -134,9 +134,20 @@ class Feeds extends Handler_Protected {
 \r
                $method_split = explode(":", $method);\r
 \r
-               if ($method == "ForceUpdate" && $feed && is_numeric($feed) > 0) {\r
-                       include "rssfuncs.php";\r
-                       update_rss_feed($this->link, $feed, true);\r
+               if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {\r
+                       // Update the feed if required with some basic flood control\r
+\r
+                       $result = db_query($this->link,\r
+                               "SELECT ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated\r
+                                       FROM ttrss_feeds WHERE id = '$feed'");\r
+\r
+                               if (db_num_rows($result) != 0) {\r
+                                       $last_updated = strtotime(db_fetch_result($result, 0, "last_updated"));\r
+                                       if (time() - $last_updated > 120) {\r
+                                               include "rssfuncs.php";\r
+                                               update_rss_feed($this->link, $feed, true, true);\r
+                                       }\r
+                               }\r
                }\r
 \r
                if ($method_split[0] == "MarkAllReadGR")  {\r