diff options
author | Ermal Luçi <eri@pfsense.org> | 2010-03-10 22:57:52 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2010-03-10 22:57:52 +0000 |
commit | 9b4e659a7f753e83be450684ac3d7fedd753790f (patch) | |
tree | a9318e2a88a984aa772c785c1f11e653d48d9d43 /usr/local/www/wizards/openvpn_wizard.inc | |
parent | 72a5f4246cbd0ab39f1581dbfd54066a8ea2febb (diff) | |
download | pfsense-9b4e659a7f753e83be450684ac3d7fedd753790f.zip pfsense-9b4e659a7f753e83be450684ac3d7fedd753790f.tar.gz |
More fixes.
Diffstat (limited to 'usr/local/www/wizards/openvpn_wizard.inc')
-rw-r--r-- | usr/local/www/wizards/openvpn_wizard.inc | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc index d534a29..fb9da32 100644 --- a/usr/local/www/wizards/openvpn_wizard.inc +++ b/usr/local/www/wizards/openvpn_wizard.inc @@ -32,22 +32,20 @@ function step3_stepbeforeformdisplay() { } function step3_submitphpaction() { + global $stepid; + if (!$_POST['uselist'] && empty($_POST['authserv'])) { $message = "Please choose an authentication server or create a new one."; header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=1&message={$message}"); exit; } else if (!$_POST['uselist'] && !empty($_POST['authserv'])) { - header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=3"); - exit; - } - - if (empty($_POST['name']) || empty($_POST['ip']) || empty($_POST['port']) || + $stepid = 2; + } else if (empty($_POST['name']) || empty($_POST['ip']) || empty($_POST['port']) || empty($_POST['transport']) || empty($_POST['scope']) || empty($_POST['authscope']) || empty($_POST['nameattr'])) { $message = "Please enter all information for authentication server."; header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=1&message={$message}"); exit; } - } function step4_stepbeforeformdisplay() { @@ -69,69 +67,61 @@ function step4_stepbeforeformdisplay() { } function step4_submitphpaction() { + global $stepid; + if ($_POST['uselist'] == "yes" && !empty($_POST['authserv'])) { $message = "Please choose an authentication server or create a new one."; header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=2&message={$message}"); exit; } else if (!$_POST['uselist'] && !empty($_POST['authserv'])) { - header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=3"); - exit; - } - - if (empty($_POST['name']) || empty($_POST['ip']) || empty($_POST['port']) || + $stepid = 2; + } else if (empty($_POST['name']) || empty($_POST['ip']) || empty($_POST['port']) || empty($_POST['passowrd'])) { $message = "Please enter all information for authentication server."; header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=2&message={$message}"); exit; } - } function step5_submitphpaction() { + global $stepid; + if ($_POST['uselist'] == "yes" && !empty($_POST['certca'])) { $message = "Please choose an certificate authority or create a new one."; header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=3&message={$message}"); exit; } else if (!$_POST['uselist'] && !empty($_POST['certca'])) { - header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=4"); - exit; - } - - if (empty($_POST['name']) || empty($_POST['keylength']) || empty($_POST['lifetime']) || + $stepid = 3; + } else if (empty($_POST['name']) || empty($_POST['keylength']) || empty($_POST['lifetime']) || empty($_POST['country']) || empty($_POST['state']) || empty($_POST['city']) || empty($_POST['organization']) || empty($_POST['email']) || empty($_POST['cn'])) { $message = "Please enter all information for the new CA authority."; header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=3&message={$message}"); exit; } - } function step6_submitphpaction() { + global $stepid; + if ($_POST['uselist'] == "yes" && !empty($_POST['certname'])) { $message = "Please choose an certificate or create a new one."; header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=4&message={$message}"); exit; } else if (!$_POST['uselist'] && !empty($_POST['certname'])) { - header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=5"); - exit; - } - - if (empty($_POST['name']) || empty($_POST['keylength']) || empty($_POST['lifetime']) || + $stepid = 4; + } else if (empty($_POST['name']) || empty($_POST['keylength']) || empty($_POST['lifetime']) || empty($_POST['country']) || empty($_POST['state']) || empty($_POST['city']) || empty($_POST['organization']) || empty($_POST['email']) || empty($_POST['cn'])) { $message = "Please enter all information for the new certificate."; header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=4&message={$message}"); exit; } - } function step7_submitphpaction() { } -function step8_submitphpaction() { -} function step9_submitphpaction() { global $config; |