mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@rcs.pfsense.org:pfsense/pfsense-gettext

Browse Source
This commit is contained in:
Rafael Lucas 2010-07-29 09:46:12 -03:00
commit dccee52ae1
12 changed files with 369 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.default/config.xml
View File

@ -566,7 +566,7 @@
-->
</shaper>
<ipsec>
<preferredoldsa/>
<preferoldsa/>
<!-- <enable/> -->
<!-- syntax:
<tunnel>

3
etc/inc/pfsense-utils.inc
View File

@ -1542,6 +1542,9 @@ function download_file_with_progress_bar($url_file, $destination_file, $readbody
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url_file);
curl_setopt($ch, CURLOPT_HEADERFUNCTION, 'read_header');
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
/* Don't verify SSL peers since we don't have the certificates to do so. */
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_WRITEFUNCTION, $readbody);
curl_setopt($ch, CURLOPT_NOPROGRESS, '1');
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, '5');

2
etc/inc/vpn.inc
View File

@ -86,7 +86,7 @@ function vpn_ipsec_configure($ipchg = false)
unlink_if_exists("{$g['vardb_path']}/ipsecpinghosts");
touch("{$g['vardb_path']}/ipsecpinghosts");
if(isset($config['ipsec']['preferredoldsa']))
if(isset($config['ipsec']['preferoldsa']))
mwexec("/sbin/sysctl -w net.key.preferred_oldsa=-30");
else
mwexec("/sbin/sysctl net.key.preferred_oldsa=0");

5
usr/local/www/interfaces_groups_edit.php
View File

@ -71,6 +71,11 @@ if ($_POST) {
if (preg_match("/([^a-zA-Z])+/", $_POST['ifname'], $match))
$input_errors[] = "Only letters A-Z are allowed as the group name.";
$ifaces = get_configured_interface_with_descr();
foreach ($ifaces as $gif => $gdescr) {
if ($gdescr == $_POST['ifname'] || $gif == $_POST['ifname'])
$input_errors[] = "The specified group name is already used by an interface. Please choose another name.";
}
$ifgroupentry = array();
$ifgroupentry['ifname'] = $_POST['ifname'];
$members = "";

2
usr/local/www/status.php
View File

@ -168,7 +168,7 @@ defCmdT("pftop -w 150 -a -b -v speed","/usr/local/sbin/pftop -w 150 -a -b -v spe
defCmdT("resolv.conf","cat /etc/resolv.conf");
defCmdT("Processes","ps xauww");
defCmdT("dhcpd.conf","cat /var/etc/dhcpd.conf");
defCmdT("dhcpd.conf","cat /var/dhcpd/etc/dhcpd.conf");
defCmdT("ez-ipupdate.cache","cat /conf/ez-ipupdate.cache");
defCmdT("df","/bin/df");

2
usr/local/www/system_advanced_misc.php
View File

@ -224,7 +224,7 @@ include("head.inc");
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("Security Assocications"); ?></td>
<td width="78%" class="vtable">
<input name="preferoldsa_enable" type="checkbox" id="preferoldsa_enable" value="yes" <?php if ($pconfig['preferoldsa_enable']) echo "checked"; ?> />
<input name="preferoldsa_enable" type="checkbox" id="preferoldsa_enable" value="yes" <?php if (isset($pconfig['preferoldsa_enable'])) echo "checked"; ?> />
<strong><?=gettext("Prefer older IPsec SAs"); ?></strong>
<br />
<?=gettext("By default, if several SAs match, the newest one is " .

150
usr/local/www/vpn_openvpn_client.php
View File

@ -37,7 +37,7 @@
require("guiconfig.inc");
require_once("openvpn.inc");
$pgtitle = array("OpenVPN", "Client");
$pgtitle = array(gettext("OpenVPN"), gettext("Client"));
$statusurl = "status_openvpn.php";
$logurl = "diag_logs_openvpn.php";
@ -145,7 +145,7 @@ if ($_POST) {
$portused = openvpn_port_used($pconfig['protocol'], $pconfig['local_port']);
if (($portused != $vpnid) && ($portused != 0))
$input_errors[] = "The specified 'Local port' is in use. Please select another value";
$input_errors[] = gettext("The specified 'Local port' is in use. Please select another value");
}
if ($result = openvpn_validate_host($pconfig['server_addr'], 'Server host or address'))
@ -164,7 +164,7 @@ if ($_POST) {
if ($pconfig['proxy_authtype'] != "none") {
if (empty($pconfig['proxy_user']) || empty($pconfig['proxy_passwd']))
$input_errors[] = "User name and password are required for proxy with authentication.";
$input_errors[] = gettext("User name and password are required for proxy with authentication.");
}
}
@ -181,21 +181,21 @@ if ($_POST) {
if (!$tls_mode && !$pconfig['autokey_enable'])
if (!strstr($pconfig['shared_key'], "-----BEGIN OpenVPN Static key V1-----") ||
!strstr($pconfig['shared_key'], "-----END OpenVPN Static key V1-----"))
$input_errors[] = "The field 'Shared Key' does not appear to be valid";
$input_errors[] = gettext("The field 'Shared Key' does not appear to be valid");
if ($tls_mode && $pconfig['tlsauth_enable'] && !$pconfig['autotls_enable'])
if (!strstr($pconfig['tls'], "-----BEGIN OpenVPN Static key V1-----") ||
!strstr($pconfig['tls'], "-----END OpenVPN Static key V1-----"))
$input_errors[] = "The field 'TLS Authentication Key' does not appear to be valid";
$input_errors[] = gettext("The field 'TLS Authentication Key' does not appear to be valid");
/* If we are not in shared key mode, then we need the CA/Cert. */
if ($pconfig['mode'] != "p2p_shared_key") {
$reqdfields = explode(" ", "caref certref");
$reqdfieldsn = explode(",", "Certificate Authority,Certificate");;
$reqdfieldsn = array(gettext("Certificate Authority"),gettext("Certificate"));
} elseif (!$pconfig['autokey_enable']) {
/* We only need the shared key filled in if we are in shared key mode and autokey is not selected. */
$reqdfields = array('shared_key');
$reqdfieldsn = array('Shared key');
$reqdfieldsn = array(gettext('Shared key'));
}
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
@ -360,10 +360,10 @@ function autotls_change() {
<form action="vpn_openvpn_client.php" method="post" name="iform" id="iform" onsubmit="presubmit()">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" valign="top" class="listtopic">General information</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("General information"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Disabled</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Disabled"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
@ -374,12 +374,12 @@ function autotls_change() {
<td>
&nbsp;
<span class="vexpl">
<strong>Disable this client</strong><br>
<strong><?=gettext("Disable this client"); ?></strong><br>
</span>
</td>
</tr>
</table>
Set this option to disable this client without removing it from the list.
<?=gettext("Set this option to disable this client without removing it from the list"); ?>.
</td>
</tr>
<tr>
@ -428,7 +428,7 @@ function autotls_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Interface</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Interface"); ?></td>
<td width="78%" class="vtable">
<select name="interface" class="formselect">
<?php
@ -457,7 +457,7 @@ function autotls_change() {
<td width="78%" class="vtable">
<input name="local_port" type="text" class="formfld unknown" size="5" value="<?=htmlspecialchars($pconfig['local_port']);?>"/>
<br/>
Set this option if you would like to bind to a specific port.
<?=gettext("Set this option if you would like to bind to a specific port"); ?>.
</td>
</tr>
<tr>
@ -491,14 +491,14 @@ function autotls_change() {
<tr>
<td align="right" width="25%">
<span class="vexpl">
&nbsp;Authentication method :&nbsp;
&nbsp;<?=gettext("Authentication method"); ?> :&nbsp;
</span>
</td>
<td>
<select name="proxy_authtype" id="proxy_authtype" class="formfld select" onChange="useproxy_changed()">
<option value="none" <?php if ($pconfig['proxy_authtype'] == "none") echo "selected"; ?>>none</option>
<option value="basic" <?php if ($pconfig['proxy_authtype'] == "basic") echo "selected"; ?>>basic</option>
<option value="ntlm" <?php if ($pconfig['proxy_authtype'] == "ntlm") echo "selected"; ?>>ntlm</option>
<option value="none" <?php if ($pconfig['proxy_authtype'] == "none") echo "selected"; ?>><?=gettext("none"); ?></option>
<option value="basic" <?php if ($pconfig['proxy_authtype'] == "basic") echo "selected"; ?>><?=gettext("basic"); ?></option>
<option value="ntlm" <?php if ($pconfig['proxy_authtype'] == "ntlm") echo "selected"; ?>><?=gettext("ntlm"); ?></option>
</select>
</td>
</tr>
@ -508,7 +508,7 @@ function autotls_change() {
<tr>
<td align="right" width="25%">
<span class="vexpl">
&nbsp;Username :&nbsp;
&nbsp;<?=gettext("Username"); ?> :&nbsp;
</span>
</td>
<td>
@ -518,7 +518,7 @@ function autotls_change() {
<tr>
<td align="right" width="25%">
<span class="vexpl">
&nbsp;Password :&nbsp;
&nbsp;<?=gettext("Password"); ?> :&nbsp;
</span>
</td>
<td>
@ -529,7 +529,7 @@ function autotls_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Server host name resolution</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Server host name resolution"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -539,32 +539,32 @@ function autotls_change() {
</td>
<td>
<span class="vexpl">
Infinitely resolve server
<?=gettext("Infinitely resolve server"); ?>
</span>
</td>
</tr>
</table>
Continuously attempt to resolve the server host
name. Useful when communicating with a server
that is not permanently connected to the Internet.
<?=gettext("Continuously attempt to resolve the server host " .
"name. Useful when communicating with a server " .
"that is not permanently connected to the Internet"); ?>.
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Description</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
<td width="78%" class="vtable">
<input name="description" type="text" class="formfld unknown" size="30" value="<?=htmlspecialchars($pconfig['description']);?>">
<br>
You may enter a description here for your reference (not parsed).
<?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
</td>
</tr>
<tr>
<td colspan="2" class="list" height="12"></td>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Cryptographic Settings</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Cryptographic Settings"); ?></td>
</tr>
<tr id="tls">
<td width="22%" valign="top" class="vncellreq">TLS Authentication</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("TLS Authentication"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -574,7 +574,7 @@ function autotls_change() {
</td>
<td>
<span class="vexpl">
Enable authentication of TLS packets.
<?=gettext("Enable authentication of TLS packets"); ?>.
</span>
</td>
</tr>
@ -588,7 +588,7 @@ function autotls_change() {
</td>
<td>
<span class="vexpl">
Automatically generate a shared TLS authentication key.
<?=gettext("Automatically generate a shared TLS authentication key"); ?>.
</span>
</td>
</tr>
@ -599,14 +599,14 @@ function autotls_change() {
<td>
<textarea name="tls" cols="65" rows="7" class="formpre"><?=htmlspecialchars($pconfig['tls']);?></textarea>
<br/>
Paste your shared key here.
<?=gettext("Paste your shared key here"); ?>.
</td>
</tr>
</table>
</td>
</tr>
<tr id="tls_ca">
<td width="22%" valign="top" class="vncellreq">Peer Certificate Authority</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Peer Certificate Authority"); ?></td>
<td width="78%" class="vtable">
<select name='caref' class="formselect">
<?php
@ -621,7 +621,7 @@ function autotls_change() {
</td>
</tr>
<tr id="tls_cert">
<td width="22%" valign="top" class="vncellreq">Client Certificate</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Client Certificate"); ?></td>
<td width="78%" class="vtable">
<select name='certref' class="formselect">
<?php
@ -636,7 +636,7 @@ function autotls_change() {
</td>
</tr>
<tr id="psk">
<td width="22%" valign="top" class="vncellreq">Shared Key</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Shared Key"); ?></td>
<td width="78%" class="vtable">
<?php if (!$pconfig['shared_key']): ?>
<table border="0" cellpadding="2" cellspacing="0">
@ -647,7 +647,7 @@ function autotls_change() {
</td>
<td>
<span class="vexpl">
Automatically generate a shared key.
<?=gettext("Automatically generate a shared key"); ?>.
</span>
</td>
</tr>
@ -658,14 +658,14 @@ function autotls_change() {
<td>
<textarea name="shared_key" cols="65" rows="7" class="formpre"><?=htmlspecialchars($pconfig['shared_key']);?></textarea>
<br/>
Paste your shared key here.
<?=gettext("Paste your shared key here"); ?>.
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Encryption algorithm</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Encryption algorithm"); ?></td>
<td width="78%" class="vtable">
<select name="crypto" class="formselect">
<?php
@ -686,34 +686,34 @@ function autotls_change() {
<td colspan="2" class="list" height="12"></td>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Tunnel Settings</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Tunnel Settings"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Tunnel Network</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Tunnel Network"); ?></td>
<td width="78%" class="vtable">
<input name="tunnel_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_network']);?>">
<br>
This is the virtual network used for private
communications between this client and the
server expressed using CIDR (eg. 10.0.8.0/24).
The first network address is assumed to be the
server address and the second network address
will be assigned to the client virtual
interface.
<?=gettext("This is the virtual network used for private " .
"communications between this client and the " .
"server expressed using CIDR (eg. 10.0.8.0/24). " .
"The first network address is assumed to be the " .
"server address and the second network address " .
"will be assigned to the client virtual " .
"interface"); ?>.
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Remote Network</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Remote Network"); ?></td>
<td width="78%" class="vtable">
<input name="remote_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['remote_network']);?>">
<br>
This is a network that will be routed through
the tunnel, so that a site-to-site VPN can be
established without manually changing the
routing tables. Expressed as a CIDR range. If
this is a site-to-site VPN, enter here the
remote LAN here. You may leave this blank to
only communicate with other clients.
<?=gettext("This is a network that will be routed through " .
"the tunnel, so that a site-to-site VPN can be " .
"established without manually changing the " .
"routing tables. Expressed as a CIDR range. If " .
"this is a site-to-site VPN, enter here the " .
"remote LAN here. You may leave this blank to " .
"only communicate with other clients"); ?>.
</td>
</tr>
<tr>
@ -721,14 +721,14 @@ function autotls_change() {
<td width="78%" class="vtable">
<input name="use_shaper" type="text" class="formfld unknown" size="5" value="<?=htmlspecialchars($pconfig['use_shaper']);?>"/>
<br/>
Maximum outgoing bandwidth for this tunnel.
Leave empty for no limit. The input value has
to be something between 100 bytes/sec and 100
Mbytes/sec (entered as bytes per second).
<?=gettext("Maximum outgoing bandwidth for this tunnel. " .
"Leave empty for no limit. The input value has " .
"to be something between 100 bytes/sec and 100 " .
"Mbytes/sec (entered as bytes per second)"); ?>.
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Compression</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Compression"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -738,7 +738,7 @@ function autotls_change() {
</td>
<td>
<span class="vexpl">
Compress tunnel packets using the LZO algorithm.
<?=gettext("Compress tunnel packets using the LZO algorithm"); ?>.
</span>
</td>
</tr>
@ -746,7 +746,7 @@ function autotls_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Type-of-Service</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Type-of-Service"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -756,7 +756,7 @@ function autotls_change() {
</td>
<td>
<span class="vexpl">
Set the TOS IP header value of tunnel packets to match the encapsulated packet value.
<?=gettext("Set the TOS IP header value of tunnel packets to match the encapsulated packet value"); ?>.
</span>
</td>
</tr>
@ -767,17 +767,17 @@ function autotls_change() {
<td colspan="2" class="list" height="12"></td>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Advanced configuration</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Advanced configuration"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Advanced</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Advanced"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
<td>
<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=$pconfig['custom_options'];?></textarea><br/>
Enter any additional options you would like to add to the OpenVPN client configuration here, separated by a semicolon<br/>
EXAMPLE: route 10.0.0.0 255.255.255.0;
<?=gettext("Enter any additional options you would like to add to the OpenVPN client configuration here, separated by a semicolon"); ?><br/>
<?=gettext("EXAMPLE: route 10.0.0.0 255.255.255.0;"); ?>
</td>
</tr>
</table>
@ -786,7 +786,7 @@ function autotls_change() {
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%">
<input name="save" type="submit" class="formbtn" value="Save">
<input name="save" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">
<input name="act" type="hidden" value="<?=$act;?>">
<?php if (isset($id) && $a_client[$id]): ?>
<input name="id" type="hidden" value="<?=$id;?>">
@ -800,10 +800,10 @@ function autotls_change() {
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="10%" class="listhdrr">Disabled</td>
<td width="10%" class="listhdrr">Protocol</td>
<td width="30%" class="listhdrr">Server</td>
<td width="40%" class="listhdrr">Description</td>
<td width="10%" class="listhdrr"><?=gettext("Disabled"); ?></td>
<td width="10%" class="listhdrr"><?=gettext("Protocol"); ?></td>
<td width="30%" class="listhdrr"><?=gettext("Server"); ?></td>
<td width="40%" class="listhdrr"><?=gettext("Description"); ?></td>
<td width="10%" class="list"></td>
</tr>
<?php
@ -829,11 +829,11 @@ function autotls_change() {
</td>
<td valign="middle" nowrap class="list">
<a href="vpn_openvpn_client.php?act=edit&id=<?=$i;?>">
<img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="edit client" width="17" height="17" border="0">
<img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit client"); ?>" width="17" height="17" border="0">
</a>
&nbsp;
<a href="vpn_openvpn_client.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this client?')">
<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="delete client" width="17" height="17" border="0">
<a href="vpn_openvpn_client.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this client?"); ?>')">
<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete client"); ?>" width="17" height="17" border="0">
</a>
</td>
</tr>
@ -844,7 +844,7 @@ function autotls_change() {
<tr>
<td class="list" colspan="4"></td>
<td class="list">
<a href="vpn_openvpn_client.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="add client" width="17" height="17" border="0">
<a href="vpn_openvpn_client.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add client"); ?>" width="17" height="17" border="0">
</a>
</td>
</tr>

158
usr/local/www/vpn_openvpn_csc.php
View File

@ -37,7 +37,7 @@
require("guiconfig.inc");
require_once("openvpn.inc");
$pgtitle = array("OpenVPN", "Client Specific Override");
$pgtitle = array(gettext("OpenVPN"), gettext("Client Specific Override"));
$statusurl = "status_openvpn.php";
$logurl = "diag_logs_openvpn.php";
@ -128,36 +128,36 @@ if ($_POST) {
if ($pconfig['dns_server_enable']) {
if (!empty($pconfig['dns_server1']) && !is_ipaddr(trim($pconfig['dns_server1'])))
$input_errors[] = "The field 'DNS Server #1' must contain a valid IP address";
$input_errors[] = gettext("The field 'DNS Server #1' must contain a valid IP address");
if (!empty($pconfig['dns_server2']) && !is_ipaddr(trim($pconfig['dns_server2'])))
$input_errors[] = "The field 'DNS Server #2' must contain a valid IP address";
$input_errors[] = gettext("The field 'DNS Server #2' must contain a valid IP address");
if (!empty($pconfig['dns_server3']) && !is_ipaddr(trim($pconfig['dns_server3'])))
$input_errors[] = "The field 'DNS Server #3' must contain a valid IP address";
$input_errors[] = gettext("The field 'DNS Server #3' must contain a valid IP address");
if (!empty($pconfig['dns_server4']) && !is_ipaddr(trim($pconfig['dns_server4'])))
$input_errors[] = "The field 'DNS Server #4' must contain a valid IP address";
$input_errors[] = gettext("The field 'DNS Server #4' must contain a valid IP address");
}
if ($pconfig['ntp_server_enable']) {
if (!empty($pconfig['ntp_server1']) && !is_ipaddr(trim($pconfig['ntp_server1'])))
$input_errors[] = "The field 'NTP Server #1' must contain a valid IP address";
$input_errors[] = gettext("The field 'NTP Server #1' must contain a valid IP address");
if (!empty($pconfig['ntp_server2']) && !is_ipaddr(trim($pconfig['ntp_server2'])))
$input_errors[] = "The field 'NTP Server #2' must contain a valid IP address";
$input_errors[] = gettext("The field 'NTP Server #2' must contain a valid IP address");
if (!empty($pconfig['ntp_server3']) && !is_ipaddr(trim($pconfig['ntp_server3'])))
$input_errors[] = "The field 'NTP Server #3' must contain a valid IP address";
$input_errors[] = gettext("The field 'NTP Server #3' must contain a valid IP address");
if (!empty($pconfig['ntp_server4']) && !is_ipaddr(trim($pconfig['ntp_server4'])))
$input_errors[] = "The field 'NTP Server #4' must contain a valid IP address";
$input_errors[] = gettext("The field 'NTP Server #4' must contain a valid IP address");
}
if ($pconfig['netbios_enable']) {
if ($pconfig['wins_server_enable']) {
if (!empty($pconfig['wins_server1']) && !is_ipaddr(trim($pconfig['wins_server1'])))
$input_errors[] = "The field 'WINS Server #1' must contain a valid IP address";
$input_errors[] = gettext("The field 'WINS Server #1' must contain a valid IP address");
if (!empty($pconfig['wins_server2']) && !is_ipaddr(trim($pconfig['wins_server2'])))
$input_errors[] = "The field 'WINS Server #2' must contain a valid IP address";
$input_errors[] = gettext("The field 'WINS Server #2' must contain a valid IP address");
}
if ($pconfig['nbdd_server_enable'])
if (!empty($pconfig['nbdd_server1']) && !is_ipaddr(trim($pconfig['nbdd_server1'])))
$input_errors[] = "The field 'NetBIOS Data Distribution Server #1' must contain a valid IP address";
$input_errors[] = gettext("The field 'NetBIOS Data Distribution Server #1' must contain a valid IP address");
}
$reqdfields[] = 'common_name';
@ -308,10 +308,10 @@ function netbios_change() {
<form action="vpn_openvpn_csc.php" method="post" name="iform" id="iform" onsubmit="presubmit()">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" valign="top" class="listtopic">General information</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("General information"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Disabled</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Disabled"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
@ -322,32 +322,32 @@ function netbios_change() {
<td>
&nbsp;
<span class="vexpl">
<strong>Disable this override</strong><br>
<strong><?=gettext("Disable this override"); ?></strong><br>
</span>
</td>
</tr>
</table>
Set this option to disable this client-specific override without removing it from the list.
<?=gettext("Set this option to disable this client-specific override without removing it from the list"); ?>.
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Common name</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Common name"); ?></td>
<td width="78%" class="vtable">
<input name="common_name" type="text" class="formfld unknown" size="30" value="<?=htmlspecialchars($pconfig['common_name']);?>">
<br>
Enter the client's X.509 common name here.
<?=gettext("Enter the client's X.509 common name here"); ?>.
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Description</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
<td width="78%" class="vtable">
<input name="description" type="text" class="formfld unknown" size="30" value="<?=htmlspecialchars($pconfig['description']);?>">
<br>
You may enter a description here for your reference (not parsed).
<?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Connection blocking</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Connection blocking"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -357,38 +357,38 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Block this client connection based on its common name.
<?=gettext("Block this client connection based on its common name"); ?>.
</span>
</td>
</tr>
</table>
Don't use this option to permanently disable a
client due to a compromised key or password.
Use a CRL (certificate revocation list) instead.
<?=gettext("Don't use this option to permanently disable a " .
"client due to a compromised key or password. " .
"Use a CRL (certificate revocation list) instead"); ?>.
</td>
</tr>
<tr>
<td colspan="2" class="list" height="12"></td>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Tunnel Settings</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Tunnel Settings"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Tunnel Network</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Tunnel Network"); ?></td>
<td width="78%" class="vtable">
<input name="tunnel_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_network']);?>">
<br>
This is the virtual network used for private
communications between this client and the
server expressed using CIDR (eg. 10.0.8.0/24).
The first network address is assumed to be the
server address and the second network address
will be assigned to the client virtual
interface.
<?=gettext("This is the virtual network used for private " .
"communications between this client and the " .
"server expressed using CIDR (eg. 10.0.8.0/24). " .
"The first network address is assumed to be the " .
"server address and the second network address " .
"will be assigned to the client virtual " .
"interface"); ?>.
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Redirect Gateway</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Redirect Gateway"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -398,7 +398,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Force all client generated traffic through the tunnel.
<?=gettext("Force all client generated traffic through the tunnel"); ?>.
</span>
</td>
</tr>
@ -409,10 +409,10 @@ function netbios_change() {
<td colspan="2" class="list" height="12"></td>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Client Settings</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Client Settings"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Server Definitions</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Server Definitions"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -422,7 +422,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Prevent this client from receiving any server-defined client settings.
<?=gettext("Prevent this client from receiving any server-defined client settings"); ?>.
</span>
</td>
</tr>
@ -430,7 +430,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">DNS Default Domain</td>
<td width="22%" valign="top" class="vncell"><?=gettext("DNS Default Domain"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -440,7 +440,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Provide a default domain name to clients<br>
<?=gettext("Provide a default domain name to clients"); ?><br>
</span>
</td>
</tr>
@ -455,7 +455,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">DNS Servers</td>
<td width="22%" valign="top" class="vncell"><?=gettext("DNS Servers"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -465,7 +465,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Provide a DNS server list to clients<br>
<?=gettext("Provide a DNS server list to clients"); ?><br>
</span>
</td>
</tr>
@ -474,7 +474,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #1:&nbsp;
<?=gettext("Server"); ?> #1:&nbsp;
</span>
<input name="dns_server1" type="text" class="formfld unknown" id="dns_server1" size="20" value="<?=$pconfig['dns_server1'];?>">
</td>
@ -482,7 +482,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #2:&nbsp;
<?=gettext("Server"); ?> #2:&nbsp;
</span>
<input name="dns_server2" type="text" class="formfld unknown" id="dns_server2" size="20" value="<?=$pconfig['dns_server2'];?>">
</td>
@ -490,7 +490,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #3:&nbsp;
<?=gettext("Server"); ?> #3:&nbsp;
</span>
<input name="dns_server3" type="text" class="formfld unknown" id="dns_server3" size="20" value="<?=$pconfig['dns_server3'];?>">
</td>
@ -498,7 +498,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #4:&nbsp;
<?=gettext("Server"); ?> #4:&nbsp;
</span>
<input name="dns_server4" type="text" class="formfld unknown" id="dns_server4" size="20" value="<?=$pconfig['dns_server4'];?>">
</td>
@ -507,7 +507,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">NTP Servers</td>
<td width="22%" valign="top" class="vncell"><?=gettext("NTP Servers"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -517,7 +517,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Provide a NTP server list to clients<br>
<?=gettext("Provide a NTP server list to clients"); ?><br>
</span>
</td>
</tr>
@ -526,7 +526,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #1:&nbsp;
<?=gettext("Server"); ?> #1:&nbsp;
</span>
<input name="ntp_server1" type="text" class="formfld unknown" id="ntp_server1" size="20" value="<?=$pconfig['ntp_server1'];?>">
</td>
@ -534,7 +534,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #2:&nbsp;
<?=gettext("Server"); ?> #2:&nbsp;
</span>
<input name="ntp_server2" type="text" class="formfld unknown" id="ntp_server2" size="20" value="<?=$pconfig['ntp_server2'];?>">
</td>
@ -543,7 +543,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">NetBIOS Options</td>
<td width="22%" valign="top" class="vncell"><?=gettext("NetBIOS Options"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -553,19 +553,19 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Enable NetBIOS over TCP/IP<br>
<?=gettext("Enable NetBIOS over TCP/IP"); ?><br>
</span>
</td>
</tr>
</table>
If this option is not set, all NetBIOS-over-TCP/IP options (includeing WINS) will be disabled.
<?=gettext("If this option is not set, all NetBIOS-over-TCP/IP options (includeing WINS) will be disabled"); ?>.
<br/>
<table border="0" cellpadding="2" cellspacing="0" id="netbios_data">
<tr>
<td>
<br/>
<span class="vexpl">
Node Type:&nbsp;
<?=gettext("Node Type"); ?>:&nbsp;
</span>
<select name='netbios_ntype' class="formselect">
<?php
@ -578,10 +578,10 @@ function netbios_change() {
<?php endforeach; ?>
</select>
<br/>
Possible options: b-node (broadcasts), p-node
(point-to-point name queries to a WINS server),
m-node (broadcast then query name server), and
h-node (query name server, then broadcast).
<?=gettext("Possible options: b-node (broadcasts), p-node " .
"(point-to-point name queries to a WINS server), " .
"m-node (broadcast then query name server), and " .
"h-node (query name server, then broadcast)"); ?>.
</td>
</tr>
<tr>
@ -592,18 +592,18 @@ function netbios_change() {
</span>
<input name="netbios_scope" type="text" class="formfld unknown" id="netbios_scope" size="30" value="<?=htmlspecialchars($pconfig['netbios_scope']);?>">
<br/>
A NetBIOS Scope ID provides an extended naming
service for NetBIOS over TCP/IP. The NetBIOS
scope ID isolates NetBIOS traffic on a single
network to only those nodes with the same
NetBIOS scope ID.
<?=gettext("A NetBIOS Scope ID provides an extended naming " .
"service for NetBIOS over TCP/IP. The NetBIOS " .
"scope ID isolates NetBIOS traffic on a single " .
"network to only those nodes with the same " .
"NetBIOS scope ID"); ?>.
</td>
</tr>
</table>
</td>
</tr>
<tr id="wins_opts">
<td width="22%" valign="top" class="vncell">WINS Servers</td>
<td width="22%" valign="top" class="vncell"><?=gettext("WINS Servers"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -613,7 +613,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Provide a WINS server list to clients<br>
<?=gettext("Provide a WINS server list to clients"); ?><br>
</span>
</td>
</tr>
@ -622,7 +622,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #1:&nbsp;
<?=gettext("Server"); ?> #1:&nbsp;
</span>
<input name="wins_server1" type="text" class="formfld unknown" id="wins_server1" size="20" value="<?=$pconfig['wins_server1'];?>">
</td>
@ -630,7 +630,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #2:&nbsp;
<?=gettext("Server"); ?> #2:&nbsp;
</span>
<input name="wins_server2" type="text" class="formfld unknown" id="wins_server2" size="20" value="<?=$pconfig['wins_server2'];?>">
</td>
@ -639,14 +639,14 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Advanced</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Advanced"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
<td>
<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=$pconfig['custom_options'];?></textarea><br/>
Enter any additional options you would like to add for this client specific override, separated by a semicolon<br/>
EXAMPLE: push "route 10.0.0.0 255.255.255.0";
<?=gettext("Enter any additional options you would like to add for this client specific override, separated by a semicolon"); ?><br/>
<?=gettext("EXAMPLE: push \"route 10.0.0.0 255.255.255.0\""); ?>;
</td>
</tr>
</table>
@ -655,7 +655,7 @@ function netbios_change() {
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%">
<input name="save" type="submit" class="formbtn" value="Save">
<input name="save" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">
<input name="act" type="hidden" value="<?=$act;?>">
<?php if (isset($id) && $a_csc[$id]): ?>
<input name="id" type="hidden" value="<?=$id;?>">
@ -669,9 +669,9 @@ function netbios_change() {
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="10%" class="listhdrr">Disabled</td>
<td width="40%" class="listhdrr">Common Name</td>
<td width="40%" class="listhdrr">Description</td>
<td width="10%" class="listhdrr"><?=gettext("Disabled"); ?></td>
<td width="40%" class="listhdrr"><?=gettext("Common Name"); ?></td>
<td width="40%" class="listhdrr"><?=gettext("Description"); ?></td>
<td width="10%" class="list"></td>
</tr>
<?php
@ -693,11 +693,11 @@ function netbios_change() {
</td>
<td valign="middle" nowrap class="list">
<a href="vpn_openvpn_csc.php?act=edit&id=<?=$i;?>">
<img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="edit csc" width="17" height="17" border="0">
<img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit csc"); ?>" width="17" height="17" border="0">
</a>
&nbsp;
<a href="vpn_openvpn_csc.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this csc?')">
<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="delete csc" width="17" height="17" border="0">
<a href="vpn_openvpn_csc.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this csc?"); ?>')">
<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete csc"); ?>" width="17" height="17" border="0">
</a>
</td>
</tr>
@ -708,7 +708,7 @@ function netbios_change() {
<tr>
<td class="list" colspan="3"></td>
<td class="list">
<a href="vpn_openvpn_csc.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="add csc" width="17" height="17" border="0">
<a href="vpn_openvpn_csc.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add csc"); ?>" width="17" height="17" border="0">
</a>
</td>
</tr>

242
usr/local/www/vpn_openvpn_server.php
View File

@ -37,7 +37,7 @@
require("guiconfig.inc");
require_once("openvpn.inc");
$pgtitle = array("OpenVPN", "Server");
$pgtitle = array(gettext("OpenVPN"), gettext("Server"));
$statusurl = "status_openvpn.php";
$logurl = "diag_logs_openvpn.php";
@ -175,7 +175,7 @@ if ($_POST) {
if (!empty($pconfig['authmode'])) {
foreach ($pconfig['authmode'] as $pauthmode) {
if ($pauthmode != "Local Database" && $pconfig['mode'] == "server_tls_user")
$input_errors[] = "Only 'Local authentication database' is allowed with " . $openvpn_server_modes[$pconfig['mode']];
$input_errors[] = gettext("Only 'Local authentication database' is allowed with") . " " . $openvpn_server_modes[$pconfig['mode']];
}
}
@ -194,7 +194,7 @@ if ($_POST) {
$portused = openvpn_port_used($pconfig['protocol'], $pconfig['local_port']);
if (($portused != $vpnid) && ($portused != 0))
$input_errors[] = "The specified 'Local port' is in use. Please select another value";
$input_errors[] = gettext("The specified 'Local port' is in use. Please select another value");
if ($pconfig['autokey_enable'])
$pconfig['shared_key'] = openvpn_create_key();
@ -202,62 +202,62 @@ if ($_POST) {
if (!$tls_mode && !$pconfig['autokey_enable'])
if (!strstr($pconfig['shared_key'], "-----BEGIN OpenVPN Static key V1-----") ||
!strstr($pconfig['shared_key'], "-----END OpenVPN Static key V1-----"))
$input_errors[] = "The field 'Shared Key' does not appear to be valid";
$input_errors[] = gettext("The field 'Shared Key' does not appear to be valid");
if ($tls_mode && $pconfig['tlsauth_enable'] && !$pconfig['autotls_enable'])
if (!strstr($pconfig['tls'], "-----BEGIN OpenVPN Static key V1-----") ||
!strstr($pconfig['tls'], "-----END OpenVPN Static key V1-----"))
$input_errors[] = "The field 'TLS Authentication Key' does not appear to be valid";
$input_errors[] = gettext("The field 'TLS Authentication Key' does not appear to be valid");
if ($pconfig['dns_server_enable']) {
if (!empty($pconfig['dns_server1']) && !is_ipaddr(trim($pconfig['dns_server1'])))
$input_errors[] = "The field 'DNS Server #1' must contain a valid IP address";
$input_errors[] = gettext("The field 'DNS Server #1' must contain a valid IP address");
if (!empty($pconfig['dns_server2']) && !is_ipaddr(trim($pconfig['dns_server2'])))
$input_errors[] = "The field 'DNS Server #2' must contain a valid IP address";
$input_errors[] = gettext("The field 'DNS Server #2' must contain a valid IP address");
if (!empty($pconfig['dns_server3']) && !is_ipaddr(trim($pconfig['dns_server3'])))
$input_errors[] = "The field 'DNS Server #3' must contain a valid IP address";
$input_errors[] = gettext("The field 'DNS Server #3' must contain a valid IP address");
if (!empty($pconfig['dns_server4']) && !is_ipaddr(trim($pconfig['dns_server4'])))
$input_errors[] = "The field 'DNS Server #4' must contain a valid IP address";
$input_errors[] = gettext("The field 'DNS Server #4' must contain a valid IP address");
}
if ($pconfig['ntp_server_enable']) {
if (!empty($pconfig['ntp_server1']) && !is_ipaddr(trim($pconfig['ntp_server1'])))
$input_errors[] = "The field 'NTP Server #1' must contain a valid IP address";
$input_errors[] = gettext("The field 'NTP Server #1' must contain a valid IP address");
if (!empty($pconfig['ntp_server2']) && !is_ipaddr(trim($pconfig['ntp_server2'])))
$input_errors[] = "The field 'NTP Server #2' must contain a valid IP address";
$input_errors[] = gettext("The field 'NTP Server #2' must contain a valid IP address");
if (!empty($pconfig['ntp_server3']) && !is_ipaddr(trim($pconfig['ntp_server3'])))
$input_errors[] = "The field 'NTP Server #3' must contain a valid IP address";
$input_errors[] = gettext("The field 'NTP Server #3' must contain a valid IP address");
if (!empty($pconfig['ntp_server4']) && !is_ipaddr(trim($pconfig['ntp_server4'])))
$input_errors[] = "The field 'NTP Server #4' must contain a valid IP address";
$input_errors[] = gettext("The field 'NTP Server #4' must contain a valid IP address");
}
if ($pconfig['netbios_enable']) {
if ($pconfig['wins_server_enable']) {
if (!empty($pconfig['wins_server1']) && !is_ipaddr(trim($pconfig['wins_server1'])))
$input_errors[] = "The field 'WINS Server #1' must contain a valid IP address";
$input_errors[] = gettext("The field 'WINS Server #1' must contain a valid IP address");
if (!empty($pconfig['wins_server2']) && !is_ipaddr(trim($pconfig['wins_server2'])))
$input_errors[] = "The field 'WINS Server #2' must contain a valid IP address";
$input_errors[] = gettext("The field 'WINS Server #2' must contain a valid IP address");
}
if ($pconfig['nbdd_server_enable'])
if (!empty($pconfig['nbdd_server1']) && !is_ipaddr(trim($pconfig['nbdd_server1'])))
$input_errors[] = "The field 'NetBIOS Data Distribution Server #1' must contain a valid IP address";
$input_errors[] = gettext("The field 'NetBIOS Data Distribution Server #1' must contain a valid IP address");
}
if ($pconfig['maxclients'] && !is_numeric($pconfig['maxclients']))
$input_errors[] = "The field 'Concurrent connections' must be numeric.";
$input_errors[] = gettext("The field 'Concurrent connections' must be numeric.");
/* If we are not in shared key mode, then we need the CA/Cert. */
if ($pconfig['mode'] != "p2p_shared_key") {
$reqdfields = explode(" ", "caref certref");
$reqdfieldsn = explode(",", "Certificate Authority,Certificate");;
$reqdfieldsn = array(gettext("Certificate Authority"),gettext("Certificate"));;
} elseif (!$pconfig['autokey_enable']) {
/* We only need the shared key filled in if we are in shared key mode and autokey is not selected. */
$reqdfields = array('shared_key');
$reqdfieldsn = array('Shared key');
$reqdfieldsn = array(gettext('Shared key'));
}
$reqdfields[] = 'tunnel_network';
$reqdfieldsn[] = 'Tunnel network';
$reqdfieldsn[] = gettext('Tunnel network');
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
@ -534,10 +534,10 @@ function netbios_change() {
<form action="vpn_openvpn_server.php" method="post" name="iform" id="iform" onsubmit="presubmit()">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td colspan="2" valign="top" class="listtopic">General information</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("General information"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Disabled</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Disabled"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
@ -548,12 +548,12 @@ function netbios_change() {
<td>
&nbsp;
<span class="vexpl">
<strong>Disable this server</strong><br>
<strong><?=gettext("Disable this server"); ?></strong><br>
</span>
</td>
</tr>
</table>
Set this option to disable this server without removing it from the list.
<?=gettext("Set this option to disable this server without removing it from the list"); ?>.
</td>
</tr>
<tr>
@ -604,7 +604,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Interface</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Interface"); ?></td>
<td width="78%" class="vtable">
<select name="interface" class="formselect">
<?php
@ -635,21 +635,21 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Description</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
<td width="78%" class="vtable">
<input name="description" type="text" class="formfld unknown" size="30" value="<?=htmlspecialchars($pconfig['description']);?>">
<br>
You may enter a description here for your reference (not parsed).
<?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
</td>
</tr>
<tr>
<td colspan="2" class="list" height="12"></td>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Cryptographic Settings</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Cryptographic Settings"); ?></td>
</tr>
<tr id="tls">
<td width="22%" valign="top" class="vncellreq">TLS Authentication</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("TLS Authentication"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -659,7 +659,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Enable authentication of TLS packets.
<?=gettext("Enable authentication of TLS packets"); ?>.
</span>
</td>
</tr>
@ -673,7 +673,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Automatically generate a shared TLS authentication key.
<?=gettext("Automatically generate a shared TLS authentication key"); ?>.
</span>
</td>
</tr>
@ -684,14 +684,14 @@ function netbios_change() {
<td>
<textarea name="tls" cols="65" rows="7" class="formpre"><?=htmlspecialchars($pconfig['tls']);?></textarea>
<br/>
Paste your shared key here.
<?=gettext("Paste your shared key here"); ?>.
</td>
</tr>
</table>
</td>
</tr>
<tr id="tls_ca">
<td width="22%" valign="top" class="vncellreq">Peer Certificate Authority</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Peer Certificate Authority"); ?></td>
<td width="78%" class="vtable">
<select name='caref' class="formselect">
<?php
@ -706,7 +706,7 @@ function netbios_change() {
</td>
</tr>
<tr id="tls_cert">
<td width="22%" valign="top" class="vncellreq">Server Certificate</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Server Certificate"); ?></td>
<td width="78%" class="vtable">
<select name='certref' class="formselect">
<?php
@ -723,7 +723,7 @@ function netbios_change() {
</td>
</tr>
<tr id="tls_dh">
<td width="22%" valign="top" class="vncellreq">DH Parameters Length</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("DH Parameters Length"); ?></td>
<td width="78%" class="vtable">
<select name="dh_length" class="formselect">
<?php
@ -741,7 +741,7 @@ function netbios_change() {
</td>
</tr>
<tr id="psk">
<td width="22%" valign="top" class="vncellreq">Shared Key</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Shared Key"); ?></td>
<td width="78%" class="vtable">
<?php if (!$pconfig['shared_key']): ?>
<table border="0" cellpadding="2" cellspacing="0">
@ -752,7 +752,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Automatically generate a shared key.
<?=gettext("Automatically generate a shared key"); ?>.
</span>
</td>
</tr>
@ -763,14 +763,14 @@ function netbios_change() {
<td>
<textarea name="shared_key" cols="65" rows="7" class="formpre"><?=htmlspecialchars($pconfig['shared_key']);?></textarea>
<br/>
Paste your shared key here.
<?=gettext("Paste your shared key here"); ?>.
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Encryption algorithm</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Encryption algorithm"); ?></td>
<td width="78%" class="vtable">
<select name="crypto" class="formselect">
<?php
@ -791,24 +791,24 @@ function netbios_change() {
<td colspan="2" class="list" height="12"></td>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Tunnel Settings</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Tunnel Settings"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Tunnel Network</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Tunnel Network"); ?></td>
<td width="78%" class="vtable">
<input name="tunnel_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['tunnel_network']);?>">
<br>
This is the virtual network used for private
communications between this server and client
hosts expressed using CIDR (eg. 10.0.8.0/24).
The first network address will be assigned to
the server virtual interface. The remaining
network addresses can optionally be assigned
to connecting clients. (see Address Pool)
<?=gettext("This is the virtual network used for private " .
"communications between this server and client " .
"hosts expressed using CIDR (eg. 10.0.8.0/24). " .
"The first network address will be assigned to " .
"the server virtual interface. The remaining " .
"network addresses can optionally be assigned " .
"to connecting clients. (see Address Pool)"); ?>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Redirect Gateway</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Redirect Gateway"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -818,7 +818,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Force all client generated traffic through the tunnel.
<?=gettext("Force all client generated traffic through the tunnel"); ?>.
</span>
</td>
</tr>
@ -826,30 +826,30 @@ function netbios_change() {
</td>
</tr>
<tr id="local_opts">
<td width="22%" valign="top" class="vncell">Local Network</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Local Network"); ?></td>
<td width="78%" class="vtable">
<input name="local_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['local_network']);?>">
<br>
This is the network that will be accessible
from the remote endpoint. Expressed as a CIDR
range. You may leave this blank if you don't
want to add a route to the local network
through this tunnel on the remote machine.
This is generally set to your LAN network.
<?=gettext("This is the network that will be accessible " .
"from the remote endpoint. Expressed as a CIDR " .
"range. You may leave this blank if you don't " .
"want to add a route to the local network " .
"through this tunnel on the remote machine. " .
"This is generally set to your LAN network"); ?>.
</td>
</tr>
<tr id="remote_opts">
<td width="22%" valign="top" class="vncell">Remote Network</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Remote Network"); ?></td>
<td width="78%" class="vtable">
<input name="remote_network" type="text" class="formfld unknown" size="20" value="<?=htmlspecialchars($pconfig['remote_network']);?>">
<br>
This is a network that will be routed through
the tunnel, so that a site-to-site VPN can be
established without manually changing the
routing tables. Expressed as a CIDR range. If
this is a site-to-site VPN, enter here the
remote LAN here. You may leave this blank if
you don't want a site-to-site VPN.
<?=gettext("This is a network that will be routed through " .
"the tunnel, so that a site-to-site VPN can be " .
"established without manually changing the " .
"routing tables. Expressed as a CIDR range. If " .
"this is a site-to-site VPN, enter here the " .
"remote LAN here. You may leave this blank if " .
"you don't want a site-to-site VPN"); ?>.
</td>
</tr>
<tr>
@ -857,11 +857,11 @@ function netbios_change() {
<td width="78%" class="vtable">
<input name="maxclients" type="text" class="formfld unknown" size="5" value="<?=htmlspecialchars($pconfig['maxclients']);?>"/>
<br/>
Specify the maximum number of clients allowed to concurrently connect to this server.
<?=gettext("Specify the maximum number of clients allowed to concurrently connect to this server"); ?>.
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Compression</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Compression"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -871,7 +871,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Compress tunnel packets using the LZO algorithm.
<?=gettext("Compress tunnel packets using the LZO algorithm"); ?>.
</span>
</td>
</tr>
@ -879,7 +879,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Type-of-Service</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Type-of-Service"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -889,7 +889,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Set the TOS IP header value of tunnel packets to match the encapsulated packet value.
<?=gettext("Set the TOS IP header value of tunnel packets to match the encapsulated packet value"); ?>.
</span>
</td>
</tr>
@ -897,7 +897,7 @@ function netbios_change() {
</td>
</tr>
<tr id="inter_client_communication">
<td width="22%" valign="top" class="vncell">Inter-client communication</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Inter-client communication"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -907,7 +907,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Allow communication between clients connected to this server
<?=gettext("Allow communication between clients connected to this server"); ?>
</span>
</td>
</tr>
@ -921,10 +921,10 @@ function netbios_change() {
<td colspan="2" class="list" height="12"></td>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Client Settings</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Client Settings"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Dynamic IP</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Dynamic IP"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -934,7 +934,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Allow connected clients to retain their connections if their IP address changes.<br>
<?=gettext("Allow connected clients to retain their connections if their IP address changes"); ?>.<br>
</span>
</td>
</tr>
@ -942,7 +942,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Address Pool</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Address Pool"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -952,7 +952,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Provide a virtual adapter IP address to clients (see Tunnel Network)<br>
<?=gettext("Provide a virtual adapter IP address to clients (see Tunnel Network)"); ?><br>
</span>
</td>
</tr>
@ -960,7 +960,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">DNS Default Domain</td>
<td width="22%" valign="top" class="vncell"><?=gettext("DNS Default Domain"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -970,7 +970,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Provide a default domain name to clients<br>
<?=gettext("Provide a default domain name to clients"); ?><br>
</span>
</td>
</tr>
@ -985,7 +985,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">DNS Servers</td>
<td width="22%" valign="top" class="vncell"><?=gettext("DNS Servers"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -995,7 +995,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Provide a DNS server list to clients<br>
<?=gettext("Provide a DNS server list to clients"); ?><br>
</span>
</td>
</tr>
@ -1004,7 +1004,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #1:&nbsp;
<?=gettext("Server"); ?> #1:&nbsp;
</span>
<input name="dns_server1" type="text" class="formfld unknown" id="dns_server1" size="20" value="<?=$pconfig['dns_server1'];?>">
</td>
@ -1012,7 +1012,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #2:&nbsp;
<?=gettext("Server"); ?> #2:&nbsp;
</span>
<input name="dns_server2" type="text" class="formfld unknown" id="dns_server2" size="20" value="<?=$pconfig['dns_server2'];?>">
</td>
@ -1020,7 +1020,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #3:&nbsp;
<?=gettext("Server"); ?> #3:&nbsp;
</span>
<input name="dns_server3" type="text" class="formfld unknown" id="dns_server3" size="20" value="<?=$pconfig['dns_server3'];?>">
</td>
@ -1028,7 +1028,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #4:&nbsp;
<?=gettext("Server"); ?> #4:&nbsp;
</span>
<input name="dns_server4" type="text" class="formfld unknown" id="dns_server4" size="20" value="<?=$pconfig['dns_server4'];?>">
</td>
@ -1037,7 +1037,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">NTP Servers</td>
<td width="22%" valign="top" class="vncell"><?=gettext("NTP Servers"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -1047,7 +1047,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Provide a NTP server list to clients<br>
<?=gettext("Provide a NTP server list to clients"); ?><br>
</span>
</td>
</tr>
@ -1056,7 +1056,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #1:&nbsp;
<?=gettext("Server"); ?> #1:&nbsp;
</span>
<input name="ntp_server1" type="text" class="formfld unknown" id="ntp_server1" size="20" value="<?=$pconfig['ntp_server1'];?>">
</td>
@ -1064,7 +1064,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #2:&nbsp;
<?=gettext("Server"); ?> #2:&nbsp;
</span>
<input name="ntp_server2" type="text" class="formfld unknown" id="ntp_server2" size="20" value="<?=$pconfig['ntp_server2'];?>">
</td>
@ -1073,7 +1073,7 @@ function netbios_change() {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">NetBIOS Options</td>
<td width="22%" valign="top" class="vncell"><?=gettext("NetBIOS Options"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -1083,19 +1083,19 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Enable NetBIOS over TCP/IP<br>
<?=gettext("Enable NetBIOS over TCP/IP"); ?><br>
</span>
</td>
</tr>
</table>
If this option is not set, all NetBIOS-over-TCP/IP options (including WINS) will be disabled.
<?=gettext("If this option is not set, all NetBIOS-over-TCP/IP options (including WINS) will be disabled"); ?>.
<br/>
<table border="0" cellpadding="2" cellspacing="0" id="netbios_data">
<tr>
<td>
<br/>
<span class="vexpl">
Node Type:&nbsp;
<?=gettext("Node Type"); ?>:&nbsp;
</span>
<select name='netbios_ntype' class="formselect">
<?php
@ -1108,32 +1108,32 @@ function netbios_change() {
<?php endforeach; ?>
</select>
<br/>
Possible options: b-node (broadcasts), p-node
(point-to-point name queries to a WINS server),
m-node (broadcast then query name server), and
h-node (query name server, then broadcast).
<?=gettext("Possible options: b-node (broadcasts), p-node " .
"(point-to-point name queries to a WINS server), " .
"m-node (broadcast then query name server), and " .
"h-node (query name server, then broadcast)"); ?>.
</td>
</tr>
<tr>
<td>
<br/>
<span class="vexpl">
Scope ID:&nbsp;
<?=gettext("Scope ID"); ?>:&nbsp;
</span>
<input name="netbios_scope" type="text" class="formfld unknown" id="netbios_scope" size="30" value="<?=htmlspecialchars($pconfig['netbios_scope']);?>">
<br/>
A NetBIOS Scope ID provides an extended naming
service for NetBIOS over TCP/IP. The NetBIOS
scope ID isolates NetBIOS traffic on a single
network to only those nodes with the same
NetBIOS scope ID.
<?=gettext("A NetBIOS Scope ID provides an extended naming " .
"service for NetBIOS over TCP/IP. The NetBIOS " .
"scope ID isolates NetBIOS traffic on a single " .
"network to only those nodes with the same " .
"NetBIOS scope ID"); ?>.
</td>
</tr>
</table>
</td>
</tr>
<tr id="wins_opts">
<td width="22%" valign="top" class="vncell">WINS Servers</td>
<td width="22%" valign="top" class="vncell"><?=gettext("WINS Servers"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
@ -1143,7 +1143,7 @@ function netbios_change() {
</td>
<td>
<span class="vexpl">
Provide a WINS server list to clients<br>
<?=gettext("Provide a WINS server list to clients"); ?><br>
</span>
</td>
</tr>
@ -1152,7 +1152,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #1:&nbsp;
<?=gettext("Server"); ?> #1:&nbsp;
</span>
<input name="wins_server1" type="text" class="formfld unknown" id="wins_server1" size="20" value="<?=$pconfig['wins_server1'];?>">
</td>
@ -1160,7 +1160,7 @@ function netbios_change() {
<tr>
<td>
<span class="vexpl">
Server #2:&nbsp;
<?=gettext("Server"); ?> #2:&nbsp;
</span>
<input name="wins_server2" type="text" class="formfld unknown" id="wins_server2" size="20" value="<?=$pconfig['wins_server2'];?>">
</td>
@ -1175,17 +1175,17 @@ function netbios_change() {
<td colspan="2" class="list" height="12"></td>
</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Advanced configuration</td>
<td colspan="2" valign="top" class="listtopic"><?=gettext("Advanced configuration"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">Advanced</td>
<td width="22%" valign="top" class="vncell"><?=gettext("Advanced"); ?></td>
<td width="78%" class="vtable">
<table border="0" cellpadding="2" cellspacing="0">
<tr>
<td>
<textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=$pconfig['custom_options'];?></textarea><br/>
Enter any additional options you would like to add to the OpenVPN server configuration here, separated by a semicolon<br/>
EXAMPLE: push "route 10.0.0.0 255.255.255.0";
<?=gettext("Enter any additional options you would like to add to the OpenVPN server configuration here, separated by a semicolon"); ?><br/>
<?=gettext("EXAMPLE: push \"route 10.0.0.0 255.255.255.0\""); ?>;
</td>
</tr>
</table>
@ -1199,7 +1199,7 @@ function netbios_change() {
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%">
<input name="save" type="submit" class="formbtn" value="Save">
<input name="save" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">
<input name="act" type="hidden" value="<?=$act;?>">
<?php if (isset($id) && $a_server[$id]): ?>
<input name="id" type="hidden" value="<?=$id;?>">
@ -1213,10 +1213,10 @@ function netbios_change() {
<table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="10%" class="listhdrr">Disabled</td>
<td width="10%" class="listhdrr">Protocol / Port</td>
<td width="30%" class="listhdrr">Tunnel Network</td>
<td width="40%" class="listhdrr">Description</td>
<td width="10%" class="listhdrr"><?=gettext("Disabled"); ?></td>
<td width="10%" class="listhdrr"><?=gettext("Protocol / Port"); ?></td>
<td width="30%" class="listhdrr"><?=gettext("Tunnel Network"); ?></td>
<td width="40%" class="listhdrr"><?=gettext("Description"); ?></td>
<td width="10%" class="list"></td>
</tr>
<?php
@ -1241,11 +1241,11 @@ function netbios_change() {
</td>
<td valign="middle" nowrap class="list">
<a href="vpn_openvpn_server.php?act=edit&id=<?=$i;?>">
<img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="edit server" width="17" height="17" border="0">
<img src="./themes/<?=$g['theme'];?>/images/icons/icon_e.gif" title="<?=gettext("edit server"); ?>" width="17" height="17" border="0">
</a>
&nbsp;
<a href="vpn_openvpn_server.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this server?')">
<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="delete server" width="17" height="17" border="0">
<a href="vpn_openvpn_server.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this server?"); ?>')">
<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete server"); ?>" width="17" height="17" border="0">
</a>
</td>
</tr>
@ -1256,7 +1256,7 @@ function netbios_change() {
<tr>
<td class="list" colspan="4"></td>
<td class="list">
<a href="vpn_openvpn_server.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="add server" width="17" height="17" border="0">
<a href="vpn_openvpn_server.php?act=new"><img src="./themes/<?=$g['theme'];?>/images/icons/icon_plus.gif" title="<?=gettext("add server"); ?>" width="17" height="17" border="0">
</a>
</td>
</tr>
@ -1296,4 +1296,4 @@ function set_checked($var,& $chk) {
$chk = '';
}
?>
?>

110
usr/local/www/vpn_pppoe.php
View File

@ -76,24 +76,24 @@ if ($_POST) {
/* input validation */
if ($_POST['mode'] == "server") {
$reqdfields = explode(" ", "localip remoteip");
$reqdfieldsn = explode(",", "Server address,Remote start address");
$reqdfieldsn = array(gettext("Server address"),gettext("Remote start address"));
if ($_POST['radiusenable']) {
$reqdfields = array_merge($reqdfields, explode(" ", "radiusserver radiussecret"));
$reqdfieldsn = array_merge($reqdfieldsn,
explode(",", "RADIUS server address,RADIUS shared secret"));
array(gettext("RADIUS server address"),gettext("RADIUS shared secret"));
}
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
if (($_POST['localip'] && !is_ipaddr($_POST['localip']))) {
$input_errors[] = "A valid server address must be specified.";
$input_errors[] = gettext("A valid server address must be specified.");
}
if (($_POST['pppoe_subnet'] && !is_ipaddr($_POST['remoteip']))) {
$input_errors[] = "A valid remote start address must be specified.";
$input_errors[] = gettext("A valid remote start address must be specified.");
}
if (($_POST['radiusserver'] && !is_ipaddr($_POST['radiusserver']))) {
$input_errors[] = "A valid RADIUS server address must be specified.";
$input_errors[] = gettext("A valid RADIUS server address must be specified.");
}
if (!$input_errors) {
@ -103,10 +103,10 @@ if ($_POST) {
if ((ip2ulong($_POST['localip']) >= $subnet_start) &&
(ip2ulong($_POST['localip']) <= $subnet_end)) {
$input_errors[] = "The specified server address lies in the remote subnet.";
$input_errors[] = gettext("The specified server address lies in the remote subnet.");
}
if ($_POST['localip'] == get_interface_ip("lan")) {
$input_errors[] = "The specified server address is equal to the LAN interface address.";
$input_errors[] = gettext("The specified server address is equal to the LAN interface address.");
}
}
} else {
@ -176,7 +176,7 @@ if ($_POST) {
}
}
$pgtitle = array("Services","PPPoE Server");
$pgtitle = array(gettext("Services"),gettext("PPPoE Server"));
include("head.inc");
?>
@ -272,8 +272,8 @@ function enable_change(enable_over) {
<tr><td class="tabnavtbl">
<?php
$tab_array = array();
$tab_array[0] = array("Configuration", true, "vpn_pppoe.php");
$tab_array[1] = array("Users", false, "vpn_pppoe_users.php");
$tab_array[0] = array(gettext("Configuration"), true, "vpn_pppoe.php");
$tab_array[1] = array(gettext("Users"), false, "vpn_pppoe_users.php");
display_top_tabs($tab_array);
?>
</td></tr>
@ -286,17 +286,17 @@ function enable_change(enable_over) {
<td width="78%" class="vtable">
<input name="mode" type="radio" onclick="enable_change(false)" value="off"
<?php if (($pconfig['mode'] != "server") && ($pconfig['mode'] != "redir")) echo "checked";?>>
Off</td>
<?=gettext("Off"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vtable">&nbsp;</td>
<td width="78%" class="vtable">
<input type="radio" name="mode" value="server" onclick="enable_change(false)" <?php if ($pconfig['mode'] == "server") echo "checked"; ?>>
Enable PPPoE server</td>
<?=gettext("Enable PPPoE server"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell"><b>Interface</b></td>
<td width="22%" valign="top" class="vncell"><b><?=gettext("Interface"); ?></b></td>
<td width="78%" valign="top" class="vtable">
<select name="interface" class="formselect" id="interface">
@ -314,7 +314,7 @@ function enable_change(enable_over) {
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Subnet netmask</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Subnet netmask"); ?></td>
<td width="78%" class="vtable">
<select id="pppoe_subnet" name="pppoe_subnet">
<?php
@ -327,11 +327,11 @@ function enable_change(enable_over) {
}
?>
</select>
<br>Hint: 24 is 255.255.255.0
<br><?=gettext("Hint"); ?>: 24 <?=gettext("is"); ?> 255.255.255.0
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">No. PPPoE users</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("No. PPPoE users"); ?></td>
<td width="78%" class="vtable">
<select id="n_pppoe_units" name="n_pppoe_units">
<?php
@ -344,104 +344,104 @@ function enable_change(enable_over) {
}
?>
</select>
<br>Hint: 10 is TEN pppoe clients
<br><?=gettext("Hint: 10 is TEN pppoe clients"); ?>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Server address</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Server address"); ?></td>
<td width="78%" class="vtable">
<?=$mandfldhtml;?><input name="localip" type="text" class="formfld unknown" id="localip" size="20" value="<?=htmlspecialchars($pconfig['localip']);?>">
<br>
Enter the IP address the PPPoE server should use on its side
for all clients.</td>
<?=gettext("Enter the IP address the PPPoE server should use on its side " .
"for all clients"); ?>.</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Remote address range</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Remote address range"); ?></td>
<td width="78%" class="vtable">
<?=$mandfldhtml;?><input name="remoteip" type="text" class="formfld unknown" id="remoteip" size="20" value="<?=htmlspecialchars($pconfig['remoteip']);?>">
<br>
Specify the starting address for the client IP address subnet.<br>
<?=gettext("Specify the starting address for the client IP address subnet"); ?>.<br>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">DNS servers</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("DNS servers"); ?></td>
<td width="78%" class="vtable">
<?=$mandfldhtml;?><input name="pppoe_dns1" type="text" class="formfld unknown" id="pppoe_dns1" size="20" value="<?=htmlspecialchars($pconfig['pppoe_dns1']);?>">
<br>
<input name="pppoe_dns2" type="text" class="formfld unknown" id="pppoe_dns2" size="20" value="<?=htmlspecialchars($pconfig['pppoe_dns2']);?>">
<br>
If entered they will be given to all PPPoE clients, else LAN DNS and one WAN DNS will go to all clients<br>
<?=gettext("If entered they will be given to all PPPoE clients, else LAN DNS and one WAN DNS will go to all clients"); ?><br>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">RADIUS</td>
<td width="22%" valign="top" class="vncell"><?=gettext("RADIUS"); ?></td>
<td width="78%" class="vtable">
<input name="radiusenable" type="checkbox" id="radiusenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiusenable']) echo "checked"; ?>>
<strong>Use a RADIUS server for authentication<br>
</strong>When set, all users will be authenticated using
the RADIUS server specified below. The local user database
will not be used.<br>
<strong><?=gettext("Use a RADIUS server for authentication"); ?><br>
</strong><?=gettext("When set, all users will be authenticated using " .
"the RADIUS server specified below. The local user database " .
"will not be used"); ?>.<br>
<br>
<input name="radacct_enable" type="checkbox" id="radacct_enable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radacct_enable']) echo "checked"; ?>>
<strong>Enable RADIUS accounting <br>
<strong><?=gettext("Enable RADIUS accounting"); ?> <br>
<br>
</strong>Sends accounting packets to the RADIUS server.<br>
</strong><?=gettext("Sends accounting packets to the RADIUS server"); ?>.<br>
<input name="radiussecenable" type="checkbox" id="radiussecenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiussecenable']) echo "checked"; ?>>
<strong>Use Backup Radius Server</strong><br>
When set, if primary server fails all requests will be sent via backup server</td>
<strong><?=gettext("Use Backup Radius Server"); ?></strong><br>
<?=gettext("When set, if primary server fails all requests will be sent via backup server"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">NAS IP Address</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("NAS IP Address"); ?></td>
<td width="78%" class="vtable">
<?=$mandfldhtml;?><input name="radius_nasip" type="text" class="formfld unknown" id="radius_nasip" size="20" value="<?=htmlspecialchars($pconfig['radius_nasip']);?>">
<br>radius server NAS ip Address<br>
<br><?=gettext("radius server NAS ip Address"); ?><br>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">RADIUS Accounting Update</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("RADIUS Accounting Update"); ?></td>
<td width="78%" class="vtable">
<?=$mandfldhtml;?><input name="radius_acct_update" type="text" class="formfld unknown" id="radius_acct_update" size="20" value="<?=htmlspecialchars($pconfig['radius_acct_update']);?>">
<br>Radius accounting update period in seconds
<br><?=gettext("Radius accounting update period in seconds"); ?>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">RADIUS issued IPs</td>
<td width="22%" valign="top" class="vncell"><?=gettext("RADIUS issued IPs"); ?></td>
<td width="78%" valign="top" class="vtable">
<input name="radiusissueips" value="yes" type="checkbox" class="formfld" id="radiusissueips"<?php if($pconfig['radiusissueips']) echo " CHECKED"; ?>>
<br>Issue IP Addresses via RADIUS server.</td>
<br><?=gettext("Issue IP Addresses via RADIUS server"); ?>.</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">RADIUS server Primary</td>
<td width="22%" valign="top" class="vncell"><?=gettext("RADIUS server Primary"); ?></td>
<td width="78%" class="vtable">
<input name="radiusserver" type="text" class="formfld unknown" id="radiusserver" size="20" value="<?=htmlspecialchars($pconfig['radiusserver']);?>">
<input name="radiusserverport" type="text" class="formfld unknown" id="radiusserverport" size="4" value="<?=htmlspecialchars($pconfig['radiusserverport']);?>">
<input name="radiusserveracctport" type="text" class="formfld unknown" id="radiusserveracctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserveracctport']);?>">
<br>Enter the IP address and port of the RADIUS server. Format ip auth_port acct_port<br>
<br> standard port 1812 and 1813 accounting</td>
<br><?=gettext("Enter the IP address and port of the RADIUS server. Format ip auth_port acct_port"); ?><br>
<br> <?=gettext("standard port 1812 and 1813 accounting"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">RADIUS primary shared secret</td>
<td width="22%" valign="top" class="vncell"><?=gettext("RADIUS primary shared secret"); ?></td>
<td width="78%" valign="top" class="vtable">
<input name="radiussecret" type="password" class="formfld pwd" id="radiussecret" size="20" value="<?=htmlspecialchars($pconfig['radiussecret']);?>">
<br>Enter the shared secret that will be used to authenticate
to the RADIUS server.</td>
<br><?=gettext("Enter the shared secret that will be used to authenticate " .
"to the RADIUS server"); ?>.</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">RADIUS server Secondary</td>
<td width="22%" valign="top" class="vncell"><?=gettext("RADIUS server Secondary"); ?></td>
<td width="78%" class="vtable">
<input name="radiusserver2" type="text" class="formfld unknown" id="radiusserver2" size="20" value="<?=htmlspecialchars($pconfig['radiusserver2']);?>">
<input name="radiusserver2port" type="text" class="formfld unknown" id="radiusserver2port" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2port']);?>">
<input name="radiusserver2acctport" type="text" class="formfld unknown" id="radiusserver2acctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2acctport']);?>">
<br>Enter the IP address and port of the BACKUP RADIUS server. Format ip auth_port acct_port<br>
<br> standard port 1812 and 1813 accounting</td>
<br><?=gettext("Enter the IP address and port of the BACKUP RADIUS server. Format ip auth_port acct_port"); ?><br>
<br> <?=gettext("standard port 1812 and 1813 accounting"); ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">RADIUS secondary shared secret</td>
<td width="22%" valign="top" class="vncell"><?=gettext("RADIUS secondary shared secret"); ?></td>
<td width="78%" valign="top" class="vtable">
<input name="radiussecret2" type="password" class="formfld pwd" id="radiussecret2" size="20" value="<?=htmlspecialchars($pconfig['radiussecret2']);?>">
<br>
Enter the shared secret that will be used to authenticate
to the RADIUS server.</td>
<?=gettext("Enter the shared secret that will be used to authenticate " .
"to the RADIUS server"); ?>.</td>
</tr>
<tr>
<td height="16" colspan="2" valign="top"></td>
@ -449,14 +449,14 @@ function enable_change(enable_over) {
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%">
<input name="Submit" type="submit" class="formbtn" value="Save" onclick="enable_change(true)">
<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" onclick="enable_change(true)">
</td>
</tr>
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%"><span class="vexpl"><span class="red"><strong>Note:<br>
</strong></span>don't forget to add a firewall rule to permit
traffic from PPPoE clients!</span></td>
<td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note"); ?>:<br>
</strong></span><?=gettext("don't forget to add a firewall rule to permit " .
"traffic from PPPoE clients"); ?>!</span></td>
</tr>
</table>
</div>

22
usr/local/www/vpn_pppoe_users.php
View File

@ -68,7 +68,7 @@ if ($_GET['act'] == "del") {
}
}
$pgtitle = array("Services","PPPoE Server","Users");
$pgtitle = array(gettext("Services"),gettext("PPPoE Server"),gettext("Users"));
include("head.inc");
?>
@ -78,16 +78,16 @@ include("head.inc");
<form action="vpn_pppoe_users.php" method="post">
<?php if ($savemsg) print_info_box($savemsg); ?>
<?php if (isset($config['pppoe']['radius']['enable']))
print_info_box("Warning: RADIUS is enabled. The local user database will not be used."); ?>
print_info_box(gettext("Warning: RADIUS is enabled. The local user database will not be used.")); ?>
<?php if (is_subsystem_dirty('pppoeusers')): ?><p>
<?php print_info_box_np("The PPPoE user list has been modified.<br>You must apply the changes in order for them to take effect.<br><b>Warning: this will terminate all current PPPoE sessions!</b>");?><br>
<?php print_info_box_np(gettext("The PPPoE user list has been modified") . ".<br>" . gettext("You must apply the changes in order for them to take effect") . ".<br><b>" . gettext("Warning: this will terminate all current PPPoE sessions") . "!</b>");?><br>
<?php endif; ?>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td class="tabnavtbl">
<?php
$tab_array = array();
$tab_array[0] = array("Configuration", false, "vpn_pppoe.php");
$tab_array[1] = array("Users", true, "vpn_pppoe_users.php");
$tab_array[0] = array(gettext("Configuration"), false, "vpn_pppoe.php");
$tab_array[1] = array(gettext("Users"), true, "vpn_pppoe_users.php");
display_top_tabs($tab_array);
?> </td></tr>
<tr>
@ -95,13 +95,13 @@ include("head.inc");
<div id="mainarea">
<table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td class="listhdrr">Username</td>
<td class="listhdr">IP address</td>
<td class="listhdrr"><?=gettext("Username"); ?></td>
<td class="listhdr"><?=gettext("IP address"); ?></td>
<td class="list">
<table border="0" cellspacing="0" cellpadding="1">
<tr>
<td width="17"></td>
<td><a href="vpn_pppoe_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td>
<td><a href="vpn_pppoe_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add user"); ?>" width="17" height="17" border="0"></a></td>
</tr>
</table>
</td>
@ -115,8 +115,8 @@ include("head.inc");
<?php if($secretent['ip'] == "") $secretent['ip'] = "Dynamic"; ?>
<?=htmlspecialchars($secretent['ip']);?>&nbsp;
</td>
<td class="list" nowrap> <a href="vpn_pppoe_users_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="edit user" width="17" height="17" border="0"></a>
&nbsp;<a href="vpn_pppoe_users.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this user?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="delete user" width="17" height="17" border="0"></a></td>
<td class="list" nowrap> <a href="vpn_pppoe_users_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit user"); ?>" width="17" height="17" border="0"></a>
&nbsp;<a href="vpn_pppoe_users.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this user?"); ?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete user"); ?>" width="17" height="17" border="0"></a></td>
</tr>
<?php $i++; endforeach; ?>
<tr>
@ -125,7 +125,7 @@ include("head.inc");
<table border="0" cellspacing="0" cellpadding="1">
<tr>
<td width="17"></td>
<td><a href="vpn_pppoe_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add user" width="17" height="17" border="0"></a></td>
<td><a href="vpn_pppoe_users_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add user"); ?>" width="17" height="17" border="0"></a></td>
</tr>
</table>
</td>

32
usr/local/www/vpn_pppoe_users_edit.php
View File

@ -73,32 +73,32 @@ if ($_POST) {
/* input validation */
if (isset($id) && ($a_secret[$id])) {
$reqdfields = explode(" ", "username");
$reqdfieldsn = explode(",", "Username");
$reqdfieldsn = array(gettext("Username"));
} else {
$reqdfields = explode(" ", "username password");
$reqdfieldsn = explode(",", "Username,Password");
$reqdfieldsn = array(gettext("Username,Password"));
}
do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
if (preg_match("/[^a-zA-Z0-9\.\-\@_]/", $_POST['username']))
$input_errors[] = "The username contains invalid characters.";
$input_errors[] = gettext("The username contains invalid characters.");
if (preg_match("/[^a-zA-Z0-9\.\-_]/", $_POST['password']))
$input_errors[] = "The password contains invalid characters.";
$input_errors[] = gettext("The password contains invalid characters.");
if (($_POST['password']) && ($_POST['password'] != $_POST['password2'])) {
$input_errors[] = "The passwords do not match.";
$input_errors[] = gettext("The passwords do not match.");
}
if (($_POST['ip'] && !is_ipaddr($_POST['ip']))) {
$input_errors[] = "The IP address entered is not valid.";
$input_errors[] = gettext("The IP address entered is not valid.");
}
if (!$input_errors && !(isset($id) && $a_secret[$id])) {
/* make sure there are no dupes */
foreach ($a_secret as $secretent) {
if ($secretent['name'] == $_POST['username']) {
$input_errors[] = "Another entry with the same username already exists.";
$input_errors[] = gettext("Another entry with the same username already exists.");
break;
}
}
@ -130,7 +130,7 @@ if ($_POST) {
}
}
$pgtitle = array("Services","PPPoE Server","User","Edit");
$pgtitle = array(gettext("Services"),gettext("PPPoE Server"),gettext("User"),gettext("Edit"));
include("head.inc");
?>
@ -141,29 +141,29 @@ include("head.inc");
<div id="mainarea">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td width="22%" valign="top" class="vncellreq">Username</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Username"); ?></td>
<td width="78%" class="vtable">
<?=$mandfldhtml;?><input name="username" type="text" class="formfld user" id="username" size="20" value="<?=htmlspecialchars($pconfig['username']);?>">
</td>
<tr>
<td width="22%" valign="top" class="vncellreq">Password</td>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Password"); ?></td>
<td width="78%" class="vtable">
<?=$mandfldhtml;?><input name="password" type="password" class="formfld pwd" id="password" size="20">
<br><?=$mandfldhtml;?><input name="password2" type="password" class="formfld pwd" id="password2" size="20">
&nbsp;(confirmation)<?php if (isset($id) && $a_secret[$id]): ?><br>
<span class="vexpl">If you want to change the users' password,
enter it here twice.</span><?php endif; ?></td>
&nbsp;(<?=gettext("confirmation"); ?>)<?php if (isset($id) && $a_secret[$id]): ?><br>
<span class="vexpl"><?=gettext("If you want to change the users' password, " .
"enter it here twice"); ?>.</span><?php endif; ?></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncell">IP address</td>
<td width="22%" valign="top" class="vncell"><?=gettext("IP address"); ?></td>
<td width="78%" class="vtable">
<input name="ip" type="text" class="formfld unknown" id="ip" size="20" value="<?=htmlspecialchars($pconfig['ip']);?>">
<br><span class="vexpl">If you want the user to be assigned a specific IP address, enter it here.</span></td>
<br><span class="vexpl"><?=gettext("If you want the user to be assigned a specific IP address, enter it here"); ?>.</span></td>
</tr>
<tr>
<td class="vncell" width="22%" valign="top">&nbsp;</td>
<td class="vncell" width="78%">
<input name="Submit" type="submit" class="formbtn" value="Save">
<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">
<?php if (isset($id) && $a_secret[$id]): ?>
<input name="id" type="hidden" value="<?=$id;?>">
<?php endif; ?>