diff options
Diffstat (limited to 'src/usr/local/www')
| -rw-r--r-- | src/usr/local/www/firewall_aliases_edit.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_aliases_import.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_nat_edit.php | 10 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_nat_out_edit.php | 6 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 8 | ||||
| -rw-r--r-- | src/usr/local/www/load_balancer_pool_edit.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/load_balancer_virtual_server_edit.php | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index c73aa3b..7a38c57 100644 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -429,7 +429,7 @@ if ($_POST['save']) { } } } else if ($_POST['type'] == "port") { - if (!is_portorrange($input_address)) { + if (!is_port_or_range($input_address)) { $input_errors[] = sprintf(gettext("%s is not a valid port or alias."), $input_address); } } else if ($_POST['type'] == "host" || $_POST['type'] == "network") { diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php index a8c02aa..df7fd86 100644 --- a/src/usr/local/www/firewall_aliases_import.php +++ b/src/usr/local/www/firewall_aliases_import.php @@ -121,7 +121,7 @@ if ($_POST) { if ($tab == "port") { // Port alias if (!empty($impip)) { - if (is_portorrange($impip)) { + if (is_port_or_range($impip)) { $imported_ips[] = $impip; $imported_descs[] = $impdesc; } else { diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index 8a1e029..ddba4fa 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -259,20 +259,20 @@ if ($_POST['save']) { $input_errors[] = sprintf(gettext("Redirect target IP must be IPv4.")); } - if ($_POST['srcbeginport'] && !is_portoralias($_POST['srcbeginport'])) { + if ($_POST['srcbeginport'] && !is_port_or_alias($_POST['srcbeginport'])) { $input_errors[] = sprintf(gettext("%s is not a valid start source port. It must be a port alias or integer between 1 and 65535."), $_POST['srcbeginport']); } - if ($_POST['srcendport'] && !is_portoralias($_POST['srcendport'])) { + if ($_POST['srcendport'] && !is_port_or_alias($_POST['srcendport'])) { $input_errors[] = sprintf(gettext("%s is not a valid end source port. It must be a port alias or integer between 1 and 65535."), $_POST['srcendport']); } - if ($_POST['dstbeginport'] && !is_portoralias($_POST['dstbeginport'])) { + if ($_POST['dstbeginport'] && !is_port_or_alias($_POST['dstbeginport'])) { $input_errors[] = sprintf(gettext("%s is not a valid start destination port. It must be a port alias or integer between 1 and 65535."), $_POST['dstbeginport']); } - if ($_POST['dstendport'] && !is_portoralias($_POST['dstendport'])) { + if ($_POST['dstendport'] && !is_port_or_alias($_POST['dstendport'])) { $input_errors[] = sprintf(gettext("%s is not a valid end destination port. It must be a port alias or integer between 1 and 65535."), $_POST['dstendport']); } - if ((strtoupper($_POST['proto']) == "TCP" || strtoupper($_POST['proto']) == "UDP" || strtoupper($_POST['proto']) == "TCP/UDP") && (!isset($_POST['nordr']) && !is_portoralias($_POST['localbeginport']))) { + if ((strtoupper($_POST['proto']) == "TCP" || strtoupper($_POST['proto']) == "UDP" || strtoupper($_POST['proto']) == "TCP/UDP") && (!isset($_POST['nordr']) && !is_port_or_alias($_POST['localbeginport']))) { $input_errors[] = sprintf(gettext("%s is not a valid redirect target port. It must be a port alias or integer between 1 and 65535."), $_POST['localbeginport']); } diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index d4f2308..ad7e3d0 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -189,15 +189,15 @@ if ($_POST['save']) { $_POST['target'] = substr($_POST['target'], 1); } - if ($protocol_uses_ports && $_POST['sourceport'] <> "" && !is_portorrangeoralias($_POST['sourceport'])) { + if ($protocol_uses_ports && $_POST['sourceport'] <> "" && !is_port_or_range_or_alias($_POST['sourceport'])) { $input_errors[] = gettext("A valid port or port alias must be supplied for the source port entry."); } - if ($protocol_uses_ports && $_POST['dstport'] <> "" && !is_portorrangeoralias($_POST['dstport'])) { + if ($protocol_uses_ports && $_POST['dstport'] <> "" && !is_port_or_range_or_alias($_POST['dstport'])) { $input_errors[] = gettext("A valid port or port alias must be supplied for the destination port entry."); } - if ($protocol_uses_ports && $_POST['natport'] <> "" && !is_portorrangeoralias($_POST['natport']) && !isset($_POST['nonat'])) { + if ($protocol_uses_ports && $_POST['natport'] <> "" && !is_port_or_range_or_alias($_POST['natport']) && !isset($_POST['nonat'])) { $input_errors[] = gettext("A valid port must be supplied for the NAT port entry."); } diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index dcc96de..1012906 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -491,16 +491,16 @@ if ($_POST['save']) { $_POST['dstendport'] = 0; } - if ($_POST['srcbeginport'] && !is_portoralias($_POST['srcbeginport'])) { + if ($_POST['srcbeginport'] && !is_port_or_alias($_POST['srcbeginport'])) { $input_errors[] = sprintf(gettext("%s is not a valid start source port. It must be a port alias or integer between 1 and 65535."), $_POST['srcbeginport']); } - if ($_POST['srcendport'] && !is_portoralias($_POST['srcendport'])) { + if ($_POST['srcendport'] && !is_port_or_alias($_POST['srcendport'])) { $input_errors[] = sprintf(gettext("%s is not a valid end source port. It must be a port alias or integer between 1 and 65535."), $_POST['srcendport']); } - if ($_POST['dstbeginport'] && !is_portoralias($_POST['dstbeginport'])) { + if ($_POST['dstbeginport'] && !is_port_or_alias($_POST['dstbeginport'])) { $input_errors[] = sprintf(gettext("%s is not a valid start destination port. It must be a port alias or integer between 1 and 65535."), $_POST['dstbeginport']); } - if ($_POST['dstendport'] && !is_portoralias($_POST['dstendport'])) { + if ($_POST['dstendport'] && !is_port_or_alias($_POST['dstendport'])) { $input_errors[] = sprintf(gettext("%s is not a valid end destination port. It must be a port alias or integer between 1 and 65535."), $_POST['dstendport']); } if (!$_POST['srcbeginport_cust'] && $_POST['srcendport_cust']) { diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index 6478d8c..265f5d1 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -93,7 +93,7 @@ if ($_POST['save']) { $input_errors[] = sprintf(gettext("Sorry, an alias is already named %s."), $_POST['name']); } - if (!is_portoralias($_POST['port'])) { + if (!is_port_or_alias($_POST['port'])) { $input_errors[] = gettext("The port must be an integer between 1 and 65535, or a port alias."); } diff --git a/src/usr/local/www/load_balancer_virtual_server_edit.php b/src/usr/local/www/load_balancer_virtual_server_edit.php index 17fd92a..9d5463c 100644 --- a/src/usr/local/www/load_balancer_virtual_server_edit.php +++ b/src/usr/local/www/load_balancer_virtual_server_edit.php @@ -88,7 +88,7 @@ if ($_POST['save']) { $input_errors[] = gettext("The 'name' field must be 32 characters or less."); } - if ($_POST['port'] != "" && !is_portoralias($_POST['port'])) { + if ($_POST['port'] != "" && !is_port_or_alias($_POST['port'])) { $input_errors[] = gettext("The port must be an integer between 1 and 65535, a port alias, or left blank."); } |
