aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcelloc <marcellocoutinho@gmail.com>2012-06-22 18:54:47 -0300
committermarcelloc <marcellocoutinho@gmail.com>2012-06-22 18:54:47 -0300
commite8285743abff669e0b795c36e2a1c4fd05b4d403 (patch)
tree9dd792d9c5621478337e04e0345a48b327550dc5
parentd00d9f721352a95cb8e7ce98e9a2884bd8c16102 (diff)
downloadpfsense-packages-e8285743abff669e0b795c36e2a1c4fd05b4d403.tar.gz
pfsense-packages-e8285743abff669e0b795c36e2a1c4fd05b4d403.tar.bz2
pfsense-packages-e8285743abff669e0b795c36e2a1c4fd05b4d403.zip
squid3 - fixes array_check and error messages dir
-rw-r--r--config/squid-reverse/squid.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index e7dffcdb..a82cc9ba 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -746,7 +746,7 @@ function squid_resync_general() {
$icp_port = ($settings['icp_port'] ? $settings['icp_port'] : 7);
$pidfile = "{$g['varrun_path']}/squid.pid";
- $language = ($settings['error_language'] ? $settings['error_language'] : 'English');
+ $language = ($settings['error_language'] ? $settings['error_language'] : 'en');
$errordir = SQUID_CONFBASE . '/errors/' . $language;
$icondir = SQUID_CONFBASE . '/icons';
$hostname = ($settings['visible_hostname'] ? $settings['visible_hostname'] : 'localhost');
@@ -763,7 +763,7 @@ icp_port $icp_port
pid_filename $pidfile
cache_effective_user proxy
cache_effective_group proxy
-error_directory $errordir
+error_default_language $errordir
icon_directory $icondir
visible_hostname $hostname
cache_mgr $email
@@ -1376,7 +1376,7 @@ function squid_resync() {
if(file_exists("/usr/local/libexec/squid/pinger"))
exec("chmod a+x /usr/local/libexec/squid/pinger");
- if (is_array($config['installedpackages']['squid']['config'][0])){
+ if (is_array($config['installedpackages']['squid']['config'])){
$log_dir = $config['installedpackages']['squid']['config'][0]['log_dir'].'/';
if(!is_dir($log_dir)) {