diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index d4ca0609f..adf104ff3 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -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 */ diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index 984718f89..f827a926b 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -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; diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index dc700a388..9f69d45d0 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -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)) { diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index fe71123c6..19fc6711c 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -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)) { diff --git a/src/www/firewall_rules_edit.php b/src/www/firewall_rules_edit.php index 03c7f489b..c84145338 100644 --- a/src/www/firewall_rules_edit.php +++ b/src/www/firewall_rules_edit.php @@ -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") { diff --git a/src/www/system_hasync.php b/src/www/system_hasync.php index d551c53a8..448989952 100644 --- a/src/www/system_hasync.php +++ b/src/www/system_hasync.php @@ -174,7 +174,7 @@ include("head.inc");
    • -
    • +