From d732f18698038b27df5a36f57285e79cc17a4314 Mon Sep 17 00:00:00 2001 From: Bill Marquette Date: Mon, 4 Jul 2005 00:13:27 +0000 Subject: Fix bottom rounds --- usr/local/www/carp_status.php | 20 +++++------ usr/local/www/firewall_nat.php | 21 +++++------- usr/local/www/firewall_nat_1to1.php | 22 ++++++------ usr/local/www/firewall_nat_out.php | 15 +++------ usr/local/www/firewall_nat_server.php | 24 ++++++-------- usr/local/www/firewall_rules.php | 46 +++++++++++--------------- usr/local/www/firewall_shaper.php | 23 ++++++------- usr/local/www/firewall_shaper_queues.php | 20 +++++------ usr/local/www/interfaces_assign.php | 16 +++------ usr/local/www/interfaces_vlan.php | 16 +++------ usr/local/www/pkg_mgr.php | 14 +++----- usr/local/www/pkg_mgr_installed.php | 19 +++-------- usr/local/www/services_captiveportal.php | 12 +++---- usr/local/www/services_captiveportal_ip.php | 12 +++---- usr/local/www/services_captiveportal_mac.php | 12 +++---- usr/local/www/services_captiveportal_users.php | 18 ++++------ usr/local/www/services_dhcp.php | 16 +++------ usr/local/www/services_dhcp_relay.php | 14 +++----- 18 files changed, 130 insertions(+), 210 deletions(-) diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index fd0895b..ca0df25 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -68,7 +68,6 @@ include("fbegin.inc");
-
-
@@ -80,8 +79,10 @@ include("fbegin.inc"); display_top_tabs($tab_array); ?>
- +
+
+ +
"; } +echo "
"; if(!is_array($config['installedpackages']['carp']['config'])) { - echo "

Could not locate any defined CARP interfaces."; + echo "

Could not locate any defined CARP interfaces."; echo "
"; include("fend.inc"); @@ -103,7 +105,7 @@ if(!is_array($config['installedpackages']['carp']['config'])) {

- +
@@ -161,16 +163,10 @@ if($config['installedpackages']['carp']['config'] <> "")
Carp Interface
+ - - - - diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index cf11e19..01d127d 100755 --- a/usr/local/www/firewall_nat.php +++ b/usr/local/www/firewall_nat.php @@ -139,7 +139,6 @@ include("head.inc");

You must apply the changes in order for them to take effect.");?> -

- + + +
- + -
+
+ @@ -235,14 +235,17 @@ include("head.inc");
   
-

Note:
+

Note:
It is not possible to access NATed services using the WAN IP address from within the LAN (or an optional network).

+
+ - "") { @@ -252,11 +255,5 @@ if ($pkg['tabs'] <> "") {
- - - diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php index 14d985e..9147eb4 100755 --- a/usr/local/www/firewall_nat_1to1.php +++ b/usr/local/www/firewall_nat_1to1.php @@ -82,7 +82,6 @@ include("head.inc");

You must apply the changes in order for them to take effect.");?>
-

- + + + +
- + -
+
+ @@ -145,18 +145,18 @@ include("head.inc");
Interface External IP
-

Note:
+

+

Note:
Depending on the way your WAN connection is setup, you may also need proxy ARP.

-
+
+ - - diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index b3796c8..f8a3f2a 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -186,7 +186,6 @@ include("head.inc");

You must apply the changes in order for them to take effect.");?>
-

-
- +
+
+

> @@ -228,8 +228,7 @@ include("head.inc");

-  
- +
@@ -321,15 +320,11 @@ include("head.inc");
   
+
-
- diff --git a/usr/local/www/firewall_nat_server.php b/usr/local/www/firewall_nat_server.php index 893981b..8c58b7e 100755 --- a/usr/local/www/firewall_nat_server.php +++ b/usr/local/www/firewall_nat_server.php @@ -95,7 +95,6 @@ include("head.inc");

You must apply the changes in order for them to take effect.");?>
-

- + - -
- + -
+
+ @@ -143,18 +143,16 @@ include("head.inc");
External IP address Description
-

Note:
+

+

Note:
The external IP addresses defined on this page may be used in inbound NAT mappings. Depending on the way your WAN connection is setup, you may also need proxy ARP.

-
-
+ + + + + - diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index ebb3476..cb0fc3b 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -158,7 +158,6 @@ include("head.inc");

You must apply the changes in order for them to take effect.");?>
-

- + + +
- + - -
+
+ @@ -288,7 +288,7 @@ include("head.inc");
   
- +
@@ -303,26 +303,20 @@ include("head.inc"); - - - - - + + - - + + - - + + - + -
passlog
pass (disabled)pass (disabled)  block (disabled)block (disabled)  reject (disabled)reject (disabled)  log (disabled)log (disabled)
-
- +

Hint:
Rules are evaluated on a first-match basis (i.e. @@ -330,15 +324,15 @@ include("head.inc"); This means that if you use block rules, you'll have to pay attention to the rule order. Everything that isn't explicitly passed is blocked by default.

+
+
+ + + - - - - diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index cf8067e..f954216 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -194,7 +194,6 @@ include("head.inc");

You must apply the changes in order for them to take effect.");?>
-

-
- + + + +
+
+

> @@ -222,8 +222,7 @@ include("head.inc");

-  
- +
@@ -312,20 +311,18 @@ include("head.inc"); -
   
- -

Note:
+

Note:
the first rule that matches a packet will be executed.
The following match patterns are not shown in the list above: IP packet length, TCP flags.

+ +
-
- diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php index 4a81fb5..01fbb42 100755 --- a/usr/local/www/firewall_shaper_queues.php +++ b/usr/local/www/firewall_shaper_queues.php @@ -115,7 +115,6 @@ include("head.inc");

You must apply the changes in order for them to take effect.");?>
-

- + A queue can only be deleted if it is not referenced by any rules.

+ +
- + -
+
+ @@ -193,21 +193,19 @@ include("head.inc");
No. Flags
+

Note:
 - A queue can only be deleted if it is not referenced by any rules.
-

+
+ - - diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 1c1e72d..8e8cdc5 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -188,7 +188,6 @@ include("head.inc");
-
-
- - +
+
+ + @@ -250,6 +250,7 @@ include("head.inc");
Interface Network port  
+


Warning:
After you click "Save", you must reboot the firewall to make the changes take effect. You may also have to do one or more of the following steps before you can access your firewall again:

@@ -260,14 +261,7 @@ include("head.inc");
- - - - diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php index ca6eca1..4e11750 100755 --- a/usr/local/www/interfaces_vlan.php +++ b/usr/local/www/interfaces_vlan.php @@ -95,7 +95,6 @@ include("head.inc");

-
-
- + + +
+
+ @@ -142,16 +142,10 @@ include("head.inc");
Interface VLAN tag 
-
- - - - diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index a940406..4d1952c 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -71,7 +71,6 @@ $pkg_sizes = get_pkg_sizes(); ?> -
-
- +
+
+ @@ -141,16 +141,10 @@ $pkg_sizes = get_pkg_sizes(); } ?>
Package Name Category
+
- - - - diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index 609c72d..6a4d16b 100755 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -47,7 +47,6 @@ include("head.inc");

-
-
- +
+
+ @@ -150,20 +150,11 @@ include("head.inc"); } ?>
Package Name Category
+
- - - - - - + diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index a215147..3501358 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -280,7 +280,6 @@ function enable_change(enable_change) {
-
-
- +
+
+
  @@ -452,10 +452,10 @@ The contents of the HTML file that you upload here are displayed when an authent Changing any settings on this page will disconnect all clients! Don't forget to enable the DHCP server on your captive portal interface! Make sure that the default/maximum DHCP lease time is higher than the timeout entered on this page. Also, the DNS forwarder needs to be enabled for DNS lookups by unauthenticated clients to work.
+
- - diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index 4e45cfc..fd5765a 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -81,7 +81,6 @@ include("head.inc");

You must apply the changes in order for them to take effect.");?>
-

-
- +
+
+ @@ -156,15 +156,11 @@ include("head.inc");
IP address Description 
+
- - diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index 2ce1128..7129ed2 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -81,7 +81,6 @@ include("head.inc");

You must apply the changes in order for them to take effect.");?>
-

-
- +
+
+ @@ -137,15 +137,11 @@ include("head.inc");
MAC address Description 
+
- - diff --git a/usr/local/www/services_captiveportal_users.php b/usr/local/www/services_captiveportal_users.php index 45bc206..7665b61 100755 --- a/usr/local/www/services_captiveportal_users.php +++ b/usr/local/www/services_captiveportal_users.php @@ -151,7 +151,6 @@ include("head.inc"); -
-
+
- - +
+
Username @@ -217,11 +216,13 @@ if($_GET['act']=="new" || $_GET['act']=="edit"){
+
+
+ @@ -266,6 +267,7 @@ END;
Username Full Name
+
END; } ?> @@ -273,13 +275,7 @@ END;
-
- - diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 8251af6..7ccb1d0 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -200,7 +200,6 @@ function enable_change(enable_over) {

You must apply the changes in order for them to take effect.");?>
-

-
- +
+
+
  @@ -327,7 +327,7 @@ The default is to use the IP of the firewall as the gateway. Specify an alterna
- +
@@ -366,10 +366,10 @@ The default is to use the IP of the firewall as the gateway. Specify an alterna
MAC address IP address
+
- - - - diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php index 97ccdca..43db595 100755 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -167,7 +167,6 @@ function enable_change(enable_over) {
-
-
- +
+
+
  @@ -220,10 +220,10 @@ function enable_change(enable_over) {
+
- - - - -- cgit v1.1