From cb97ff0dc7aee50ffdfebf15610ff27fd9dbcee7 Mon Sep 17 00:00:00 2001
From: Florian Aders <eleras@froxlor.org>
Date: Sat, 30 Jan 2016 14:11:58 +0100
Subject: [PATCH] Add icon and fixed list

Signed-off-by: Florian Aders <eleras@froxlor.org>
---
 customer_domains.php                             |   6 +++---
 .../Sparkle/assets/img/icons/ssl_letsencrypt.png | Bin 0 -> 4003 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 templates/Sparkle/assets/img/icons/ssl_letsencrypt.png

diff --git a/customer_domains.php b/customer_domains.php
index 1c89ddfd..c8ec610b 100644
--- a/customer_domains.php
+++ b/customer_domains.php
@@ -71,10 +71,10 @@ if ($page == 'overview') {
 			$ssl_stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid` = :domainid");
 			Database::pexecute($ssl_stmt, array("domainid" => $row['id']));
 			$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)
 				$row['domain_hascert'] = 1;
-			} elseif ($row['letsencrypt'] == 0) {
+			} else {
 				// check if it's parent has one set (shared)
 				if ($row['parentdomainid'] != 0) {
 					$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
 					$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;
 					}
 					$row = htmlentities_array($row);
diff --git a/templates/Sparkle/assets/img/icons/ssl_letsencrypt.png b/templates/Sparkle/assets/img/icons/ssl_letsencrypt.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef0d8f64971bd0d31d76fdcd5e792fa292922df7
GIT binary patch
literal 4003
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

literal 0
HcmV?d00001