diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-05-13 13:43:37 +0200 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-05-13 13:43:37 +0200 |
| commit | 69be9601ac8fcff7a4afda93d8d32035ec1877e4 (patch) | |
| tree | 81946beb76e20819548e842787cdb9d7033b381e /usr/local/www/wizards/openvpn_wizard.inc | |
| parent | cd9fa56b5729da52f0dfd116e782906d6bd85555 (diff) | |
| parent | 042578fd634f8c54a158417527d018e0f8f56b95 (diff) | |
| download | pfsense-69be9601ac8fcff7a4afda93d8d32035ec1877e4.zip pfsense-69be9601ac8fcff7a4afda93d8d32035ec1877e4.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/vslb.inc
etc/version
Diffstat (limited to 'usr/local/www/wizards/openvpn_wizard.inc')
| -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; |
