summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorBill Marquette <billm@pfsense.org>2005-07-03 18:28:13 +0000
committerBill Marquette <billm@pfsense.org>2005-07-03 18:28:13 +0000
commit183a4aae1c16f3978726879a90945ed983884185 (patch)
treed3b457b08809e93fbea70c5348d3030226f786f1 /usr
parent305eae3c233dadac95f5a8a4a6282d69acb2cad8 (diff)
downloadpfsense-183a4aae1c16f3978726879a90945ed983884185.zip
pfsense-183a4aae1c16f3978726879a90945ed983884185.tar.gz
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
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/firewall_aliases_edit.php7
-rwxr-xr-xusr/local/www/firewall_nat.php8
-rwxr-xr-xusr/local/www/firewall_nat_1to1.php6
-rwxr-xr-xusr/local/www/firewall_nat_1to1_edit.php1
-rwxr-xr-xusr/local/www/firewall_nat_edit.php9
-rwxr-xr-xusr/local/www/firewall_nat_out.php8
-rwxr-xr-xusr/local/www/firewall_nat_out_edit.php5
-rwxr-xr-xusr/local/www/firewall_nat_server.php8
-rwxr-xr-xusr/local/www/firewall_nat_server_edit.php5
9 files changed, 30 insertions, 27 deletions
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() {
-->
</script>
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
@@ -233,6 +231,9 @@ rowtype[2] = "select";
<form action="firewall_aliases_edit.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
+ <td colspan="2" valign="top" class="listtopic">Edit Alias</td>
+ </tr>
+ <tr>
<td valign="top" class="vncellreq">Name</td>
<td class="vtable"> <input name="name" type="text" class="formfld" id="name" size="40" value="<?=htmlspecialchars($pconfig['name']);?>">
<br> <span class="vexpl">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");
<tr><td>
<?php
$tab_array = array();
- $tab_array[0] = array("Inbound", true, "firewall_nat.php");
- $tab_array[1] = array("Server NAT", false, "firewall_nat_server.php");
+ $tab_array[0] = array("Port Forward", true, "firewall_nat.php");
+ $tab_array[1] = array("NAT Addresses", false, "firewall_nat_server.php");
$tab_array[2] = array("1:1", false, "firewall_nat_1to1.php");
$tab_array[3] = array("Outbound", false, "firewall_nat_out.php");
- $tab_array[4] = array("Outgoing Load Balancing", false, "firewall_nat_out_load_balancing.php");
+ $tab_array[4] = array("Outbound Load Balancing", false, "firewall_nat_out_load_balancing.php");
display_top_tabs($tab_array);
?>
</td></tr>
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");
<table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td>
<?php
$tab_array = array();
- $tab_array[0] = array("Inbound", false, "firewall_nat.php");
- $tab_array[1] = array("Server NAT", false, "firewall_nat_server.php");
+ $tab_array[0] = array("Port Forward", false, "firewall_nat.php");
+ $tab_array[1] = array("NAT Addresses", false, "firewall_nat_server.php");
$tab_array[2] = array("1:1", true, "firewall_nat_1to1.php");
$tab_array[3] = array("Outbound", false, "firewall_nat_out.php");
- $tab_array[4] = array("Outgoing Load Balancing", false, "firewall_nat_out_load_balancing.php");
+ $tab_array[4] = array("Outbound Load Balancing", false, "firewall_nat_out_load_balancing.php");
display_top_tabs($tab_array);
?>
</td></tr>
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");
<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<form action="firewall_nat_1to1_edit.php" method="post" name="iform" id="iform">
+ <?display_topbar()?>
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td width="22%" valign="top" class="vncellreq">Interface</td>
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() {
}
//-->
</script>
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<form action="firewall_nat_edit.php" method="post" name="iform" id="iform">
+ <?display_topbar()?>
<table width="100%" border="0" cellpadding="6" cellspacing="0">
- <tr>
+ <tr>
<td width="22%" valign="top" class="vncellreq">Interface</td>
<td width="78%" class="vtable">
<select name="interface" class="formfld">
@@ -263,7 +262,7 @@ function ext_rep_change() {
<span class="vexpl">
If you want this rule to apply to another IP address than the IP address of the interface chosen above,
select it here (you need to define IP addresses on the
- <a href="firewall_nat_server.php">Server NAT</a> page first). Also note that if you are trying to redirect connections on the LAN select the "any" option.</span></td>
+ <a href="firewall_nat_server.php">NAT Addresses</a> page first). Also note that if you are trying to redirect connections on the LAN select the "any" option.</span></td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Protocol</td>
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");
<table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td>
<?php
$tab_array = array();
- $tab_array[0] = array("Inbound", false, "firewall_nat.php");
- $tab_array[1] = array("Server NAT", false, "firewall_nat_server.php");
+ $tab_array[0] = array("Port Forward", false, "firewall_nat.php");
+ $tab_array[1] = array("NAT Addresses", false, "firewall_nat_server.php");
$tab_array[2] = array("1:1", false, "firewall_nat_1to1.php");
$tab_array[3] = array("Outbound", true, "firewall_nat_out.php");
- $tab_array[4] = array("Outgoing Load Balancing", false, "firewall_nat_out_load_balancing.php");
+ $tab_array[4] = array("Outbound Load Balancing", false, "firewall_nat_out_load_balancing.php");
display_top_tabs($tab_array);
?>
</td></tr>
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() {
<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<form action="firewall_nat_out_edit.php" method="post" name="iform" id="iform">
+ <?display_topbar()?>
<table width="100%" border="0" cellpadding="6" cellspacing="0">
- <tr>
+ <tr>
<td width="22%" valign="top" class="vncellreq">Interface</td>
<td width="78%" class="vtable">
<select name="interface" class="formfld">
diff --git a/usr/local/www/firewall_nat_server.php b/usr/local/www/firewall_nat_server.php
index 78de460..893981b 100755
--- a/usr/local/www/firewall_nat_server.php
+++ b/usr/local/www/firewall_nat_server.php
@@ -82,7 +82,7 @@ if ($_GET['act'] == "del") {
}
}
-$pgtitle = "Firewall: NAT: Server NAT";
+$pgtitle = "Firewall: NAT: NAT Addresses";
include("head.inc");
?>
@@ -99,11 +99,11 @@ include("head.inc");
<table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td>
<?php
$tab_array = array();
- $tab_array[0] = array("Inbound", false, "firewall_nat.php");
- $tab_array[1] = array("Server NAT", true, "firewall_nat_server.php");
+ $tab_array[0] = array("Port Forward", false, "firewall_nat.php");
+ $tab_array[1] = array("NAT Addresses", true, "firewall_nat_server.php");
$tab_array[2] = array("1:1", false, "firewall_nat_1to1.php");
$tab_array[3] = array("Outbound", false, "firewall_nat_out.php");
- $tab_array[4] = array("Outgoing Load Balancing", false, "firewall_nat_out_load_balancing.php");
+ $tab_array[4] = array("Outbound Load Balancing", false, "firewall_nat_out_load_balancing.php");
display_top_tabs($tab_array);
?>
</td></tr>
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");
<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<form action="firewall_nat_server_edit.php" method="post" name="iform" id="iform">
+ <?display_topbar()?>
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
<td width="22%" valign="top" class="vncellreq">External IP address</td>
OpenPOWER on IntegriCloud