From f9fa5d109ee4606dcc8c900fc2496e9e948ea4b5 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 18 Mar 2010 17:38:23 +0000
Subject: Add some descriptions. Default to local port 1194 when no other
 server is configured.

---
 usr/local/www/wizards/openvpn_wizard.inc |  3 +++
 usr/local/www/wizards/openvpn_wizard.xml | 20 ++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc
index 4c342ba..2e01e6a 100644
--- a/usr/local/www/wizards/openvpn_wizard.inc
+++ b/usr/local/www/wizards/openvpn_wizard.inc
@@ -261,6 +261,9 @@ function step10_stepbeforeformdisplay() {
 				$opt['value'] = $type;
                         $pkg['step'][$stepid]['fields']['field'][$idx]['options']['option'][] = $opt;
 			}
+		} else if ($field['name'] == "localport") {
+			if (count($config['openvpn']['openvpn-server']) < 1)
+				$pkg['step'][$stepid]['fields']['field'][$idx]['value'] = 1194;
 		}
 	}
 }
diff --git a/usr/local/www/wizards/openvpn_wizard.xml b/usr/local/www/wizards/openvpn_wizard.xml
index d7e927a..7cce90d 100644
--- a/usr/local/www/wizards/openvpn_wizard.xml
+++ b/usr/local/www/wizards/openvpn_wizard.xml
@@ -33,7 +33,7 @@
 <totalsteps>12</totalsteps>
 <step>
 	<id>1</id>
-	<title>Choose the type of user authentication you wish to use.</title>
+	<title>Choose the type of user authentication you wish to use and click Next.</title>
 	<description>OpenVPN Remote Access Server Setup Wizard</description>
 	<fields>
 		<field>
@@ -798,6 +798,14 @@
 	<fields>
 		<field>
 			<type>listtopic</type>
+			<name>Firewall Rules configuration</name>
+		</field>
+		<field>
+			<type>text</type>
+			<description>Firewall Rules control what network traffic is permitted. You must add rules to allow traffic to the OpenVPN server's IP and port, as well as allowing traffic from connected clients through the tunnel. These rules can be auto-added here, or configured manually after completing the wizardr.</description>
+		</field>
+		<field>
+			<type>listtopic</type>
 			<name>Traffic from clients to server</name>
 		</field>
 		<field>
@@ -830,8 +838,16 @@
 	<disableheader>on</disableheader>
 	<fields>
 		<field>
+			<type>listtopic</type>
+			<name>Configuration Complete!</name>
+		</field>
+		<field>
+			<type>text</type>
+			<description>Your configuration is now complete.</description>
+		</field>
+		<field>
 			<type>text</type>
-			<description>Configuration Complete</description>
+			<description>To be able to export client configurations, browse to System->Packages and install the OpenVPN Client Export package.</description>
 		</field>
 		<field>
 			<type>submit</type>
-- 
cgit v1.1