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

Prevent enabling let's encrypt for wildcard - domains

Browse Source 
Signed-off-by: Florian Aders <eleras@froxlor.org>
This commit is contained in:
Florian Aders
2016-01-30 14:46:00 +01:00
parent c189ad759b
commit d87fc4c717
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
admin_domains.php
View File

@@ -565,6 +565,11 @@ if ($page == 'domains'
$ssl_ipandports[] = -1; $ssl_ipandports[] = -1;
} }
// We can't enable let's encrypt for wildcard - domains
if ($serveraliasoption == '0') {
$letsencrypt = 0;
}
if (!preg_match('/^https?\:\/\//', $documentroot)) { if (!preg_match('/^https?\:\/\//', $documentroot)) {
if (strstr($documentroot, ":") !== false) { if (strstr($documentroot, ":") !== false) {
standard_error('pathmaynotcontaincolon'); standard_error('pathmaynotcontaincolon');
@@ -1342,6 +1347,11 @@ if ($page == 'domains'
$ssl_ipandports[] = -1; $ssl_ipandports[] = -1;
} }
// We can't enable let's encrypt for wildcard domains
if ($serveraliasoption == '0') {
$letsencrypt = '0';
}
if (!preg_match('/^https?\:\/\//', $documentroot)) { if (!preg_match('/^https?\:\/\//', $documentroot)) {
$documentroot = makeCorrectDir($documentroot); $documentroot = makeCorrectDir($documentroot);
} }
@@ -1889,6 +1899,7 @@ if ($page == 'domains'
$_value = '2'; $_value = '2';
if ($result['iswildcarddomain'] == '1') { if ($result['iswildcarddomain'] == '1') {
$_value = '0'; $_value = '0';
$letsencrypt = 0;
} elseif ($result['wwwserveralias'] == '1') { } elseif ($result['wwwserveralias'] == '1') {
$_value = '1'; $_value = '1';
} }