From a808a3f782daffbdae4fb5cf7760ec7734dcd1ff Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Mon, 2 Oct 2023 14:12:55 +0200 Subject: [PATCH] fix ssl-enabled flag when using Domains.duplicate() and disable ssl-enabled if remove-ssl-ipandport parameter is set Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/Commands/Domains.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Froxlor/Api/Commands/Domains.php b/lib/Froxlor/Api/Commands/Domains.php index 23f25d0c..0123f29a 100644 --- a/lib/Froxlor/Api/Commands/Domains.php +++ b/lib/Froxlor/Api/Commands/Domains.php @@ -1211,7 +1211,7 @@ class Domains extends ApiCommand implements ResourceEntity $p_ssl_ipandports = $this->getParam('ssl_ipandport', true, $remove_ssl_ipandport ? [ -1 ] : null); - $sslenabled = $this->getBoolParam('sslenabled', true, $result['ssl_enabled']); + $sslenabled = $remove_ssl_ipandport ? false : $this->getBoolParam('sslenabled', true, $result['ssl_enabled']); $http2 = $this->getBoolParam('http2', true, $result['http2']); $hsts_maxage = $this->getParam('hsts_maxage', true, $result['hsts']); $hsts_sub = $this->getBoolParam('hsts_sub', true, $result['hsts_sub']); @@ -2321,6 +2321,10 @@ class Domains extends ApiCommand implements ResourceEntity unset($result['wwwserveralias']); unset($result['iswildcarddomain']); + // translate sslenabled flag + $result['sslenabled'] = $result['ssl_enabled']; + unset($result['ssl_enabled']); + $additional_params = $this->getParamList(); // unset unneeded params from this call unset($additional_params['id']);