From badc234035f2d0f3ba7db8b5ce589d91fa3ec625 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 30 Aug 2011 15:29:37 -0400
Subject: Fix bottom note when viewing Floating rules to better reflect how
 they operate.

---
 usr/local/www/firewall_rules.php | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 8e61360..a209974 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -863,12 +863,21 @@ if($_REQUEST['undodrag']) {
 	<span class="red"><?=gettext("Hint:");?></span>
   </strong><br>
 	<ul>
-  <li><?=gettext("Rules are evaluated on a first-match basis (i.e. " .
-  "the action of the first rule to match a packet will be executed). " .
-  "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. ");?>
-</li>
+<? if ("FloatingRules" != $if): ?>
+	<li><?=gettext("Rules are evaluated on a first-match basis (i.e. " .
+	"the action of the first rule to match a packet will be executed). " .
+	"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. ");?>
+	</li>
+<? else: ?>
+	<li><?=gettext("Floating rules are evaluated on a first-match basis (i.e. " .
+	"the action of the first rule to match a packet will be executed) only " .
+	"if the 'quick' option is checked on a rule. Otherwise they will only apply if no " .
+	"other rules match. Pay close attention to the rule order and options " .
+	"chosen. If no rule here matches, the per-interface or default rules are used. ");?>
+	</li>
+<? endif; ?>
 </ul>
 		 </td>
 	        </tr>
-- 
cgit v1.1