From a2925af73a365c45fe3f7e519e7dd6cadde4681d Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 30 Jan 2025 13:16:06 +0100 Subject: [PATCH] fix deletion of webserver-logfiles when customer gehts deleted, thx to irisdina Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/System/TasksCron.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/Froxlor/Cron/System/TasksCron.php b/lib/Froxlor/Cron/System/TasksCron.php index e561bebb..b77bb868 100644 --- a/lib/Froxlor/Cron/System/TasksCron.php +++ b/lib/Froxlor/Cron/System/TasksCron.php @@ -341,10 +341,11 @@ class TasksCron extends FroxlorCron // webserver logs $logsdir = FileDir::makeCorrectFile(Settings::Get('system.logfiles_directory') . '/' . $row['data']['loginname']); - if (file_exists($logsdir) && $logsdir != '/' && $logsdir != FileDir::makeCorrectDir(Settings::Get('system.logfiles_directory')) && substr($logsdir, 0, strlen(Settings::Get('system.logfiles_directory'))) == Settings::Get('system.logfiles_directory')) { + if (file_exists(dirname($logsdir)) && $logsdir != '/' && $logsdir != FileDir::makeCorrectDir(Settings::Get('system.logfiles_directory')) && substr($logsdir, 0, strlen(Settings::Get('system.logfiles_directory'))) == Settings::Get('system.logfiles_directory')) { // build up wildcard for webX-{access,error}.log{*} - $logsdir .= '-*'; - FileDir::safe_exec('rm -f ' . escapeshellarg($logsdir)); + $logsdir .= '-*.log'; + FroxlorLogger::getInstanceOf()->logAction(FroxlorLogger::CRON_ACTION, LOG_NOTICE, 'Running: rm -rf ' .FileDir::makeCorrectFile($logsdir)); + FileDir::safe_exec('rm -f ' . FileDir::makeCorrectFile($logsdir)); } } }