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

add default-ssl-ip setting

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-21 11:50:34 +01:00
parent 26b9c030b5
commit 5480fcbf5d
14 changed files with 106 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/api/commands/class.Customers.php
View File

@@ -751,8 +751,7 @@ class Customers extends ApiCommand implements ResourceEntity
'adminid' => $this->getUserDetail('adminid'),
'docroot' => $result['documentroot'],
'phpenabled' => $phpenabled,
'openbasedir' => '1',
'ipandport' => explode(',', Settings::Get('system.defaultip'))
'openbasedir' => '1'
);
$domainid = - 1;
try {

4
lib/classes/api/commands/class.Domains.php
View File

@@ -124,7 +124,7 @@ class Domains extends ApiCommand implements ResourceEntity
$mod_fcgid_maxrequests = $this->getParam('mod_fcgid_maxrequests', true, - 1);
$ssl_redirect = $this->getParam('ssl_redirect', true, 0);
$letsencrypt = $this->getParam('letsencrypt', true, 0);
$p_ssl_ipandports = $this->getParam('ssl_ipandport', true, array());
$p_ssl_ipandports = $this->getParam('ssl_ipandport', true, explode(',', Settings::Get('system.defaultsslip')));
$http2 = $this->getParam('http2', true, 0);
$hsts_maxage = $this->getParam('hsts_maxage', true, 0);
$hsts_sub = $this->getParam('hsts_sub', true, 0);
@@ -312,7 +312,7 @@ class Domains extends ApiCommand implements ResourceEntity
}
if (empty($p_ipandports)) {
throw new Exception("No IPs given, unable to add domain (no default IPs set?", 406);
throw new Exception("No IPs given, unable to add domain (no default IPs set?)", 406);
}
$ipandports = array();

2
lib/classes/api/commands/class.IpsAndPorts.php
View File

@@ -370,7 +370,7 @@ class IpsAndPorts extends ApiCommand implements ResourceEntity
), true, true);
if ($result_checkdomain['id'] == '') {
if (! in_array($result['id'], explode(',', Settings::Get('system.defaultip')))) {
if (! in_array($result['id'], explode(',', Settings::Get('system.defaultip'))) && ! in_array($result['id'], explode(',', Settings::Get('system.defaultsslip')))) {
$result_sameipotherport_stmt = Database::prepare("
SELECT `id` FROM `" . TABLE_PANEL_IPSANDPORTS . "`