From 061833b83dba18cff9621f1669737760716463b1 Mon Sep 17 00:00:00 2001 From: acsfer <12234510+acsfer@users.noreply.github.com> Date: Tue, 11 Jan 2022 18:56:27 +0100 Subject: [PATCH] Harden some PHP functions To avoid things like https://github.com/nextcloud/server/issues/26034 Signed-off-by: Louis Chemineau --- apps/settings/lib/Controller/CheckSetupController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php index 0b3d63ac06d8b..dd401b045f0b2 100644 --- a/apps/settings/lib/Controller/CheckSetupController.php +++ b/apps/settings/lib/Controller/CheckSetupController.php @@ -379,7 +379,7 @@ private function isCorrectMemcachedPHPModuleInstalled() { return true; } - // there are two different memcached modules for PHP + // there are two different memcache modules for PHP // we only support memcached and not memcache // https://code.google.com/p/memcached/wiki/PHPClientComparison return !(!extension_loaded('memcached') && extension_loaded('memcache')); @@ -392,7 +392,7 @@ private function isCorrectMemcachedPHPModuleInstalled() { */ private function isSettimelimitAvailable() { if (function_exists('set_time_limit') - && strpos(@ini_get('disable_functions'), 'set_time_limit') === false) { + && strpos(ini_get('disable_functions'), 'set_time_limit') === false) { return true; } @@ -819,12 +819,12 @@ protected function isEnoughTempSpaceAvailableIfS3PrimaryStorageIsUsed(): bool { $tempPath = sys_get_temp_dir(); if (!is_dir($tempPath)) { - $this->logger->error('Error while checking the temporary PHP path - it was not properly set to a directory. value: ' . $tempPath); + $this->logger->error('Error while checking the temporary PHP path - it was not properly set to a directory. Returned value: ' . $tempPath); return false; } - $freeSpaceInTemp = disk_free_space($tempPath); + $freeSpaceInTemp = function_exists('disk_free_space') ? disk_free_space($tempPath) : false; if ($freeSpaceInTemp === false) { - $this->logger->error('Error while checking the available disk space of temporary PHP path - no free disk space returned. temporary path: ' . $tempPath); + $this->logger->error('Error while checking the available disk space of temporary PHP path or no free disk space returned. Temporary path: ' . $tempPath); return false; }