diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-05-13 13:43:37 +0200 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-05-13 13:43:37 +0200 |
| commit | 69be9601ac8fcff7a4afda93d8d32035ec1877e4 (patch) | |
| tree | 81946beb76e20819548e842787cdb9d7033b381e /usr/local/www/vpn_openvpn_server.php | |
| parent | cd9fa56b5729da52f0dfd116e782906d6bd85555 (diff) | |
| parent | 042578fd634f8c54a158417527d018e0f8f56b95 (diff) | |
| download | pfsense-69be9601ac8fcff7a4afda93d8d32035ec1877e4.zip pfsense-69be9601ac8fcff7a4afda93d8d32035ec1877e4.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/vslb.inc
etc/version
Diffstat (limited to 'usr/local/www/vpn_openvpn_server.php')
| -rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index cfe51cf..bb7c106 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -791,13 +791,16 @@ if ($savemsg) <option value="">None</option> <?php foreach ($a_crl as $crl): - if (is_crl_internal($crl) && (count($crl['cert']) <= 0)) - continue; $selected = ""; - if ($pconfig['crlref'] == $crl['refid']) - $selected = "selected"; + $caname = ""; + $ca = lookup_ca($crl['caref']); + if ($ca) { + $caname = " (CA: {$ca['descr']})"; + if ($pconfig['crlref'] == $crl['refid']) + $selected = "selected"; + } ?> - <option value="<?=$crl['refid'];?>" <?=$selected;?>><?=$crl['descr'];?></option> + <option value="<?=$crl['refid'];?>" <?=$selected;?>><?=$crl['descr'] . $caname;?></option> <?php endforeach; ?> </select> </td> |
