Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoracsfer <12234510+acsfer@users.noreply.github.com>2022-01-11 20:56:27 +0300
committerLouis Chemineau <louis@chmn.me>2022-10-04 14:22:03 +0300
commit4207b80141f762aa007a17b5e133db8ebdb81047 (patch)
tree3486c2e37455a36a45970466e5e83f06493c175a
parentb57115df3ff0c7ffc23ed5844225df2d21e4ee5b (diff)
Harden some PHP functions
To avoid things like https://github.com/nextcloud/server/issues/26034 Signed-off-by: Louis Chemineau <louis@chmn.me>
-rw-r--r--apps/settings/lib/Controller/CheckSetupController.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/settings/lib/Controller/CheckSetupController.php b/apps/settings/lib/Controller/CheckSetupController.php
index 0b3d63ac06d..dd401b045f0 100644
--- a/apps/settings/lib/Controller/CheckSetupController.php
+++ b/apps/settings/lib/Controller/CheckSetupController.php
@@ -379,7 +379,7 @@ class CheckSetupController extends Controller {
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 @@ class CheckSetupController extends Controller {
*/
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 @@ Raw output
$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;
}