aboutsummaryrefslogtreecommitdiffstats
path: root/config/squidGuard
diff options
context:
space:
mode:
authorsaxonbeta <saxonbeta@gmail.com>2012-03-29 18:02:36 -0600
committersaxonbeta <saxonbeta@gmail.com>2012-03-29 18:02:36 -0600
commitb1e79dec2f2cd22ba1cb5b15fb02f84bb8121c9d (patch)
treeeae1bc90dcd2dc3c0303104bdbe5966bca47d530 /config/squidGuard
parent7c46d50de8c14df8a264411ec5326bf668a15389 (diff)
downloadpfsense-packages-b1e79dec2f2cd22ba1cb5b15fb02f84bb8121c9d.tar.gz
pfsense-packages-b1e79dec2f2cd22ba1cb5b15fb02f84bb8121c9d.tar.bz2
pfsense-packages-b1e79dec2f2cd22ba1cb5b15fb02f84bb8121c9d.zip
Save adv_blankimg field value to squidguard_conf.xml
Diffstat (limited to 'config/squidGuard')
-rw-r--r--config/squidGuard/squidguard.inc10
1 files changed, 7 insertions, 3 deletions
diff --git a/config/squidGuard/squidguard.inc b/config/squidGuard/squidguard.inc
index c1680adb..856e15b6 100644
--- a/config/squidGuard/squidguard.inc
+++ b/config/squidGuard/squidguard.inc
@@ -326,7 +326,7 @@ function squidguard_resync() {
# apply changes
//if ($submit == APPLY_BTN) {
# write_config('Update squidGuard options.'); # store, if not 'Save' button
-# перенести в validate для детектирования ошибок?
+
sg_reconfigure();
//}
@@ -817,7 +817,7 @@ function squidguard_install_command() {
# conf_mount_rw();
$blklist_file = SQUIDGUARD_BLK_FILELISTPATH;
- # рассмотреть вариант слияния examples базы и существующей в системе
+
if (!file_exists($blklist_file)) {
# if blacklist not exists, then copy default db from samples
# $entries = array("ads", "aggressive", "audio-video", "drugs", "gambling", "hacking", "mail", "porn", "proxy", "violence", "warez");
@@ -934,6 +934,10 @@ function convert_pfxml_to_sgxml() {
$sgxml[F_ENABLEGUILOG] = $pfxml['enable_guilog'] == 'on' ? 'on' : 'off';
$sgxml[F_LOGROTATION] = $pfxml['log_rotation'] == 'on' ? 'on' : 'off';
+ #Clean adversiting
+ $sgxml[F_ADV_BLANKIMG] = $pfxml['adv_blankimg'] == 'on' ? 'on' : 'off';
+
+
# other
$lanip = $config['interfaces']['lan']['ipaddr'];
$sgxml[F_CURRENT_LAN_IP] = $lanip;
@@ -1395,4 +1399,4 @@ function squidguard_blacklist_list()
return $res;
}
-?>
+?> \ No newline at end of file