diff options
| -rw-r--r-- | packages/squidGuard/squidguard.xml | 21 | ||||
| -rw-r--r-- | packages/squidGuard/squidguard_configurator.inc | 20 |
2 files changed, 27 insertions, 14 deletions
diff --git a/packages/squidGuard/squidguard.xml b/packages/squidGuard/squidguard.xml index ec26fb57..739fe609 100644 --- a/packages/squidGuard/squidguard.xml +++ b/packages/squidGuard/squidguard.xml @@ -58,32 +58,43 @@ </service> <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/squidGuard/squidguard.inc</item> </additional_files_needed> <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/squidGuard/squidguard_configurator.inc</item> </additional_files_needed> <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/squidGuard/squidguard_acl.xml</item> </additional_files_needed> <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/squidGuard/squidguard_default.xml</item> </additional_files_needed> <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/squidGuard/squidguard_dest.xml</item> </additional_files_needed> <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/squidGuard/squidguard_rewr.xml</item> </additional_files_needed> -<!-- - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/squidGuard/squidguard_src.xml</item> - </additional_files_needed> ---> <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/squidGuard/squidguard_time.xml</item> </additional_files_needed> <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>0755</chmod> <item>http://www.pfsense.org/packages/config/squidGuard/squidguard_log.xml</item> </additional_files_needed> <additional_files_needed> diff --git a/packages/squidGuard/squidguard_configurator.inc b/packages/squidGuard/squidguard_configurator.inc index a3adffc2..df293258 100644 --- a/packages/squidGuard/squidguard_configurator.inc +++ b/packages/squidGuard/squidguard_configurator.inc @@ -1024,18 +1024,20 @@ function sg_build_config() { $varray = explode(" ", $acl[FLD_OVERDESTINATIONNAME]); // delete blacklist entries from 'pass' if blacklist disabled - foreach($entry_blacklist as $entry) { - $tk = array_search($entry, $tarray); - if ($tk !== false) unset ($tarray[$tk]); + if (is_array($entry_blacklist) and !empty($entry_blacklist)) { + foreach($entry_blacklist as $entry) { + $tk = array_search($entry, $tarray); + if ($tk !== false) unset ($tarray[$tk]); - $tk = array_search("!$entry", $tarray); - if ($tk !== false) unset($tarray[$tk]); + $tk = array_search("!$entry", $tarray); + if ($tk !== false) unset($tarray[$tk]); - $tk = array_search($entry, $varray); - if ($tk !== false) unset ($varray[$tk]); + $tk = array_search($entry, $varray); + if ($tk !== false) unset ($varray[$tk]); - $tk = array_search("!$entry", $varray); - if ($tk !== false) unset ($varray[$tk]); + $tk = array_search("!$entry", $varray); + if ($tk !== false) unset ($varray[$tk]); + } } $acl[FLD_DESTINATIONNAME] = implode (" ", $tarray); |