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) {
$settings = $config['openvpn']['openvpn-server'][$srvid];
if (empty($settings))
return false;
if ($settings['disable'])
if (!empty($settings['disable'])) {
return false;
}
$host = empty($config['system']['hostname']) ? "openvpn" : $config['system']['hostname'];
$prot = ($settings['protocol'] == 'UDP' ? 'udp' : $settings['protocol']);
......@@ -75,6 +76,7 @@ function openvpn_client_pem_to_pk12($outpath, $outpass, $crtpath, $keypath, $cap
function openvpn_client_export_validate_config($srvid, $usrid, $crtid) {
global $config, $g, $input_errors;
$nokeys = false;
// lookup server settings
$settings = $config['openvpn']['openvpn-server'][$srvid];
......@@ -82,7 +84,7 @@ function openvpn_client_export_validate_config($srvid, $usrid, $crtid) {
$input_errors[] = "Could not locate server configuration.";
return false;
}
if ($settings['disable']) {
if (!empty($settings['disable'])) {
$input_errors[] = "You cannot export for disabled servers.";
return false;
}
......@@ -93,7 +95,7 @@ function openvpn_client_export_validate_config($srvid, $usrid, $crtid) {
{
$input_errors[] = "Could not locate server certificate.";
} else {
$server_ca = lookup_ca($server_cert['caref']);
$server_ca = isset($server_cert['caref']) ? lookup_ca($server_cert['caref']) : null;
if (!$server_ca) {
$input_errors[] = "Could not locate the CA reference for the server certificate.";
}
......
......@@ -29,7 +29,6 @@
DISABLE_PHP_LINT_CHECKING
*/
require_once("guiconfig.inc");
require_once("openvpn.inc");
require_once("filter.inc");
......@@ -41,26 +40,10 @@ global $current_openvpn_version, $current_openvpn_version_rev;
$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();
foreach ($a_server as $sindex => $server) {
if (isset($config['openvpn']['openvpn-server'])) {
// collect info
foreach ($config['openvpn']['openvpn-server'] as $sindex => $server) {
if (isset($server['disable'])) {
continue;
}
......@@ -70,8 +53,9 @@ foreach ($a_server as $sindex => $server) {
continue;
}
if (($server['mode'] == "server_tls_user") && ($server['authmode'] == "Local Database")) {
foreach ($a_user as $uindex => $user) {
if (!is_array($user['cert'])) {
if (isset($config['system']['user'])) {
foreach ($config['system']['user'] as $uindex => $user) {
if (!isset($user['cert'])) {
continue;
}
foreach ($user['cert'] as $cindex => $cert) {
......@@ -91,8 +75,10 @@ foreach ($a_server as $sindex => $server) {
$ras_user[] = $ras_userent;
}
}
}
} elseif (($server['mode'] == "server_tls") || (($server['mode'] == "server_tls_user") && ($server['authmode'] != "Local Database"))) {
foreach ($a_cert as $cindex => $cert) {
if (isset($config['cert'])) {
foreach ($config['cert'] as $cindex => $cert) {
if (($cert['caref'] != $server['caref']) || ($cert['refid'] == $server['certref'])) {
continue;
}
......@@ -102,6 +88,7 @@ foreach ($a_server as $sindex => $server) {
$ras_certs[] = $ras_cert_entry;
}
}
}
$ras_serverent = array();
$prot = $server['protocol'];
......@@ -117,22 +104,16 @@ foreach ($a_server as $sindex => $server) {
$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)) {
$srvid = $_GET['srvid'];
$usrid = $_GET['usrid'];
$crtid = $_GET['crtid'];
// handle request export..
if (!empty($_GET['act'])) {
$input_errors = array();
$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;
......@@ -158,11 +139,11 @@ if (!empty($act)) {
$input_errors[] = "You need to specify an IP or hostname.";
}
$advancedoptions = $_GET['advancedoptions'];
$openvpnmanager = $_GET['openvpnmanager'];
$advancedoptions = isset($_GET['advancedoptions']) ? $_GET['advancedoptions'] : null;
$openvpnmanager = isset($_GET['openvpnmanager']) ? $_GET['openvpnmanager'] : null;
$verifyservercn = $_GET['verifyservercn'];
$randomlocalport = $_GET['randomlocalport'];
$verifyservercn = isset($_GET['verifyservercn']) ? $_GET['verifyservercn'] : null;
$randomlocalport = isset($_GET['randomlocalport']) ? $_GET['randomlocalport'] : null;
$usetoken = $_GET['usetoken'];
if ($usetoken && (substr($act, 0, 10) == "confinline")) {
$input_errors[] = "You cannot use Microsoft Certificate Storage with an Inline configuration.";
......@@ -171,7 +152,7 @@ if (!empty($act)) {
$input_errors[] = "You cannot use Microsoft Certificate Storage with a Yealink or SNOM configuration.";
}
$password = "";
if ($_GET['password']) {
if (!empty($_GET['password'])) {
$password = $_GET['password'];
}
......@@ -188,7 +169,10 @@ if (!empty($act)) {
} else {
$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'])) {
......@@ -203,6 +187,7 @@ if (!empty($act)) {
}
}
}
}
$exp_name = openvpn_client_export_prefix($srvid, $usrid, $crtid);
......@@ -261,7 +246,7 @@ if (!empty($act)) {
$input_errors[] = "Failed to export config files!";
}
if (empty($input_errors)) {
if (count($input_errors) == 0) {
if (($act == "conf") || (substr($act, 0, 10) == "confinline")) {
$exp_size = strlen($exp_path);
} else {
......@@ -280,8 +265,13 @@ if (!empty($act)) {
}
exit;
}
}
}
include("head.inc");
?>
......@@ -471,84 +461,74 @@ function server_changed() {
var cell0 = row.insertCell(0);
var cell1 = row.insertCell(1);
var cell2 = row.insertCell(2);
cell0.className = "listlr";
cell0.innerHTML = users[i][2];
cell1.className = "listr";
cell1.innerHTML = users[i][3];
cell2.className = "listr";
cell2.innerHTML = "- Standard Configurations:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"confzip\"," + i + ", -1)'>Archive<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"conf\"," + i + ", -1)'>Config Only<\/a>";
cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"confzip\"," + i + ", -1)'>Archive</button>";
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 += "<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 += "<a href='javascript:download_begin(\"confinlinedroid\"," + i + ", -1)'>Android<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"confinlineios\"," + i + ", -1)'>OpenVPN Connect (iOS/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(\"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 += "<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 += "<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 += "<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 += "<a href='javascript:download_begin(\"inst-x86-win6\"," + i + ", -1)'>x86-win6<\/a>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"inst-x64-win6\"," + i + ", -1)'>x64-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 += "<br\/>- Mac OSX:<br\/>";
cell2.innerHTML += "&nbsp;&nbsp; ";
cell2.innerHTML += "<a href='javascript:download_begin(\"visc\"," + i + ", -1)'>Viscosity Bundle<\/a>";
cell2.innerHTML += "<button type='button' class='btn btn-primary btn-xs' onclick='download_begin(\"visc\"," + i + ", -1)'>Viscosity Bundle</button>";
}
for (j=0; j < certs.length; j++) {
var row = table.insertRow(table.rows.length);
var cell0 = row.insertCell(0);
var cell1 = row.insertCell(1);
var cell2 = row.insertCell(2);
cell0.className = "listlr";
if (servers[index][2] == "server_tls") {
cell0.innerHTML = "Certificate (SSL/TLS, no Auth)";
} else {
cell0.innerHTML = "Certificate with External Auth";
}
cell1.className = "listr";
cell1.innerHTML = certs[j][1];
cell2.className = "listr";
cell2.innerHTML = "- Standard Configurations:<br\/>";
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 += "<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 += "&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 += "<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 += "<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 += "&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 += "<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 += "<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 += "<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 += "&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") {
cell2.innerHTML += "<br\/>- Yealink SIP Handsets: <br\/>";
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 += "<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 += "<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 += "- <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') {
......@@ -556,44 +536,46 @@ function server_changed() {
var cell0 = row.insertCell(0);
var cell1 = row.insertCell(1);
var cell2 = row.insertCell(2);
cell0.className = "listlr";
cell0.innerHTML = "Authentication Only (No Cert)";
cell1.className = "listr";
cell1.innerHTML = "none";
cell2.className = "listr";
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 + ")'>Archive</button>";
cell2.innerHTML += "<a href='javascript:download_begin(\"confzip\"," + i + ")'>Archive<\/a>";
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 += "<br\/>- Inline Configurations:<br\/>";
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 += "&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 += "&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 += "<br\/>- Windows Installers (<?php echo $current_openvpn_version . '-Ix' . $current_openvpn_version_rev;?>):<br\/>";
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 += "<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 += "<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 += "<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 += "&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) {
if (obj.value == "other")
$('HostName').show();
$('#HostName').show();
else
$('HostName').hide();
$('#HostName').hide();
}
......@@ -607,11 +589,16 @@ function usepass_changed() {
function useproxy_changed(obj) {
if ((obj.id == "useproxy" && obj.checked) ||
(obj.id == "useproxypass" && (obj.value != 'none'))) {
$(obj.id + '_opts').show();
if ($('#useproxy').prop( "checked" ) ){
$('#useproxy_opts').show();
} else {
$('#useproxy_opts').hide();
}
if ($( "#useproxypass option:selected" ).text() != 'none') {
$('#useproxypass_opts').show();
} else {
$(obj.id + '_opts').hide();
$('#useproxypass_opts').hide();
}
}
//]]>
......@@ -624,9 +611,10 @@ if (isset($savemsg)) {
print_info_box($savemsg);
}
?>
<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="openvpn export">
<tr>
<td>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[] = array(gettext("Server"), false, "vpn_openvpn_server.php");
......@@ -637,41 +625,34 @@ if (isset($savemsg)) {
$tab_array[] = array(gettext("Shared Key Export"), false, "vpn_openvpn_export_shared.php");
display_top_tabs($tab_array);
?>
</td>
</tr>
<tr>
<td id="mainarea">
<div class="tabcont">
<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area">
<div class="tab-content content-box col-xs-12">
<div class="table-responsive">
<table width="100%" border="0" class="table table-striped" cellpadding="0" cellspacing="0">
<tr>
<td width="22%" valign="top" class="vncellreq">Remote Access Server</td>
<td width="78%" class="vtable">
<td width="22%" valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Remote Access Server");?></td>
<td width="78%" >
<select name="server" id="server" class="formselect" onchange="server_changed()">
<?php foreach ($ras_server as & $server) :
?>
<option value="<?=$server['index'];
?>"><?=$server['name'];?></option>
?>
<option value="<?=$server['index'];?>"><?=htmlspecialchars($server['name']);?></option>
<?php
endforeach; ?>
endforeach; ?>
</select>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Host Name Resolution</td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0" summary="name resolution">
<tr>
<td>
<td valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Host Name Resolution");?></td>
<td >
<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>
<option value="serveraddr" ><?=gettext("Interface IP Address");?></option>
<option value="servermagic" ><?=gettext("Automagic Multi-WAN IPs (port forward targets)");?></option>
<option value="servermagichost" ><?=gettext("Automagic Multi-WAN DDNS Hostnames (port forward targets)");?></option>
<option value="serverhostname" ><?=gettext("Installation hostname");?></option>
<?php if (isset($config['dyndnses']['dyndns'])) :
?>
<?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
endforeach; ?>
<?php
......@@ -680,295 +661,163 @@ endif; ?>
?>
<?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
endforeach; ?>
<?php
endif; ?>
<option value="other">Other</option>
<option value="other"><?=gettext("Other");?></option>
</select>
<br />
<div style="display:none;" id="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>
<div id="HostName" style="display:none;" >
<div>
<?=gettext("Enter the hostname or IP address the client will use to connect to this server.");?>
</div>
<input name="useaddr_hostname" type="text" id="useaddr_hostname" size="40" />
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Verify Server CN</td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0" summary="verify server cn">
<tr>
<td>
<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 >
<select name="verifyservercn" id="verifyservercn" class="formselect">
<option value="auto">Automatic - Use verify-x509-name (OpenVPN 2.3+) where possible</option>
<option value="tls-remote">Use tls-remote (Deprecated, use only on old clients &lt;= OpenVPN 2.2.x)</option>
<option value="tls-remote-quote">Use tls-remote and quote the server CN</option>
<option value="none">Do not verify the server CN</option>
<option value="auto"><?=gettext("Automatic - Use verify-x509-name (OpenVPN 2.3+) where possible");?></option>
<option value="tls-remote"><?=gettext("Use tls-remote (Deprecated, use only on old clients &lt;= OpenVPN 2.2.x");?>)</option>
<option value="tls-remote-quote"><?=gettext("Use tls-remote and quote the server CN");?></option>
<option value="none"><?=gettext("Do not verify the server CN");?></option>
</select>
<br/>
<span class="vexpl">
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/>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/>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.
</span>
</td>
</tr>
</table>
<div class="hidden" for="help_for_verify_server_cn">
<?=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/>
<?=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/>
<?=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.");?>
</div>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Use Random Local Port</td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0" summary="random local port">
<tr>
<td>
<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>
<td >
<input name="randomlocalport" id="randomlocalport" type="checkbox" value="yes" checked="CHECKED" />
</td>
<td>
<span class="vexpl">
Use a random local source port (lport) for traffic from the client. Without this set, two clients may not run concurrently.
</span>
</td>
</tr>
<tr>
<td colspan="2">
<span class="vexpl"><br/>NOTE: Not supported on older clients. Automatically disabled for Yealink and Snom configurations.</span>
</td>
</tr>
</table>
<div class="hidden" for="help_for_random_local_port">
<?=gettext("Use a random local source port (lport) for traffic from the client. Without this set, two clients may not run concurrently.");?>
<br/>
<?=gettext("NOTE: Not supported on older clients. Automatically disabled for Yealink and Snom configurations."); ?>
</div>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Certificate Export Options</td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0" summary="export options">
<tr>
<td>
<td valign="top"><i class="fa fa-info-circle text-muted"></i> <?=gettext("Certificate Export Options");?></td>
<td >
<div>
<input name="usetoken" id="usetoken" type="checkbox" value="yes" />
</td>
<td>
<span class="vexpl">
Use Microsoft Certificate Storage instead of local files.
</span>
</td>
</tr>
</table>
<table border="0" cellpadding="2" cellspacing="0" summary="checkbox for password">
<tr>
<td>
<?=gettext("Use Microsoft Certificate Storage instead of local files.");?>
</div>
<div>
<input name="usepass" id="usepass" type="checkbox" value="yes" onclick="usepass_changed()" />
</td>
<td>
<span class="vexpl">
Use a password to protect the pkcs12 file contents or key in Viscosity bundle.
</span>
</td>
</tr>
</table>
<table border="0" cellpadding="2" cellspacing="0" id="usepass_opts" style="display:none" summary="password">
<tr>
<td align="right">
<span class="vexpl">
&nbsp;Password :&nbsp;
</span>
</td>
<td>
<?=gettext("Use a password to protect the pkcs12 file contents or key in Viscosity bundle.");?>
</div>
<div id="usepass_opts" style="display:none">
<?=gettext("Password");?> :
<input name="pass" id="pass" type="password" class="formfld pwd" size="20" value="" />
</td>
</tr>
<tr>
<td align="right">
<span class="vexpl">
&nbsp;Confirm :&nbsp;
</span>
</td>
<td>
<?=gettext("Confirm");?> :
<input name="conf" id="conf" type="password" class="formfld pwd" size="20" value="" />
</div>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<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>
<td>
<td valign="top"><a id="help_for_http_proxy" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Use Proxy");?></td>
<td >
<input name="useproxy" id="useproxy" type="checkbox" value="yes" onclick="useproxy_changed(this)" />
</td>
<td>
<span class="vexpl">
Use proxy to communicate with the server.
</span>
</td>
</tr>
</table>
<table border="0" cellpadding="2" cellspacing="0" id="useproxy_opts" style="display:none" summary="user options">
<tr>
<td align="right" width="25%">
<span class="vexpl">
&nbsp; Type :&nbsp;
</span>
</td>
<td>
<div class="hidden" for="help_for_http_proxy">
<?=gettext("Use proxy to communicate with the server.");?>
</div>
<div id="useproxy_opts" style="display:none" >
<?=gettext("Type");?>
<select name="useproxytype" id="useproxytype" class="formselect">
<option value="http">HTTP</option>
<option value="socks">Socks</option>
<option value="http"><?=gettext("HTTP");?></option>
<option value="socks"><?=gettext("Socks");?></option>
</select>
</td>
</tr>
<tr>
<td align="right" width="25%">
<span class="vexpl">
&nbsp; IP Address :&nbsp;
</span>
</td>
<td>
<input name="proxyaddr" id="proxyaddr" class="formfld unknown" size="30" value="" />
</td>
</tr>
<tr>
<td align="right" width="25%">
<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>
<?=gettext("IP Address");?>
<input name="proxyaddr" id="proxyaddr" type="text" class="formfld unknown" size="30" value="" />
<?=gettext("Port");?> :
<input name="proxyport" id="proxyport" type="text" class="formfld unknown" size="5" value="" />
<div>
<?=gettext("Choose proxy authentication if any.");?>
<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>
<option value="none"><?=gettext("none");?></option>
<option value="basic"><?=gettext("basic");?></option>
<option value="ntlm"><?=gettext("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>
<div id="useproxypass_opts" style="display:none">
<?=gettext("Username");?> :
<input name="proxyuser" id="proxyuser" type="text" class="formfld unknown" size="20" value="" />
<?=gettext("Password");?> :
<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>
<?=gettext("Confirm");?> :
<input name="proxyconf" id="proxyconf" type="password" class="formfld pwd" size="20" value="" />
</div>
</div>
</div>
</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>
<td valign="top"><a id="help_for_openvpnmanager" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Management Interface OpenVPNManager");?></td>
<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>
<div class="hidden" for="help_for_openvpnmanager">
<?=gettext('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.');?>
<br/>
<?=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.");?>
</div>
</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">
<td valign="top"><a id="help_for_advancedoptions" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Additional configuration options");?></td>
<td >
<textarea rows="6" cols="68" name="advancedoptions" id="advancedoptions"></textarea><br/>
<div class="hidden" for="help_for_advancedoptions">
<?=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"); ?>;
</div>
</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">
<td valign="top"><a id="help_for_clientpkg" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Client Install Packages");?></td>
<td>
<table width="100%" id="users" border="0" cellpadding="0" cellspacing="0" class="table table-striped table-bordered ">
<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>
<td width="25%" ><b><?=gettext("User");?></b></td>
<td width="35%" ><b><?=gettext("Certificate Name");?></b></td>
<td width="40%" ><b><?=gettext("Export");?></b></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") ?>
<div class="hidden" for="help_for_clientpkg">
<?= gettext("NOTES:") ?> <br/>
<?= 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/>
<br/><br/>
<strong><?= gettext("Links to OpenVPN clients for various platforms:") ?></strong><br/>
<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") ?>
<br/><br/>
<?= gettext("NOTES:") ?><br/>
<?= 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/>
</div>
</td>
</tr>
</table>
</div>
</td>
</tr>
</table>
</div>
</section>
</div>
</div>
</section>
<script type="text/javascript">
//<![CDATA[
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