New ver update

1 files changed, 27 insertions, 27 deletions

diff --git a/packages/squidGuard/squidguard_rewr.xml b/packages/squidGuard/squidguard_rewr.xml
index 6dcdec5e..0de007ac 100644
--- a/packages/squidGuard/squidguard_rewr.xml
+++ b/packages/squidGuard/squidguard_rewr.xml
@@ -2,14 +2,14 @@
 <!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>squidguardrewrite</name>
 	<version>none</version>
-	<title>Proxy server filter SquidGuard: Rewrites</title>
-	<include_file>squidguard.inc</include_file>
+	<title>Proxy Content filter SquidGuard: Rewrites</title>
+	<include_file>/usr/local/pkg/squidguard.inc</include_file>
 
 	<tabs>
 		<tab>
@@ -46,6 +46,7 @@
 			<url>/pkg_edit.php?xml=squidguard_log.xml</url>
 		</tab>
 	</tabs>
+	
 	<adddeleteeditpagefields>
 		<columnitem>
 			<fielddescr>Name</fielddescr>
@@ -56,6 +57,7 @@
 			<fieldname>description</fieldname>
 		</columnitem>
 	</adddeleteeditpagefields>
+
 	<fields>		
 		<field>
 			<fielddescr>Name</fielddescr>
@@ -69,37 +71,25 @@
 			<size>100</size>
 		</field>
 		<field>
-			<fielddescr>Enable log</fielddescr>
-			<fieldname>enablelog</fieldname>
-			<type>checkbox</type>
-			<description>Check this for enable log.</description>
-		</field>
-		<field>
-			<fielddescr>Description</fielddescr>
-			<fieldname>description</fieldname>
-			<description>You may enter a description here for your reference (not parsed).</description>
-			<type>input</type>
-			<size>100</size>
-		</field>
-		<field>
 			<fielddescr>
 				&lt;b&gt;Rewrite rule.&lt;/b&gt;&lt;br&gt;
 				Define how url will be replaced.</fielddescr>
 			<type>rowhelper</type>
 			<rowhelper>
 				<rowhelperfield>
-					<fielddescr>Target URL</fielddescr>
+					<fielddescr>Target URL or regular expression</fielddescr>
 					<fieldname>targeturl</fieldname>
 					<type>input</type>
 					<size>50</size>
 				</rowhelperfield>
 				<rowhelperfield>
-					<fielddescr>Replace to</fielddescr>
+					<fielddescr>Replace to URL</fielddescr>
 					<fieldname>replaceto</fieldname>
 					<type>input</type>
 					<size>69</size>
 				</rowhelperfield>
-				<rowhelperfield>
+				
+<!--				<rowhelperfield>
 					<fielddescr>Case ins.</fielddescr>
 					<fieldname>caseins</fieldname>
 					<type>checkbox</type>
@@ -114,19 +104,29 @@
 					<fieldname>http302</fieldname>
 					<type>checkbox</type>
 				</rowhelperfield>
+-->
 			</rowhelper>
 		</field>
 		<field>
-			<fielddescr>Note</fielddescr>
-			<fieldname>note</fieldname>
+			<fielddescr>Enable log</fielddescr>
+			<fieldname>enablelog</fieldname>
+			<description>Check this for enable log.</description>
 			<type>checkbox</type>
-			<description>
-				&lt;b&gt;Rewrite rule&lt;/b&gt;-define how url will are replaced.&lt;br&gt;
-				&lt;b&gt;Target url&lt;/b&gt;-contains destination url or his template. Url template example: */cc32e46.exe &lt;br&gt;
-				&lt;b&gt;Replace to&lt;/b&gt;-contains replacing url.
+		</field>
+		<field>
+			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
+			<description>You may enter a description here for your reference (not parsed).&lt;br&gt;
+				&lt;b&gt; Note: &lt;/b&gt; &lt;br&gt;
+				&lt;b&gt;Rewrite rule&lt;/b&gt; - define how url will are replaced.&lt;br&gt;
+				&lt;b&gt;Target URL or regular expression&lt;/b&gt; - contains destination url or regular expression. Regular expression example: */cc32e46.exe &lt;br&gt;
+				&lt;b&gt;Replace to&lt;/b&gt; - contains replacing url.		
 			</description>
+			<type>input</type>
+			<size>100</size>
 		</field>
 	</fields>
+
 	<custom_php_after_form_command> 
                squidGuard_print_javascript();
 	</custom_php_after_form_command>