diff options
| author | jim-p <jimp@pfsense.org> | 2010-09-22 14:15:45 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-09-22 14:15:45 -0400 |
| commit | 602716e9d73584faa7bd820208559cba9f32ddbe (patch) | |
| tree | 0272e67c151432bbd9fae29c1754cbb2e65c3051 | |
| parent | 9d5c084cd9e8ce2564650e3010d3bf7c96d7b031 (diff) | |
| download | pfsense-packages-602716e9d73584faa7bd820208559cba9f32ddbe.tar.gz pfsense-packages-602716e9d73584faa7bd820208559cba9f32ddbe.tar.bz2 pfsense-packages-602716e9d73584faa7bd820208559cba9f32ddbe.zip | |
Consider user destinations before blacklists.
| -rw-r--r-- | config/squidGuard/squidguard.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config/squidGuard/squidguard.inc b/config/squidGuard/squidguard.inc index d0e1213a..303f53b0 100644 --- a/config/squidGuard/squidguard.inc +++ b/config/squidGuard/squidguard.inc @@ -518,6 +518,15 @@ function squidguard_before_form_acl($pkg, $is_acl=true) { } # --- Destinations --- + # User destinations + if ($squidguard_config[F_DESTINATIONS]) { + foreach($squidguard_config[F_DESTINATIONS]['item'] as $dst) + $dest_items[] = array ('name'=>$dst[F_NAME], + 'upt_value'=>$acls_up[$dst[F_NAME]], + 'ovt_value'=>$acls_over[$dst[F_NAME]], + 'description'=>$dst[F_DESCRIPTION]); + } + # Blacklist if ($squidguard_config[F_BLACKLISTENABLED] === 'on') { $blk_entries = sg_entries_blacklist(); @@ -530,15 +539,6 @@ function squidguard_before_form_acl($pkg, $is_acl=true) { } } - # User destinations - if ($squidguard_config[F_DESTINATIONS]) { - foreach($squidguard_config[F_DESTINATIONS]['item'] as $dst) - $dest_items[] = array ('name'=>$dst[F_NAME], - 'upt_value'=>$acls_up[$dst[F_NAME]], - 'ovt_value'=>$acls_over[$dst[F_NAME]], - 'description'=>$dst[F_DESCRIPTION]); - } - # Default all $dest_items[] = array('name'=>FLT_DEFAULT_ALL, 'upt_value'=>$acls_up[FLT_DEFAULT_ALL], |