Log view changed. Log rotation added. Validation Names with reserved words added.

1 files changed, 60 insertions, 66 deletions

diff --git a/config/squidGuard/squidguard_acl.xml b/config/squidGuard/squidguard_acl.xml
index 03755b8e..04bb8553 100644
--- a/config/squidGuard/squidguard_acl.xml
+++ b/config/squidGuard/squidguard_acl.xml
@@ -2,51 +2,47 @@
 <!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>
-
-        <name>squidguardacl</name>
-        <version>none</version>
-        <title>Proxy filter SquidGuard: Access Control List (ACL)</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>
-                        <url>/pkg_edit.php?xml=squidguard.xml&amp;id=0</url>
-                </tab>
-                <tab>
-                        <text>Default</text>
-                        <url>/pkg_edit.php?xml=squidguard_default.xml&amp;id=0</url>
-                </tab>
-                <tab>
-                        <text>ACL</text>
-                        <url>/pkg.php?xml=squidguard_acl.xml</url>
-                        <active/>
-                </tab>
-                <tab>
-                        <text>Destinations</text>
-                        <url>/pkg.php?xml=squidguard_dest.xml</url>
-                </tab>
-                <tab>
-                        <text>Times</text>
-                        <url>/pkg.php?xml=squidguard_time.xml</url>
-                </tab>
-                <tab>
-                        <text>Rewrites</text>
-                        <url>/pkg.php?xml=squidguard_rewr.xml</url>
-                </tab>
-                <tab>
-                        <text>Log</text>
-                        <url>/pkg_edit.php?xml=squidguard_log.xml&amp;id=0</url>
-                </tab>
-        </tabs>
-
-        <adddeleteeditpagefields>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
+	<name>squidguardacl</name>
+	<version>none</version>
+	<title>Proxy filter SquidGuard: Access Control List (ACL)</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>
+			<url>/pkg_edit.php?xml=squidguard.xml&amp;id=0</url>
+		</tab>
+		<tab>
+			<text>Default</text>
+			<url>/pkg_edit.php?xml=squidguard_default.xml&amp;id=0</url>
+		</tab>
+		<tab>
+			<text>ACL</text>
+			<url>/pkg.php?xml=squidguard_acl.xml</url>
+			<active/>
+		</tab>
+		<tab>
+			<text>Destinations</text>
+			<url>/pkg.php?xml=squidguard_dest.xml</url>
+		</tab>
+		<tab>
+			<text>Times</text>
+			<url>/pkg.php?xml=squidguard_time.xml</url>
+		</tab>
+		<tab>
+			<text>Rewrites</text>
+			<url>/pkg.php?xml=squidguard_rewr.xml</url>
+		</tab>
+		<tab>
+			<text>Log</text>
+			<url>/squidGuard/squidguard_log.php</url>
+		</tab>
+	</tabs>
+	<adddeleteeditpagefields>
                 <columnitem>
                         <fielddescr>Disabled</fielddescr>
                         <fieldname>disabled</fieldname>
@@ -71,9 +67,8 @@
                         <fielddescr>Description</fielddescr>
                         <fieldname>description</fieldname>
                 </columnitem>
-        </adddeleteeditpagefields>
-
-        <fields>
+	</adddeleteeditpagefields>
+	<fields>
                 <field>
                         <fielddescr>Disabled</fielddescr>
                         <fieldname>disabled</fieldname>
@@ -250,30 +245,29 @@
                         <size>100</size>
                 </field>
                 <field>
-                        <fielddescr>Enable log</fielddescr>
+                        <fielddescr>Log</fielddescr>
                         <fieldname>enablelog</fieldname>
-                        <description>Check this for enable log.</description>
+                        <description>Check this for log this item.</description>
                         <type>checkbox</type>
                 </field>
-        </fields>
-
-        <custom_php_validation_command>
+	</fields>
+	<custom_php_validation_command>
                 squidguard_validate_acl(&amp;$_POST, &amp;$input_errors);
-        </custom_php_validation_command>
-        <custom_php_command_before_form>
+	</custom_php_validation_command>
+	<custom_php_command_before_form>
                 squidguard_before_form_acl(&amp;$pkg);
-        </custom_php_command_before_form>
-        <custom_php_after_form_command>
+	</custom_php_command_before_form>
+	<custom_php_after_form_command>
                 squidGuard_print_javascript();
-        </custom_php_after_form_command>
-        <custom_php_resync_config_command>
+	</custom_php_after_form_command>
+	<custom_php_resync_config_command>
                 squidguard_resync_acl();
-        </custom_php_resync_config_command>
-        <custom_delete_php_command>
+	</custom_php_resync_config_command>
+	<custom_delete_php_command>
                 squidguard_resync_acl();
-        </custom_delete_php_command>
-        <custom_add_php_command>
-        </custom_add_php_command>
-        <custom_add_php_command_late>
-        </custom_add_php_command_late>
+	</custom_delete_php_command>
+	<custom_add_php_command>
+	</custom_add_php_command>
+	<custom_add_php_command_late>
+	</custom_add_php_command_late>
 </packagegui>
\ No newline at end of file