diff options
| author | Chris Buechler <cmb@pfsense.org> | 2012-03-30 20:56:06 -0700 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2012-03-30 20:56:06 -0700 |
| commit | 949a8708959e8777c17e8d21fc20791af2616f94 (patch) | |
| tree | dae83b59de43df0202f6d32a09f5aa48f0c5f793 /config/squidGuard/squidguard.inc | |
| parent | 7852acc1ede90c850669e6d94568c53c5fb807d4 (diff) | |
| parent | 63f8ba46162fc25d5512fdcfe91d9f622de6e52e (diff) | |
| download | pfsense-packages-949a8708959e8777c17e8d21fc20791af2616f94.tar.gz pfsense-packages-949a8708959e8777c17e8d21fc20791af2616f94.tar.bz2 pfsense-packages-949a8708959e8777c17e8d21fc20791af2616f94.zip | |
Merge pull request #233 from saxonbeta/master
SquidGuard: Added option to general settings to show a blank gif image for the advertising category
Diffstat (limited to 'config/squidGuard/squidguard.inc')
| -rw-r--r-- | config/squidGuard/squidguard.inc | 10 |
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 |