merge branch v2 (release 2.0.0-beta.33)

marcantondahmen · marcantondahmen · commit e6c8e1b3bb20 · 2026-05-22T21:49:50.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,17 @@
 # Changelog
 
-## [v2.0.0-beta.32](https://github.com/marcantondahmen/automad/commit/8713cccebb050201735f8cf91d8e6d794300466f)
+## [v2.0.0-beta.33](https://github.com/marcantondahmen/automad/commit/01d123edd54ae375acffbc8e3b14d25713f7f793)
 
-Mon, 11 May 2026 11:40:57 +0200
+Fri, 22 May 2026 21:46:37 +0200
+
+### New Features
+
+- also return success on account recovery token requests when user doesn't exist ([eac0b05da](https://github.com/marcantondahmen/automad/commit/eac0b05dafdb0ddf8b9139dad8929aaba86568ca))
+- improve editing performance by caching disk usage information ([d1238cc15](https://github.com/marcantondahmen/automad/commit/d1238cc15e8f6716bddb72a53aa970b9c60cc218))
+
+## [v2.0.0-beta.32](https://github.com/marcantondahmen/automad/commit/d9dc838ab916ae566f6726409ccb2bb20b529c48)
+
+Mon, 11 May 2026 11:44:31 +0200
 
 ### Bugfixes
 
diff --git a/automad/lang/english.json b/automad/lang/english.json
@@ -14,7 +14,7 @@
 	"accountRecoverySuccessHeading": "Account recovered",
 	"accountRecoverySuccessText": "Your password has been updated and two-factor authentication has been disabled. You can now sign in and set up 2FA again.",
 	"accountRecoveryTokenSentHeading": "Check your email",
-	"accountRecoveryTokenSentText": "A verification email has been sent to your inbox. Click the link in the email to set a new password and complete account recovery.",
+	"accountRecoveryTokenSentText": "If the provided username or email matches an account, a verification email has been sent to your inbox. Click the link in the email to set a new password and complete account recovery.",
 	"add": "Add",
 	"addImage": "Add image",
 	"addPage": "Add Page",
diff --git a/automad/src/server/App.php b/automad/src/server/App.php
@@ -56,7 +56,7 @@
  * @license See LICENSE.md for license information
  */
 class App {
-	const VERSION = '2.0.0-beta.32';
+	const VERSION = '2.0.0-beta.33';
 
 	/**
 	 * Required PHP version.
diff --git a/automad/src/server/Auth/User.php b/automad/src/server/Auth/User.php
@@ -208,8 +208,6 @@ public function sendPasswordResetToken(string $type, Messenger $Messenger): bool
 		$email = $this->email;
 
 		if (!$email) {
-			$Messenger->setError(Text::get('error_user_no_email'));
-
 			return false;
 		}
 
diff --git a/automad/src/server/Controllers/API/AppController.php b/automad/src/server/Controllers/API/AppController.php
@@ -45,6 +45,7 @@
 use Automad\Core\FileSystem;
 use Automad\Core\Str;
 use Automad\Core\Text;
+use Automad\System\DiskUsage;
 use Automad\System\Fields;
 
 defined('AUTOMAD') or die('Direct access not permitted!');
@@ -101,7 +102,7 @@ public static function getServerInfo(): Response {
 			'phpVersion' => phpversion(),
 			'phpSapiName' => php_sapi_name(),
 			'memoryLimit' => ini_get('memory_limit'),
-			'diskUsage' => FileSystem::diskUsage(),
+			'diskUsage' => DiskUsage::calculate(),
 			'diskQuota' => AM_DISK_QUOTA
 		));
 	}
diff --git a/automad/src/server/Controllers/API/FileCollectionController.php b/automad/src/server/Controllers/API/FileCollectionController.php
@@ -43,6 +43,7 @@
 use Automad\Core\Request;
 use Automad\Core\Text;
 use Automad\Models\FileCollection;
+use Automad\System\DiskUsage;
 
 defined('AUTOMAD') or die('Direct access not permitted!');
 
@@ -105,7 +106,7 @@ public static function list(): Response {
 	public static function upload(): Response {
 		$Response = new Response();
 
-		if (FileSystem::diskQuotaExceeded()) {
+		if (DiskUsage::quotaExceeded()) {
 			return $Response->setError(Text::get('diskQuotaExceeded'))->setCode(403);
 		}
 
diff --git a/automad/src/server/Controllers/API/FileController.php b/automad/src/server/Controllers/API/FileController.php
@@ -36,11 +36,11 @@
 namespace Automad\Controllers\API;
 
 use Automad\API\Response;
-use Automad\Core\FileSystem;
 use Automad\Core\Messenger;
 use Automad\Core\Request;
 use Automad\Core\Text;
 use Automad\Models\File;
+use Automad\System\DiskUsage;
 
 defined('AUTOMAD') or die('Direct access not permitted!');
 
@@ -82,7 +82,7 @@ public static function import(): Response {
 		$Response = new Response();
 		$Messenger = new Messenger();
 
-		if (FileSystem::diskQuotaExceeded()) {
+		if (DiskUsage::quotaExceeded()) {
 			return $Response->setError(Text::get('diskQuotaExceeded'))->setCode(403);
 		}
 
diff --git a/automad/src/server/Controllers/API/ImageController.php b/automad/src/server/Controllers/API/ImageController.php
@@ -42,6 +42,7 @@
 use Automad\Core\Request;
 use Automad\Core\Text;
 use Automad\Models\Image;
+use Automad\System\DiskUsage;
 
 defined('AUTOMAD') or die('Direct access not permitted!');
 
@@ -61,7 +62,7 @@ class ImageController {
 	public static function save(): Response {
 		$Response = new Response();
 
-		if (FileSystem::diskQuotaExceeded()) {
+		if (DiskUsage::quotaExceeded()) {
 			return $Response->setError(Text::get('diskQuotaExceeded'))->setCode(403);
 		}
 
diff --git a/automad/src/server/Controllers/API/PageController.php b/automad/src/server/Controllers/API/PageController.php
@@ -47,6 +47,7 @@
 use Automad\Models\Page;
 use Automad\Models\Selection;
 use Automad\Stores\DataStore;
+use Automad\System\DiskUsage;
 use Automad\System\Fields;
 use Automad\System\ThemeCollection;
 
@@ -68,7 +69,7 @@ class PageController {
 	public static function add(): Response {
 		$Response = new Response();
 
-		if (FileSystem::diskQuotaExceeded()) {
+		if (DiskUsage::quotaExceeded()) {
 			return $Response->setError(Text::get('diskQuotaExceeded'))->setCode(403);
 		}
 
@@ -255,7 +256,7 @@ public static function discardDraft(): Response {
 	public static function duplicate(): Response {
 		$Response = new Response();
 
-		if (FileSystem::diskQuotaExceeded()) {
+		if (DiskUsage::quotaExceeded()) {
 			return $Response->setError(Text::get('diskQuotaExceeded'))->setCode(403);
 		}
 
@@ -435,7 +436,7 @@ private static function getTemplateNameFromPost(): string {
 	private static function save(Page $Page, array $data): Response {
 		$Response = new Response();
 
-		if (FileSystem::diskQuotaExceeded()) {
+		if (DiskUsage::quotaExceeded()) {
 			return $Response->setError(Text::get('diskQuotaExceeded'))->setCode(403);
 		}
 
diff --git a/automad/src/server/Controllers/API/UserController.php b/automad/src/server/Controllers/API/UserController.php
@@ -134,11 +134,8 @@ public static function requestPasswordResetToken(): Response {
 
 		$User = $UserCollection->getUser($nameOrEmail);
 
-		if (!$User) {
-			return $Response->setError(Text::get('userNotFoundError'));
-		}
-
-		if ($User->sendPasswordResetToken(Request::post('type'), $Messenger)) {
+		// Also return success when user doesn't exist.
+		if (!$User || $User->sendPasswordResetToken(Request::post('type'), $Messenger)) {
 			return $Response->setData(array('success' => true));
 		}
 
diff --git a/automad/src/server/Core/Debug.php b/automad/src/server/Core/Debug.php
@@ -35,6 +35,8 @@
 
 namespace Automad\Core;
 
+use Automad\System\DiskUsage;
+
 defined('AUTOMAD') or die('Direct access not permitted!');
 
 /**
@@ -218,7 +220,7 @@ private static function addEntry($element, string $description, string $level):
 	 * Log disk usage.
 	 */
 	private static function diskUsage(): void {
-		self::log(round(FileSystem::diskUsage(), 2), 'Disk usage (M)');
+		self::log(round(DiskUsage::calculate(), 2), 'Disk usage (M)');
 	}
 
 	/**
diff --git a/automad/src/server/Core/FileSystem.php b/automad/src/server/Core/FileSystem.php
@@ -36,10 +36,6 @@
 namespace Automad\Core;
 
 use Exception;
-use FilesystemIterator;
-use RecursiveCallbackFilterIterator;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
 
 defined('AUTOMAD') or die('Direct access not permitted!');
 
@@ -133,49 +129,6 @@ public static function deleteMedia(string $file, Messenger $Messenger): bool {
 		return true;
 	}
 
-	/**
-	 * Check whether the disk quota is exeeded.
-	 *
-	 * @return bool
-	 */
-	public static function diskQuotaExceeded(): bool {
-		if (!AM_DISK_QUOTA) {
-			return false;
-		}
-
-		return (self::diskUsage() > AM_DISK_QUOTA);
-	}
-
-	/**
-	 * Get the disk usage of the installation in MB.
-	 *
-	 * @return float the disk usage in MB
-	 */
-	public static function diskUsage(): float {
-		$bytes = 0.0;
-		$dirIterator = new RecursiveDirectoryIterator(AM_BASE_DIR, FilesystemIterator::SKIP_DOTS);
-
-		$filterIterator = new RecursiveCallbackFilterIterator($dirIterator, function ($item) {
-			if (is_link($item->getPathname())) {
-				return false;
-			}
-
-			return true;
-		});
-
-		$objects = new RecursiveIteratorIterator($filterIterator);
-
-		foreach ($objects as $object) {
-			try {
-				$bytes += $object->getSize();
-			} catch (Exception $e) {
-				Debug::log($e->getMessage());
-			}
-		}
-
-		return round($bytes / (1024.0 * 1024.0), 2);
-	}
-
 	/**
 	 * Get the full file system path for the given path.
 	 *
diff --git a/automad/src/server/System/DiskUsage.php b/automad/src/server/System/DiskUsage.php
@@ -0,0 +1,115 @@
+<?php
+/*
+ *                    ....
+ *                  .:   '':.
+ *                  ::::     ':..
+ *                  ::.         ''..
+ *       .:'.. ..':.:::'    . :.   '':.
+ *      :.   ''     ''     '. ::::.. ..:
+ *      ::::.        ..':.. .''':::::  .
+ *      :::::::..    '..::::  :. ::::  :
+ *      ::'':::::::.    ':::.'':.::::  :
+ *      :..   ''::::::....':     ''::  :
+ *      :::::.    ':::::   :     .. '' .
+ *   .''::::::::... ':::.''   ..''  :.''''.
+ *   :..:::'':::::  :::::...:''        :..:
+ *   ::::::. '::::  ::::::::  ..::        .
+ *   ::::::::.::::  ::::::::  :'':.::   .''
+ *   ::: '::::::::.' '':::::  :.' '':  :
+ *   :::   :::::::::..' ::::  ::...'   .
+ *   :::  .::::::::::   ::::  ::::  .:'
+ *    '::'  '':::::::   ::::  : ::  :
+ *              '::::   ::::  :''  .:
+ *               ::::   ::::    ..''
+ *               :::: ..:::: .:''
+ *                 ''''  '''''
+ *
+ *
+ * AUTOMAD
+ *
+ * Copyright (c) 2026 by Marc Anton Dahmen
+ * https://marcdahmen.de
+ *
+ * See LICENSE.md for license information.
+ */
+
+namespace Automad\System;
+
+use Automad\Core\Debug;
+use Automad\Core\FileSystem;
+use Exception;
+use FilesystemIterator;
+use RecursiveCallbackFilterIterator;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+defined('AUTOMAD') or die('Direct access not permitted!');
+
+/**
+ * The DiskUsage util class contains helper functions for getting disk usage information.
+ *
+ * @author Marc Anton Dahmen
+ * @copyright Copyright (c) 2026 by Marc Anton Dahmen - https://marcdahmen.de
+ * @license See LICENSE.md for license information
+ */
+class DiskUsage {
+	const CACHE_LIFETIME = 300;
+	const FILE_CACHE = AM_DIR_TMP . '/disk_usage';
+
+	/**
+	 * Get the disk usage of the installation in MB.
+	 *
+	 * @return float the disk usage in MB
+	 */
+	public static function calculate(): float {
+		if (is_readable(self::FILE_CACHE) && intval(filemtime(self::FILE_CACHE)) + self::CACHE_LIFETIME > time()) {
+			$diskUsage = floatval(file_get_contents(self::FILE_CACHE));
+
+			Debug::log('Read disk usage from cache');
+
+			return $diskUsage;
+		}
+
+		Debug::log('Calculating disk usage ...');
+
+		$bytes = 0.0;
+		$dirIterator = new RecursiveDirectoryIterator(AM_BASE_DIR, FilesystemIterator::SKIP_DOTS);
+
+		$filterIterator = new RecursiveCallbackFilterIterator($dirIterator, function ($item) {
+			if (is_link($item->getPathname())) {
+				return false;
+			}
+
+			return true;
+		});
+
+		$objects = new RecursiveIteratorIterator($filterIterator);
+
+		foreach ($objects as $object) {
+			try {
+				$bytes += $object->getSize();
+			} catch (Exception $e) {
+				Debug::log($e->getMessage());
+			}
+		}
+
+		$diskUsage = round($bytes / (1024.0 * 1024.0), 2);
+
+		FileSystem::write(self::FILE_CACHE, strval($diskUsage));
+
+		return $diskUsage;
+	}
+
+	/**
+	 * Check whether the disk quota is exeeded.
+	 *
+	 * @return bool
+	 */
+	public static function quotaExceeded(): bool {
+		if (!AM_DISK_QUOTA) {
+			return false;
+		}
+
+		return (self::calculate() > AM_DISK_QUOTA);
+	}
+}
diff --git a/lib/composer.lock b/lib/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,6 @@ public function sendPasswordResetToken(string $type, Messenger $Messenger): bool`
`208`	`208`	`$email = $this->email;`
`209`	`209`
`210`	`210`	`if (!$email) {`
`211`		`- $Messenger->setError(Text::get('error_user_no_email'));`
`212`		`-`
`213`	`211`	`return false;`
`214`	`212`	`}`
`215`	`213`