diff options
author | Jim P <jim@pingle.org> | 2012-11-05 12:48:41 -0800 |
---|---|---|
committer | Jim P <jim@pingle.org> | 2012-11-05 12:48:41 -0800 |
commit | 8e14756dfd9b22bf4d1bc1d7275403072bfcae07 (patch) | |
tree | aed173bbb4dd85bed7a3512636542a481f9b0ae8 /config/openvpn-client-export/vpn_openvpn_export.php | |
parent | a535a40b5c4dc37ee8b055c4d91c715f31d5720e (diff) | |
parent | 43eb7bc003dd6b9b2725d0c9e6fb37a243bfde29 (diff) | |
download | pfsense-packages-8e14756dfd9b22bf4d1bc1d7275403072bfcae07.tar.gz pfsense-packages-8e14756dfd9b22bf4d1bc1d7275403072bfcae07.tar.bz2 pfsense-packages-8e14756dfd9b22bf4d1bc1d7275403072bfcae07.zip |
Merge pull request #334 from PiBa-NL/master
openvpn-client-export, added option to include OpenVPNManager in windows setup
Diffstat (limited to 'config/openvpn-client-export/vpn_openvpn_export.php')
-rwxr-xr-x | config/openvpn-client-export/vpn_openvpn_export.php | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php index 414ad7d0..e7c94ae6 100755 --- a/config/openvpn-client-export/vpn_openvpn_export.php +++ b/config/openvpn-client-export/vpn_openvpn_export.php @@ -136,6 +136,7 @@ if (!empty($act)) { } else $useaddr = $_GET['useaddr']; $advancedoptions = $_GET['advancedoptions']; + $openvpnmanager = $_GET['openvpnmanager']; $quoteservercn = $_GET['quoteservercn']; $usetoken = $_GET['usetoken']; @@ -171,7 +172,7 @@ if (!empty($act)) { } } - $exp_name = openvpn_client_export_prefix($srvid); + $exp_name = openvpn_client_export_prefix($srvid, $usrid); if(substr($act, 0, 4) == "conf") { switch ($act) { @@ -203,17 +204,17 @@ if (!empty($act)) { $exp_name = urlencode($exp_name."-config.ovpn"); $expformat = "baseconf"; } - $exp_path = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $quoteservercn, $usetoken, $nokeys, $proxy, $expformat, $password, false, false, $advancedoptions); + $exp_path = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $quoteservercn, $usetoken, $nokeys, $proxy, $expformat, $password, false, false, $openvpnmanager, $advancedoptions); } if($act == "visc") { $exp_name = urlencode($exp_name."-Viscosity.visc.zip"); - $exp_path = viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $useaddr, $quoteservercn, $usetoken, $password, $proxy, $advancedoptions); + $exp_path = viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $useaddr, $quoteservercn, $usetoken, $password, $proxy, $openvpnmanager, $advancedoptions); } if(substr($act, 0, 4) == "inst") { $exp_name = urlencode($exp_name."-install.exe"); - $exp_path = openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $quoteservercn, $usetoken, $password, $proxy, $advancedoptions, substr($act, 5)); + $exp_path = openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $quoteservercn, $usetoken, $password, $proxy, $openvpnmanager, $advancedoptions, substr($act, 5)); } if (!$exp_path) { @@ -303,6 +304,9 @@ function download_begin(act, i, j) { var usepass = 0; if (document.getElementById("usepass").checked) usepass = 1; + var openvpnmanager = 0; + if (document.getElementById("openvpnmanager").checked) + openvpnmanager = 1; var pass = document.getElementById("pass").value; var conf = document.getElementById("conf").value; @@ -366,6 +370,7 @@ function download_begin(act, i, j) { } dlurl += "&useaddr=" + escape(useaddr); dlurl += ""eservercn=" + escape(quoteservercn); + dlurl += "&openvpnmanager=" + escape(openvpnmanager); dlurl += "&usetoken=" + escape(usetoken); if (usepass) dlurl += "&password=" + escape(pass); @@ -732,6 +737,25 @@ function useproxy_changed(obj) { </td> </tr> <tr> + <td width="22%" valign="top" class="vncell">Management Interface<br/>OpenVPNManager</td> + <td width="78%" class="vtable"> + <table border="0" cellpadding="2" cellspacing="0"> + <tr> + <td> + <input name="openvpnmanager" id="openvpnmanager" type="checkbox" value="yes"> + </td> + <td> + <span class="vexpl"> + This will change the generated .ovpn configuration to allow for usage of the management interface. + And include the OpenVPNManager program in the "Windows Installers". With this OpenVPN can be used also by non-administrator users. + This is also usefull for Windows7/Vista systems where elevated permissions are needed to add routes to the system. + </span> + </td> + </tr> + </table> + </td> + </tr> + <tr> <td colspan="2" class="list" height="12"> </td> </tr> <tr> |