diff options
| author | jim-p <jimp@pfsense.org> | 2012-06-30 22:45:30 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-06-30 22:45:30 -0400 |
| commit | e27c484b01b55b6d1198f46aefb84ac6fc23afb0 (patch) | |
| tree | a0fd5ccce998c9ce3449bd71edc3be9e01a35b37 /config/openvpn-client-export/vpn_openvpn_export.php | |
| parent | 0ee1b513a3fbb0fffa5460ec04065b2568b6da27 (diff) | |
| download | pfsense-packages-e27c484b01b55b6d1198f46aefb84ac6fc23afb0.tar.gz pfsense-packages-e27c484b01b55b6d1198f46aefb84ac6fc23afb0.tar.bz2 pfsense-packages-e27c484b01b55b6d1198f46aefb84ac6fc23afb0.zip | |
Generalize this variable name
Diffstat (limited to 'config/openvpn-client-export/vpn_openvpn_export.php')
| -rwxr-xr-x | config/openvpn-client-export/vpn_openvpn_export.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/config/openvpn-client-export/vpn_openvpn_export.php b/config/openvpn-client-export/vpn_openvpn_export.php index 28bf2232..dceaf20f 100755 --- a/config/openvpn-client-export/vpn_openvpn_export.php +++ b/config/openvpn-client-export/vpn_openvpn_export.php @@ -168,14 +168,15 @@ if (!empty($act)) { $exp_name = openvpn_client_export_prefix($srvid); - if($act == "conf" || $act == "confall") { - if ($act == "confall") { + if($act == "conf" || $act == "confzip") { + if ($act == "confzip") { $exp_name = urlencode($exp_name."-config.zip"); - $zipconf = true; + $expformat = "zip"; } else { $exp_name = urlencode($exp_name."-config.ovpn"); + $expformat = "baseconf"; } - $exp_path = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $usetoken, $nokeys, $proxy, $zipconf, $password, false, false, $advancedoptions); + $exp_path = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $usetoken, $nokeys, $proxy, $expformat, $password, false, false, $advancedoptions); } if($act == "visc") { @@ -373,7 +374,7 @@ function server_changed() { cell2.className = "listr"; cell2.innerHTML = "<a href='javascript:download_begin(\"conf\"," + i + ", -1)'>Configuration</a>"; cell2.innerHTML += "<br/>"; - cell2.innerHTML += "<a href='javascript:download_begin(\"confall\"," + i + ", -1)'>Configuration archive</a>"; + cell2.innerHTML += "<a href='javascript:download_begin(\"confzip\"," + i + ", -1)'>Configuration archive</a>"; cell2.innerHTML += "<br/>"; cell2.innerHTML += "<a href='javascript:download_begin(\"inst\"," + i + ", -1)'>Windows Installer</a>"; cell2.innerHTML += "<br/>"; @@ -395,7 +396,7 @@ function server_changed() { cell2.className = "listr"; cell2.innerHTML = "<a href='javascript:download_begin(\"conf\", -1," + j + ")'>Configuration</a>"; cell2.innerHTML += "<br/>"; - cell2.innerHTML += "<a href='javascript:download_begin(\"confall\", -1," + j + ")'>Configuration archive</a>"; + cell2.innerHTML += "<a href='javascript:download_begin(\"confzip\", -1," + j + ")'>Configuration archive</a>"; cell2.innerHTML += "<br/>"; cell2.innerHTML += "<a href='javascript:download_begin(\"inst\", -1," + j + ")'>Windows Installer</a>"; cell2.innerHTML += "<br/>"; @@ -413,7 +414,7 @@ function server_changed() { cell2.className = "listr"; cell2.innerHTML = "<a href='javascript:download_begin(\"conf\"," + i + ")'>Configuration</a>"; cell2.innerHTML += "<br/>"; - cell2.innerHTML += "<a href='javascript:download_begin(\"confall\"," + i + ")'>Configuration archive</a>"; + cell2.innerHTML += "<a href='javascript:download_begin(\"confzip\"," + i + ")'>Configuration archive</a>"; cell2.innerHTML += "<br/>"; cell2.innerHTML += "<a href='javascript:download_begin(\"inst\"," + i + ")'>Windows Installer</a>"; cell2.innerHTML += "<br/>"; |