Commit 439efe64 authored by Ad Schellevis's avatar Ad Schellevis

(legacy) fix some coding errors in openvpn client export / refactor styling

parent d8a81cda
...@@ -40,8 +40,9 @@ function openvpn_client_export_prefix($srvid, $usrid = null, $crtid = null) { ...@@ -40,8 +40,9 @@ function openvpn_client_export_prefix($srvid, $usrid = null, $crtid = null) {
$settings = $config['openvpn']['openvpn-server'][$srvid]; $settings = $config['openvpn']['openvpn-server'][$srvid];
if (empty($settings)) if (empty($settings))
return false; return false;
if ($settings['disable']) if (!empty($settings['disable'])) {
return false; return false;
}
$host = empty($config['system']['hostname']) ? "openvpn" : $config['system']['hostname']; $host = empty($config['system']['hostname']) ? "openvpn" : $config['system']['hostname'];
$prot = ($settings['protocol'] == 'UDP' ? 'udp' : $settings['protocol']); $prot = ($settings['protocol'] == 'UDP' ? 'udp' : $settings['protocol']);
...@@ -75,6 +76,7 @@ function openvpn_client_pem_to_pk12($outpath, $outpass, $crtpath, $keypath, $cap ...@@ -75,6 +76,7 @@ function openvpn_client_pem_to_pk12($outpath, $outpass, $crtpath, $keypath, $cap
function openvpn_client_export_validate_config($srvid, $usrid, $crtid) { function openvpn_client_export_validate_config($srvid, $usrid, $crtid) {
global $config, $g, $input_errors; global $config, $g, $input_errors;
$nokeys = false;
// lookup server settings // lookup server settings
$settings = $config['openvpn']['openvpn-server'][$srvid]; $settings = $config['openvpn']['openvpn-server'][$srvid];
...@@ -82,7 +84,7 @@ function openvpn_client_export_validate_config($srvid, $usrid, $crtid) { ...@@ -82,7 +84,7 @@ function openvpn_client_export_validate_config($srvid, $usrid, $crtid) {
$input_errors[] = "Could not locate server configuration."; $input_errors[] = "Could not locate server configuration.";
return false; return false;
} }
if ($settings['disable']) { if (!empty($settings['disable'])) {
$input_errors[] = "You cannot export for disabled servers."; $input_errors[] = "You cannot export for disabled servers.";
return false; return false;
} }
...@@ -93,7 +95,7 @@ function openvpn_client_export_validate_config($srvid, $usrid, $crtid) { ...@@ -93,7 +95,7 @@ function openvpn_client_export_validate_config($srvid, $usrid, $crtid) {
{ {
$input_errors[] = "Could not locate server certificate."; $input_errors[] = "Could not locate server certificate.";
} else { } else {
$server_ca = lookup_ca($server_cert['caref']); $server_ca = isset($server_cert['caref']) ? lookup_ca($server_cert['caref']) : null;
if (!$server_ca) { if (!$server_ca) {
$input_errors[] = "Could not locate the CA reference for the server certificate."; $input_errors[] = "Could not locate the CA reference for the server certificate.";
} }
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
DISABLE_PHP_LINT_CHECKING DISABLE_PHP_LINT_CHECKING
*/ */
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("openvpn.inc"); require_once("openvpn.inc");
require_once("filter.inc"); require_once("filter.inc");
...@@ -41,247 +40,238 @@ global $current_openvpn_version, $current_openvpn_version_rev; ...@@ -41,247 +40,238 @@ global $current_openvpn_version, $current_openvpn_version_rev;
$pgtitle = array("OpenVPN", "Client Export Utility"); $pgtitle = array("OpenVPN", "Client Export Utility");
if (!isset($config['openvpn']['openvpn-server'])) {
$config['openvpn']['openvpn-server'] = array();
}
$a_server = $config['openvpn']['openvpn-server'];
if (!is_array($config['system']['user'])) {
$config['system']['user'] = array();
}
$a_user = $config['system']['user'];
if (!is_array($config['cert'])) {
$config['cert'] = array();
}
$a_cert = $config['cert'];
$ras_server = array(); $ras_server = array();
foreach ($a_server as $sindex => $server) { if (isset($config['openvpn']['openvpn-server'])) {
if (isset($server['disable'])) { // collect info
continue; foreach ($config['openvpn']['openvpn-server'] as $sindex => $server) {
} if (isset($server['disable'])) {
$ras_user = array(); continue;
$ras_certs = array();
if (stripos($server['mode'], "server") === false) {
continue;
}
if (($server['mode'] == "server_tls_user") && ($server['authmode'] == "Local Database")) {
foreach ($a_user as $uindex => $user) {
if (!is_array($user['cert'])) {
continue;
}
foreach ($user['cert'] as $cindex => $cert) {
// If $cert is not an array, it's a certref not a cert.
if (!is_array($cert)) {
$cert = lookup_cert($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['descr'];
$ras_user[] = $ras_userent;
}
} }
} elseif (($server['mode'] == "server_tls") || (($server['mode'] == "server_tls_user") && ($server['authmode'] != "Local Database"))) { $ras_user = array();
foreach ($a_cert as $cindex => $cert) { $ras_certs = array();
if (($cert['caref'] != $server['caref']) || ($cert['refid'] == $server['certref'])) { if (stripos($server['mode'], "server") === false) {
continue; continue;
}
if (($server['mode'] == "server_tls_user") && ($server['authmode'] == "Local Database")) {
if (isset($config['system']['user'])) {
foreach ($config['system']['user'] as $uindex => $user) {
if (!isset($user['cert'])) {
continue;
}
foreach ($user['cert'] as $cindex => $cert) {
// If $cert is not an array, it's a certref not a cert.
if (!is_array($cert)) {
$cert = lookup_cert($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['descr'];
$ras_user[] = $ras_userent;
}
}
}
} elseif (($server['mode'] == "server_tls") || (($server['mode'] == "server_tls_user") && ($server['authmode'] != "Local Database"))) {
if (isset($config['cert'])) {
foreach ($config['cert'] as $cindex => $cert) {
if (($cert['caref'] != $server['caref']) || ($cert['refid'] == $server['certref'])) {
continue;
}
$ras_cert_entry['cindex'] = $cindex;
$ras_cert_entry['certname'] = $cert['descr'];
$ras_cert_entry['certref'] = $cert['refid'];
$ras_certs[] = $ras_cert_entry;
}
} }
$ras_cert_entry['cindex'] = $cindex;
$ras_cert_entry['certname'] = $cert['descr'];
$ras_cert_entry['certref'] = $cert['refid'];
$ras_certs[] = $ras_cert_entry;
} }
}
$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_serverent['certs'] = $ras_certs;
$ras_serverent['mode'] = $server['mode'];
$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 (!empty($act)) { $ras_serverent = array();
$srvid = $_GET['srvid']; $prot = $server['protocol'];
$usrid = $_GET['usrid']; $port = $server['local_port'];
$crtid = $_GET['crtid']; if ($server['description']) {
if ($srvid === false) { $name = "{$server['description']} {$prot}:{$port}";
redirectHeader("vpn_openvpn_export.php"); } else {
exit; $name = "Server {$prot}:{$port}";
} elseif (($config['openvpn']['openvpn-server'][$srvid]['mode'] != "server_user") && }
(($usrid === false) || ($crtid === false))) { $ras_serverent['index'] = $sindex;
redirectHeader("vpn_openvpn_export.php"); $ras_serverent['name'] = $name;
exit; $ras_serverent['users'] = $ras_user;
$ras_serverent['certs'] = $ras_certs;
$ras_serverent['mode'] = $server['mode'];
$ras_server[] = $ras_serverent;
} }
if ($config['openvpn']['openvpn-server'][$srvid]['mode'] == "server_user") { // handle request export..
$nokeys = true; if (!empty($_GET['act'])) {
} else { $input_errors = array();
$nokeys = false; $exp_path = false;
} $act = $_GET['act'];
$srvid = isset($_GET['srvid']) ? $_GET['srvid'] : false;
$usrid = isset($_GET['usrid']) ? $_GET['usrid'] : false;
$crtid = isset($_GET['crtid']) ? $_GET['crtid'] : false;
if ($srvid === false) {
redirectHeader("vpn_openvpn_export.php");
exit;
} elseif (($config['openvpn']['openvpn-server'][$srvid]['mode'] != "server_user") &&
(($usrid === false) || ($crtid === false))) {
redirectHeader("vpn_openvpn_export.php");
exit;
}
$useaddr = ''; if ($config['openvpn']['openvpn-server'][$srvid]['mode'] == "server_user") {
if (isset($_GET['useaddr']) && !empty($_GET['useaddr'])) { $nokeys = true;
$useaddr = trim($_GET['useaddr']); } else {
} $nokeys = false;
}
if (!(is_ipaddr($useaddr) || is_hostname($useaddr) || $useaddr = '';
in_array($useaddr, array("serveraddr", "servermagic", "servermagichost", "serverhostname")))) { if (isset($_GET['useaddr']) && !empty($_GET['useaddr'])) {
$input_errors[] = "You need to specify an IP or hostname."; $useaddr = trim($_GET['useaddr']);
} }
$advancedoptions = $_GET['advancedoptions']; if (!(is_ipaddr($useaddr) || is_hostname($useaddr) ||
$openvpnmanager = $_GET['openvpnmanager']; in_array($useaddr, array("serveraddr", "servermagic", "servermagichost", "serverhostname")))) {
$input_errors[] = "You need to specify an IP or hostname.";
}
$verifyservercn = $_GET['verifyservercn']; $advancedoptions = isset($_GET['advancedoptions']) ? $_GET['advancedoptions'] : null;
$randomlocalport = $_GET['randomlocalport']; $openvpnmanager = isset($_GET['openvpnmanager']) ? $_GET['openvpnmanager'] : null;
$usetoken = $_GET['usetoken'];
if ($usetoken && (substr($act, 0, 10) == "confinline")) {
$input_errors[] = "You cannot use Microsoft Certificate Storage with an Inline configuration.";
}
if ($usetoken && (($act == "conf_yealink_t28") || ($act == "conf_yealink_t38g") || ($act == "conf_yealink_t38g2") || ($act == "conf_snom"))) {
$input_errors[] = "You cannot use Microsoft Certificate Storage with a Yealink or SNOM configuration.";
}
$password = "";
if ($_GET['password']) {
$password = $_GET['password'];
}
$proxy = ""; $verifyservercn = isset($_GET['verifyservercn']) ? $_GET['verifyservercn'] : null;
if (!empty($_GET['proxy_addr']) || !empty($_GET['proxy_port'])) { $randomlocalport = isset($_GET['randomlocalport']) ? $_GET['randomlocalport'] : null;
$proxy = array(); $usetoken = $_GET['usetoken'];
if (empty($_GET['proxy_addr'])) { if ($usetoken && (substr($act, 0, 10) == "confinline")) {
$input_errors[] = "You need to specify an address for the proxy port."; $input_errors[] = "You cannot use Microsoft Certificate Storage with an Inline configuration.";
} else {
$proxy['ip'] = $_GET['proxy_addr'];
} }
if (empty($_GET['proxy_port'])) { if ($usetoken && (($act == "conf_yealink_t28") || ($act == "conf_yealink_t38g") || ($act == "conf_yealink_t38g2") || ($act == "conf_snom"))) {
$input_errors[] = "You need to specify a port for the proxy ip."; $input_errors[] = "You cannot use Microsoft Certificate Storage with a Yealink or SNOM configuration.";
} else { }
$proxy['port'] = $_GET['proxy_port']; $password = "";
if (!empty($_GET['password'])) {
$password = $_GET['password'];
} }
$proxy['proxy_type'] = $_GET['proxy_type'];
$proxy['proxy_authtype'] = $_GET['proxy_authtype']; $proxy = "";
if ($_GET['proxy_authtype'] != "none") { if (!empty($_GET['proxy_addr']) || !empty($_GET['proxy_port'])) {
if (empty($_GET['proxy_user'])) { $proxy = array();
$input_errors[] = "You need to specify a username with the proxy config."; if (empty($_GET['proxy_addr'])) {
$input_errors[] = "You need to specify an address for the proxy port.";
} else { } else {
$proxy['user'] = $_GET['proxy_user']; $proxy['ip'] = $_GET['proxy_addr'];
} }
if (!empty($_GET['proxy_user']) && empty($_GET['proxy_password'])) { if (empty($_GET['proxy_port'])) {
$input_errors[] = "You need to specify a password with the proxy user."; $input_errors[] = "You need to specify a port for the proxy ip.";
} else { } else {
$proxy['password'] = $_GET['proxy_password']; $proxy['port'] = $_GET['proxy_port'];
}
if (isset($_GET['proxy_type'])) {
$proxy['proxy_type'] = $_GET['proxy_type'];
}
if (isset($_GET['proxy_authtype'])) {
$proxy['proxy_authtype'] = $_GET['proxy_authtype'];
if ($_GET['proxy_authtype'] != "none") {
if (empty($_GET['proxy_user'])) {
$input_errors[] = "You need to specify a username with the proxy config.";
} else {
$proxy['user'] = $_GET['proxy_user'];
}
if (!empty($_GET['proxy_user']) && empty($_GET['proxy_password'])) {
$input_errors[] = "You need to specify a password with the proxy user.";
} else {
$proxy['password'] = $_GET['proxy_password'];
}
}
} }
} }
}
$exp_name = openvpn_client_export_prefix($srvid, $usrid, $crtid); $exp_name = openvpn_client_export_prefix($srvid, $usrid, $crtid);
if (substr($act, 0, 4) == "conf") { if (substr($act, 0, 4) == "conf") {
switch ($act) { switch ($act) {
case "confzip": case "confzip":
$exp_name = urlencode($exp_name."-config.zip"); $exp_name = urlencode($exp_name."-config.zip");
$expformat = "zip"; $expformat = "zip";
break; break;
case "conf_yealink_t28": case "conf_yealink_t28":
$exp_name = urlencode("client.tar"); $exp_name = urlencode("client.tar");
$expformat = "yealink_t28"; $expformat = "yealink_t28";
break; break;
case "conf_yealink_t38g": case "conf_yealink_t38g":
$exp_name = urlencode("client.tar"); $exp_name = urlencode("client.tar");
$expformat = "yealink_t38g"; $expformat = "yealink_t38g";
break; break;
case "conf_yealink_t38g2": case "conf_yealink_t38g2":
$exp_name = urlencode("client.tar"); $exp_name = urlencode("client.tar");
$expformat = "yealink_t38g2"; $expformat = "yealink_t38g2";
break; break;
case "conf_snom": case "conf_snom":
$exp_name = urlencode("vpnclient.tar"); $exp_name = urlencode("vpnclient.tar");
$expformat = "snom"; $expformat = "snom";
break; break;
case "confinline": case "confinline":
$exp_name = urlencode($exp_name."-config.ovpn"); $exp_name = urlencode($exp_name."-config.ovpn");
$expformat = "inline"; $expformat = "inline";
break; break;
case "confinlinedroid": case "confinlinedroid":
$exp_name = urlencode($exp_name."-android-config.ovpn"); $exp_name = urlencode($exp_name."-android-config.ovpn");
$expformat = "inlinedroid"; $expformat = "inlinedroid";
break; break;
case "confinlineios": case "confinlineios":
$exp_name = urlencode($exp_name."-ios-config.ovpn"); $exp_name = urlencode($exp_name."-ios-config.ovpn");
$expformat = "inlineios"; $expformat = "inlineios";
break; break;
default: default:
$exp_name = urlencode($exp_name."-config.ovpn"); $exp_name = urlencode($exp_name."-config.ovpn");
$expformat = "baseconf"; $expformat = "baseconf";
}
$exp_path = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $nokeys, $proxy, $expformat, $password, false, false, $openvpnmanager, $advancedoptions);
} }
$exp_path = openvpn_client_export_config($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $nokeys, $proxy, $expformat, $password, false, false, $openvpnmanager, $advancedoptions);
}
if ($act == "visc") { if ($act == "visc") {
$exp_name = urlencode($exp_name."-Viscosity.visc.zip"); $exp_name = urlencode($exp_name."-Viscosity.visc.zip");
$exp_path = viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $password, $proxy, $openvpnmanager, $advancedoptions); $exp_path = viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $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, $verifyservercn, $randomlocalport, $usetoken, $password, $proxy, $openvpnmanager, $advancedoptions, substr($act, 5));
}
if (!$exp_path) { if (substr($act, 0, 4) == "inst") {
$input_errors[] = "Failed to export config files!"; $exp_name = urlencode($exp_name."-install.exe");
} $exp_path = openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $verifyservercn, $randomlocalport, $usetoken, $password, $proxy, $openvpnmanager, $advancedoptions, substr($act, 5));
}
if (empty($input_errors)) { if (!$exp_path) {
if (($act == "conf") || (substr($act, 0, 10) == "confinline")) { $input_errors[] = "Failed to export config files!";
$exp_size = strlen($exp_path);
} else {
$exp_size = filesize($exp_path);
} }
header('Pragma: ');
header('Cache-Control: '); if (count($input_errors) == 0) {
header("Content-Type: application/octet-stream"); if (($act == "conf") || (substr($act, 0, 10) == "confinline")) {
header("Content-Disposition: attachment; filename={$exp_name}"); $exp_size = strlen($exp_path);
header("Content-Length: $exp_size"); } else {
if (($act == "conf") || (substr($act, 0, 10) == "confinline")) { $exp_size = filesize($exp_path);
echo $exp_path; }
} else { header('Pragma: ');
readfile($exp_path); header('Cache-Control: ');
@unlink($exp_path); header("Content-Type: application/octet-stream");
header("Content-Disposition: attachment; filename={$exp_name}");
header("Content-Length: $exp_size");
if (($act == "conf") || (substr($act, 0, 10) == "confinline")) {
echo $exp_path;
} else {
readfile($exp_path);
@unlink($exp_path);
}
exit;
} }
exit;
} }
} }
include("head.inc"); include("head.inc");
?> ?>
...@@ -471,84 +461,74 @@ function server_changed() { ...@@ -471,84 +461,74 @@ function server_changed() {
var cell0 = row.insertCell(0); var cell0 = row.insertCell(0);
var cell1 = row.insertCell(1); var cell1 = row.insertCell(1);
var cell2 = row.insertCell(2); var cell2 = row.insertCell(2);
cell0.className = "listlr";
cell0.innerHTML = users[i][2]; cell0.innerHTML = users[i][2];
cell1.className = "listr";
cell1.innerHTML = users[i][3]; cell1.innerHTML = users[i][3];
cell2.className = "listr";
cell2.innerHTML = "- Standard Configurations:<br\/>"; cell2.innerHTML = "- Standard Configurations:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confzip\"," + i + ", -1)'>Archive</button>";
cell2.innerHTML += "<a href='javascript:download_begin(\"confzip\"," + i + ", -1)'>Archive<\/a>"; cell2.innerHTML += "&nbsp;&nbsp;";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"conf\"," + i + ", -1)'>Config Only</button>";
cell2.innerHTML += "<a href='javascript:download_begin(\"conf\"," + i + ", -1)'>Config Only<\/a>";
cell2.innerHTML += "<br\/>- Inline Configurations:<br\/>"; cell2.innerHTML += "<br\/>- Inline Configurations:<br\/>";
cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confinlinedroid\"," + i + ", -1)'>Android</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"confinlinedroid\"," + i + ", -1)'>Android<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confinlineios\"," + i + ", -1)'>OpenVPN Connect (iOS/Android)</button>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"confinlineios\"," + i + ", -1)'>OpenVPN Connect (iOS/Android)<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"confinline\"," + i + ", -1)'>Others<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confinline\"," + i + ", -1)'>Others</button>";
cell2.innerHTML += "<br\/>- Windows Installers (<?php echo $current_openvpn_version . '-Ix' . $current_openvpn_version_rev;?>):<br\/>"; cell2.innerHTML += "<br\/>- Windows Installers (<?php echo $current_openvpn_version . '-Ix' . $current_openvpn_version_rev;?>):<br\/>";
cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x86-xp\"," + i + ", -1)'>x86-xp</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-xp\"," + i + ", -1)'>x86-xp<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x64-xp\"," + i + ", -1)'>x64-xp</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-xp\"," + i + ", -1)'>x64-xp<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x86-win6\"," + i + ", -1)'>x86-win6</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\"," + i + ", -1)'>x86-win6<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x64-win6\"," + i + ", -1)'>x64-win6</button>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\"," + i + ", -1)'>x64-win6<\/a>";
cell2.innerHTML += "<br\/>- Mac OSX:<br\/>"; cell2.innerHTML += "<br\/>- Mac OSX:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"visc\"," + i + ", -1)'>Viscosity Bundle</button>";
cell2.innerHTML += "<a href='javascript:download_begin(\"visc\"," + i + ", -1)'>Viscosity Bundle<\/a>";
} }
for (j=0; j < certs.length; j++) { for (j=0; j < certs.length; j++) {
var row = table.insertRow(table.rows.length); var row = table.insertRow(table.rows.length);
var cell0 = row.insertCell(0); var cell0 = row.insertCell(0);
var cell1 = row.insertCell(1); var cell1 = row.insertCell(1);
var cell2 = row.insertCell(2); var cell2 = row.insertCell(2);
cell0.className = "listlr";
if (servers[index][2] == "server_tls") { if (servers[index][2] == "server_tls") {
cell0.innerHTML = "Certificate (SSL/TLS, no Auth)"; cell0.innerHTML = "Certificate (SSL/TLS, no Auth)";
} else { } else {
cell0.innerHTML = "Certificate with External Auth"; cell0.innerHTML = "Certificate with External Auth";
} }
cell1.className = "listr";
cell1.innerHTML = certs[j][1]; cell1.innerHTML = certs[j][1];
cell2.className = "listr";
cell2.innerHTML = "- Standard Configurations:<br\/>"; cell2.innerHTML = "- Standard Configurations:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"confzip\", -1," + j + ")'>Archive<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confzip\",-1," + j + ")'>Archive</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"conf\", -1," + j + ")'>File Only<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"conf\",-1," + j + ")'>File Only</button>";
cell2.innerHTML += "<br\/>- Inline Configurations:<br\/>"; cell2.innerHTML += "<br\/>- Inline Configurations:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"confinlinedroid\", -1," + j + ")'>Android<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confinlinedroid\",-1," + j + ")'>Android</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"confinlineios\", -1," + j + ")'>OpenVPN Connect (iOS/Android)<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confinlineios\",-1," + j + ")'>OpenVPN Connect (iOS/Android)</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"confinline\", -1," + j + ")'>Others<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confinline\",-1," + j + ")'>Others</button>";
cell2.innerHTML += "<br\/>- Windows Installers (<?php echo $current_openvpn_version . '-Ix' . $current_openvpn_version_rev;?>):<br\/>"; cell2.innerHTML += "<br\/>- Windows Installers (<?php echo $current_openvpn_version . '-Ix' . $current_openvpn_version_rev;?>):<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-xp\", -1," + j + ")'>x86-xp<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x86-xp\",-1," + j + ")'>x86-xp</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-xp\", -1," + j + ")'>x64-xp<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x64-xp\",-1," + j + ")'>x64-xp</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\", -1," + j + ")'>x86-win6<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x86-win6\",-1," + j + ")'>x86-win6</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\", -1," + j + ")'>x64-win6<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x64-win6\",-1," + j + ")'>x64-win6</button>";
cell2.innerHTML += "<br\/>- Mac OSX:<br\/>"; cell2.innerHTML += "<br\/>- Mac OSX:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"visc\", -1," + j + ")'>Viscosity Bundle<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"visc\",-1," + j + ")'>Viscosity Bundle</button>";
if (servers[index][2] == "server_tls") { if (servers[index][2] == "server_tls") {
cell2.innerHTML += "<br\/>- Yealink SIP Handsets: <br\/>"; cell2.innerHTML += "<br\/>- Yealink SIP Handsets: <br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"conf_yealink_t28\", -1," + j + ")'>T28<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"conf_yealink_t28\",-1," + j + ")'>T28</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"conf_yealink_t38g\", -1," + j + ")'>T38G (1)<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"conf_yealink_t38g\",-1," + j + ")'>T38G (1)</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"conf_yealink_t38g2\", -1," + j + ")'>T38G (2)<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"conf_yealink_t38g\",-1," + j + ")'>T38G (1)</button>";
cell2.innerHTML += "<br\/>"; cell2.innerHTML += "<br\/>";
cell2.innerHTML += "- <a href='javascript:download_begin(\"conf_snom\", -1," + j + ")'>SNOM SIP Handset<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"conf_snom\",-1," + j + ")'>SNOM SIP Handset</button>";
} }
} }
if (servers[index][2] == 'server_user') { if (servers[index][2] == 'server_user') {
...@@ -556,44 +536,46 @@ function server_changed() { ...@@ -556,44 +536,46 @@ function server_changed() {
var cell0 = row.insertCell(0); var cell0 = row.insertCell(0);
var cell1 = row.insertCell(1); var cell1 = row.insertCell(1);
var cell2 = row.insertCell(2); var cell2 = row.insertCell(2);
cell0.className = "listlr";
cell0.innerHTML = "Authentication Only (No Cert)"; cell0.innerHTML = "Authentication Only (No Cert)";
cell1.className = "listr";
cell1.innerHTML = "none"; cell1.innerHTML = "none";
cell2.className = "listr";
cell2.innerHTML = "- Standard Configurations:<br\/>"; cell2.innerHTML = "- Standard Configurations:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confzip\"," + i + ")'>Archive</button>";
cell2.innerHTML += "<a href='javascript:download_begin(\"confzip\"," + i + ")'>Archive<\/a>"; cell2.innerHTML += "<a href='javascript:download_begin(\"confzip\"," + i + ")'>Archive<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"conf\"," + i + ")'>File Only</button>";
cell2.innerHTML += "<a href='javascript:download_begin(\"conf\"," + i + ")'>File Only<\/a>"; cell2.innerHTML += "<a href='javascript:download_begin(\"conf\"," + i + ")'>File Only<\/a>";
cell2.innerHTML += "<br\/>- Inline Configurations:<br\/>"; cell2.innerHTML += "<br\/>- Inline Configurations:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confinlinedroid\"," + i + ")'>Android</button>";
cell2.innerHTML += "<a href='javascript:download_begin(\"confinlinedroid\"," + i + ")'>Android<\a>"; cell2.innerHTML += "<a href='javascript:download_begin(\"confinlinedroid\"," + i + ")'>Android<\a>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confinlineios\"," + i + ")'>OpenVPN Connect (iOS/Android)</button>";
cell2.innerHTML += "<a href='javascript:download_begin(\"confinlineios\"," + i + ")'>OpenVPN Connect (iOS/Android)<\/a>"; cell2.innerHTML += "<a href='javascript:download_begin(\"confinlineios\"," + i + ")'>OpenVPN Connect (iOS/Android)<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confinline\"," + i + ")'>Others</button>";
cell2.innerHTML += "<a href='javascript:download_begin(\"confinline\"," + i + ")'>Others<\/a>"; cell2.innerHTML += "<a href='javascript:download_begin(\"confinline\"," + i + ")'>Others<\/a>";
cell2.innerHTML += "<br\/>- Windows Installers (<?php echo $current_openvpn_version . '-Ix' . $current_openvpn_version_rev;?>):<br\/>"; cell2.innerHTML += "<br\/>- Windows Installers (<?php echo $current_openvpn_version . '-Ix' . $current_openvpn_version_rev;?>):<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-xp\"," + i + ")'>x86-xp<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x86-xp\"," + i + ")'>x86-xp</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-xp\"," + i + ")'>x64-xp<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x64-xp\"," + i + ")'>x64-xp</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x86-win6\"," + i + ")'>x86-win6<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x86-win6\"," + i + ")'>x86-win6</button>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\"," + i + ")'>x64-win6<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"inst-x64-win6\"," + i + ")'>x64-win6</button>";
cell2.innerHTML += "<br\/>- Mac OSX:<br\/>"; cell2.innerHTML += "<br\/>- Mac OSX:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; "; cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"visc\"," + i + ")'>Viscosity Bundle<\/a>"; cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"visc\"," + i + ")'>Viscosity Bundle</button>";
} }
} }
function useaddr_changed(obj) { function useaddr_changed(obj) {
if (obj.value == "other") if (obj.value == "other")
$('HostName').show(); $('#HostName').show();
else else
$('HostName').hide(); $('#HostName').hide();
} }
...@@ -607,12 +589,17 @@ function usepass_changed() { ...@@ -607,12 +589,17 @@ function usepass_changed() {
function useproxy_changed(obj) { function useproxy_changed(obj) {
if ((obj.id == "useproxy" && obj.checked) || if ($('#useproxy').prop( "checked" ) ){
(obj.id == "useproxypass" && (obj.value != 'none'))) { $('#useproxy_opts').show();
$(obj.id + '_opts').show(); } else {
} else { $('#useproxy_opts').hide();
$(obj.id + '_opts').hide(); }
}
if ($( "#useproxypass option:selected" ).text() != 'none') {
$('#useproxypass_opts').show();
} else {
$('#useproxypass_opts').hide();
}
} }
//]]> //]]>
</script> </script>
...@@ -624,351 +611,213 @@ if (isset($savemsg)) { ...@@ -624,351 +611,213 @@ if (isset($savemsg)) {
print_info_box($savemsg); print_info_box($savemsg);
} }
?> ?>
<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="openvpn export"> <section class="page-content-main">
<tr> <div class="container-fluid">
<td> <div class="row">
<?php <section class="col-xs-12">
$tab_array = array(); <?php
$tab_array[] = array(gettext("Server"), false, "vpn_openvpn_server.php"); $tab_array = array();
$tab_array[] = array(gettext("Client"), false, "vpn_openvpn_client.php"); $tab_array[] = array(gettext("Server"), false, "vpn_openvpn_server.php");
$tab_array[] = array(gettext("Client Specific Overrides"), false, "vpn_openvpn_csc.php"); $tab_array[] = array(gettext("Client"), false, "vpn_openvpn_client.php");
$tab_array[] = array(gettext("Wizards"), false, "wizard.php?xml=openvpn_wizard.xml"); $tab_array[] = array(gettext("Client Specific Overrides"), false, "vpn_openvpn_csc.php");
$tab_array[] = array(gettext("Client Export"), true, "vpn_openvpn_export.php"); $tab_array[] = array(gettext("Wizards"), false, "wizard.php?xml=openvpn_wizard.xml");
$tab_array[] = array(gettext("Shared Key Export"), false, "vpn_openvpn_export_shared.php"); $tab_array[] = array(gettext("Client Export"), true, "vpn_openvpn_export.php");
display_top_tabs($tab_array); $tab_array[] = array(gettext("Shared Key Export"), false, "vpn_openvpn_export_shared.php");
?> display_top_tabs($tab_array);
</td> ?>
</tr> <div class="tab-content content-box col-xs-12">
<tr> <div class="table-responsive">
<td id="mainarea"> <table width="100%" border="0" class="table table-striped" cellpadding="0" cellspacing="0">
<div class="tabcont"> <tr>
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area"> <td width="22%" valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Remote Access Server");?></td>
<tr> <td width="78%" >
<td width="22%" valign="top" class="vncellreq">Remote Access Server</td> <select name="server" id="server" class="formselect" onchange="server_changed()">
<td width="78%" class="vtable"> <?php foreach ($ras_server as & $server) :
<select name="server" id="server" class="formselect" onchange="server_changed()"> ?>
<?php foreach ($ras_server as & $server) : <option value="<?=$server['index'];?>"><?=htmlspecialchars($server['name']);?></option>
?> <?php
<option value="<?=$server['index']; endforeach; ?>
?>"><?=$server['name'];?></option> </select>
<?php </td>
endforeach; ?> </tr>
</select> <tr>
</td> <td valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Host Name Resolution");?></td>
</tr> <td >
<tr> <select name="useaddr" id="useaddr" class="formselect" onchange="useaddr_changed(this)">
<td width="22%" valign="top" class="vncell">Host Name Resolution</td> <option value="serveraddr" ><?=gettext("Interface IP Address");?></option>
<td width="78%" class="vtable"> <option value="servermagic" ><?=gettext("Automagic Multi-WAN IPs (port forward targets)");?></option>
<table border="0" cellpadding="2" cellspacing="0" summary="name resolution"> <option value="servermagichost" ><?=gettext("Automagic Multi-WAN DDNS Hostnames (port forward targets)");?></option>
<tr> <option value="serverhostname" ><?=gettext("Installation hostname");?></option>
<td> <?php if (isset($config['dyndnses']['dyndns'])) :
<select name="useaddr" id="useaddr" class="formselect" onchange="useaddr_changed(this)">
<option value="serveraddr" >Interface IP Address</option>
<option value="servermagic" >Automagic Multi-WAN IPs (port forward targets)</option>
<option value="servermagichost" >Automagic Multi-WAN DDNS Hostnames (port forward targets)</option>
<option value="serverhostname" >Installation hostname</option>
<?php if (isset($config['dyndnses']['dyndns'])) :
?> ?>
<?php foreach ($config['dyndnses']['dyndns'] as $ddns) : <?php foreach ($config['dyndnses']['dyndns'] as $ddns) :
?> ?>
<option value="<?php echo $ddns["host"] ?>">DynDNS: <?php echo $ddns["host"] ?></option> <option value="<?php echo $ddns["host"] ?>"><?=gettext("DynDNS");?>: <?= htmlspecialchars($ddns["host"]); ?></option>
<?php <?php
endforeach; ?> endforeach; ?>
<?php <?php
endif; ?> endif; ?>
<?php if (isset($config['dnsupdates']['dnsupdate'])) : <?php if (isset($config['dnsupdates']['dnsupdate'])) :
?> ?>
<?php foreach ($config['dnsupdates']['dnsupdate'] as $ddns) : <?php foreach ($config['dnsupdates']['dnsupdate'] as $ddns) :
?> ?>
<option value="<?php echo $ddns["host"] ?>">DynDNS: <?php echo $ddns["host"] ?></option> <option value="<?php echo $ddns["host"] ?>"><?=gettext("DynDNS");?>: <?= htmlspecialchars($ddns["host"]); ?></option>
<?php <?php
endforeach; ?> endforeach; ?>
<?php <?php
endif; ?> endif; ?>
<option value="other">Other</option> <option value="other"><?=gettext("Other");?></option>
</select> </select>
<br /> <div id="HostName" style="display:none;" >
<div style="display:none;" id="HostName"> <div>
<input name="useaddr_hostname" id="useaddr_hostname" size="40" /> <?=gettext("Enter the hostname or IP address the client will use to connect to this server.");?>
<span class="vexpl"> </div>
Enter the hostname or IP address the client will use to connect to this server. <input name="useaddr_hostname" type="text" id="useaddr_hostname" size="40" />
</span> </div>
</div> </td>
</td> </tr>
</tr> <tr>
</table> <td valign="top"><a id="help_for_verify_server_cn" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Verify Server CN");?></td>
</td> <td >
</tr> <select name="verifyservercn" id="verifyservercn" class="formselect">
<tr> <option value="auto"><?=gettext("Automatic - Use verify-x509-name (OpenVPN 2.3+) where possible");?></option>
<td width="22%" valign="top" class="vncell">Verify Server CN</td> <option value="tls-remote"><?=gettext("Use tls-remote (Deprecated, use only on old clients &lt;= OpenVPN 2.2.x");?>)</option>
<td width="78%" class="vtable"> <option value="tls-remote-quote"><?=gettext("Use tls-remote and quote the server CN");?></option>
<table border="0" cellpadding="2" cellspacing="0" summary="verify server cn"> <option value="none"><?=gettext("Do not verify the server CN");?></option>
<tr> </select>
<td> <div class="hidden" for="help_for_verify_server_cn">
<select name="verifyservercn" id="verifyservercn" class="formselect"> <?=gettext("Optionally verify the server certificate Common Name (CN) when the client connects. Current clients, including the most recent versions of Windows, Viscosity, Tunnelblick, OpenVPN on iOS and Android and so on should all work at the default automatic setting.");?><br/><br/>
<option value="auto">Automatic - Use verify-x509-name (OpenVPN 2.3+) where possible</option> <?=gettext("Only use tls-remote if you must use an older client that you cannot control. The option has been deprecated by OpenVPN and will be removed in the next major version.");?><br/><br/>
<option value="tls-remote">Use tls-remote (Deprecated, use only on old clients &lt;= OpenVPN 2.2.x)</option> <?=gettext("With tls-remote the server CN may optionally be enclosed in quotes. This can help if the server CN contains spaces and certain clients cannot parse the server CN. Some clients have problems parsing the CN with quotes. Use only as needed.");?>
<option value="tls-remote-quote">Use tls-remote and quote the server CN</option> </div>
<option value="none">Do not verify the server CN</option> </td>
</select> </tr>
<br/> <tr>
<span class="vexpl"> <td valign="top"><a id="help_for_random_local_port" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use Random Local Port");?></td>
Optionally verify the server certificate Common Name (CN) when the client connects. Current clients, including the most recent versions of Windows, Viscosity, Tunnelblick, OpenVPN on iOS and Android and so on should all work at the default automatic setting. <td >
<br/><br/>Only use tls-remote if you must use an older client that you cannot control. The option has been deprecated by OpenVPN and will be removed in the next major version. <input name="randomlocalport" id="randomlocalport" type="checkbox" value="yes" checked="CHECKED" />
<br/><br/>With tls-remote the server CN may optionally be enclosed in quotes. This can help if the server CN contains spaces and certain clients cannot parse the server CN. Some clients have problems parsing the CN with quotes. Use only as needed. <div class="hidden" for="help_for_random_local_port">
</span> <?=gettext("Use a random local source port (lport) for traffic from the client. Without this set, two clients may not run concurrently.");?>
</td> <br/>
</tr> <?=gettext("NOTE: Not supported on older clients. Automatically disabled for Yealink and Snom configurations."); ?>
</table> </div>
</td> </tr>
</tr> <tr>
<tr> <td valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Certificate Export Options");?></td>
<td width="22%" valign="top" class="vncell">Use Random Local Port</td> <td >
<td width="78%" class="vtable"> <div>
<table border="0" cellpadding="2" cellspacing="0" summary="random local port"> <input name="usetoken" id="usetoken" type="checkbox" value="yes" />
<tr> <?=gettext("Use Microsoft Certificate Storage instead of local files.");?>
<td> </div>
<input name="randomlocalport" id="randomlocalport" type="checkbox" value="yes" checked="CHECKED" /> <div>
</td> <input name="usepass" id="usepass" type="checkbox" value="yes" onclick="usepass_changed()" />
<td> <?=gettext("Use a password to protect the pkcs12 file contents or key in Viscosity bundle.");?>
<span class="vexpl"> </div>
Use a random local source port (lport) for traffic from the client. Without this set, two clients may not run concurrently. <div id="usepass_opts" style="display:none">
</span> <?=gettext("Password");?> :
</td> <input name="pass" id="pass" type="password" class="formfld pwd" size="20" value="" />
</tr> <?=gettext("Confirm");?> :
<tr> <input name="conf" id="conf" type="password" class="formfld pwd" size="20" value="" />
<td colspan="2"> </div>
<span class="vexpl"><br/>NOTE: Not supported on older clients. Automatically disabled for Yealink and Snom configurations.</span> </td>
</td> </tr>
</tr> <tr>
</table> <td valign="top"><a id="help_for_http_proxy" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use Proxy");?></td>
</tr> <td >
<tr> <input name="useproxy" id="useproxy" type="checkbox" value="yes" onclick="useproxy_changed(this)" />
<td width="22%" valign="top" class="vncell">Certificate Export Options</td> <div class="hidden" for="help_for_http_proxy">
<td width="78%" class="vtable"> <?=gettext("Use proxy to communicate with the server.");?>
<table border="0" cellpadding="2" cellspacing="0" summary="export options"> </div>
<tr> <div id="useproxy_opts" style="display:none" >
<td> <?=gettext("Type");?>
<input name="usetoken" id="usetoken" type="checkbox" value="yes" /> <select name="useproxytype" id="useproxytype" class="formselect">
</td> <option value="http"><?=gettext("HTTP");?></option>
<td> <option value="socks"><?=gettext("Socks");?></option>
<span class="vexpl"> </select>
Use Microsoft Certificate Storage instead of local files. <?=gettext("IP Address");?>
</span> <input name="proxyaddr" id="proxyaddr" type="text" class="formfld unknown" size="30" value="" />
</td> <?=gettext("Port");?> :
</tr> <input name="proxyport" id="proxyport" type="text" class="formfld unknown" size="5" value="" />
</table> <div>
<table border="0" cellpadding="2" cellspacing="0" summary="checkbox for password"> <?=gettext("Choose proxy authentication if any.");?>
<tr> <select name="useproxypass" id="useproxypass" class="formselect" onchange="useproxy_changed(this)">
<td> <option value="none"><?=gettext("none");?></option>
<input name="usepass" id="usepass" type="checkbox" value="yes" onclick="usepass_changed()" /> <option value="basic"><?=gettext("basic");?></option>
</td> <option value="ntlm"><?=gettext("ntlm");?></option>
<td> </select>
<span class="vexpl"> <div id="useproxypass_opts" style="display:none">
Use a password to protect the pkcs12 file contents or key in Viscosity bundle. <?=gettext("Username");?> :
</span> <input name="proxyuser" id="proxyuser" type="text" class="formfld unknown" size="20" value="" />
</td> <?=gettext("Password");?> :
</tr> <input name="proxypass" id="proxypass" type="password" class="formfld pwd" size="20" value="" />
</table> <?=gettext("Confirm");?> :
<table border="0" cellpadding="2" cellspacing="0" id="usepass_opts" style="display:none" summary="password"> <input name="proxyconf" id="proxyconf" type="password" class="formfld pwd" size="20" value="" />
<tr> </div>
<td align="right"> </div>
<span class="vexpl"> </div>
&nbsp;Password :&nbsp; </td>
</span> </tr>
</td> <tr>
<td> <td valign="top"><a id="help_for_openvpnmanager" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Management Interface OpenVPNManager");?></td>
<input name="pass" id="pass" type="password" class="formfld pwd" size="20" value="" /> <td >
</td> <input name="openvpnmanager" id="openvpnmanager" type="checkbox" value="yes" />
</tr> <div class="hidden" for="help_for_openvpnmanager">
<tr> <?=gettext('This will change the generated .ovpn configuration to allow for usage of the management interface.'.
<td align="right"> 'And include the OpenVPNManager program in the "Windows Installers". With this OpenVPN can be used also by non-administrator users.'.
<span class="vexpl"> 'This is also useful for Windows Vista/7/8 systems where elevated permissions are needed to add routes to the system.');?>
&nbsp;Confirm :&nbsp; <br/>
</span> <?=gettext("NOTE: This is not currently compatible with the 64-bit OpenVPN installer. It will work with the 32-bit installer on a 64-bit system.");?>
</td> </div>
<td> </td>
<input name="conf" id="conf" type="password" class="formfld pwd" size="20" value="" /> </tr>
</td> <tr>
</tr> <td colspan="2" class="list" height="12">&nbsp;</td>
</table> </tr>
</td> <tr>
</tr> <td valign="top"><a id="help_for_advancedoptions" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Additional configuration options");?></td>
<tr> <td >
<td width="22%" valign="top" class="vncell">Use Proxy</td> <textarea rows="6" cols="68" name="advancedoptions" id="advancedoptions"></textarea><br/>
<td width="78%" class="vtable"> <div class="hidden" for="help_for_advancedoptions">
<table border="0" cellpadding="2" cellspacing="0" summary="http proxy"> <?=gettext("Enter any additional options you would like to add to the OpenVPN client export configuration here, separated by a line break or semicolon"); ?><br/>
<tr> <?=gettext("EXAMPLE: remote-random"); ?>;
<td> </div>
<input name="useproxy" id="useproxy" type="checkbox" value="yes" onclick="useproxy_changed(this)" /> </td>
</tr>
</td> <tr>
<td> <td valign="top"><a id="help_for_clientpkg" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Client Install Packages");?></td>
<span class="vexpl"> <td>
Use proxy to communicate with the server. <table width="100%" id="users" border="0" cellpadding="0" cellspacing="0" class="table table-striped table-bordered ">
</span> <tr>
</td> <td width="25%" ><b><?=gettext("User");?></b></td>
</tr> <td width="35%" ><b><?=gettext("Certificate Name");?></b></td>
</table> <td width="40%" ><b><?=gettext("Export");?></b></td>
<table border="0" cellpadding="2" cellspacing="0" id="useproxy_opts" style="display:none" summary="user options"> </tr>
<tr> </table>
<td align="right" width="25%"> <div class="hidden" for="help_for_clientpkg">
<span class="vexpl"> <?= gettext("NOTES:") ?> <br/>
&nbsp; Type :&nbsp; <?= gettext("The &quot;XP&quot; Windows installers work on Windows XP and later versions. The &quot;win6&quot; Windows installers include a new tap-windows6 driver that works only on Windows Vista and later.") ?><br/>
</span> <br/><br/>
</td> <strong><?= gettext("Links to OpenVPN clients for various platforms:") ?></strong><br/>
<td> <a href="http://openvpn.net/index.php/open-source/downloads.html"><?= gettext("OpenVPN Community Client") ?></a> - <?=gettext("Binaries for Windows, Source for other platforms. Packaged above in the Windows Installers")?><br/>
<select name="useproxytype" id="useproxytype" class="formselect"> <a href="https://play.google.com/store/apps/details?id=de.blinkt.openvpn"><?= gettext("OpenVPN For Android") ?></a> - <?=gettext("Recommended client for Android")?><br/>
<option value="http">HTTP</option> <a href="http://www.featvpn.com/"><?= gettext("FEAT VPN For Android") ?></a> - <?=gettext("For older versions of Android")?><br/>
<option value="socks">Socks</option> <?= gettext("OpenVPN Connect") ?>: <a href="https://play.google.com/store/apps/details?id=net.openvpn.openvpn"><?=gettext("Android (Google Play)")?></a> or <a href="https://itunes.apple.com/us/app/openvpn-connect/id590379981"><?=gettext("iOS (App Store)")?></a> - <?= gettext("Recommended client for iOS") ?>
</select> <br/><a href="http://www.sparklabs.com/viscosity/"><?= gettext("Viscosity") ?></a> - <?= gettext("Recommended client for Mac OSX") ?>
</td> <br/><a href="http://code.google.com/p/tunnelblick/"><?= gettext("Tunnelblick") ?></a> - <?= gettext("Free client for OSX") ?>
</tr> <br/><br/>
<tr> <?= gettext("NOTES:") ?><br/>
<td align="right" width="25%"> <?= gettext("If you expect to see a certain client in the list but it is not there, it is usually due to a CA mismatch between the OpenVPN server instance and the client certificates found in the User Manager.") ?><br/>
<span class="vexpl"> </div>
&nbsp; IP Address :&nbsp; </td>
</span> </tr>
</td> </table>
<td> </div>
<input name="proxyaddr" id="proxyaddr" class="formfld unknown" size="30" value="" /> </div>
</td> </section>
</tr> </div>
<tr> </div>
<td align="right" width="25%"> </section>
<span class="vexpl">
&nbsp; Port :&nbsp;
</span>
</td>
<td>
<input name="proxyport" id="proxyport" class="formfld unknown" size="5" value="" />
</td>
</tr>
<tr>
<td width="25%">
<br />
</td>
<td>
<select name="useproxypass" id="useproxypass" class="formselect" onchange="useproxy_changed(this)">
<option value="none">none</option>
<option value="basic">basic</option>
<option value="ntlm">ntlm</option>
</select>
<span class="vexpl">
Choose proxy authentication if any.
</span>
<br />
<table border="0" cellpadding="2" cellspacing="0" id="useproxypass_opts" style="display:none" summary="name and password">
<tr>
<td align="right" width="25%">
<span class="vexpl">
&nbsp;Username :&nbsp;
</span>
</td>
<td>
<input name="proxyuser" id="proxyuser" class="formfld unknown" size="20" value="" />
</td>
</tr>
<tr>
<td align="right" width="25%">
<span class="vexpl">
&nbsp;Password :&nbsp;
</span>
</td>
<td>
<input name="proxypass" id="proxypass" type="password" class="formfld pwd" size="20" value="" />
</td>
</tr>
<tr>
<td align="right" width="25%">
<span class="vexpl">
&nbsp;Confirm :&nbsp;
</span>
</td>
<td>
<input name="proxyconf" id="proxyconf" type="password" class="formfld pwd" size="20" value="" />
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Management&nbsp;Interface<br/>OpenVPNManager</td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0" summary="openvpn manager">
<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 useful for Windows Vista/7/8 systems where elevated permissions are needed to add routes to the system.
</span>
</td>
</tr>
<tr>
<td colspan="2">
<span class="vexpl"><br/>NOTE: This is not currently compatible with the 64-bit OpenVPN installer. It will work with the 32-bit installer on a 64-bit system.</span>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="2" class="list" height="12">&nbsp;</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Additional configuration options</td>
<td width="78%" class="vtable">
<textarea rows="6" cols="68" name="advancedoptions" id="advancedoptions"></textarea><br/>
<?=gettext("Enter any additional options you would like to add to the OpenVPN client export configuration here, separated by a line break or semicolon"); ?><br/>
<?=gettext("EXAMPLE: remote-random"); ?>;
</td>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Client Install Packages</td>
</tr>
</table>
<table width="100%" id="users" border="0" cellpadding="0" cellspacing="0" summary="heading">
<tr>
<td width="25%" class="listhdrr"><?=gettext("User");?></td>
<td width="35%" class="listhdrr"><?=gettext("Certificate Name");?></td>
<td width="40%" class="listhdrr"><?=gettext("Export");?></td>
</tr>
</table>
<table width="100%" border="0" cellpadding="0" cellspacing="5" summary="note">
<tr>
<td align="right" valign="top" width="5%"><?= gettext("NOTES:") ?></td>
<td><?= gettext("The &quot;XP&quot; Windows installers work on Windows XP and later versions. The &quot;win6&quot; Windows installers include a new tap-windows6 driver that works only on Windows Vista and later.") ?></td>
</tr>
<tr>
<td>&nbsp;</td>
<td><?= gettext("If you expect to see a certain client in the list but it is not there, it is usually due to a CA mismatch between the OpenVPN server instance and the client certificates found in the User Manager.") ?></td>
</tr>
<tr>
<td colspan="2"><br/><strong><?= gettext("Links to OpenVPN clients for various platforms:") ?></strong></td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<a href="http://openvpn.net/index.php/open-source/downloads.html"><?= gettext("OpenVPN Community Client") ?></a> - <?=gettext("Binaries for Windows, Source for other platforms. Packaged above in the Windows Installers")?>
<br/><a href="https://play.google.com/store/apps/details?id=de.blinkt.openvpn"><?= gettext("OpenVPN For Android") ?></a> - <?=gettext("Recommended client for Android")?>
<br/><a href="http://www.featvpn.com/"><?= gettext("FEAT VPN For Android") ?></a> - <?=gettext("For older versions of Android")?>
<br/><?= gettext("OpenVPN Connect") ?>: <a href="https://play.google.com/store/apps/details?id=net.openvpn.openvpn"><?=gettext("Android (Google Play)")?></a> or <a href="https://itunes.apple.com/us/app/openvpn-connect/id590379981"><?=gettext("iOS (App Store)")?></a> - <?= gettext("Recommended client for iOS") ?>
<br/><a href="http://www.sparklabs.com/viscosity/"><?= gettext("Viscosity") ?></a> - <?= gettext("Recommended client for Mac OSX") ?>
<br/><a href="http://code.google.com/p/tunnelblick/"><?= gettext("Tunnelblick") ?></a> - <?= gettext("Free client for OSX") ?>
</td>
</tr>
</table>
</div>
</td>
</tr>
</table>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
server_changed(); server_changed();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment