Adding zip and unzip

5 files changed, 31 insertions, 1 deletions

diff --git a/config/openvpn-client-export/bin/unzip b/config/openvpn-client-export/bin/unzip
new file mode 100755
index 00000000..d8da509b
--- /dev/null
+++ b/config/openvpn-client-export/bin/unzip
diff --git a/config/openvpn-client-export/bin/zip b/config/openvpn-client-export/bin/zip
new file mode 100755
index 00000000..0900bd60
--- /dev/null
+++ b/config/openvpn-client-export/bin/zip
diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc
index 222fe71b..34b0a675 100755
--- a/config/openvpn-client-export/openvpn-client-export.inc
+++ b/config/openvpn-client-export/openvpn-client-export.inc
@@ -253,4 +253,4 @@ function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $uset
 	return $outfile;	
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml
index f0975ced..de579c70 100755
--- a/config/openvpn-client-export/openvpn-client-export.xml
+++ b/config/openvpn-client-export/openvpn-client-export.xml
@@ -25,6 +25,16 @@
 		<item>http://www.pfsense.com/packages/config/openvpn-client-export/openvpn-client-export.tgz</item>
 	</additional_files_needed>
 	<additional_files_needed>
+		<prefix>/usr/local/bin/</prefix>
+		<chmod>755</chmod>
+		<item>http://www.pfsense.com/packages/config/openvpn-client-export/bin/zip</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/bin/</prefix>
+		<chmod>755</chmod>
+		<item>http://www.pfsense.com/packages/config/openvpn-client-export/bin/unzip</item>
+	</additional_files_needed>	
+	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
 		<item>http://www.pfsense.com/packages/config/openvpn-client-export/vpn_openvpn_export.php</item>
diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php
index e5d474cb..95db34d1 100755
--- a/config/openvpn-client-export/vpn_openvpn_export.php
+++ b/config/openvpn-client-export/vpn_openvpn_export.php
@@ -32,6 +32,12 @@
 require("guiconfig.inc");
 require("openvpn-client-export.inc");
 
+// Handle Viscosiy upload
+if (is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
+	rename($_FILES['ulfile']['tmp_name'], "{$g['upload_path']}/viscosity.zip");
+	
+}
+
 $pgtitle = array("OpenVPN", "Client Export Utility");
 
 if (!is_array($config['openvpn']['openvpn-server']))
@@ -335,9 +341,23 @@ function usepass_changed() {
 							</table>
 						</td>
 					</tr>
+
 					<tr>
 						<td colspan="2" class="list" height="12">&nbsp;</td>
 					</tr>
+					<?php if(is_dir("/usr/local/share/openvpn")): ?>
+
+					<?php else: ?>
+						<form action="vpn_openvpn_export.php" method="post" enctype="multipart/form-data">
+						<strong>Zipped Viscosity file:</strong>
+						<input name="ulfile" type="file" class="formfld">
+						</form>
+					<?php endif; ?>
+					<tr>
+						<td colspan="2" class="list" height="12">&nbsp;</td>
+					</tr>
+
+
 					<tr>
 						<td colspan="2" valign="top" class="listtopic">Client Install Packages</td>
 					</tr>