From c4ec2509fa484d1766743f7969bf48cf90bd3e0f Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Mon, 9 Jan 2023 09:24:22 +0100 Subject: [PATCH] fix resetting of isemaildomain-flag of subdomains when nothing changed; fixes #1067 Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/Commands/SubDomains.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/Froxlor/Api/Commands/SubDomains.php b/lib/Froxlor/Api/Commands/SubDomains.php index a9547941..6097caf0 100644 --- a/lib/Froxlor/Api/Commands/SubDomains.php +++ b/lib/Froxlor/Api/Commands/SubDomains.php @@ -701,10 +701,12 @@ class SubDomains extends ApiCommand implements ResourceEntity $wwwserveralias = ($selectserveralias == '1') ? '1' : '0'; // if allowed, check for 'is email domain'-flag - if ($result['parentdomainid'] != '0' && ($result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2') && $isemaildomain != $result['isemaildomain']) { - $isemaildomain = intval($isemaildomain); - } elseif ($result['parentdomainid'] != '0') { - $isemaildomain = $result['subcanemaildomain'] == '3' ? 1 : 0; + if ($isemaildomain != $result['isemaildomain']) { + if ($result['parentdomainid'] != '0' && ($result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2')) { + $isemaildomain = intval($isemaildomain); + } elseif ($result['parentdomainid'] != '0') { + $isemaildomain = $result['subcanemaildomain'] == '3' ? 1 : 0; + } } // check changes of openbasedir-path variable