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

Add icon and fixed list

Browse Source 
Signed-off-by: Florian Aders <eleras@froxlor.org>
This commit is contained in:
Florian Aders
2016-01-30 14:11:58 +01:00
parent 7b5a425913
commit cb97ff0dc7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
customer_domains.php
View File

@@ -71,10 +71,10 @@ if ($page == 'overview') {
$ssl_stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid` = :domainid"); $ssl_stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid` = :domainid");
Database::pexecute($ssl_stmt, array("domainid" => $row['id'])); Database::pexecute($ssl_stmt, array("domainid" => $row['id']));
$ssl_result = $ssl_stmt->fetch(PDO::FETCH_ASSOC); $ssl_result = $ssl_stmt->fetch(PDO::FETCH_ASSOC);
if (is_array($ssl_result) && isset($ssl_result['ssl_cert_file']) && $ssl_result['ssl_cert_file'] != '' && $row['letsencrypt'] == 0) { if (is_array($ssl_result) && isset($ssl_result['ssl_cert_file']) && $ssl_result['ssl_cert_file'] != '') {
// own certificate (ssl_customer_green) // own certificate (ssl_customer_green)
$row['domain_hascert'] = 1; $row['domain_hascert'] = 1;
} elseif ($row['letsencrypt'] == 0) { } else {
// check if it's parent has one set (shared) // check if it's parent has one set (shared)
if ($row['parentdomainid'] != 0) { if ($row['parentdomainid'] != 0) {
$ssl_stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid` = :domainid"); $ssl_stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid` = :domainid");
@@ -146,7 +146,7 @@ if ($page == 'overview') {
// get ssl-ips if activated // get ssl-ips if activated
$show_ssledit = false; $show_ssledit = false;
if (Settings::Get('system.use_ssl') == '1' && domainHasSslIpPort($row['id']) && $row['caneditdomain'] == '1') { if (Settings::Get('system.use_ssl') == '1' && domainHasSslIpPort($row['id']) && $row['caneditdomain'] == '1' && $row['letsencrypt'] == 0) {
$show_ssledit = true; $show_ssledit = true;
} }
$row = htmlentities_array($row); $row = htmlentities_array($row);

BIN
templates/Sparkle/assets/img/icons/ssl_letsencrypt.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB