From 183a4aae1c16f3978726879a90945ed983884185 Mon Sep 17 00:00:00 2001 From: Bill Marquette Date: Sun, 3 Jul 2005 18:28:13 +0000 Subject: Change "Inbound NAT" to "Port Forward" Update _edit.php's to use diaplay_topbar() Change "Outgoing" to "Outbound" for consistency between load balancing and NAT --- usr/local/www/firewall_aliases_edit.php | 7 ++++--- usr/local/www/firewall_nat.php | 8 ++++---- usr/local/www/firewall_nat_1to1.php | 6 +++--- usr/local/www/firewall_nat_1to1_edit.php | 1 + usr/local/www/firewall_nat_edit.php | 9 ++++----- usr/local/www/firewall_nat_out.php | 8 ++++---- usr/local/www/firewall_nat_out_edit.php | 5 +++-- usr/local/www/firewall_nat_server.php | 8 ++++---- usr/local/www/firewall_nat_server_edit.php | 5 +++-- 9 files changed, 30 insertions(+), 27 deletions(-) (limited to 'usr') diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 2a110f2..08d0b65 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -133,8 +133,7 @@ if ($_POST) { } } -$pgtitle = "System: Firewall: Aliases: Edit alias"; -$closehead = false; +$pgtitle = "System: Firewall: Aliases: Edit"; include("head.inc"); ?> @@ -203,7 +202,6 @@ function update_box_type() { --> - @@ -233,6 +231,9 @@ rowtype[2] = "select";

+ + + diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php index ba1c364..14d985e 100755 --- a/usr/local/www/firewall_nat_1to1.php +++ b/usr/local/www/firewall_nat_1to1.php @@ -86,11 +86,11 @@ include("head.inc");

Edit Alias
Name	The name of the alias may only consist diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index 877453b..cf11e19 100755 --- a/usr/local/www/firewall_nat.php +++ b/usr/local/www/firewall_nat.php @@ -125,7 +125,7 @@ if (isset($_POST['del_x'])) { } } -$pgtitle = "Firewall: NAT: Inbound"; +$pgtitle = "Firewall: NAT: Port Forward"; include("head.inc"); ?> @@ -144,11 +144,11 @@ include("head.inc");

diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php index f53dc4d..26fed2a 100755 --- a/usr/local/www/firewall_nat_1to1_edit.php +++ b/usr/local/www/firewall_nat_1to1_edit.php @@ -150,6 +150,7 @@ include("head.inc");

diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index ace7e8e..6b6b343 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -188,8 +188,7 @@ if ($_POST) { } } -$pgtitle = "Firewall: NAT: Edit inbound"; -$closehead = false; +$pgtitle = "Firewall: NAT: Port Forward: Edit"; include("head.inc"); ?> @@ -222,15 +221,15 @@ function ext_rep_change() { } //--> -

Interface

- + + NAT Addresses page first). Also note that if you are trying to redirect connections on the LAN select the "any" option. diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index 0339c6e..b3796c8 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -172,7 +172,7 @@ if (isset($_POST['del_x'])) { } -$pgtitle = "Firewall: NAT: Outgoing"; +$pgtitle = "Firewall: NAT: Outbound"; include("head.inc"); ?> @@ -190,11 +190,11 @@ include("head.inc");

Interface
Protocol

diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php index 04c4e82..c176231 100755 --- a/usr/local/www/firewall_nat_out_edit.php +++ b/usr/local/www/firewall_nat_out_edit.php @@ -131,7 +131,7 @@ if ($_POST) { . $_POST['destination_subnet']; if ($_POST['target']) { - /* check for clashes with 1:1 NAT (Server NAT is OK) */ + /* check for clashes with 1:1 NAT (NAT Addresses is OK) */ if (is_array($config['nat']['onetoone'])) { foreach ($config['nat']['onetoone'] as $natent) { if (check_subnets_overlap($_POST['target'], 32, $natent['external'], $natent['subnet'])) { @@ -244,8 +244,9 @@ function sourcesel_change() {

- +

Interface

diff --git a/usr/local/www/firewall_nat_server_edit.php b/usr/local/www/firewall_nat_server_edit.php index 26b6048..6b11199 100755 --- a/usr/local/www/firewall_nat_server_edit.php +++ b/usr/local/www/firewall_nat_server_edit.php @@ -65,7 +65,7 @@ if ($_POST) { } if ($_POST['ipaddr'] == $config['interfaces']['wan']['ipaddr']) - $input_errors[] = "The WAN IP address may not be used in a Server NAT entry."; + $input_errors[] = "The WAN IP address may not be used in a NAT Address entry."; /* check for overlaps with other server NAT */ foreach ($a_snat as $natent) { @@ -112,7 +112,7 @@ if ($_POST) { } } -$pgtitle = "Firewall: NAT: Server NAT: Edit"; +$pgtitle = "Firewall: NAT: NAT Addresses: Edit"; include("head.inc"); ?> @@ -122,6 +122,7 @@ include("head.inc");

-- cgit v1.1

External IP address