From 602716e9d73584faa7bd820208559cba9f32ddbe Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 22 Sep 2010 14:15:45 -0400
Subject: Consider user destinations before blacklists.

---
 config/squidGuard/squidguard.inc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'config')

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],
-- 
cgit v1.2.3