improved mc logs folder cleaning

application/core/Files/FileUtil.php

@@ -161,32 +161,42 @@ abstract class FileUtil {
 	}
 
 	/**
-	 * Delete old ManiaControl Log Files
+	 * Clean the given directory by deleting old files
 	 *
+	 * @param string $directory
 	 * @param float  $maxFileAgeInDays
+	 * @param bool   $recursive
 	 * @return bool
 	 */
-	public static function deleteOldLogFiles($maxFileAgeInDays = 10.) {
-		$logsFolderPath = Logger::getLogsFolder();
-		if (!is_readable($logsFolderPath)) {
+	public static function cleanDirectory($directory, $maxFileAgeInDays = 10., $recursive = false) {
+		if (!is_dir($directory) || !is_readable($directory)) {
 			return false;
 		}
-		$dirHandle = opendir($logsFolderPath);
+		$dirHandle = opendir($directory);
 		if (!is_resource($dirHandle)) {
 			return false;
 		}
 		$time = time();
 		while ($fileName = readdir($dirHandle)) {
-			$filePath = $logsFolderPath . $fileName;
+			$filePath = $directory . $fileName;
 			if (!is_readable($filePath)) {
 				continue;
 			}
+			if (is_dir($filePath) && $recursive) {
+				// Directory
+				self::cleanDirectory($filePath . DIRECTORY_SEPARATOR, $maxFileAgeInDays, $recursive);
+			} else if (is_file($filePath)) {
+				// File
+				if (!is_writable($filePath)) {
+					continue;
+				}
 				$fileModTime   = filemtime($filePath);
 				$timeDeltaDays = ($time - $fileModTime) / (24. * 3600.);
 				if ($timeDeltaDays > $maxFileAgeInDays) {
 					unlink($filePath);
 				}
 			}
+		}
 		closedir($dirHandle);
 		return true;
 	}

application/core/Logger.php

@@ -2,6 +2,8 @@
 
 namespace ManiaControl;
 
+use ManiaControl\Files\FileUtil;
+
 /**
  * ManiaControl Logger Class
  *
@@ -16,6 +18,7 @@ class Logger {
 	 */
 	public static function setup() {
 		self::setupErrorLogFileName();
+		self::cleanLogsFolder();
 	}
 
 	/**
@@ -54,6 +57,16 @@ class Logger {
 		return $logsFolder;
 	}
 
+	/**
+	 * Delete old ManiaControl Log Files
+	 *
+	 * @return bool
+	 */
+	private static function cleanLogsFolder() {
+		$logsFolderPath = self::getLogsFolder();
+		return FileUtil::cleanDirectory($logsFolderPath);
+	}
+
 	/**
 	 * Log and echo the given Error Message
 	 *