diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-03-09 12:51:11 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-03-09 12:51:11 +0100 |
| commit | f22c9ae209d1e6a49f5778e078c2c19f7acfeea0 (patch) | |
| tree | 221ee55d25665e2acdaf3e8ae7641ff5831b85e0 /etc | |
| parent | 9c5ad16762b0922cc7224ef3b1531a778100551b (diff) | |
| parent | fdc0e920cc80c772616e30051a8661811208f8c9 (diff) | |
| download | pfsense-f22c9ae209d1e6a49f5778e078c2c19f7acfeea0.zip pfsense-f22c9ae209d1e6a49f5778e078c2c19f7acfeea0.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 1 | ||||
| -rw-r--r-- | etc/inc/shaper.inc | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 3f9fe33..1419f86 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1384,6 +1384,7 @@ function filter_nat_rules_generate() { } } $natrules .= "\n# Subnets to NAT \n"; + $tonathosts .= "127.0.0.0/8 "; if($numberofnathosts > 4) { $natrules .= "table <tonatsubnets> { {$tonathosts} }\n"; $macroortable = "<tonatsubnets>"; diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 7e77502..c56543a 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -560,16 +560,16 @@ class altq_root_queue { function build_javascript() { $javascript = "<script type=\"text/javascript\">"; $javascript .= "function mySuspend() {"; - $javascript .= "if (document.layers && document.layers['shaperarea'] != null);"; - $javascript .= "document.layers['shaperarea'].visibility = 'hidden';"; + $javascript .= "if (document.layers && document.layers['shaperarea'] != null) "; + $javascript .= "document.layers['shaperarea'].visibility = 'hidden'; "; $javascript .= "else if (document.all)"; $javascript .= "document.all['shaperarea'].style.visibility = 'hidden';"; $javascript .= "}"; $javascript .= "function myResume() {"; - $javascript .= "if (document.layers && document.layers['shaperarea'] != null)"; + $javascript .= "if (document.layers && document.layers['shaperarea'] != null) "; $javascript .= "document.layers['shaperarea'].visibility = 'visible';"; - $javascript .= "else if (document.all)"; + $javascript .= "else if (document.all) "; $javascript .= "document.all['shaperarea'].style.visibility = 'visible';"; $javascript .= "}"; $javascript .= "</script>"; @@ -858,7 +858,7 @@ class priq_queue { function build_javascript() { $javascript = "<script type=\"text/javascript\">"; $javascript .= "function mySuspend() { \n"; - $javascript .= "if (document.layers && document.layers['shaperarea'] != null);\n"; + $javascript .= "if (document.layers && document.layers['shaperarea'] != null)\n"; $javascript .= "document.layers['shaperarea'].visibility = 'hidden';\n"; $javascript .= "else if (document.all)\n"; $javascript .= "document.all['shaperarea'].style.visibility = 'hidden';\n"; |
