From d5b9ad345235b4dd6ad6048f5ac1e08c26261fda Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 20 Feb 2018 21:37:06 +0100 Subject: [PATCH] darn, stay php-5.3 compatible, thx greppy Signed-off-by: Michael Kaufmann (d00p) --- scripts/jobs/cron_tasks.inc.http.10.apache.php | 3 ++- scripts/jobs/cron_tasks.inc.http.20.lighttpd.php | 3 ++- scripts/jobs/cron_tasks.inc.http.30.nginx.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 2a7ab516..e49ef34e 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -66,7 +66,8 @@ class apache extends HttpConfigBase foreach ($restart_cmds as $restart_cmd) { // check whether the config dir is empty (no domains uses this daemon) // so we need to create a dummy - $isDirEmpty = !(new \FilesystemIterator($restart_cmd['config_dir']))->valid(); + $fsi = new \FilesystemIterator($restart_cmd['config_dir']); + $isDirEmpty = !$fsi->valid(); if ($isDirEmpty) { $this->logger->logAction(CRON_ACTION, LOG_INFO, 'apache::reload: fpm config directory "' . $restart_cmd['config_dir'] . '" is empty. Creating dummy.'); phpinterface_fpm::createDummyPool($restart_cmd['config_dir']); diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index 99232c8c..84b88400 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -66,7 +66,8 @@ class lighttpd extends HttpConfigBase foreach ($restart_cmds as $restart_cmd) { // check whether the config dir is empty (no domains uses this daemon) // so we need to create a dummy - $isDirEmpty = !(new \FilesystemIterator($restart_cmd['config_dir']))->valid(); + $fsi = new \FilesystemIterator($restart_cmd['config_dir']); + $isDirEmpty = !$fsi->valid(); if ($isDirEmpty) { $this->logger->logAction(CRON_ACTION, LOG_INFO, 'lighttpd::reload: fpm config directory "' . $restart_cmd['config_dir'] . '" is empty. Creating dummy.'); phpinterface_fpm::createDummyPool($restart_cmd['config_dir']); diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index 7f86f605..e2eac04d 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -81,7 +81,8 @@ class nginx extends HttpConfigBase foreach ($restart_cmds as $restart_cmd) { // check whether the config dir is empty (no domains uses this daemon) // so we need to create a dummy - $isDirEmpty = !(new \FilesystemIterator($restart_cmd['config_dir']))->valid(); + $fsi = new \FilesystemIterator($restart_cmd['config_dir']); + $isDirEmpty = !$fsi->valid(); if ($isDirEmpty) { $this->logger->logAction(CRON_ACTION, LOG_INFO, 'nginx::reload: fpm config directory "' . $restart_cmd['config_dir'] . '" is empty. Creating dummy.'); phpinterface_fpm::createDummyPool($restart_cmd['config_dir']);