From 0b0a515124c56774a6139576c19c4eee90a681b7 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 29 Sep 2013 18:40:25 +0200 Subject: [PATCH] show either if domain has a global certificate (via ip/port), a shared certificate (via parentdomain) or it's own certificate (customer-entered), thx to Nico for the artwork Signed-off-by: Michael Kaufmann (d00p) --- customer_domains.php | 21 ++++++++++++++---- .../assets/img/icons/ssl_customer_green.png | Bin 0 -> 699 bytes .../Froxlor/assets/img/icons/ssl_global.png | Bin 0 -> 778 bytes .../Froxlor/assets/img/icons/ssl_green.png | Bin 3070 -> 0 bytes .../Froxlor/assets/img/icons/ssl_red.png | Bin 3097 -> 0 bytes .../Froxlor/assets/img/icons/ssl_shared.png | Bin 0 -> 695 bytes .../customer/domains/domains_domain.tpl | 2 +- 7 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 templates/Froxlor/assets/img/icons/ssl_customer_green.png create mode 100644 templates/Froxlor/assets/img/icons/ssl_global.png delete mode 100644 templates/Froxlor/assets/img/icons/ssl_green.png delete mode 100644 templates/Froxlor/assets/img/icons/ssl_red.png create mode 100644 templates/Froxlor/assets/img/icons/ssl_shared.png 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 0000000000000000000000000000000000000000..66bb7707395eae7594e843d251fea5dba7479f01 GIT binary patch literal 699 zcmV;s0!00ZP)tYwK%{6T7TJejIw_Vqn$FCfnS1a1wwSPN)Xw@j&-p#)9KjCta{Pswef5;Y z!Xl1z(1aiu3K8wN#L1RU@wZm&)co$*9eR4g6nVX5%?znT9QSIB=d)+1JKwj>ME}=d zCN@lO??D!Sz`~M-EraNGf(GLVU5qdm3vbgG7?_*OxI_t4Q(3O|4{l8w9_Uf+wP1c- z-`fB?pE;e(0`Rc^imt5Og|rEq=`1cgzD=(2pK`L<#|YPuQB}{HeGW}??@geT1f@_a zPj5twi%rKnupE$9hA-0rcDzFSgEj@Ax&J^F9`oxxTXj&ks%i$Pi_%S1U@)}tCN-eZivnb;m-J~fxmoOF;#Y-!^t zhe1!88*5(N-hISZ;=KO!kwC;>xC6r<0l?$(V96Yga*#?<;f?TpDTP>GWm5gbs6Irf zIK=qeE(9q%jrvU>kwnU>2$UXX=EGZB8#;M1Il*+<^zH*g3G8%f8hvz)}IGm$6p`JZ| zBAdVc$ia4%IEm3pFT5jS{EG9p zz8R7@?+RY6-Q(uX(^TKU_O8Yzqd4|}3un%8m0ww3D-H2Og5~AqY`w9`_WlUJ{~54P zVO}W}h*bXVcN%ZL{1m!djRC*3w4{av-EQ}TQdT%yh*=zp}C-Ljq$=PuVVt6o^nRmo5KOtE;P8A8&+VC?YY4Aabe_UM3SNFEdmJu`RG2z&5|p9!C#Hf+1RSm4F!i?rY5Jz7cXuM1bdHf zNINi0jQPY-pE$O};?hnpaPOCW)aW^qT#4;QpE!=0bbHkPewhq*P}|uhh#Z>xeL%3* zqH>?`=$|^DUA@CzplS6YwmJ=(HsZp}$CS$zJrES9O4wMD@jarbPb@Bf?936JI!{}V zkeHa*7$(L>nLtQoayV&+p#&ljh5;gi$xL(qX_b-7x7gTe<9migghJkDEbF1QB9dc= zRGcay0>)_iQ3R=JYV974L(70-#e3a^^I9tsYjn zjAuP&CS7XHkal1>GoE3u6}+FIP%2=p1(jy;(lp<1?Q&?+%uZ&>`z|BCOOgo9UPRE3 zj|4wIe1Hh3WB-}T&oOH)HT@wwZ#(!76!K{@p5c_QX?G(219dShfU>D{BLDyZ07*qo IM6N<$f(njiiU0rr literal 0 HcmV?d00001 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 c40835dfd81925a3284d40e1fcf34e36eabc92f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3070 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 M07*qoM6N<$g3vg&a{vGU 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 8e36416410b327de6ec8c2d39950d02d5976ed63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3097 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 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 0000000000000000000000000000000000000000..35b66aac9411640efe8f780730cb906ad0ce76b9 GIT binary patch literal 695 zcmV;o0!aOdP)kkfTngS*bnM1bi2FEcxb4uB{9ConRlLf=lPAs7WLxIbG7*L z5rvGwhTI^aX*9LAviI0U`g@OSfA(ry9e)4#9s>hOLb^_+Y_nEK6V8t_ws?|*=dSx8 z;%~s0@lgf`+c8!klMUd>CWKd@r=yD#JmvLx($`-HD4RbBYB8p!DqOxbQoCvN?tnVl z4dt(^zWzX+0I&Myb*tiAUS5&dwj$`I{{i^Vsskt`K`E5-`_(jsRDc#{%M^x(hZTUX z>$OeWwtveK0wDyJWg$dW-O$jGR+HG**9Sl}8pUxOq?AZ0NhA^&hC!)Rs=?y%I1>{S z{uGMEA^`b(zUtERP)cE07KUMv%jIf-WHRZCQ3ZoR-cF_f=$9W5xM-m$G&U1IdBG{|TWM7ToY()5`?ZFF#>nG^! z>||kPdQ&xym8WPfAuDAfJCelq9YQw?=nE-I`_Ci8jlKy2EiJnUg+iMdf^>26E0~{C zDetsS!lOf`njNLq~iMiQ1UtFPv7!7SvG$}FDv$*C@p4>Qv z>r_ZID-z}pFqYWnR#?}#Bfe)cxUO3RnCTfr0D_G%8g_T#teFJLHY!;Ca|+Pg58#&9 d$xeT~_6rYq`YoNTSjqqZ002ovPDHLkV1m#HGnoJY literal 0 HcmV?d00001 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 @@ - {$lng['panel']['ssleditor']} + {$lng['panel']['ssleditor']}