diff options
| author | jim-p <jimp@pfsense.org> | 2010-10-19 14:19:44 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-10-19 14:19:44 -0400 |
| commit | f2a86ca96fb8e49d978679dab4cfad6ce2f0d9f4 (patch) | |
| tree | 5d64e957ba798bc7818f31a3dc7b1593de59a7f0 /usr/local/www/system_usermanager.php | |
| parent | 6751b3e7863196ab865f8fb76a2ad6e9f8556788 (diff) | |
| download | pfsense-f2a86ca96fb8e49d978679dab4cfad6ce2f0d9f4.zip pfsense-f2a86ca96fb8e49d978679dab4cfad6ce2f0d9f4.tar.gz | |
Rename 'name' to 'descr' for CA, Certificates, and CRLs, to gain CDATA protection and standardize field names. Ticket #320.
Diffstat (limited to 'usr/local/www/system_usermanager.php')
| -rw-r--r-- | usr/local/www/system_usermanager.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index a80ba00..706ffde 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -102,7 +102,7 @@ if (isAllowedPage("system_usermanager")) { $cert =& lookup_cert($a_user[$id]['cert'][$_GET['certid']]); - $exp_name = urlencode("{$a_user[$id]['name']}-{$cert['name']}.crt"); + $exp_name = urlencode("{$a_user[$id]['name']}-{$cert['descr']}.crt"); $exp_data = base64_decode($cert['crt']); $exp_size = strlen($exp_data); @@ -122,7 +122,7 @@ if (isAllowedPage("system_usermanager")) { $cert =& lookup_cert($a_user[$id]['cert'][$_GET['certid']]); - $exp_name = urlencode("{$a_user[$id]['name']}-{$cert['name']}.key"); + $exp_name = urlencode("{$a_user[$id]['name']}-{$cert['descr']}.key"); $exp_data = base64_decode($cert['prv']); $exp_size = strlen($exp_data); @@ -141,7 +141,7 @@ if (isAllowedPage("system_usermanager")) { } $certdeleted = lookup_cert($a_user[$id]['cert'][$_GET['certid']]); - $certdeleted = $certdeleted['name']; + $certdeleted = $certdeleted['descr']; unset($a_user[$id]['cert'][$_GET['certid']]); write_config(); $_GET['act'] = "edit"; @@ -302,7 +302,7 @@ if (isAllowedPage("system_usermanager")) { $cert['refid'] = uniqid(); $userent['cert'] = array(); - $cert['name'] = $_POST['name']; + $cert['descr'] = $_POST['name']; $subject = cert_get_subject_array($ca['crt']); @@ -644,10 +644,10 @@ function sshkeyClicked(obj) { ?> <tr> <td class="listlr"> - <?=htmlspecialchars($cert['name']);?> + <?=htmlspecialchars($cert['descr']);?> </td> <td class="listr"> - <?=htmlspecialchars($ca['name']);?> + <?=htmlspecialchars($ca['descr']);?> </td> <td valign="middle" nowrap class="list"> <a href="system_usermanager.php?act=expckey&id=<?=$id;?>&certid=<?=$i;?>"> @@ -703,7 +703,7 @@ function sshkeyClicked(obj) { <tr> <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td> <td width="78%" class="vtable"> - <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/> + <input name="descr" type="text" class="formfld unknown" id="descr" size="20" value="<?=htmlspecialchars($pconfig['descr']);?>"/> </td> </tr> <tr> @@ -715,7 +715,7 @@ function sshkeyClicked(obj) { if (!$ca['prv']) continue; ?> - <option value="<?=$ca['refid'];?>"><?=$ca['name'];?></option> + <option value="<?=$ca['refid'];?>"><?=$ca['descr'];?></option> <?php endforeach; ?> </select> </td> |
