From 5abe663cbe1e84714559c21038bd8c919b8bc63c Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 3 Nov 2022 12:08:16 +0100 Subject: [PATCH] fix stats-alias-path for subdomains with parent having speciallogfile == 1 Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/Http/Apache.php | 2 +- lib/Froxlor/Cron/Http/Lighttpd.php | 2 +- lib/Froxlor/Cron/Http/Nginx.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Froxlor/Cron/Http/Apache.php b/lib/Froxlor/Cron/Http/Apache.php index 52e2f3a1..03e0dc28 100644 --- a/lib/Froxlor/Cron/Http/Apache.php +++ b/lib/Froxlor/Cron/Http/Apache.php @@ -1035,7 +1035,7 @@ class Apache extends HttpConfigBase $statTool = Settings::Get('system.traffictool'); $statDomain = ""; if ($domain['speciallogfile'] == '1') { - $statDomain = "/" . $domain['domain']; + $statDomain = "/" . (($domain['parentdomainid'] == '0') ? $domain['domain'] : $domain['parentdomain']); } $statDocroot = FileDir::makeCorrectFile($domain['customerroot'] . '/' . $statTool . $statDomain); diff --git a/lib/Froxlor/Cron/Http/Lighttpd.php b/lib/Froxlor/Cron/Http/Lighttpd.php index 8747d883..64d38611 100644 --- a/lib/Froxlor/Cron/Http/Lighttpd.php +++ b/lib/Froxlor/Cron/Http/Lighttpd.php @@ -720,7 +720,7 @@ class Lighttpd extends HttpConfigBase $statTool = Settings::Get('system.traffictool'); $statDomain = ""; if ($domain['speciallogfile'] == '1') { - $statDomain = "/" . $domain['domain']; + $statDomain = "/" . (($domain['parentdomainid'] == '0') ? $domain['domain'] : $domain['parentdomain']); } $statDocroot = FileDir::makeCorrectFile($domain['customerroot'] . '/' . $statTool . $statDomain); diff --git a/lib/Froxlor/Cron/Http/Nginx.php b/lib/Froxlor/Cron/Http/Nginx.php index 09ee17ba..4087ec2d 100644 --- a/lib/Froxlor/Cron/Http/Nginx.php +++ b/lib/Froxlor/Cron/Http/Nginx.php @@ -1120,7 +1120,7 @@ class Nginx extends HttpConfigBase $statTool = Settings::Get('system.traffictool'); $statDomain = ""; if ($domain['speciallogfile'] == '1') { - $statDomain = "/" . $domain['domain']; + $statDomain = "/" . (($domain['parentdomainid'] == '0') ? $domain['domain'] : $domain['parentdomain']); } $statDocroot = FileDir::makeCorrectFile($domain['customerroot'] . '/' . $statTool . $statDomain);