Warnung über bald ablaufende Zertifikate bei Lets-Encrypt ausgeblendet
Bernd Wurst commited on 2016-05-30 08:10:00
Zeige 2 geänderte Dateien mit 4 Einfügungen und 1 Löschungen.
- modules/vhosts/certs.php 8c485c0..487ef93
- modules/vhosts/shortcuts.php 1981faa..834332e
| ... | ... |
@@ -36,7 +36,7 @@ if (count($certs) > 0) |
| 36 | 36 |
if ($c['valid_until'] <= date('Y-m-d')) {
|
| 37 | 37 |
$style=' style="background-color: #f88;" '; |
| 38 | 38 |
} |
| 39 |
- elseif ($c['valid_until'] <= date('Y-m-d', time()+(30*24*3600))) {
|
|
| 39 |
+ elseif ($c['valid_until'] <= date('Y-m-d', time()+(30*24*3600)) && !cert_is_letsencrypt($c['id'])) {
|
|
| 40 | 40 |
$style=' style="background-color: #ff8;" '; |
| 41 | 41 |
} |
| 42 | 42 |
output("<tr><td{$style}>".internal_link('showcert', $c['subject'], "mode=cert&id={$c['id']}")."</td><td{$style}>{$c['cn']}</td><td{$style}>{$c['valid_from']}</td><td{$style}>{$c['valid_until']}</td><td>".internal_link('newcert', '<img src="'.$prefix.'images/refresh.png" title="Neue Version des Zertifikats einspielen" />', 'replace='.$c['id'])."   ".internal_link('savecert', '<img src="'.$prefix.'images/delete.png" />', 'action=delete&id='.$c['id'])."</td></tr>");
|
| ... | ... |
@@ -32,6 +32,9 @@ if ($_SESSION['role'] & ROLE_SYSTEMUSER) {
|
| 32 | 32 |
$num_warn = 0; |
| 33 | 33 |
foreach ($certs as $c) |
| 34 | 34 |
{
|
| 35 |
+ if (cert_is_letsencrypt($c['id'])) {
|
|
| 36 |
+ continue; |
|
| 37 |
+ } |
|
| 35 | 38 |
if ($c['valid_until'] <= date('Y-m-d')) {
|
| 36 | 39 |
$num_expired++; |
| 37 | 40 |
} elseif ($c['valid_until'] <= date('Y-m-d', time()+(30*24*3600))) {
|
| 38 | 41 |