diff --git a/customer_domains.php b/customer_domains.php
index fbb70a13..7c5985e2 100644
--- a/customer_domains.php
+++ b/customer_domains.php
@@ -74,16 +74,29 @@ elseif($page == 'domains')
}
/**
- * check for set ssl-certs to show either
- * a red or a green ssl-icon
+ * check for set ssl-certs to show different state-icons
*/
- $row['domain_hascert'] = false;
+ // nothing (ssl_global)
+ $row['domain_hascert'] = 0;
$ssl_result = $db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid`='".(int)$row['id']."';");
if (is_array($ssl_result)
&& isset($ssl_result['ssl_cert_file'])
&& $ssl_result['ssl_cert_file'] != ''
) {
- $row['domain_hascert'] = true;
+ // own certificate (ssl_customer_green)
+ $row['domain_hascert'] = 1;
+ } else {
+ // check if it's parent has one set (shared)
+ if ($row['parentdomainid'] != 0) {
+ $ssl_result = $db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid`='".(int)$row['parentdomainid']."';");
+ if (is_array($ssl_result)
+ && isset($ssl_result['ssl_cert_file'])
+ && $ssl_result['ssl_cert_file'] != ''
+ ) {
+ // parent has a certificate (ssl_shared)
+ $row['domain_hascert'] = 2;
+ }
+ }
}
$domains_count++;
diff --git a/templates/Froxlor/assets/img/icons/ssl_customer_green.png b/templates/Froxlor/assets/img/icons/ssl_customer_green.png
new file mode 100644
index 00000000..66bb7707
Binary files /dev/null and b/templates/Froxlor/assets/img/icons/ssl_customer_green.png differ
diff --git a/templates/Froxlor/assets/img/icons/ssl_global.png b/templates/Froxlor/assets/img/icons/ssl_global.png
new file mode 100644
index 00000000..52a2c13a
Binary files /dev/null and b/templates/Froxlor/assets/img/icons/ssl_global.png differ
diff --git a/templates/Froxlor/assets/img/icons/ssl_green.png b/templates/Froxlor/assets/img/icons/ssl_green.png
deleted file mode 100644
index c40835df..00000000
Binary files a/templates/Froxlor/assets/img/icons/ssl_green.png and /dev/null differ
diff --git a/templates/Froxlor/assets/img/icons/ssl_red.png b/templates/Froxlor/assets/img/icons/ssl_red.png
deleted file mode 100644
index 8e364164..00000000
Binary files a/templates/Froxlor/assets/img/icons/ssl_red.png and /dev/null differ
diff --git a/templates/Froxlor/assets/img/icons/ssl_shared.png b/templates/Froxlor/assets/img/icons/ssl_shared.png
new file mode 100644
index 00000000..35b66aac
Binary files /dev/null and b/templates/Froxlor/assets/img/icons/ssl_shared.png differ
diff --git a/templates/Froxlor/customer/domains/domains_domain.tpl b/templates/Froxlor/customer/domains/domains_domain.tpl
index 37298570..760f445d 100644
--- a/templates/Froxlor/customer/domains/domains_domain.tpl
+++ b/templates/Froxlor/customer/domains/domains_domain.tpl
@@ -17,7 +17,7 @@
-
+