X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FClearCache.php;h=026e7f4d80034aafd1f3c14bf05a8b3b9d71a60f;hb=e563de4de790d7970bf5f8f52a7fac27f196af4e;hp=c19d13194ad1a94645b17463b7565d93fa9e11ee;hpb=66bfb9e76feed2996e83bd4758c282337d99701d;p=friendica.git

diff --git a/src/Worker/ClearCache.php b/src/Worker/ClearCache.php
index c19d13194a..026e7f4d80 100644
--- a/src/Worker/ClearCache.php
+++ b/src/Worker/ClearCache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,8 +23,7 @@ namespace Friendica\Worker;
 
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Photo;
-use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\DateTimeFormat;
 
 /**
  * Clear cache entries
@@ -33,47 +32,13 @@ class ClearCache
 {
 	public static function execute()
 	{
-		$a = DI::app();
-
 		// clear old cache
 		DI::cache()->clear();
-		if (!DI::config()->get('system', 'optimize_tables')) {
-			DBA::e("OPTIMIZE TABLE `cache`");
-		}
-
-		// clear old item cache files
-		clear_cache();
-
-		// clear cache for photos
-		clear_cache($a->getBasePath(), $a->getBasePath() . "/photo");
-
-		// clear smarty cache
-		clear_cache($a->getBasePath() . "/view/smarty3/compiled", $a->getBasePath() . "/view/smarty3/compiled");
-
-		// clear cache for image proxy
-		if (!DI::config()->get("system", "proxy_disabled")) {
-			clear_cache($a->getBasePath(), $a->getBasePath() . "/proxy");
-
-			$cachetime = DI::config()->get('system', 'proxy_cache_time');
-
-			if (!$cachetime) {
-				$cachetime = ProxyUtils::DEFAULT_TIME;
-			}
-
-			$condition = ['`uid` = 0 AND `resource-id` LIKE "pic:%" AND `created` < NOW() - INTERVAL ? SECOND', $cachetime];
-			Photo::delete($condition);
-		}
 
 		// Delete the cached OEmbed entries that are older than three month
-		DBA::delete('oembed', ["`created` < NOW() - INTERVAL 3 MONTH"]);
-		if (!DI::config()->get('system', 'optimize_tables')) {
-			DBA::e("OPTIMIZE TABLE `oembed`");
-		}
+		DBA::delete('oembed', ["`created` < ?", DateTimeFormat::utc('now - 3 months')]);
 
-		// Delete the cached "parse_url" entries that are older than three month
-		DBA::delete('parsed_url', ["`created` < NOW() - INTERVAL 3 MONTH"]);
-		if (!DI::config()->get('system', 'optimize_tables')) {
-			DBA::e("OPTIMIZE TABLE `parsed_url`");
-		}
+		// Delete the cached "parsed_url" entries that are expired
+		DBA::delete('parsed_url', ["`expires` < ?", DateTimeFormat::utcNow()]);
 	}
 }