From 5e736e4592d27107d69d9b7fbd19ae91b209956e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 31 Mar 2013 19:28:36 +0400
Subject: implement stop action

---
 include/functions.php | 2 +-
 include/rssfuncs.php  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/functions.php b/include/functions.php
index 9f75fc23a..9a52981e6 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 112);
+	define('SCHEMA_VERSION', 113);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 3bce14d33..e3b1e44b2 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -283,9 +283,11 @@
 					_debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)");
 				}
 
+				$force_refetch = isset($_REQUEST["force_refetch"]);
+
 				$feed_data = fetch_file_contents($fetch_url, false,
 					$auth_login, $auth_pass, false, $no_cache ? 15 : 45,
-					max($last_updated_timestamp, $cache_timestamp));
+					$force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp));
 
 				if ($debug_enabled) {
 					_debug("update_rss_feed: fetch done.");
@@ -1297,6 +1299,9 @@
 			if ($filter_match) {
 				foreach ($filter["actions"] AS $action) {
 					array_push($matches, $action);
+
+					// if Stop action encountered, perform no further processing
+					if ($action["type"] == "stop") return $matches;
 				}
 			}
 		}
-- 
cgit v1.2.3-54-g00ecf