From d23db99bbc7f9b4625fb7c911b4d5d3210a8cbb9 Mon Sep 17 00:00:00 2001
From: marcelloc <marcellocoutinho@gmail.com>
Date: Mon, 30 Jan 2012 00:37:34 -0200
Subject: dansguardian - improve blacklist import and category assign 	
 - include dansguardian on service 		- include log, deamon and
 config default xml options 		- fix some typos

---
 config/dansguardian/dansguardian_blacklist.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'config/dansguardian/dansguardian_blacklist.xml')

diff --git a/config/dansguardian/dansguardian_blacklist.xml b/config/dansguardian/dansguardian_blacklist.xml
index d518f531..cf4e3c15 100644
--- a/config/dansguardian/dansguardian_blacklist.xml
+++ b/config/dansguardian/dansguardian_blacklist.xml
@@ -95,9 +95,15 @@
 			<type>listtopic</type>
 		</field>
 		<field>
-			<fielddescr>Enable</fielddescr>
-			<fieldname>blacklist</fieldname>
-			<type>checkbox</type>
+			<fielddescr>List on</fielddescr>
+			<fieldname>liston</fieldname>
+			<description><![CDATA[Select where to list categories dowloaded form file<br>
+							List on Banned and Exception is usefull if you want to whitelist any category downloaded from url.]]></description>
+	    	<type>select</type>
+ 				<options>
+ 				<option><name>Banned only</name><value>banned</value></option>
+ 				<option><name>Banned and Exception</name><value>both</value></option>
+				</options>
 		</field>
 		<field>
 			<fielddescr>Update frequency</fielddescr>
@@ -107,10 +113,11 @@
 	    	<type>select</type>
  				<options>
  				<option><name>Never</name><value>never</value></option>
- 				<option><name>Now</name><value>now</value></option>
  				<option><name>Every day</name><value>day</value></option>
 				<option><name>Every 2 days</name><value>02days</value></option>
 				<option><name>Once a week</name><value>week</value></option>
+				<option><name>Download and update Now</name><value>force_download</value></option>
+				<option><name>Reapply downloaded list Now</name><value>force_update</value></option>
 				</options>
 		</field>
 		<field>
-- 
cgit v1.2.3