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

set domain, letsencrypt-flag and loginname for froxlor-hostname in ssl-overview because the certificate will get removed as invalid otherwise, thx to Tbyte

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-10-31 10:53:18 +01:00
parent 304926260f
commit a44be363a6
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ssl_certificates.php
View File

@@ -86,11 +86,21 @@ if (count($all_certs) == 0) {
foreach ($all_certs as $idx => $cert) { foreach ($all_certs as $idx => $cert) {
if ($paging->checkDisplay($idx)) { if ($paging->checkDisplay($idx)) {
// respect froxlor-hostname
if ($cert['domainid'] == 0) {
$cert['domain'] = Settings::Get('system.hostname');
$cert['letsencrypt'] = Settings::Get('system.le_froxlor_enabled');
$cert['loginname'] = 'froxlor.panel';
}
if (empty($cert['domain']) || empty($cert['ssl_cert_file'])) { if (empty($cert['domain']) || empty($cert['ssl_cert_file'])) {
// no domain found to the entry or empty entry - safely delete it from the DB // no domain found to the entry or empty entry - safely delete it from the DB
/*
Database::pexecute($del_stmt, array( Database::pexecute($del_stmt, array(
'id' => $cert['id'] 'id' => $cert['id']
)); ));
*/
echo "no domain found to the entry or empty entry - safely delete it from the DB";
continue; continue;
} }
@@ -99,7 +109,7 @@ if (count($all_certs) == 0) {
$cert['domain'] = $idna_convert->decode($cert['domain']); $cert['domain'] = $idna_convert->decode($cert['domain']);
$adminCustomerLink = ""; $adminCustomerLink = "";
if (AREA == 'admin') { if (AREA == 'admin' && $cert['domainid'] > 0) {
if (! empty($cert['loginname'])) { if (! empty($cert['loginname'])) {
$adminCustomerLink = '&nbsp;(<a href="' . $linker->getLink(array( $adminCustomerLink = '&nbsp;(<a href="' . $linker->getLink(array(
'section' => 'customers', 'section' => 'customers',