pfBlocker - version 0.1.4 changes alias/lists/rules engine and gui

1 files changed, 14 insertions, 114 deletions

diff --git a/config/pf-blocker/pfblocker.xml b/config/pf-blocker/pfblocker.xml
index 77a81e24..eef4c882 100755
--- a/config/pf-blocker/pfblocker.xml
+++ b/config/pf-blocker/pfblocker.xml
@@ -50,7 +50,7 @@
 		<name>pfBlocker</name>
 		<tooltiptext>Configure pfblocker</tooltiptext>
 		<section>Firewall</section>
-		<url>pkg_edit.php?xml=pfblocker.xml&amp;id=0</url>
+		<url>pkg_edit.php?xml=pfblocker.xml</url>
 	</menu>
 	<additional_files_needed>
 		<item>http://www.pfsense.org/packages/config/pf-blocker/pfblocker.inc</item>
@@ -73,6 +73,11 @@
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
+		<item>http://www.pfsense.org/packages/config/pf-blocker/pfblocker_lists.xml</item>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>0755</chmod>
+	</additional_files_needed>
+	<additional_files_needed>
 		<item>http://www.pfsense.org/packages/config/pf-blocker/pfblocker_sync.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
@@ -114,6 +119,11 @@
 			<active/>
 		</tab>
 		<tab>
+			<text>Lists</text>
+			<url>/pkg.php?xml=pfblocker_lists.xml</url>
+		</tab>
+
+		<tab>
 			<text>Top Spammers</text>
 			<url>/pkg_edit.php?xml=pfblocker_topspammers.xml&amp;id=0</url>
 		</tab>
@@ -169,8 +179,7 @@
 		<field>
 			<fielddescr>Inbound Interface(s)</fielddescr>
 			<fieldname>inbound_interface</fieldname>
-			<description><![CDATA[Default: <strong>WAN</strong><br>Select interface(s) that you want to block incoming traffic.<br>
-								If you want to create custom inbound rules for blocked countries based on pfBlocker firewall alias, leave this list empty.]]></description>
+			<description><![CDATA[Default: <strong>WAN</strong><br>Select interface(s) that you want to block incoming traffic.]]></description>
 			<type>interfaces_selection</type>
 			<required/>
 			<multiple/>
@@ -189,8 +198,7 @@
 		<field>
 			<fielddescr>Outbound Interface(s)</fielddescr>
 			<fieldname>outbound_interface</fieldname>
-			<description><![CDATA[Default:<strong>LAN</strong> or none.<br>Select interface(s) that you do not want to send outgoing traffic.<br>
-								If you want to create custom outbound rules for blocked countries based on pfBlocker firewall alias, leave this list empty.]]></description>
+			<description><![CDATA[Default:<strong>LAN</strong> or none.<br>Select interface(s) that you do not want to send outgoing traffic.]]></description>
 			<type>interfaces_selection</type>
 			<required/>
 			<multiple/>
@@ -206,115 +214,7 @@
 				<option><name>Block</name><value>block</value></option>
 				</options>
 		</field>	
-	
-		<field>
-			<name>Network ranges / CIDR lists</name>
-			<type>listtopic</type>
-		</field>
-	
-			<field>
-			<fielddescr>Country Action</fielddescr>
-			<fieldname>countryblock</fieldname>
-			<description><![CDATA[Default:<strong>Block Inbound</strong><br>
-							Select action for countries you have selected<br><br>
-							<strong>Note: </strong><br>'Deny Inbound' traffic will deny access from selected countries to your network.<br>
-									'Deny Outgoing' traffic will deny access from your users to countries you selected to block<br>
-									'Whitelist' will allow access from and to selected countries to your network.<br>
-									'None' will not apply rules to selected countries.]]></description>
-	    	<type>select</type>
- 				<options>
-				<option><name>Deny Inbound</name><value>inbound</value></option>
-				<option><name>Deny Outbound</name><value>outbound</value></option>
-				<option><name>Deny Inbound and Outbound</name><value>both</value></option>
-				<option><name>whitelist</name><value>whitelist</value></option>
-				<option><name>None</name><value>none</value></option>
-				</options>
-			</field>
-			<field>
-			<fielddescr>Update frequency</fielddescr>
-			<fieldname>update</fieldname>
-			<description><![CDATA[Default:<strong>Never</strong><br>
-							Select how often pfsense will download List files]]></description>
-	    	<type>select</type>
- 				<options>
- 				<option><name>Never</name><value>never</value></option>
-				<option><name>Every 4 Hours</name><value>4hours</value></option>
-				<option><name>Every 12 Hours</name><value>12hours</value></option>
-				<option><name>Once a day</name><value>day</value></option>
-				<option><name>Once a week</name><value>week</value></option>
-				</options>
-		</field>	
-		<field>
-			<fielddescr><![CDATA[Lists]]></fielddescr>
-			<fieldname>none</fieldname>
-			<description><![CDATA[In 'list action' choose the way you want to use the list and in 'Format' choose the file format on url.<br>
-								  ON url field, add direct link to list (Example: <a target=_new href='http://list.iblocklist.com/?list=bt_ads&fileformat=p2p&archiveformat=gz'>Ads</a>,
-																	<a target=_new href='http://list.iblocklist.com/?list=bt_spyware&fileformat=p2p&archiveformat=gz'>Spyware</a>,
-																	<a target=_new href='http://list.iblocklist.com/?list=bt_proxy&fileformat=p2p&archiveformat=gz'>Proxies</a> )<br> 
-									Compressed lists must be in gz format.<br>
-									File must have only one network per line and could follows PeerBlock syntax	or this below:<br>
-									Network ranges: <strong>172.16.1.0-172.16.1.255</strong><br>
-									CIDR: <strong>172.16.1.0/24</strong>
-								   ]]></description>
-			<type>rowhelper</type>
-			<rowhelper>
-			<rowhelperfield>
-			<fielddescr>List Action</fielddescr>
-			<fieldname>action</fieldname>
-	    	<type>select</type>
- 				<options>
-				<option><name>Deny Inbound</name><value>ips_in</value></option>
-				<option><name>Deny Outbound</name><value>ips_out</value></option>
-				<option><name>whitelist</name><value>whitelist</value></option>
-				<option><name>None</name><value>none</value></option>
-				</options>
-			</rowhelperfield>
-			<rowhelperfield>
-			<fielddescr>Format</fielddescr>
-			<fieldname>format</fieldname>
-	    	<type>select</type>
- 				<options>
-				<option><name>gz</name><value>gz</value></option>
-				<option><name>txt</name><value>txt</value></option>
-				</options>
-			</rowhelperfield>		
-			<rowhelperfield>
-				<fielddescr>Url</fielddescr>
-				<fieldname>url</fieldname>
-				<type>input</type>
-				<size>55</size>
-			</rowhelperfield>
-			</rowhelper>
-		</field>
-		<field>
-			<name>List info help</name>
-			<fieldname>list_info</fieldname>
-			<description><![CDATA[In 'list action' choose the way you want to use the list and in 'Format' choose the file format on url.<br>
-								  ON url field, add direct link to list (Example: <a target=_new href='http://list.iblocklist.com/?list=bt_ads&fileformat=p2p&archiveformat=gz'>Ads</a>,
-																	<a target=_new href='http://list.iblocklist.com/?list=bt_spyware&fileformat=p2p&archiveformat=gz'>Spyware</a>,
-																	<a target=_new href='http://list.iblocklist.com/?list=bt_proxy&fileformat=p2p&archiveformat=gz'>Proxies</a> )<br> 
-									Compressed lists must be in gz format.<br>	
-									File must have only one network per line and could follows PeerBlock syntax	or this below:<br>
-									Network ranges: <strong>172.16.1.0-172.16.1.255</strong><br>
-									CIDR: <strong>172.16.1.0/24</strong>
-								   ]]></description>
-			<type>checkbox</type>
-			
-		</field>
-		<field>
-			<name>Custom list</name>
-			<type>listtopic</type>
-		</field>
-		<field>
-			<fielddescr>Whitelist</fielddescr>
-			<fieldname>whitelist</fieldname>
-			<description><![CDATA[Enter network you want to whitlist in CIDR format. One network per line.<br>	
-								  Example: 192.168.1.0/24]]></description>
-			<type>textarea</type>
-			<cols>50</cols>
-			<rows>06</rows>
-			<encoding>base64</encoding>
-		</field>
+
 	</fields>
 	<custom_php_install_command>
 		pfblocker_php_install_command();