From efd66fc41c9a657a7721e64ff0b9a07794215262 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 30 Jun 2009 16:03:58 -0400 Subject: Sync tgz file and remove openvpn-client-export.php since its copied by xml file now for easier modifications --- .../client-export/template/config-import | 6 +- .../client-export/template/config-standard | 6 +- .../client-export/template/procchain-import | 4 +- .../client-export/template/procchain-standard | 4 +- .../client-export/vpn_openvpn_export.php | 362 --------------------- 5 files changed, 10 insertions(+), 372 deletions(-) delete mode 100755 config/openvpn-client-export/client-export/vpn_openvpn_export.php (limited to 'config/openvpn-client-export') diff --git a/config/openvpn-client-export/client-export/template/config-import b/config/openvpn-client-export/client-export/template/config-import index 74f273bd..6b4465c2 100755 --- a/config/openvpn-client-export/client-export/template/config-import +++ b/config/openvpn-client-export/client-export/template/config-import @@ -1,3 +1,3 @@ -;!@Install@!UTF-8! -RunProgram="procchain.exe procchain-import" -;!@InstallEnd@! +;!@Install@!UTF-8! +RunProgram="procchain.exe procchain-import" +;!@InstallEnd@! diff --git a/config/openvpn-client-export/client-export/template/config-standard b/config/openvpn-client-export/client-export/template/config-standard index 2dfce2dc..19e410e9 100755 --- a/config/openvpn-client-export/client-export/template/config-standard +++ b/config/openvpn-client-export/client-export/template/config-standard @@ -1,3 +1,3 @@ -;!@Install@!UTF-8! -RunProgram="procchain.exe procchain-standard" -;!@InstallEnd@! +;!@Install@!UTF-8! +RunProgram="procchain.exe procchain-standard" +;!@InstallEnd@! diff --git a/config/openvpn-client-export/client-export/template/procchain-import b/config/openvpn-client-export/client-export/template/procchain-import index c70ad842..3b7c74fb 100755 --- a/config/openvpn-client-export/client-export/template/procchain-import +++ b/config/openvpn-client-export/client-export/template/procchain-import @@ -1,2 +1,2 @@ -"openvpn-install.exe" -"openvpn-postinstall.exe" /Import +"openvpn-install.exe" +"openvpn-postinstall.exe" /Import diff --git a/config/openvpn-client-export/client-export/template/procchain-standard b/config/openvpn-client-export/client-export/template/procchain-standard index 670aadea..b9d1a1e5 100755 --- a/config/openvpn-client-export/client-export/template/procchain-standard +++ b/config/openvpn-client-export/client-export/template/procchain-standard @@ -1,2 +1,2 @@ -"openvpn-install.exe" -"openvpn-postinstall.exe" +"openvpn-install.exe" +"openvpn-postinstall.exe" diff --git a/config/openvpn-client-export/client-export/vpn_openvpn_export.php b/config/openvpn-client-export/client-export/vpn_openvpn_export.php deleted file mode 100755 index e5d474cb..00000000 --- a/config/openvpn-client-export/client-export/vpn_openvpn_export.php +++ /dev/null @@ -1,362 +0,0 @@ - & $server) { - $ras_user = array(); - if (stripos($server['mode'], "server") === false) - continue; - foreach($a_user as $uindex => & $user) { - if (!is_array($user['cert'])) - continue; - foreach($user['cert'] as $cindex => & $cert) { - if ($cert['caref'] != $server['caref']) - continue; - $ras_userent = array(); - $ras_userent['uindex'] = $uindex; - $ras_userent['cindex'] = $cindex; - $ras_userent['name'] = $user['name']; - $ras_userent['certname'] = $cert['name']; - $ras_user[] = $ras_userent; - } - } - if (!count($ras_user)) - continue; - $ras_serverent = array(); - $prot = $server['protocol']; - $port = $server['local_port']; - if ($server['description']) - $name = "{$server['description']} {$prot}:{$port}"; - else - $name = "Server {$prot}:{$port}"; - $ras_serverent['index'] = $sindex; - $ras_serverent['name'] = $name; - $ras_serverent['users'] = $ras_user; - $ras_server[] = $ras_serverent; -} - -$id = $_GET['id']; -if (isset($_POST['id'])) - $id = $_POST['id']; - -$act = $_GET['act']; -if (isset($_POST['act'])) - $act = $_POST['act']; - -if($act == "conf") { - $srvid = $_GET['srvid']; - $usrid = $_GET['usrid']; - $crtid = $_GET['crtid']; - if (($srvid === false) || ($usrid === false) || ($crtid === false)) { - pfSenseHeader("vpn_openvpn_export.php"); - exit; - } - $useaddr = $_GET['useaddr']; - $usetoken = $_GET['usetoken']; - - $exp_name = openvpn_client_export_prefix($srvid); - $exp_name = urlencode($exp_name."-config.ovpn"); - $exp_data = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $usetoken); - $exp_size = strlen($exp_data); - - header("Content-Type: application/octet-stream"); - header("Content-Disposition: attachment; filename={$exp_name}"); - header("Content-Length: $exp_size"); - echo $exp_data; - exit; -} - -if($act == "inst") { - $srvid = $_GET['srvid']; - $usrid = $_GET['usrid']; - $crtid = $_GET['crtid']; - if (($srvid === false) || ($usrid === false) || ($crtid === false)) { - pfSenseHeader("vpn_openvpn_export.php"); - exit; - } - $useaddr = $_GET['useaddr']; - $usetoken = $_GET['usetoken']; - $password = ""; - if ($_GET['password']) - $password = $_GET['password']; ; - - $exp_name = openvpn_client_export_prefix($srvid); - $exp_name = urlencode($exp_name."-install.exe"); - $exp_path = openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $usetoken, $password); - $exp_size = filesize($exp_path); - - header("Content-Type: application/octet-stream"); - header("Content-Disposition: attachment; filename={$exp_name}"); - header("Content-Length: $exp_size"); - readfile($exp_path); - unlink($exp_path); - exit; -} - -include("head.inc"); - -?> - - - - - - - - - - - - -
- -
-
- - - - - - - - - - - - - - - - - - - -
Remote Access Server - -
Host Name Resolution - - - - - -
- - - - Use the server IP address instead of the hostname. - -
-
Certificate Export Options - - - - - -
- - - - Use Microsoft Certificate Storage instead of local files. - -
- - - - - -
- - - - Use a password to protect the pkcs12 file contents. - -
- - - - - - - - - -
- -  Password :  - - - -
- -  Confirm :  - - - -
-
 
Client Install Packages
- - - - - - -
-
-
- - - -- cgit v1.2.3