diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
| commit | e73b001e2585b55973faaf0be199a5f438c4ae89 (patch) | |
| tree | 6dc08100313fe95ab4ca2dfa9883c23152dd4538 /usr/local/www/firewall_rules.php | |
| parent | 3e6ec5dfba9679f6b521962269aca9570e391abb (diff) | |
| parent | 3e4f5a3359ebcc46710f37466620d0c0cdfd7293 (diff) | |
| download | pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.zip pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.tar.gz | |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/diag_smart.php
usr/local/www/firewall_rules_edit.php
usr/local/www/interfaces.php
usr/local/www/load_balancer_pool_edit.php
usr/local/www/pkg_mgr_settings.php
Diffstat (limited to 'usr/local/www/firewall_rules.php')
| -rwxr-xr-x | usr/local/www/firewall_rules.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index 9d5b499..3a769b7 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -51,7 +51,7 @@ require_once("shaper.inc"); $pgtitle = array(gettext("Firewall"),gettext("Rules")); -function check_for_advaned_options(&$item) { +function check_for_advanced_options(&$item) { $item_set = ""; if($item['max']) $item_set .= "max {$item['max']} "; @@ -62,9 +62,9 @@ function check_for_advaned_options(&$item) { if($item['max-src-states']) $item_set .= "max-src-states {$item['max-src-states']} "; if($item['statetype'] != "keep state" && $item['statetype'] != "") - $item_set .= "statetype {$item['statetype']} {$item['statetype']}"; + $item_set .= "statetype {$item['statetype']} "; if($item['statetimeout']) - $item_set .= "statetimeout {$item['statetimeout']}"; + $item_set .= "statetimeout {$item['statetimeout']} "; if($item['nosync']) $item_set .= "nosync "; if($item['max-src-conn-rate']) @@ -436,9 +436,9 @@ if($_REQUEST['undodrag']) { continue; if (isset($filterent['floating']) && "FloatingRules" != $if) continue; - $isadvset = check_for_advaned_options($filterent); + $isadvset = check_for_advanced_options($filterent); if($isadvset) - $advanced_set = sprintf("<img src=\"./themes/%s/images/icons/icon_advanced.gif\" title=\"%s: %s\" border=\"0\">", $g['theme'], gettext("advanced settings set"), $isadvset); + $advanced_set = "<img src=\"./themes/{$g['theme']}/images/icons/icon_advanced.gif\" title=\"" . gettext("advanced settings set") . ": {$isadvset}\" border=\"0\">"; else $advanced_set = "" ?> |
