maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix ssl-enabled flag when using Domains.duplicate() and disable ssl-enabled if remove-ssl-ipandport parameter is set

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-10-02 14:12:55 +02:00
parent 686065c294
commit a808a3f782
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Froxlor/Api/Commands/Domains.php
View File

@@ -1211,7 +1211,7 @@ class Domains extends ApiCommand implements ResourceEntity
$p_ssl_ipandports = $this->getParam('ssl_ipandport', true, $remove_ssl_ipandport ? [ $p_ssl_ipandports = $this->getParam('ssl_ipandport', true, $remove_ssl_ipandport ? [
-1 -1
] : null); ] : 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']); $http2 = $this->getBoolParam('http2', true, $result['http2']);
$hsts_maxage = $this->getParam('hsts_maxage', true, $result['hsts']); $hsts_maxage = $this->getParam('hsts_maxage', true, $result['hsts']);
$hsts_sub = $this->getBoolParam('hsts_sub', true, $result['hsts_sub']); $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['wwwserveralias']);
unset($result['iswildcarddomain']); unset($result['iswildcarddomain']);
// translate sslenabled flag
$result['sslenabled'] = $result['ssl_enabled'];
unset($result['ssl_enabled']);
$additional_params = $this->getParamList(); $additional_params = $this->getParamList();
// unset unneeded params from this call // unset unneeded params from this call
unset($additional_params['id']); unset($additional_params['id']);