Revision f2a86ca9
Added by Jim Pingle over 14 years ago
| usr/local/www/wizards/openvpn_wizard.inc | ||
|---|---|---|
| 187 | 187 |
$cacns = array(); |
| 188 | 188 |
if (is_array($config['ca'])) {
|
| 189 | 189 |
foreach($config['ca'] as $ca) {
|
| 190 |
$canames[] = $ca['name'];
|
|
| 190 |
$canames[] = $ca['descr'];
|
|
| 191 | 191 |
$cainfo = cert_get_subject_hash($ca['crt']); |
| 192 | 192 |
$cacns[] = $cainfo["CN"]; |
| 193 | 193 |
} |
| ... | ... | |
| 214 | 214 |
global $stepid, $config; |
| 215 | 215 |
|
| 216 | 216 |
if (count($config['cert']) < 1 || |
| 217 |
(count($config['cert']) == 1 && stristr($config['cert'][0]['name'], "webconf"))) {
|
|
| 217 |
(count($config['cert']) == 1 && stristr($config['cert'][0]['descr'], "webconf"))) {
|
|
| 218 | 218 |
$stepid++; |
| 219 | 219 |
} |
| 220 | 220 |
} |
| ... | ... | |
| 273 | 273 |
$certcns = array(); |
| 274 | 274 |
if (is_array($config['cert'])) {
|
| 275 | 275 |
foreach($config['cert'] as $cert) {
|
| 276 |
$certnames[] = $cert['name'];
|
|
| 276 |
$certnames[] = $cert['descr'];
|
|
| 277 | 277 |
$certinfo = cert_get_subject_hash($cert['crt']); |
| 278 | 278 |
$certcns[] = $certinfo["CN"]; |
| 279 | 279 |
} |
| ... | ... | |
| 440 | 440 |
if (isset($pconfig['step6']['uselist']) && !empty($pconfig['step6']['certca'])) {
|
| 441 | 441 |
$ca = array(); |
| 442 | 442 |
$ca['refid'] = uniqid(); |
| 443 |
$ca['name'] = $pconfig['step6']['certca'];
|
|
| 443 |
$ca['descr'] = $pconfig['step6']['certca'];
|
|
| 444 | 444 |
$dn = array( |
| 445 | 445 |
'countryName' => $pconfig['step6']['country'], |
| 446 | 446 |
'stateOrProvinceName' => $pconfig['step6']['state'], |
| ... | ... | |
| 467 | 467 |
if (isset($pconfig['step9']['uselist'])) {
|
| 468 | 468 |
$cert = array(); |
| 469 | 469 |
$cert['refid'] = uniqid(); |
| 470 |
$cert['name'] = $pconfig['step9']['certname'];
|
|
| 470 |
$cert['descr'] = $pconfig['step9']['certname'];
|
|
| 471 | 471 |
$dn = array( |
| 472 | 472 |
'countryName' => $pconfig['step9']['country'], |
| 473 | 473 |
'stateOrProvinceName' => $pconfig['step9']['state'], |
Also available in: Unified diff
Rename 'name' to 'descr' for CA, Certificates, and CRLs, to gain CDATA protection and standardize field names. Ticket #320.