diff --git a/config.php-dist b/config.php-dist
index c5417ec24..78f1a2b3f 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -201,6 +201,11 @@
// Displays an URL for users to provide feedback or comments regarding
// this instance of tt-rss. Can lead to a forum, contact email, etc.
+ define('FORCE_ARTICLE_PURGE', 0);
+ // When this option is not 0, users ability to control feed purging
+ // intervals is disabled and all articles (which are not starred)
+ // older than this amount of days are purged.
+
define('CONFIG_VERSION', 18);
// Expected config version. Please update this option in config.php
// if necessary (after migrating all new options from this file).
diff --git a/functions.php b/functions.php
index 962057e33..565c5d103 100644
--- a/functions.php
+++ b/functions.php
@@ -147,8 +147,13 @@
if (!$owner_uid) return;
- $purge_unread = get_pref($link, "PURGE_UNREAD_ARTICLES",
- $owner_uid, false);
+ if (FORCE_ARTICLE_PURGE == 0) {
+ $purge_unread = get_pref($link, "PURGE_UNREAD_ARTICLES",
+ $owner_uid, false);
+ } else {
+ $purge_unread = true;
+ $purge_interval = FORCE_ARTICLE_PURGE;
+ }
if (!$purge_unread) $query_limit = " unread = false AND ";
@@ -252,7 +257,7 @@
// print "Feed $feed_id: purge interval = $purge_interval\n";
}
- if ($purge_interval > 0) {
+ if ($purge_interval > 0 || FORCE_ARTICLE_PURGE) {
purge_feed($link, $feed_id, $purge_interval, $do_output);
}
}
@@ -1423,9 +1428,12 @@
_debug("update_rss_feed: updating counters cache...");
}
- ccache_update($link, $feed, $owner_uid);
+ // disabled, purge_feed() does that...
+ //ccache_update($link, $feed, $owner_uid);
}
+ purge_feed($link, $feed, 0, true);
+
db_query($link, "UPDATE ttrss_feeds
SET last_updated = NOW(), last_error = '' WHERE id = '$feed'");
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 8b715e48f..532a8f531 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -276,15 +276,19 @@
print_select_hash("update_method", $update_method, $update_methods);
}
- /* Purge intl */
+ if (FORCE_ARTICLE_PURGE == 0) {
- print "
";
+ /* Purge intl */
- $purge_interval = db_fetch_result($result, 0, "purge_interval");
+ print "
";
- print __('Article purging:') . " ";
+ $purge_interval = db_fetch_result($result, 0, "purge_interval");
- print_select_hash("purge_interval", $purge_interval, $purge_intervals);
+ print __('Article purging:') . " ";
+
+ print_select_hash("purge_interval", $purge_interval, $purge_intervals);
+
+ }
print "";
print "