From d8b86fc3c53ee39ff4d638a6e6b3224b4244611b Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Mon, 4 Mar 2024 16:48:35 +0100 Subject: [PATCH] correctly disabled ssl-related settings when domain update sets ssl-enbled flag to false; fixes #1241 Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/Commands/Domains.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/Froxlor/Api/Commands/Domains.php b/lib/Froxlor/Api/Commands/Domains.php index 8559e6e5a..ad0d4c554 100644 --- a/lib/Froxlor/Api/Commands/Domains.php +++ b/lib/Froxlor/Api/Commands/Domains.php @@ -1528,13 +1528,12 @@ public function update() // enabled ssl for the domain but no ssl ip/port is selected Response::standardError('nosslippportgiven', '', true); } - if (Settings::Get('system.use_ssl') == "0" || empty($ssl_ipandports)) { + if (Settings::Get('system.use_ssl') == "0" || empty($ssl_ipandports) || !$sslenabled) { $ssl_redirect = 0; $letsencrypt = 0; $http2 = 0; - // we need this for the json_encode - // if ssl is disabled or no ssl-ip/port exists - $ssl_ipandports[] = -1; + // act like $remove_ssl_ipandport + $ssl_ipandports = []; // HSTS $hsts_maxage = 0;