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/wizards | |
| 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/wizards')
| -rw-r--r-- | usr/local/www/wizards/openvpn_wizard.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc index fc7d0c4..518aad2 100644 --- a/usr/local/www/wizards/openvpn_wizard.inc +++ b/usr/local/www/wizards/openvpn_wizard.inc @@ -187,7 +187,7 @@ function step7_submitphpaction() { $cacns = array(); if (is_array($config['ca'])) { foreach($config['ca'] as $ca) { - $canames[] = $ca['name']; + $canames[] = $ca['descr']; $cainfo = cert_get_subject_hash($ca['crt']); $cacns[] = $cainfo["CN"]; } @@ -214,7 +214,7 @@ function step8_stepbeforeformdisplay() { global $stepid, $config; if (count($config['cert']) < 1 || - (count($config['cert']) == 1 && stristr($config['cert'][0]['name'], "webconf"))) { + (count($config['cert']) == 1 && stristr($config['cert'][0]['descr'], "webconf"))) { $stepid++; } } @@ -273,7 +273,7 @@ function step9_submitphpaction() { $certcns = array(); if (is_array($config['cert'])) { foreach($config['cert'] as $cert) { - $certnames[] = $cert['name']; + $certnames[] = $cert['descr']; $certinfo = cert_get_subject_hash($cert['crt']); $certcns[] = $certinfo["CN"]; } @@ -440,7 +440,7 @@ function step12_submitphpaction() { if (isset($pconfig['step6']['uselist']) && !empty($pconfig['step6']['certca'])) { $ca = array(); $ca['refid'] = uniqid(); - $ca['name'] = $pconfig['step6']['certca']; + $ca['descr'] = $pconfig['step6']['certca']; $dn = array( 'countryName' => $pconfig['step6']['country'], 'stateOrProvinceName' => $pconfig['step6']['state'], @@ -467,7 +467,7 @@ function step12_submitphpaction() { if (isset($pconfig['step9']['uselist'])) { $cert = array(); $cert['refid'] = uniqid(); - $cert['name'] = $pconfig['step9']['certname']; + $cert['descr'] = $pconfig['step9']['certname']; $dn = array( 'countryName' => $pconfig['step9']['country'], 'stateOrProvinceName' => $pconfig['step9']['state'], |
