From 19b9b276626fb7de8791388bf1f4d1c4563ed0de Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 13 Aug 2019 14:13:42 +0300
Subject: expire_cached_files to DiskCache::expire()

---
 classes/rssutils.php | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'classes/rssutils.php')

diff --git a/classes/rssutils.php b/classes/rssutils.php
index 4c8da4546..8a8867563 100755
--- a/classes/rssutils.php
+++ b/classes/rssutils.php
@@ -1284,32 +1284,6 @@ class RSSUtils {
 		Debug::log("Removed $num_deleted old lock files.");
 	}
 
-	static function expire_cached_files() {
-		foreach (array("feeds", "images", "export", "upload") as $dir) {
-			$cache_dir = CACHE_DIR . "/$dir";
-
-			Debug::log("Expiring $cache_dir", Debug::$LOG_VERBOSE);
-
-			$num_deleted = 0;
-
-			if (is_writable($cache_dir)) {
-				$files = glob("$cache_dir/*");
-
-				if ($files) {
-					foreach ($files as $file) {
-						if (time() - filemtime($file) > 86400*CACHE_MAX_DAYS) {
-							unlink($file);
-
-							++$num_deleted;
-						}
-					}
-				}
-			}
-
-			Debug::log("$cache_dir: removed $num_deleted files.");
-		}
-	}
-
 	/**
 	 * Source: http://www.php.net/manual/en/function.parse-url.php#104527
 	 * Returns the url query as associative array
@@ -1498,7 +1472,8 @@ class RSSUtils {
 	}
 
 	static function housekeeping_common() {
-		RSSUtils::expire_cached_files();
+		DiskCache::expire();
+
 		RSSUtils::expire_lock_files();
 		RSSUtils::expire_error_log();
 		RSSUtils::expire_feed_archive();
-- 
cgit v1.2.3-54-g00ecf