diff options
author | N0YB <Al_Stu@Frontier.com> | 2013-06-05 21:09:16 -0700 |
---|---|---|
committer | N0YB <Al_Stu@Frontier.com> | 2013-06-05 21:09:16 -0700 |
commit | 50152cdeade8e6927cd34681525955be3c0ad1fe (patch) | |
tree | 9212479004c98d4d0fb6fad566c8f9cf20e3802f /config/openvpn-client-export/vpn_openvpn_export.php | |
parent | ee6c400fe47de2e632fe5144efb4b259db5cfde4 (diff) | |
download | pfsense-packages-50152cdeade8e6927cd34681525955be3c0ad1fe.tar.gz pfsense-packages-50152cdeade8e6927cd34681525955be3c0ad1fe.tar.bz2 pfsense-packages-50152cdeade8e6927cd34681525955be3c0ad1fe.zip |
Add Proxy Type Option
Diffstat (limited to 'config/openvpn-client-export/vpn_openvpn_export.php')
-rwxr-xr-x | config/openvpn-client-export/vpn_openvpn_export.php | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php index cfec87f7..4f7e1caa 100755 --- a/config/openvpn-client-export/vpn_openvpn_export.php +++ b/config/openvpn-client-export/vpn_openvpn_export.php @@ -159,6 +159,7 @@ if (!empty($act)) { $input_errors[] = "You need to specify a port for the proxy ip."; } else $proxy['port'] = $_GET['proxy_port']; + $proxy['proxy_type'] = $_GET['proxy_type']; $proxy['proxy_authtype'] = $_GET['proxy_authtype']; if ($_GET['proxy_authtype'] != "none") { if (empty($_GET['proxy_user'])) { @@ -345,6 +346,8 @@ function download_begin(act, i, j) { if (document.getElementById("useproxypass").value != 'none') useproxypass = 1; + var proxytype = document.getElementById("useproxytype").value; + var proxyauth = document.getElementById("useproxypass").value; var proxyuser = document.getElementById("proxyuser").value; var proxypass = document.getElementById("proxypass").value; @@ -383,6 +386,7 @@ function download_begin(act, i, j) { if (usepass) dlurl += "&password=" + escape(pass); if (useproxy) { + dlurl += "&proxy_type=" + escape(proxytype); dlurl += "&proxy_addr=" + escape(proxyaddr); dlurl += "&proxy_port=" + escape(proxyport); dlurl += "&proxy_authtype=" + escape(proxyauth); @@ -603,7 +607,7 @@ function useproxy_changed(obj) { </select> <br /> <div style="display:none;" id="HostName"> - <input name="useaddr_hostname" id="useaddr_hostname" /> + <input name="useaddr_hostname" id="useaddr_hostname" size="40" /> <span class="vexpl"> Enter the hostname or IP address the client will use to connect to this server. </span> @@ -682,7 +686,7 @@ function useproxy_changed(obj) { </td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Use HTTP Proxy</td> + <td width="22%" valign="top" class="vncell">Use Proxy</td> <td width="78%" class="vtable"> <table border="0" cellpadding="2" cellspacing="0" summary="http proxy"> <tr> @@ -692,7 +696,7 @@ function useproxy_changed(obj) { </td> <td> <span class="vexpl"> - Use HTTP proxy to communicate with the server. + Use proxy to communicate with the server. </span> </td> </tr> @@ -701,11 +705,24 @@ function useproxy_changed(obj) { <tr> <td align="right" width="25%"> <span class="vexpl"> + Type : + </span> + </td> + <td> + <select name="useproxytype" id="useproxytype" class="formselect"> + <option value="http">HTTP</option> + <option value="socks">Socks</option> + </select> + </td> + </tr> + <tr> + <td align="right" width="25%"> + <span class="vexpl"> IP Address : </span> </td> <td> - <input name="proxyaddr" id="proxyaddr" class="formfld unknown" size="20" value="" /> + <input name="proxyaddr" id="proxyaddr" class="formfld unknown" size="30" value="" /> </td> </tr> <tr> @@ -729,7 +746,7 @@ function useproxy_changed(obj) { <option value="ntlm">ntlm</option> </select> <span class="vexpl"> - Choose HTTP proxy authentication if any. + Choose proxy authentication if any. </span> <br /> <table border="0" cellpadding="2" cellspacing="0" id="useproxypass_opts" style="display:none" summary="name and password"> |