lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

www: more of the same typo

Browse Source
This commit is contained in:
Franco Fichtner 2018-05-03 21:34:29 +02:00
parent a584cb16e9
commit 10cf1bbcc2
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/auth.inc
View File

@ -49,7 +49,7 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][
/* DNS ReBinding attack prevention */
$found_host = false;
/* Either a IPv6 address with or without a alternate port */
/* either an IPv6 address with or without an alternate port */
if (strstr($_SERVER['HTTP_HOST'], "]")) {
$http_host_port = explode("]", $_SERVER['HTTP_HOST']);
/* v6 address has more parts, drop the last part */

10
src/etc/inc/gwlb.inc
View File

@ -534,7 +534,7 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive
$gateway['dynamic'] = true;
$found_defaultv4 = 1;
}
/* Loopback dummy for dynamic interfaces without a IP */
/* loopback dummy for dynamic interfaces without an IP */
if (!is_ipaddrv4($gateway['gateway']) && $gateway['dynamic'] == true) {
$gateway['gateway'] = "dynamic";
}
@ -621,7 +621,7 @@ function return_gateways_array($disabled = false, $localhost = false, $inactive
$found_defaultv6 = 1;
}
/* Loopback dummy for dynamic interfaces without a IP */
/* loopback dummy for dynamic interfaces without an IP */
if (!is_ipaddrv6($gateway['gateway']) && $gateway['dynamic'] == true) {
$gateway['gateway'] = "dynamic";
}
@ -983,8 +983,10 @@ function get_interface_gateway_v6($interface, &$dynamic = false)
return ($gw);
}
/* Check a IP address against a gateway IP or name
* to verify it's address family */
/*
* Check an IP address against a gateway IP
* or name to verify it's address family
*/
function validate_address_family($ipaddr, $gwname)
{
$v4ip = false;

1
src/etc/inc/interfaces.inc
View File

@ -3827,7 +3827,6 @@ function get_real_interface($interface = 'wan', $family = 'all')
return $wanif;
}
/* Guess the physical interface by providing a IP address */
function guess_interface_from_ip($ipaddress)
{
if (!is_ipaddr($ipaddress)) {

2
src/etc/inc/util.inc
View File

@ -368,7 +368,7 @@ function ip_range_to_subnet_array($startip, $endip)
return $rangesubnets;
}
/* returns true if $ipaddr is a valid dotted IPv4 address or a IPv6 */
/* returns true if $ipaddr is a valid dotted IPv4 address or an IPv6 */
function is_ipaddr($ipaddr)
{
if (is_ipaddrv4($ipaddr)) {

12
src/www/firewall_rules_edit.php
View File

@ -228,24 +228,24 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$family = 'inet6';
}
if(($pconfig['ipprotocol'] == "inet6") && ($pconfig['ipprotocol'] != $family)) {
$input_errors[] = gettext("You can not assign a IPv4 gateway group on IPv6 Address Family rule");
$input_errors[] = gettext('You can not assign an IPv4 gateway group on an IPv6 rule.');
}
if(($pconfig['ipprotocol'] == "inet") && ($pconfig['ipprotocol'] != $family)) {
$input_errors[] = gettext("You can not assign a IPv6 gateway group on IPv4 Address Family rule");
$input_errors[] = gettext('You can not assign an IPv6 gateway group on an IPv4 rule.');
}
}
}
}
if (!empty($pconfig['gateway']) && is_ipaddr(lookup_gateway_ip_by_name($pconfig['gateway']))) {
if ($pconfig['ipprotocol'] == "inet6" && !is_ipaddrv6(lookup_gateway_ip_by_name($pconfig['gateway']))) {
$input_errors[] = gettext("You can not assign the IPv4 Gateway to a IPv6 Filter rule");
$input_errors[] = gettext('You can not assign the IPv4 Gateway to an IPv6 filter rule.');
}
if ($pconfig['ipprotocol'] == "inet" && !is_ipaddrv4(lookup_gateway_ip_by_name($pconfig['gateway']))) {
$input_errors[] = gettext("You can not assign the IPv6 Gateway to a IPv4 Filter rule");
$input_errors[] = gettext('You can not assign the IPv6 Gateway to an IPv4 filter rule.');
}
}
if ($pconfig['protocol'] == "icmp" && !empty($pconfig['icmptype']) && $pconfig['ipprotocol'] == "inet46") {
$input_errors[] = gettext("You can not assign a ICMP type to a rule that applies to IPv4 and IPv6");
$input_errors[] = gettext('You can not assign an ICMP type to a rule that applies to IPv4 and IPv6.');
}
if ($pconfig['statetype'] == "synproxy state" || $pconfig['statetype'] == "modulate state") {
if ($pconfig['protocol'] != "tcp") {
@ -307,7 +307,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
if ((is_ipaddr($pconfig['src']) || is_ipaddr($pconfig['dst'])) && ($pconfig['ipprotocol'] == "inet46")) {
$input_errors[] = gettext("You can not use a IPv4 or IPv6 address in combined IPv4 + IPv6 rules.");
$input_errors[] = gettext('You can not use an IPv4 or IPv6 address in combined IPv4 + IPv6 rules.');
}
if (!empty($pconfig['os'])) {
if ($pconfig['protocol'] != "tcp") {

2
src/www/system_hasync.php
View File

@ -174,7 +174,7 @@ include("head.inc");
<div class="well">
<lu>
<li><?=gettext('We recommend setting this to a interface other than LAN! A dedicated interface works the best.') ?></li>
<li><?=gettext('You must define a IP on each machine participating in this failover group.') ?></li>
<li><?=gettext('You must define an IP on each machine participating in this failover group.') ?></li>
<li><?=gettext('You must have an IP assigned to the interface on any participating sync nodes.') ?></li>
</lu>
</div>