From 8938167b0efdda72f05f0aa1297f1132d09718cf Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 30 Jun 2009 18:26:38 -0400
Subject: Correct arguments to zip.

---
 config/openvpn-client-export/openvpn-client-export.inc | 9 ++-------
 config/openvpn-client-export/vpn_openvpn_export.php    | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc
index b872f8ed..14b2a007 100755
--- a/config/openvpn-client-export/openvpn-client-export.inc
+++ b/config/openvpn-client-export/openvpn-client-export.inc
@@ -284,14 +284,9 @@ function viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $usead
 	// create template directory
 	mkdir($tempdir, 0700, true);
 
-	// create config directory
-	$confdir = "{$tempdir}/config";
-	if (!is_dir($conf_dir))
-		mkdir($confdir, 0700, true);
-
 	// write cofiguration file
 	$prefix = openvpn_client_export_prefix($srvid);
-	$cfgfile = "{$confdir}/config.conf";
+	$cfgfile = "{$tempdir}/config.conf";
 	$conf = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $usetoken);
 	if (!$conf)
 		return false;
@@ -317,7 +312,7 @@ function viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $usead
 		openvpn_client_pem_to_pk12($p12file, $outpass, $crtfile, $keyfile, $cafile);
 
 	// Zip Viscosity file
-	exec("/usr/local/bin/zip {$tempdir} {$tempdir}.zip");
+	exec("/usr/local/bin/zip {$tempdir}.zip {$tempdir}");
 
 	// Read in file and deliver to client
 	$outfile = "{$tempdir}.zip";
diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php
index c26236e7..8eecdae0 100755
--- a/config/openvpn-client-export/vpn_openvpn_export.php
+++ b/config/openvpn-client-export/vpn_openvpn_export.php
@@ -333,7 +333,7 @@ function usepass_changed() {
 							<table border="0" cellpadding="2" cellspacing="0">
 								<tr>
 									<td>
-										<input name="usepass" id="usepass" type="checkbox" value="yes" onClick="usepass_changed()" checked>
+										<input name="usepass" id="usepass" type="checkbox" onClick="usepass_changed()" checked>
 									</td>
 									<td>
 										<span class="vexpl">
-- 
cgit v1.2.3