Indicate in various places if a certificate is revoked.

This commit is contained in:
jim-p 2010-10-21 16:00:15 -04:00
parent 150bbe09fb
commit 6a0b3ea4bf
3 changed files with 29 additions and 4 deletions

View File

@ -705,6 +705,7 @@ function internalca_change() {
$selected = "";
$caname = "";
$inuse = "";
$revoked = "";
if (in_array($cert['refid'], $config['system']['user'][$userid]['cert']))
continue;
$ca = lookup_ca($cert['caref']);
@ -714,8 +715,10 @@ function internalca_change() {
$selected = "selected";
if (cert_in_use($cert['refid']))
$inuse = " *In Use";
if (is_cert_revoked($cert))
$revoked = " *Revoked";
?>
<option value="<?=$cert['refid'];?>" <?=$selected;?>><?=$cert['descr'] . $caname . $inuse;?></option>
<option value="<?=$cert['refid'];?>" <?=$selected;?>><?=$cert['descr'] . $caname . $inuse . $revoked;?></option>
<?php endforeach; ?>
</select>
</td>

View File

@ -627,10 +627,22 @@ function autotls_change() {
<?php
foreach ($config['cert'] as $cert):
$selected = "";
$caname = "";
$inuse = "";
$revoked = "";
if (in_array($cert['refid'], $config['system']['user'][$userid]['cert']))
continue;
$ca = lookup_ca($cert['caref']);
if ($ca)
$caname = " (CA: {$ca['descr']})";
if ($pconfig['certref'] == $cert['refid'])
$selected = "selected";
if (cert_in_use($cert['refid']))
$inuse = " *In Use";
if (is_cert_revoked($cert))
$revoked = " *Revoked";
?>
<option value="<?=$cert['refid'];?>" <?=$selected;?>><?=$cert['descr'];?></option>
<option value="<?=$cert['refid'];?>" <?=$selected;?>><?=$cert['descr'] . $caname . $inuse . $revoked;?></option>
<?php endforeach; ?>
</select>
</td>

View File

@ -751,12 +751,22 @@ function netbios_change() {
<?php
foreach ($config['cert'] as $cert):
$selected = "";
if (strstr($cert['descr'], "webConfigurator"))
$caname = "";
$inuse = "";
$revoked = "";
if (in_array($cert['refid'], $config['system']['user'][$userid]['cert']))
continue;
$ca = lookup_ca($cert['caref']);
if ($ca)
$caname = " (CA: {$ca['descr']})";
if ($pconfig['certref'] == $cert['refid'])
$selected = "selected";
if (cert_in_use($cert['refid']))
$inuse = " *In Use";
if (is_cert_revoked($cert))
$revoked = " *Revoked";
?>
<option value="<?=$cert['refid'];?>" <?=$selected;?>><?=$cert['descr'];?></option>
<option value="<?=$cert['refid'];?>" <?=$selected;?>><?=$cert['descr'] . $caname . $inuse . $revoked;?></option>
<?php endforeach; ?>
</select>
</td>