diff options
| author | jim-p <jimp@pfsense.org> | 2011-05-07 16:07:02 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-05-07 16:07:58 -0400 |
| commit | c7ac47fd2d5ad66ff69a3e46c93bf41247929bc8 (patch) | |
| tree | d3fb3c6b79edaf3583cb8f50c5b9bc55879c7f6d | |
| parent | 2635f1f52f7949198a04ab629468a1a538581d6c (diff) | |
| download | pfsense-c7ac47fd2d5ad66ff69a3e46c93bf41247929bc8.zip pfsense-c7ac47fd2d5ad66ff69a3e46c93bf41247929bc8.tar.gz | |
Misc fixes to make the openvpn wizard stop re-creating a CA previously made via the wizard if you re-ran the wizard and chose a CA instead. Fixes #1512
| -rw-r--r-- | usr/local/www/wizards/openvpn_wizard.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc index e48cfb3..51c7a63 100644 --- a/usr/local/www/wizards/openvpn_wizard.inc +++ b/usr/local/www/wizards/openvpn_wizard.inc @@ -177,6 +177,7 @@ function step6_submitphpaction() { if (isset($_POST['next'])) { $_POST['uselist'] = ""; + unset($config['ovpnserver']['step6']['uselist']); $stepid++; } else { $config['ovpnserver']['step6']['uselist'] = "on"; @@ -228,11 +229,15 @@ function step8_stepbeforeformdisplay() { } function step8_submitphpaction() { - global $stepid, $_POST; + global $stepid, $config, $_POST; if (isset($_POST['next'])) { $_POST['uselist'] = ""; + unset($config['ovpnserver']['step9']['uselist']); $stepid++; + } else { + $config['ovpnserver']['step6']['uselist'] = "on"; + $_POST['uselist'] = "on"; } } @@ -502,7 +507,7 @@ function step12_submitphpaction() { $config['cert'] = array(); $config['cert'][] = $cert; - } else if (!isset($pconfig['step6']['uselist']) && empty($pconfig['step9']['authcertname'])) { + } else if (!isset($pconfig['step9']['uselist']) && empty($pconfig['step9']['authcertname'])) { $message = "Please choose a Certificate."; header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7&message={$message}"); exit; |
