From 2ca50c87df75ce30e135cfcf1c2d056403a61c47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=E7i?= Date: Thu, 11 Mar 2010 12:38:00 +0000 Subject: Improve wizard by adding more steps and cleaness. --- usr/local/www/wizards/openvpn_wizard.inc | 335 ++++++++++++++++++------------- usr/local/www/wizards/openvpn_wizard.xml | 238 +++++++++++----------- 2 files changed, 314 insertions(+), 259 deletions(-) (limited to 'usr/local/www/wizards') diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc index 319b49a..cc9f099 100644 --- a/usr/local/www/wizards/openvpn_wizard.inc +++ b/usr/local/www/wizards/openvpn_wizard.inc @@ -1,127 +1,177 @@ $auth) { - if ($auth['type'] != "ldap") + if ($auth['type'] != "ldap") { + $count++; continue; - $opts = array(); - $opts['name'] = $auth['name']; - $opts['value'] = $auth['name']; - $fields[2]['options']['option'][] = $opts; + } + $opts = array(); + $opts['name'] = $auth['name']; + $opts['value'] = $auth['name']; + $fields[2]['options']['option'][] = $opts; } + if ($count < 1) + $stepid = 2; +} + +function step2_submitphpaction() { + global $stepid, $config; + + $config['ovpnserver']['step2']['authserv'] = $_POST['authserv']; + unset($config['ovpnserver']['step2']['uselist']); + write_config(); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=3"); + exit; } 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'])) { - $stepid = 2; - } else if (empty($_POST['name']) || empty($_POST['ip']) || empty($_POST['port']) || + 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; } - $stepid = 2; + $_POST['uselist'] = "on"; } function step4_stepbeforeformdisplay() { global $pkg; - $fields =& $pkg['step'][2]['fields']['field']; + $fields =& $pkg['step'][3]['fields']['field']; + $count = 0; $authlist = auth_get_authserver_list(); - - $fields[2]['options']['option'] = array(); - foreach ($authlist as $i => $auth) { - if ($auth['type'] != "radius") - continue; - $opts = array(); - $opts['name'] = $auth['name']; - $opts['value'] = $auth['name']; - $fields[2]['options']['option'][] = $opts; + $fields[0]['options']['option'] = array(); + foreach ($authlist as $i => $auth) { + if ($auth['type'] != "radius") { + $count++; + continue; + } + $opts = array(); + $opts['name'] = $auth['name']; + $opts['value'] = $auth['name']; + $fields[2]['options']['option'][] = $opts; } + if ($count < 1) + $stepid = 4; } function step4_submitphpaction() { + global $stepid, $config; + + $config['ovpnserver']['step2']['authserv'] = $_POST['authserv']; + unset($config['ovpnserver']['step2']['uselist']); + write_config(); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=4"); + exit; +} + +function step5_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'])) { - $stepid = 2; - } else if (empty($_POST['name']) || empty($_POST['ip']) || empty($_POST['port']) || + 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}"); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=4&message={$message}"); exit; } + $_POST['uselist'] = "on"; } -function step5_submitphpaction() { - global $stepid; +function step6_stepbeforeformdisplay() { + global $stepid, $config; - 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}"); + if (count($config['system']['ca']) < 1) { + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=6"); exit; - } else if (!$_POST['uselist'] && !empty($_POST['certca'])) { - $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'])) { + } +} + +function step6_submitphpaction() { + global $config; + + $config['ovpnserver']['step6']['authcertca'] = $_POST['authcertca']; + unset($config['ovpnserver']['step6']['uselist']); + write_config(); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7"); + exit; +} + +function step7_submitphpaction() { + + 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}"); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=6&message={$message}"); exit; } - $stepid = 3; + $_POST['uselist'] = "on"; } -function step6_submitphpaction() { - global $stepid; +function step8_stepbeforeformdisplay() { + global $stepid, $config; - 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}"); + if (count($config['system']['cert']) < 1 || + (count($config['system']['cert']) == 1 && stristr($config['system']['cert'][0]['name'], "webconf"))) { + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=8"); exit; - } else if (!$_POST['uselist'] && !empty($_POST['certname'])) { - $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'])) { + } +} + +function step8_submitphpaction() { + global $config; + + $config['ovpnserver']['step9']['authcertname'] = $_POST['authcertname']; + unset($config['ovpnserver']['step6']['uselist']); + write_config(); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=9"); + exit; +} + +function step9_submitphpaction() { + global $stepid; + + 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}"); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=8&message={$message}"); exit; } - $stepid = 4; + $_POST['uselist'] = "on"; } -function step7_stepbeforeformdisplay() { +function step10_stepbeforeformdisplay() { global $pkg, $stepid, $netbios_nodetypes; foreach ($pkg['step'][$stepid]['fields']['field'] as $idx => $field) { @@ -145,7 +195,7 @@ function step7_stepbeforeformdisplay() { } } -function step7_submitphpaction() { +function step10_submitphpaction() { global $savemsg, $stepid; /* input validation */ @@ -201,7 +251,7 @@ function step7_submitphpaction() { } } -function step9_submitphpaction() { +function step12_submitphpaction() { global $config; $pconfig = $config['ovpnserver']; @@ -253,57 +303,57 @@ function step9_submitphpaction() { exit; } - if (isset($pconfig['step5']['uselist'])) { + if (isset($pconfig['step6']['uselist'])) { $ca = array(); $ca['refid'] = uniqid(); - $ca['name'] = $pconfig['step5']['certname']; + $ca['name'] = $pconfig['step6']['certname']; $dn = array( - 'countryName' => $pconfig['step5']['country'], - 'stateOrProvinceName' => $pconfig['step5']['state'], - 'localityName' => $pconfig['step5']['city'], - 'organizationName' => $pconfig['step5']['organization'], - 'emailAddress' => $pconfig['step5']['email'], + 'countryName' => $pconfig['step6']['country'], + 'stateOrProvinceName' => $pconfig['step6']['state'], + 'localityName' => $pconfig['step6']['city'], + 'organizationName' => $pconfig['step6']['organization'], + 'emailAddress' => $pconfig['step6']['email'], 'commonName' => $pconfig['step6']['cn']); - ca_create($ca, $pconfig['step5']['keylength'], $pconfig['step5']['lifetime'], $dn); + ca_create($ca, $pconfig['step6']['keylength'], $pconfig['step6']['lifetime'], $dn); if (!is_array($config['system']['ca'])) $config['system']['ca'] = array(); $config['system']['ca'][] = $ca; - } else if (!isset($pconfig['step5']['uselist']) && empty($pconfig['step5']['authcertca'])) { + } else if (!isset($pconfig['step6']['uselist']) && empty($pconfig['step6']['authcertca'])) { $message = "Please choose a CA authority."; - header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=3&message={$message}"); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=5&message={$message}"); exit; - } else if (!($ca = lookup_ca($pconfig['step5']['authcertca']))) { + } else if (!($ca = lookup_ca($pconfig['step6']['authcertca']))) { $message = "Not a valid CA authority specified."; - header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=3&message={$message}"); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=5&message={$message}"); exit; } - if (isset($pconfig['step6']['uselist'])) { + if (isset($pconfig['step9']['uselist'])) { $cert = array(); $cert['refid'] = uniqid(); - $cert['name'] = $pconfig['step6']['certname']; + $cert['name'] = $pconfig['step9']['certname']; $dn = array( - 'countryName' => $pconfig['step6']['country'], - 'stateOrProvinceName' => $pconfig['step6']['state'], - 'localityName' => $pconfig['step6']['city'], - 'organizationName' => $pconfig['step6']['organization'], - 'emailAddress' => $pconfig['step6']['email'], - 'commonName' => $pconfig['step6']['cn']); - - cert_create($cert, $ca['refid'], $pconfig['step6']['keylength'], $pconfig['step6']['lifetime'], $dn); + 'countryName' => $pconfig['step9']['country'], + 'stateOrProvinceName' => $pconfig['step9']['state'], + 'localityName' => $pconfig['step9']['city'], + 'organizationName' => $pconfig['step9']['organization'], + 'emailAddress' => $pconfig['step9']['email'], + 'commonName' => $pconfig['step9']['cn']); + + cert_create($cert, $ca['refid'], $pconfig['step9']['keylength'], $pconfig['step9']['lifetime'], $dn); if (!is_array($config['system']['cert'])) $config['system']['cert'] = array(); $config['system']['cert'][] = $cert; - } else if (!isset($pconfig['step6']['uselist']) && empty($pconfig['step6']['authcertname'])) { + } else if (!isset($pconfig['step6']['uselist']) && empty($pconfig['step9']['authcertname'])) { $message = "Please choose a Certificate."; - header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=4&message={$message}"); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7&message={$message}"); exit; - } else if (!($cert = lookup_cert($pconfig['step6']['authcertname']))) { + } else if (!($cert = lookup_cert($pconfig['step9']['authcertname']))) { $message = "Not a valid Certificate specified."; - header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=4&message={$message}"); + header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7&message={$message}"); exit; } $server = array(); @@ -324,62 +374,62 @@ function step9_submitphpaction() { } $server['caref'] = $ca['refid']; $server['certref'] = $cert['refid']; - $server['protocol'] = $pconfig['step7']['protocol']; - $server['interface'] = $pconfig['step7']['interface']; - if (isset($pconfig['step7']['localport'])) - $server['localport'] = $pconfig['step7']['localport']; - $server['description'] = $pconfig['step7']['descr']; - $server['custom_options'] = $pconfig['step7']['advanced']; - if (isset($pconfig['step7']['tlsauth'])) { - if (isset($pconfig['step7']['gentlskey'])) + $server['protocol'] = $pconfig['step10']['protocol']; + $server['interface'] = $pconfig['step10']['interface']; + if (isset($pconfig['step10']['localport'])) + $server['localport'] = $pconfig['step10']['localport']; + $server['description'] = $pconfig['step10']['descr']; + $server['custom_options'] = $pconfig['step10']['advanced']; + if (isset($pconfig['step10']['tlsauth'])) { + if (isset($pconfig['step10']['gentlskey'])) $tlskey = openvpn_create_key(); else - $tlskey = $pconfig['step7']['tlskey']; + $tlskey = $pconfig['step10']['tlskey']; $server['tls'] = base64_encode($tlskey); } - $server['dh_length'] = $pconfig['step7']['dhkey']; - $server['tunnel_network'] = $pconfig['step7']['tunnelnet']; - if (isset($pconfig['step7']['rdrgw'])) - $server['gwredir'] = $pconfig['step7']['rdrgw']; - if (isset($pconfig['step7']['localnet'])) - $server['local_network'] = $pconfig['step7']['localnet']; - if (isset($pconfig['step7']['remotenet'])) - $server['remote_network'] = $pconfig['step7']['remotenet']; - if (isset($pconfig['step7']['concurrentcon'])) - $server['maxclients'] = $pconfig['step7']['concurrentcon']; - if (isset($pconfig['step7']['compression'])) - $server['compression'] = $pconfig['step7']['compression']; - if (isset($pconfig['step7']['tos'])) - $server['passtos'] = $pconfig['step7']['tos']; - if (isset($pconfig['step7']['interclient'])) - $server['client2client'] = $pconfig['step7']['interclient']; - if (isset($pconfig['step7']['addrpool'])) - $server['pool_enable'] = $pconfig['step7']['addrpool']; - if (isset($pconfig['step7']['defaultdomain'])) - $server['dns_domain'] = $pconfig['step7']['defaultdomain']; - if (isset($pconfig['step7']['dns1'])) - $server['dns_server1'] = $pconfig['step7']['dns1']; - if (isset($pconfig['step7']['dns2'])) - $server['dns_server2'] = $pconfig['step7']['dns2']; - if (isset($pconfig['step7']['dns3'])) - $server['dns_server3'] = $pconfig['step7']['dns3']; - if (isset($pconfig['step7']['dns4'])) - $server['dns_server4'] = $pconfig['step7']['dns4']; - if (isset($pconfig['step7']['ntp1'])) - $server['ntp_server1'] = $pconfig['step7']['ntp1']; - if (isset($pconfig['step7']['ntp2'])) - $server['ntp_server2'] = $pconfig['step7']['ntp2']; - if (isset($pconfig['step7']['wins1'])) - $server['wins_server1'] = $pconfig['step7']['wins1']; - if (isset($pconfig['step7']['wins2'])) - $server['wins_server2'] = $pconfig['step7']['wins2']; - if (isset($pconfig['step7']['nbtenable'])) { - $server['netbios_ntype'] = $pconfig['step7']['nbttype']; - if (isset($pconfig['step7']['nbtscope'])) - $server['netbios_scope'] = $pconfig['step7']['nbtscope']; - $server['netbios_enable'] = $pconfig['step7']['nbtenable']; + $server['dh_length'] = $pconfig['step10']['dhkey']; + $server['tunnel_network'] = $pconfig['step10']['tunnelnet']; + if (isset($pconfig['step10']['rdrgw'])) + $server['gwredir'] = $pconfig['step10']['rdrgw']; + if (isset($pconfig['step10']['localnet'])) + $server['local_network'] = $pconfig['step10']['localnet']; + if (isset($pconfig['step10']['remotenet'])) + $server['remote_network'] = $pconfig['step10']['remotenet']; + if (isset($pconfig['step10']['concurrentcon'])) + $server['maxclients'] = $pconfig['step10']['concurrentcon']; + if (isset($pconfig['step10']['compression'])) + $server['compression'] = $pconfig['step10']['compression']; + if (isset($pconfig['step10']['tos'])) + $server['passtos'] = $pconfig['step10']['tos']; + if (isset($pconfig['step10']['interclient'])) + $server['client2client'] = $pconfig['step10']['interclient']; + if (isset($pconfig['step10']['addrpool'])) + $server['pool_enable'] = $pconfig['step10']['addrpool']; + if (isset($pconfig['step10']['defaultdomain'])) + $server['dns_domain'] = $pconfig['step10']['defaultdomain']; + if (isset($pconfig['step10']['dns1'])) + $server['dns_server1'] = $pconfig['step10']['dns1']; + if (isset($pconfig['step10']['dns2'])) + $server['dns_server2'] = $pconfig['step10']['dns2']; + if (isset($pconfig['step10']['dns3'])) + $server['dns_server3'] = $pconfig['step10']['dns3']; + if (isset($pconfig['step10']['dns4'])) + $server['dns_server4'] = $pconfig['step10']['dns4']; + if (isset($pconfig['step10']['ntp1'])) + $server['ntp_server1'] = $pconfig['step10']['ntp1']; + if (isset($pconfig['step10']['ntp2'])) + $server['ntp_server2'] = $pconfig['step10']['ntp2']; + if (isset($pconfig['step10']['wins1'])) + $server['wins_server1'] = $pconfig['step10']['wins1']; + if (isset($pconfig['step10']['wins2'])) + $server['wins_server2'] = $pconfig['step10']['wins2']; + if (isset($pconfig['step10']['nbtenable'])) { + $server['netbios_ntype'] = $pconfig['step10']['nbttype']; + if (isset($pconfig['step10']['nbtscope'])) + $server['netbios_scope'] = $pconfig['step10']['nbtscope']; + $server['netbios_enable'] = $pconfig['step10']['nbtenable']; } - $server['crypto'] = $pconfig['step7']['crypto']; + $server['crypto'] = $pconfig['step10']['crypto']; if (!is_array($config['openvpn']['openvpn-server'])) $config['openvpn']['openvpn-server'] = array(); @@ -391,4 +441,5 @@ function step9_submitphpaction() { header("Location: vpn_openvpn_server.php"); exit; } + ?> diff --git a/usr/local/www/wizards/openvpn_wizard.xml b/usr/local/www/wizards/openvpn_wizard.xml index 1030f88..06e250c 100644 --- a/usr/local/www/wizards/openvpn_wizard.xml +++ b/usr/local/www/wizards/openvpn_wizard.xml @@ -33,9 +33,9 @@ 8 - OpenVPN Server Setup Wizard 1 - Choose type of user authentication you wish to use. + OpenVPN Remote Access Server Setup Wizard + Choose the type of user authentication you wish to use. select @@ -63,27 +63,19 @@ submit - step2_submitphpaction(); + step1_submitphpaction(); /usr/local/www/wizards/openvpn_wizard.inc 2 - Add an authentication server - Add an LDAP authentication server + OpenVPN Remote Access Server Setup Wizard + Choose an LDAP authentication server listtopic Authentication Servers list - checkbox - uselist - name,ip,port,transport,scope,authscope,userdn,passdn,nameattr - Use authentication server from list - Server from list - ovpnserver->step2->uselist - - authserv Authentication servers select @@ -99,9 +91,20 @@ submit Next + + step2_stepbeforeformdisplay(); + step2_submitphpaction(); + enablechange(); + /usr/local/www/wizards/openvpn_wizard.inc + + + 3 + OpenVPN Remote Access Server Setup Wizard + Create an LDAP authentication server + listtopic - Add a new authentication server + LDAP authentication server parameters name @@ -196,23 +199,15 @@ /usr/local/www/wizards/openvpn_wizard.inc - 3 - Add an RADIUS authentication server - Add an RADIUS authentication server + 4 + OpenVPN Remote Access Server Setup Wizard + Choose RADIUS authentication server listtopic Authentication Servers list - checkbox - uselist - name,ip,port,secret - Use authentication server from list - Server from list - ovpnserver->step2->uselist - - authserv Authentication servers select @@ -228,6 +223,17 @@ submit Next + + step4_stepbeforeformdisplay(); + step4_submitphpaction(); + enablechange(); + /usr/local/www/wizards/openvpn_wizard.inc + + + 5 + OpenVPN Remote Access Server Setup Wizard + Add an RADIUS authentication server + listtopic Add a new authentication server @@ -263,34 +269,35 @@ submit - step4_stepbeforeformdisplay(); - step4_submitphpaction(); - enablechange(); + step5_stepbeforeformdisplay(); + step5_submitphpaction(); /usr/local/www/wizards/openvpn_wizard.inc - 4 - Select Certificate Authority - Please choose or create a certificate authority. + 6 + OpenVPN Remote Access Server Setup Wizard + Select certificate authority. - checkbox - uselist - name,keylength,lifetime,country,state,city,organization,email,cn - Use authentication server from list - Server from list - ovpnserver->step5->uselist - - certca_selection certca Certificate Authority - ovpnserver->step5->authcertca + ovpnserver->step6->authcertca Next submit + + step6_stepbeforeformdisplay(); + step6_submitphpaction(); + /usr/local/www/wizards/openvpn_wizard.inc + + + 7 + OpenVPN Remote Access Server Setup Wizard + Create a certificate authority. + Create a new CA certificate listtopic @@ -299,13 +306,13 @@ name Descriptive name input - ovpnserver->step5->certca + ovpnserver->step6->certca keylength Key length select - ovpnserver->step5->keylength + ovpnserver->step6->keylength country Country Code input 5 - ovpnserver->step5->country + ovpnserver->step6->country state State or Province input 30 - ovpnserver->step5->state + ovpnserver->step6->state city City input 30 - ovpnserver->step5->city + ovpnserver->step6->city organization Organization input 30 - ovpnserver->step5->organization + ovpnserver->step6->organization email E-mail input 30 - ovpnserver->step5->email + ovpnserver->step6->email cn Common name input 20 - ovpnserver->step5->cn + ovpnserver->step6->cn Add new CA submit - step5_submitphpaction(); + step7_submitphpaction(); /usr/local/www/wizards/openvpn_wizard.inc enablechange(); - 5 - Choose Server Certificate + 8 + OpenVPN Remote Access Server Setup Wizard Create a certificate to be used by server. - checkbox - uselist - name,keylength,lifetime,country,state,city,organization,email,cn,ca - Use authentication server from list - Server from list - ovpnserver->step6->uselist - - cert_selection certname Certificate - ovpnserver->step6->authcertname + ovpnserver->step9->authcertname Next submit + + step8_stepbeforeformdisplay(); + step8_submitphpaction(); + /usr/local/www/wizards/openvpn_wizard.inc + + + 9 + OpenVPN Remote Access Server Setup Wizard + Create a certificate to be used by server. + Create a new certificate listtopic @@ -415,19 +424,13 @@ name Descriptive name input - ovpnserver->step6->certname - - - ca - certca_selection - Certificate authority - ovpnserver->step6->ca + ovpnserver->step9->certname keylength Key length select - ovpnserver->step6->keylength + ovpnserver->step9->keylength country Country Code input 5 - ovpnserver->step6->country + ovpnserver->step9->country state State or Province input 30 - ovpnserver->step6->state + ovpnserver->step9->state city City input 30 - ovpnserver->step6->city + ovpnserver->step9->city organization Organization input 30 - ovpnserver->step6->organization + ovpnserver->step9->organization email E-mail input 30 - ovpnserver->step6->email + ovpnserver->step9->email cn Common name input 20 - ovpnserver->step6->cn + ovpnserver->step9->cn Create new Certificate submit - step6_submitphpaction(); + step9_submitphpaction(); /usr/local/www/wizards/openvpn_wizard.inc enablechange(); - 6 - Other needed parameters + 10 + OpenVPN Remote Access Server Setup Wizard On this screen we will configure the Local Area Network information. @@ -519,12 +522,12 @@ interface interfaces_selection Interface - ovpnserver->step7->interface + ovpnserver->step10->interface Protocol select - ovpnserver->step7->protocol + ovpnserver->step10->protocol description Description input 30 - ovpnserver->step7->descr + ovpnserver->step10->descr listtopic @@ -559,7 +562,7 @@ checkbox on Enable authentication of TLS packets. - ovpnserver->step7->tlsauth + ovpnserver->step10->tlsauth Automatically generate a TLS key @@ -568,20 +571,20 @@ on checkbox Automatically generate a shared TLS authentication key. - ovpnserver->step7->gentlskey + ovpnserver->step10->gentlskey tlssharedkey textarea 30 5 - ovpnserver->step7->tlskey + ovpnserver->step10->tlskey DH Parameters Length dhparameters select - ovpnserver->step7->dhkey + ovpnserver->step10->dhkey Redirect Gateway redirectgw checkbox Force all client generated traffic through the tunnel. - ovpnserver->step7->rdrgw + ovpnserver->step10->rdrgw Remote network remotenet input 20 - ovpnserver->step7->remotenet + ovpnserver->step10->remotenet Local network localnet input 20 - ovpnserver->step7->localnet + ovpnserver->step10->localnet Concurrent Connections @@ -647,28 +650,28 @@ Specify the maximum number of clients allowed to concurrently connect to this server. input 10 - ovpnserver->step7->concurrentcon + ovpnserver->step10->concurrentcon Compression compression checkbox Compress tunnel packets using the LZO algorithm. - ovpnserver->step7->compression + ovpnserver->step10->compression Type-of-Service tos checkbox Set the TOS IP header value of tunnel packets to match the encapsulated packet value. - ovpnserver->step7->tos + ovpnserver->step10->tos Inter-client communication interclient checkbox Allow communication between clients connected to this server. - ovpnserver->step7->interclient + ovpnserver->step10->interclient listtopic @@ -679,50 +682,50 @@ addrpool checkbox Provide a virtual adapter IP address to clients (see Tunnel Network). - ovpnserver->step7->addrpool + ovpnserver->step10->addrpool DNS Default Domain defaultdomain input Provide a default domain name to clients. - ovpnserver->step7->defaultdomain + ovpnserver->step10->defaultdomain DNS Server 1 dnsserver1 input - ovpnserver->step7->dns1 + ovpnserver->step10->dns1 DNS Server 2 dnserver2 input - ovpnserver->step7->dns2 + ovpnserver->step10->dns2 DNS Server 3 dnserver3 input - ovpnserver->step7->dns3 + ovpnserver->step10->dns3 DNS Server 4 dnserver4 input - ovpnserver->step7->dns4 + ovpnserver->step10->dns4 NTP Server ntpserver1 input - ovpnserver->step7->ntp1 + ovpnserver->step10->ntp1 NTP Server 2 ntpserver2 input - ovpnserver->step7->ntp2 + ovpnserver->step10->ntp2 nbtenable @@ -733,7 +736,7 @@ NetBios Node Type nbttype select - ovpnserver->step7->nbttype + ovpnserver->step10->nbttype WINS Server 1 winsserver1 input - ovpnserver->step7->wins1 + ovpnserver->step10->wins1 WINS Server 2 winsserver2 input - ovpnserver->step7->wins2 + ovpnserver->step10->wins2 Advanced @@ -765,20 +768,20 @@ 30 5 Enter any additional options you would like to add to the OpenVPN server configuration here, separated by a semicolon. EXAMPLE: push "route 10.0.0.0 255.255.255.0" - ovpnserver->step7->advanced + ovpnserver->step10->advanced Next submit - step7_stepbeforeformdisplay(); - step7_submitphpaction(); + step10_stepbeforeformdisplay(); + step10_submitphpaction(); /usr/local/www/wizards/openvpn_wizard.inc - 7 - Firewall Rules + 11 + OpenVPN Remote Access Server Setup Wizard listtopic @@ -789,7 +792,7 @@ Firewall Rule Automatically add rule to permit checkbox - ovpnserver->step8->ovpnrule + ovpnserver->step11->ovpnrule listtopic @@ -800,7 +803,7 @@ OpenVPN rule Add a rule to allow all traffic from connected clients checkbox - ovpnserver->step8->ovpnallow + ovpnserver->step11->ovpnallow Next @@ -809,7 +812,8 @@ - 8 + 12 + OpenVPN Remote Access Server Setup Wizard text @@ -820,7 +824,7 @@ Finish - step9_submitphpaction(); + step12_submitphpaction(); /usr/local/www/wizards/openvpn_wizard.inc -- cgit v1.1