From 7875b9cf9e7fe6dd370c693906a4dd087950a3e6 Mon Sep 17 00:00:00 2001 From: jim-p Date: Tue, 4 Nov 2014 17:12:55 -0500 Subject: Update OpenVPN installers to 2.3.5-Ix01. Add -I6xx installers. --- .../openvpn-client-export.inc | 24 +++++++++---- .../openvpn-client-export.xml | 2 +- .../openvpn-client-export/vpn_openvpn_export.php | 40 ++++++++++++++++------ 3 files changed, 47 insertions(+), 19 deletions(-) (limited to 'config') diff --git a/config/openvpn-client-export/openvpn-client-export.inc b/config/openvpn-client-export/openvpn-client-export.inc index 1a34c260..44604a90 100755 --- a/config/openvpn-client-export/openvpn-client-export.inc +++ b/config/openvpn-client-export/openvpn-client-export.inc @@ -38,6 +38,10 @@ require_once("shaper.inc"); require_once("util.inc"); require_once("pfsense-utils.inc"); +global $current_openvpn_version, $current_openvpn_version_rev; +$current_openvpn_version = "2.3.5"; +$current_openvpn_version_rev = "01"; + function openvpn_client_export_install() { conf_mount_rw(); $tarpath = "/usr/local/pkg/openvpn-client-export.tgz"; @@ -478,19 +482,25 @@ function openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifys } } -function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $outpass, $proxy, $openvpnmanager, $advancedoptions, $openvpn_version = "2.1") { - global $config, $g, $input_errors; +function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $outpass, $proxy, $openvpnmanager, $advancedoptions, $openvpn_version = "x86-xp") { + global $config, $g, $input_errors, $current_openvpn_version, $current_openvpn_version_rev; $uname_p = trim(exec("uname -p")); switch ($openvpn_version) { - case "2.3-x86": - $client_install_exe = "openvpn-install-2.3-i686.exe"; + case "x86-xp": + $client_install_exe = "openvpn-install-{$current_openvpn_version}-I0{$current_openvpn_version_rev}-i686.exe"; + break; + case "x64-xp": + $client_install_exe = "openvpn-install-{$current_openvpn_version}-I0{$current_openvpn_version_rev}-x86_64.exe"; + break; + case "x86-win6": + $client_install_exe = "openvpn-install-{$current_openvpn_version}-I6{$current_openvpn_version_rev}-i686.exe"; break; - case "2.3-x64": - $client_install_exe = "openvpn-install-2.3-x86_64.exe"; + case "x64-win6": + $client_install_exe = "openvpn-install-{$current_openvpn_version}-I6{$current_openvpn_version_rev}-x86_64.exe"; break; default: - $client_install_exe = "openvpn-install-2.3-i686.exe"; + $client_install_exe = "openvpn-install-{$current_openvpn_version}-I0{$current_openvpn_version_rev}-i686.exe"; } $ovpndir = "/usr/local/share/openvpn"; diff --git a/config/openvpn-client-export/openvpn-client-export.xml b/config/openvpn-client-export/openvpn-client-export.xml index 21faa26d..f96336b3 100755 --- a/config/openvpn-client-export/openvpn-client-export.xml +++ b/config/openvpn-client-export/openvpn-client-export.xml @@ -1,7 +1,7 @@ OpenVPN Client Export - 1.2.13 + 1.2.14 OpenVPN Client Export /usr/local/pkg/openvpn-client-export.inc diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php index 6a8c9358..cb576aa6 100755 --- a/config/openvpn-client-export/vpn_openvpn_export.php +++ b/config/openvpn-client-export/vpn_openvpn_export.php @@ -34,6 +34,8 @@ require("globals.inc"); require("guiconfig.inc"); require("openvpn-client-export.inc"); +global $current_openvpn_version, $current_openvpn_version_rev; + $pgtitle = array("OpenVPN", "Client Export Utility"); if (!is_array($config['openvpn']['openvpn-server'])) @@ -362,7 +364,7 @@ function download_begin(act, i, j) { var proxyconf = document.getElementById("proxyconf").value; if (useproxypass) { if (!proxyuser) { - alert("Please fill the proxy username and password."); + alert("Please fill the proxy username and passowrd."); return; } if (!proxypass || !proxyconf) { @@ -441,11 +443,15 @@ function server_changed() { cell2.innerHTML += "OpenVPN Connect (iOS/Android)<\/a>"; cell2.innerHTML += "   "; cell2.innerHTML += "Others<\/a>"; - cell2.innerHTML += "- Windows Installers:"; + cell2.innerHTML += "- Windows Installers ():"; + cell2.innerHTML += "   "; + cell2.innerHTML += "x86-xp<\/a>"; + cell2.innerHTML += "   "; + cell2.innerHTML += "x64-xp<\/a>"; cell2.innerHTML += "   "; - cell2.innerHTML += "2.3-x86<\/a>"; + cell2.innerHTML += "x86-win6<\/a>"; cell2.innerHTML += "   "; - cell2.innerHTML += "2.3-x64<\/a>"; + cell2.innerHTML += "x64-win6<\/a>"; cell2.innerHTML += "- Mac OSX:"; cell2.innerHTML += "   "; cell2.innerHTML += "Viscosity Bundle<\/a>"; @@ -476,11 +482,15 @@ function server_changed() { cell2.innerHTML += "OpenVPN Connect (iOS/Android)<\/a>"; cell2.innerHTML += "   "; cell2.innerHTML += "Others<\/a>"; - cell2.innerHTML += "- Windows Installers:"; + cell2.innerHTML += "- Windows Installers ():"; + cell2.innerHTML += "   "; + cell2.innerHTML += "x86-xp<\/a>"; + cell2.innerHTML += "   "; + cell2.innerHTML += "x64-xp<\/a>"; cell2.innerHTML += "   "; - cell2.innerHTML += "2.3-x86<\/a>"; + cell2.innerHTML += "x86-win6<\/a>"; cell2.innerHTML += "   "; - cell2.innerHTML += "2.3-x64<\/a>"; + cell2.innerHTML += "x64-win6<\/a>"; cell2.innerHTML += "- Mac OSX:"; cell2.innerHTML += "   "; cell2.innerHTML += "Viscosity Bundle<\/a>"; @@ -518,11 +528,15 @@ function server_changed() { cell2.innerHTML += "OpenVPN Connect (iOS/Android)<\/a>"; cell2.innerHTML += "   "; cell2.innerHTML += "Others<\/a>"; - cell2.innerHTML += "- Windows Installers:"; + cell2.innerHTML += "- Windows Installers ():"; cell2.innerHTML += "   "; - cell2.innerHTML += "2.3-x86<\/a>"; + cell2.innerHTML += "x86-xp<\/a>"; cell2.innerHTML += "   "; - cell2.innerHTML += "2.3-x64<\/a>"; + cell2.innerHTML += "x64-xp<\/a>"; + cell2.innerHTML += "   "; + cell2.innerHTML += "x86-win6<\/a>"; + cell2.innerHTML += "   "; + cell2.innerHTML += "x64-win6<\/a>"; cell2.innerHTML += "- Mac OSX:"; cell2.innerHTML += "   "; cell2.innerHTML += "Viscosity Bundle<\/a>"; @@ -871,7 +885,11 @@ function useproxy_changed(obj) { - + + + + + -- cgit v1.2.3