diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2008-04-27 21:56:00 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2008-04-27 21:56:00 +0000 |
| commit | 90fcb813f43b9e7b5deff9e9685becf8af130114 (patch) | |
| tree | 33299259d004465e5477f983e485d03bb6283963 /usr | |
| parent | 5bada54e6d5393350e2b65abdf80db07500cc9e7 (diff) | |
| download | pfsense-90fcb813f43b9e7b5deff9e9685becf8af130114.zip pfsense-90fcb813f43b9e7b5deff9e9685becf8af130114.tar.gz | |
handle descriptions correctly
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/vpn_openvpn_certs.php | 4 | ||||
| -rw-r--r-- | usr/local/www/vpn_openvpn_certs_create.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr/local/www/vpn_openvpn_certs.php b/usr/local/www/vpn_openvpn_certs.php index 2038f45..72bc9d1 100644 --- a/usr/local/www/vpn_openvpn_certs.php +++ b/usr/local/www/vpn_openvpn_certs.php @@ -88,8 +88,8 @@ include("head.inc"); <tr class="vtable"> <td class="listlr" width="35%"> <?php - if($ca['caname']) - echo $ca['caname']; + if($ca['descr']) + echo $ca['descr']; else echo $cert; ?> diff --git a/usr/local/www/vpn_openvpn_certs_create.php b/usr/local/www/vpn_openvpn_certs_create.php index 059a2bf..fd35be7 100644 --- a/usr/local/www/vpn_openvpn_certs_create.php +++ b/usr/local/www/vpn_openvpn_certs_create.php @@ -71,8 +71,8 @@ if ($_POST) { $orginizationname=$_POST['orginizationname']; $email = $_POST['email']; $authmode = $_POST['auth_method']; - $caname = $_POST['caname']; - + $caname = trim(strtolower($_POST['descr'])); + if ($caname) { /* XXX: do more input validation */ @@ -218,7 +218,7 @@ function edit_mode() { conf_mount_ro(); /* vars */ $ovpnkeys[$caname]['existing'] = "no"; - $ovpnleys[$caname]['caname'] = $caname; + $ovpnleys[$caname]['descr'] = $_POST['descr']; $ovpnleys[$caname]['auth_method'] = $auth_method; $ovpnkeys[$caname]['KEYSIZE'] = $cakeysize; $ovpnkeys[$caname]['KEYEXPIRE'] = $cakeyexpire; @@ -244,7 +244,7 @@ function edit_mode() { <tr> <td width="35%" class="vncell"><B>Certificate Name</td> <td width="78%" class="vtable"> - <input name="caname" class="formfld" value="<?=$caname?>"> + <input name="descr" class="formfld" value="<?=$descr?>"> </span></td> </tr> <tr> |
