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

Do not allow Let's Encrypt with AliasDomain until the certificate - storage is reworked

Browse Source 
Signed-off-by: Florian Aders <eleras@froxlor.org>
This commit is contained in:
Florian Aders
2016-02-29 17:23:14 +01:00
parent cf8fbe2224
commit 4c4916a661
4 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
customer_domains.php
View File

@@ -342,6 +342,11 @@ if ($page == 'overview') {
}
}
if ($aliasdomain != 0 && $letsencrypt != 0)
{
standard_error('letsencryptdoesnotworkwithaliasdomains');
}
// Temporarily deactivate ssl_redirect until Let's Encrypt certificate was generated
if ($ssl_redirect > 0 && $letsencrypt == 1) {
$ssl_redirect = 2;
@@ -605,6 +610,11 @@ if ($page == 'overview') {
$letsencrypt = '0';
}
if ($aliasdomain != 0 && $letsencrypt != 0)
{
standard_error('letsencryptdoesnotworkwithaliasdomains');
}
// Temporarily deactivate ssl_redirect until Let's Encrypt certificate was generated
if ($ssl_redirect > 0 && $letsencrypt == 1 && $result['letsencrypt'] != $letsencrypt) {
$ssl_redirect = 2;