New ver update

1 files changed, 57 insertions, 15 deletions

diff --git a/packages/squidGuard/squidguard_src.xml b/packages/squidGuard/squidguard_src.xml
index 3a291c42..000528db 100644
--- a/packages/squidGuard/squidguard_src.xml
+++ b/packages/squidGuard/squidguard_src.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-	<description>Describe your package here</description>
-	<requirements>Describe your package requirements here</requirements>
-	<faq>Currently there are no FAQ items provided.</faq>
+    <description>Describe your package here</description>
+    <requirements>Describe your package requirements here</requirements>
+    <faq>Currently there are no FAQ items provided.</faq>
 
 	<name>squidguardsrc</name>
 	<version>none</version>
-	<title>Proxy server filter SquidGuard: Sources</title>
-	<include_file>squidguard.inc</include_file>
+	<title>Proxy Content filter SquidGuard: Sources</title>
+	<include_file>/usr/local/pkg/squidguard.inc</include_file>
 
 	<delete_string>A proxy server user has been deleted.</delete_string>
 	<addedit_string>A proxy server user has been created/modified.</addedit_string>
-
+	
 	<tabs>
 		<tab>
 			<text>General settings</text>
@@ -49,8 +49,13 @@
 			<url>/pkg_edit.php?xml=squidguard_log.xml</url>
 		</tab>
 	</tabs>
+	
 	<adddeleteeditpagefields>
 		<columnitem>
+			<fielddescr>Order</fielddescr>
+			<fieldname>order</fieldname>
+		</columnitem>
+		<columnitem>
 			<fielddescr>Source name</fielddescr>
 			<fieldname>name</fieldname>
 		</columnitem>
@@ -59,10 +64,15 @@
 			<fieldname>iplist</fieldname>
 		</columnitem>
 		<columnitem>
+			<fielddescr>domains list</fielddescr>
+			<fieldname>domains</fieldname>
+		</columnitem>
+		<columnitem>
 			<fielddescr>Description</fielddescr>
 			<fieldname>description</fieldname>
 		</columnitem>
 	</adddeleteeditpagefields>
+
 	<fields>
 		<field>
 			<fielddescr>Source name</fielddescr>
@@ -72,21 +82,46 @@
 				All other symbols is [a-Z_0-9]. Source name must be &lt;b&gt;unique&lt;/b&gt; .
 			</description>
 			<type>input</type>
-			<size>80</size>
 			<required/>
+			<size>80</size>
+		</field>
+		<field>
+			<fielddescr>Order</fielddescr>
+			<fieldname>order</fieldname>
+			<description>
+				Order source in list. &lt;br&gt;
+				&lt;b&gt;Note:&lt;/b&gt; &lt;br&gt;
+					Sources order have very high importance. Sources are evaluated on a first-match basis. &lt;br&gt;
+					If your sources have an overlaying ranges, then act will be first in list. &lt;br&gt;
+					&lt;b&gt;For example:&lt;/b&gt; &lt;br&gt;
+					Wrong order: &lt;br&gt;
+					First source entry is the range 10.0.0.0/24 and second entry is 10.0.0.15 (or 10.0.0.15/32 ) &lt;br&gt;
+					Right order: &lt;br&gt;
+					First source entry is the single ip 10.0.0.15 (or 10.0.0.15/32 ) then the overlaying range 10.0.0.0/24 &lt;br&gt;
+			</description>
+			<type>input</type>
+			<size>5</size>
 		</field>
 		<field>
 			<fielddescr>IP addresses</fielddescr>
 			<fieldname>iplist</fieldname>
 			<description>
 				Enter IP addresses here with space(' ') divider. &lt;br&gt; 
-				IP addresses must be in format:&lt;br&gt; 
-				ip xxx.xxx.xxx.xxx [...] or ip xxx.xxx.xxx.xxx/nn [...] or &lt;br&gt; 
-				ip xxx.xxx.xxx.xxx/mmm.mmm.mmm.mmm [...] or ip xxx.xxx.xxx.xxx-yyy.yyy.yyy.yyy [...] &lt;br&gt; 
-				where: &lt;br&gt; 
-				xxx.xxx.xxx.xxx is an IP address (host or net, i.e. 10.11.12.13 or 10.11.12.0), /nn a net prefix (i.e. /23), &lt;br&gt; 
-				mmm.mmm.mmm.mmm is a netmask (i.e. 255.255.254.0) and	yyy.yyy.yyy.yyy is a host address &lt;br&gt; 
-				(must be >= xxx.xxx.xxx.xxx)	
+				IP addresses must have format:&lt;br&gt;
+				single example: '192.168.0.1' &lt;br&gt; 
+				range examples: &lt;br&gt;
+				'192.168.0.0/24', '192.168.1.0/255.255.255.0', 	'192.168.1.1-192.168.1.10' &lt;br&gt;
+			</description>
+			<type>textarea</type>
+			<cols>50</cols>
+			<rows>10</rows>
+		</field>
+		<field>
+			<fielddescr>Domains</fielddescr>
+			<fieldname>domains</fieldname>
+			<description>
+				Enter domains names here with space(' ') divider. &lt;br&gt; 
+				Example: &lt;b&gt;'foo.bar'&lt;/b&gt; match &lt;b&gt;'foo.bar'&lt;/b&gt; or &lt;b&gt;'*.foo.bar'&lt;/b&gt;.
 			</description>
 			<type>textarea</type>
 			<cols>50</cols>
@@ -106,6 +141,10 @@
 			<size>80</size>
 		</field>
 	</fields>
+
+	<custom_php_command_before_form>
+		squidguard_before_form_src(&amp;$pkg);
+	</custom_php_command_before_form>
 	<custom_php_after_form_command> 
                squidGuard_print_javascript();
 	</custom_php_after_form_command>
@@ -113,6 +152,9 @@
 		squidguard_validate_source($_POST, &amp;$input_errors);
 	</custom_php_validation_command>
 	<custom_php_resync_config_command>
-//		squidguard_resync_time();
+		squidguard_resync_src();
 	</custom_php_resync_config_command>
+	<custom_delete_php_command>
+		squidguard_resync_src();
+	</custom_delete_php_command>
 </packagegui>