From 5e6c7206641c79bfd6ab116e7cd41dba21b8b6f8 Mon Sep 17 00:00:00 2001
From: Marcello Coutinho <marcellocoutinho@gmail.com>
Date: Sun, 15 Apr 2012 23:00:46 +0000
Subject: squid3 - fix package integration with squidguard

---
 config/squid-reverse/squid.inc | 5 +++--
 config/squid-reverse/squid.xml | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 08f57b52..408ecb7a 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -1095,14 +1095,15 @@ function squid_resync_auth() {
 		$settingsnac = $config['installedpackages']['squidnac']['config'][0];
 	if (is_array($config['installedpackages']['squid']['config']))
 		$settingsconfig = $config['installedpackages']['squid']['config'][0];
+	
 	$conf = '';
 
 	// Package integration
 	if(!empty($settingsconfig['custom_options']))
-		$conf.=preg_replace('/;/',"\n",$settingconfig['custom_options']);
+		$conf.="# Package Integration\n".preg_replace('/;/',"\n",$settingsconfig['custom_options'])."\n\n";
 	
 	// Custom User Options
-	$conf .= "# Custom options\n".sq_text_area_decode($settingsconfig['custom_options_squid3'])."\n";
+	$conf .= "# Custom options\n".sq_text_area_decode($settingsconfig['custom_options_squid3'])."\n\n";
 
 	// Deny the banned guys before allowing the good guys
 	if(! empty($settingsnac['banned_hosts'])) {
diff --git a/config/squid-reverse/squid.xml b/config/squid-reverse/squid.xml
index e0539f38..1c003a27 100644
--- a/config/squid-reverse/squid.xml
+++ b/config/squid-reverse/squid.xml
@@ -373,7 +373,6 @@
 			<fieldname>custom_options</fieldname>
 			<description><![CDATA[Squid options added from packages like squidguard or havp for squid integration.]]></description>
 			<type>textarea</type>
-			<encoding>base64</encoding>
 			<cols>78</cols>
 			<rows>5</rows>
 		</field>
-- 
cgit v1.2.3