From dc1799e8c22af75c4f77dc655b5f86dd4f167abc Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 6 Feb 2013 14:55:34 -0500
Subject: We are crafting a URL, not user output. Use & not &amp; here.
 Unbreaks export.

---
 .../openvpn-client-export/vpn_openvpn_export.php   | 32 +++++++++++-----------
 pkg_config.8.xml                                   |  2 +-
 pkg_config.8.xml.amd64                             |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php
index fd134a9d..fd2060ad 100755
--- a/config/openvpn-client-export/vpn_openvpn_export.php
+++ b/config/openvpn-client-export/vpn_openvpn_export.php
@@ -367,32 +367,32 @@ function download_begin(act, i, j) {
 
 	var dlurl;
 	dlurl  = "/vpn_openvpn_export.php?act=" + act;
-	dlurl += "&amp;srvid=" + escape(servers[index][0]);
+	dlurl += "&srvid=" + escape(servers[index][0]);
 	if (users[i]) {
-		dlurl += "&amp;usrid=" + escape(users[i][0]);
-		dlurl += "&amp;crtid=" + escape(users[i][1]);
+		dlurl += "&usrid=" + escape(users[i][0]);
+		dlurl += "&crtid=" + escape(users[i][1]);
 	}
 	if (certs[j]) {
-		dlurl += "&amp;usrid=";
-		dlurl += "&amp;crtid=" + escape(certs[j][0]);
+		dlurl += "&usrid=";
+		dlurl += "&crtid=" + escape(certs[j][0]);
 	}
-	dlurl += "&amp;useaddr=" + escape(useaddr);
-	dlurl += "&amp;quoteservercn=" + escape(quoteservercn);
-	dlurl += "&amp;openvpnmanager=" + escape(openvpnmanager);
-	dlurl += "&amp;usetoken=" + escape(usetoken);
+	dlurl += "&useaddr=" + escape(useaddr);
+	dlurl += "&quoteservercn=" + escape(quoteservercn);
+	dlurl += "&openvpnmanager=" + escape(openvpnmanager);
+	dlurl += "&usetoken=" + escape(usetoken);
 	if (usepass)
-		dlurl += "&amp;password=" + escape(pass);
+		dlurl += "&password=" + escape(pass);
 	if (useproxy) {
-		dlurl += "&amp;proxy_addr=" + escape(proxyaddr);
-		dlurl += "&amp;proxy_port=" + escape(proxyport);
-		dlurl += "&amp;proxy_authtype=" + escape(proxyauth);
+		dlurl += "&proxy_addr=" + escape(proxyaddr);
+		dlurl += "&proxy_port=" + escape(proxyport);
+		dlurl += "&proxy_authtype=" + escape(proxyauth);
 		if (useproxypass) {
-			dlurl += "&amp;proxy_user=" + escape(proxyuser);
-			dlurl += "&amp;proxy_password=" + escape(proxypass);
+			dlurl += "&proxy_user=" + escape(proxyuser);
+			dlurl += "&proxy_password=" + escape(proxypass);
 		}
 	}
 
-	dlurl += "&amp;advancedoptions=" + escape(advancedoptions);
+	dlurl += "&advancedoptions=" + escape(advancedoptions);
 
 	window.open(dlurl,"_self");
 }
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 41136e1e..092475e1 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1393,7 +1393,7 @@
 		<depends_on_package_pbi>zip-3.0-i386.pbi p7zip-9.20.1-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/archivers/p7zip</build_port_path>
 		<build_port_path>/usr/ports/archivers/zip</build_port_path>
-		<version>1.0.3</version>
+		<version>1.0.4</version>
 		<status>RELEASE</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index d53cbbc1..370c3fc9 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1380,7 +1380,7 @@
 		<depends_on_package_pbi>p7zip-9.20.1-amd64.pbi zip-3.0-amd64.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/archivers/p7zip</build_port_path>
 		<build_port_path>/usr/ports/archivers/zip</build_port_path>
-		<version>1.0.3</version>
+		<version>1.0.4</version>
 		<status>RELEASE</status>
 		<required_version>2.0</required_version>
 		<config_file>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.xml</config_file>
-- 
cgit v1.2.3