]> source.dussan.org Git - nextcloud-server.git/commitdiff
fix(setupchecks): skip check when disk_free_space is disabled 46203/head
authorDaniel Kesselberg <mail@danielkesselberg.de>
Fri, 28 Jun 2024 11:06:49 +0000 (13:06 +0200)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Sat, 29 Jun 2024 14:00:33 +0000 (14:00 +0000)
Make it easier to discover that the check failed because disk_free_space is disabled.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
apps/settings/lib/SetupChecks/TempSpaceAvailable.php

index 6a8aa1eab51170a685c946fcd281b6533f96ff26..a696c0bdc655a6d1d2cd1709a8b8be245466ebfd 100644 (file)
@@ -84,7 +84,11 @@ class TempSpaceAvailable implements ISetupCheck {
                        return SetupResult::error($this->l10n->t('Error while checking the temporary PHP path - it was not properly set to a directory. Returned value: %s', [$phpTempPath]));
                }
 
-               $freeSpaceInTemp = function_exists('disk_free_space') ? disk_free_space($phpTempPath) : false;
+               if (!function_exists('disk_free_space')) {
+                       return SetupResult::info($this->l10n->t('The PHP function "disk_free_space" is disabled, which prevents the check for enough space in the temporary directories.'));
+               }
+
+               $freeSpaceInTemp = disk_free_space($phpTempPath);
                if ($freeSpaceInTemp === false) {
                        return SetupResult::error($this->l10n->t('Error while checking the available disk space of temporary PHP path or no free disk space returned. Temporary path: %s', [$phpTempPath]));
                }
@@ -93,7 +97,7 @@ class TempSpaceAvailable implements ISetupCheck {
                $freeSpaceInTempInGB = $freeSpaceInTemp / 1024 / 1024 / 1024;
                $spaceDetail = $this->l10n->t('- %.1f GiB available in %s (PHP temporary directory)', [round($freeSpaceInTempInGB, 1),$phpTempPath]);
                if ($nextcloudTempPath !== $phpTempPath) {
-                       $freeSpaceInNextcloudTemp = function_exists('disk_free_space') ? disk_free_space($nextcloudTempPath) : false;
+                       $freeSpaceInNextcloudTemp = disk_free_space($nextcloudTempPath);
                        if ($freeSpaceInNextcloudTemp === false) {
                                return SetupResult::error($this->l10n->t('Error while checking the available disk space of temporary PHP path or no free disk space returned. Temporary path: %s', [$nextcloudTempPath]));
                        }