Pre POST

Formatting XML sources for standard view

8 files changed, 201 insertions, 131 deletions

diff --git a/packages/squidGuard/squidguard.xml b/packages/squidGuard/squidguard.xml
index 692fe858..45f20cfc 100644
--- a/packages/squidGuard/squidguard.xml
+++ b/packages/squidGuard/squidguard.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-	<title>Proxy server filter SquidGuard: General settings</title>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
+
 	<name>squidguardgeneral</name>
 	<version>1.2.0_1</version>
+	<title>Proxy server filter SquidGuard: General settings</title>
 	<include_file>squidguard.inc</include_file>
 
 	<!-- Installation -->
@@ -12,39 +18,13 @@
 		<section>Services</section>
 		<url>/pkg_edit.php?xml=squidguard.xml&amp;id=0</url>
 	</menu>
-	<additional_files_needed>
-		<item>http://diskatel.narod.ru/pfSense/packages/squidguard.inc</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_cls.inc</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://diskatel.narod.ru/pfSense/packages/upload.inc</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_acl.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_default.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_dest.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_rewr.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_src.xml</item>
-	</additional_files_needed>
-	<additional_files_needed>
-		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_time.xml</item>
-	</additional_files_needed>
+
 	<service>
 		<name>squidGuard</name>
-		<description>Proxy server filter Service</description>
 		<executable>squidGuard</executable>
+		<description>Proxy server filter Service</description>
 	</service>
-
+	
 	<tabs>
 		<tab>
 			<text>General settings</text>
@@ -80,35 +60,65 @@
 			<url>/pkg_edit.php?xml=squidguard_log.xml</url>
 		</tab>
 	</tabs>
+	
+	<additional_files_needed>
+		<item>http://diskatel.narod.ru/pfSense/packages/squidguard.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_cls.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://diskatel.narod.ru/pfSense/packages/upload.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_acl.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_default.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_dest.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_rewr.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_src.xml</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<item>http://diskatel.narod.ru/pfSense/packages/squidguard_time.xml</item>
+	</additional_files_needed>
+
 	<fields>		
 		<field>
-			<fieldname>squidguard_enable</fieldname>
 			<fielddescr>Enable</fielddescr>
-			<type>checkbox</type>
+			<fieldname>squidguard_enable</fieldname>
 			<description>Check this for enable squidGuard</description>
+			<type>checkbox</type>
 		</field>
 		<field>
-			<fieldname>blacklist</fieldname>
 			<fielddescr>Blacklist</fielddescr>
+			<fieldname>blacklist</fieldname>
 			<description>Check this for enable blacklist</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fieldname>admin_email</fieldname>
 			<fielddescr>Administrator email</fielddescr>
+			<fieldname>admin_email</fieldname>
 			<description>This is the email address displayed in error messages to the users.</description>
-			<default_value>admin@localhost</default_value>
 			<type>input</type>
 			<size>100</size>
+			<default_value>admin@localhost</default_value>
 		</field>
 		<field>
-			<fieldname>view_gui_log</fieldname>
 			<fielddescr>View GUI log</fielddescr>
+			<fieldname>view_gui_log</fieldname>
 			<description>Check this for view GUI log</description>
 			<type>checkbox</type>
 		</field>
 	</fields>
-       <custom_php_install_command></custom_php_install_command>
+	
+    <custom_php_install_command></custom_php_install_command>
 	<custom_add_php_command></custom_add_php_command>
 	<custom_php_command_before_form>
 		squidguard_before_form(&amp;$pkg);
diff --git a/packages/squidGuard/squidguard_acl.xml b/packages/squidGuard/squidguard_acl.xml
index cd62fc2f..2d36dcf3 100644
--- a/packages/squidGuard/squidguard_acl.xml
+++ b/packages/squidGuard/squidguard_acl.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-	<include_file>squidguard.inc</include_file>
+	<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 server filter SquidGuard: Access Control List (ACL)</title>
+	<include_file>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>
@@ -42,89 +51,89 @@
 	</tabs>
 	<adddeleteeditpagefields>
 		<columnitem>
-			<fieldname>source</fieldname>
 			<fielddescr>Source</fielddescr>
+			<fieldname>source</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>dest</fieldname>
 			<fielddescr>Destinations</fielddescr>
+			<fieldname>dest</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>time</fieldname>
 			<fielddescr>Uptime</fielddescr>
+			<fieldname>time</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>redirect</fieldname>
 			<fielddescr>Redirect</fielddescr>
+			<fieldname>redirect</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>rewrite</fieldname>
 			<fielddescr>Rewrite</fielddescr>
+			<fieldname>rewrite</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
 		</columnitem>
 	</adddeleteeditpagefields>
 	<fields>
 		<field>
-			<fieldname>disabled</fieldname>
 			<fielddescr>Disabled</fielddescr>
+			<fieldname>disabled</fieldname>
 			<description>Check this for disable this ACL rule.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fieldname>source</fieldname>
 			<fielddescr>Source name</fielddescr>
+			<fieldname>source</fieldname>
 			<description>Select source name here (required). Any ACL must have unique source name.</description>
-			<required/>
 			<type>select</type>
+			<required/>
 		</field>
 		<field>
-			<fieldname>time</fieldname>
 			<fielddescr>Time</fielddescr>
-			<type>select</type>
+			<fieldname>time</fieldname>
 			<description>Enter time name in current which this rule permitted.</description>
+			<type>select</type>
 		</field>
 		<field>
-			<fieldname>dest</fieldname>
 			<fielddescr>Destination</fielddescr>
+			<fieldname>dest</fieldname>
 			<description></description>
 			<type>input</type>
 			<size>114</size>
 		</field>
 		<field>
-			<fieldname>redirect</fieldname>
 			<fielddescr>Redirect</fielddescr>
+			<fieldname>redirect</fieldname>
 			<description>Enter redirection URL or Error page message for this rule, or leave blank.</description>
 			<type>textarea</type>
 			<cols>70</cols>
-                     <rows>5</rows>
+            <rows>5</rows>
 		</field>
 		<field>
-			<fieldname>overredirect</fieldname>
 			<fielddescr>Overtime redirect</fielddescr>
+			<fieldname>overredirect</fieldname>
 			<description>Enter redirection URL or Error page message for this rule, or leave blank.</description>
 			<type>textarea</type>
 			<cols>70</cols>
-                     <rows>5</rows>
+            <rows>5</rows>
 		</field>
 		<field>
-			<fieldname>rewrite</fieldname>
 			<fielddescr>Rewrite</fielddescr>
-			<type>select</type>
+			<fieldname>rewrite</fieldname>
 			<description>Enter rewrite condition name for this rule, or leave blank.</description>
+			<type>select</type>
 		</field>
 		<field>
-			<fieldname>overrewrite</fieldname>
 			<fielddescr>Overtime rewrite</fielddescr>
-			<type>select</type>
+			<fieldname>overrewrite</fieldname>
 			<description>Enter rewrite condition name for this rule, or leave blank.</description>
+			<type>select</type>
 		</field>
 		<field>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
 			<description>You may enter a description here for your reference (not parsed).</description>
+			<fieldname>description</fieldname>
 			<type>input</type>
 			<size>114</size>
 		</field>
diff --git a/packages/squidGuard/squidguard_default.xml b/packages/squidGuard/squidguard_default.xml
index 4d118748..2318f95b 100644
--- a/packages/squidGuard/squidguard_default.xml
+++ b/packages/squidGuard/squidguard_default.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-	<include_file>squidguard.inc</include_file>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
+
 	<name>squidguarddefault</name>
+	<version>none</version>
 	<title>Proxy server filter SquidGuard: Default</title>
+	<include_file>squidguard.inc</include_file>
+	
 	<tabs>
 		<tab>
 			<text>General settings</text>
@@ -40,51 +48,51 @@
 	</tabs>
 	<fields>		
 		<field>
-			<fieldname>time</fieldname>
 			<fielddescr>Default Time</fielddescr>
+			<fieldname>time</fieldname>
 			<type>select</type>
 			<description>Enter time name in current which this rule permitted.</description>
 		</field>
 		<field>
-			<fieldname>dest</fieldname>
 			<fielddescr>Default destination</fielddescr>
+			<fieldname>dest</fieldname>
 			<description></description>
 			<type>input</type>
 			<size>115</size>
 		</field>
 		<field>
-			<fieldname>redirect</fieldname>
 			<fielddescr>Default Redirect</fielddescr>
+			<fieldname>redirect</fieldname>
 			<description>Enter redirection URL or Error page message for this rule, or leave blank.</description>
 			<type>textarea</type>
 			<cols>70</cols>
-                     <rows>5</rows>
+            <rows>5</rows>
 		</field>
 		<field>
-			<fieldname>overredirect</fieldname>
 			<fielddescr>Default overtime redirect</fielddescr>
+			<fieldname>overredirect</fieldname>
 			<description>Enter redirection URL or Error page message for this rule, or leave blank.</description>
 			<type>textarea</type>
 			<cols>70</cols>
-                     <rows>5</rows>
+            <rows>5</rows>
 		</field>
 		<field>
-			<fieldname>rewrite</fieldname>
 			<fielddescr>Default Rewrite</fielddescr>
-			<type>select</type>
+			<fieldname>rewrite</fieldname>
 			<description>Enter rewrite condition name for this rule, or leave blank.</description>
+			<type>select</type>
 		</field>
 		<field>
-			<fieldname>overrewrite</fieldname>
 			<fielddescr>Default overtime rewrite</fielddescr>
-			<type>select</type>
+			<fieldname>overrewrite</fieldname>
 			<description>Enter rewrite condition name for this rule, or leave blank.</description>
+			<type>select</type>
 		</field>
 		<field>
-			<fieldname>enablelog</fieldname>
 			<fielddescr>Enable log</fielddescr>
-			<type>checkbox</type>
+			<fieldname>enablelog</fieldname>
 			<description>Check this for enable log.</description>
+			<type>checkbox</type>
 		</field>
 	</fields>
 	<custom_php_validation_command>
diff --git a/packages/squidGuard/squidguard_dest.xml b/packages/squidGuard/squidguard_dest.xml
index 213a0406..b70d8acc 100644
--- a/packages/squidGuard/squidguard_dest.xml
+++ b/packages/squidGuard/squidguard_dest.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-	<include_file>squidguard.inc</include_file>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
+
 	<name>squidguarddest</name>
+	<version>none</version>
 	<title>Proxy server filter SquidGuard: Destinations</title>
+	<include_file>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>
@@ -42,34 +51,34 @@
 	</tabs>
 	<adddeleteeditpagefields>
 		<columnitem>
-			<fieldname>name</fieldname>
 			<fielddescr>Destination name</fielddescr>
+			<fieldname>name</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>domains</fieldname>
 			<fielddescr>Domain list</fielddescr>
+			<fieldname>domains</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>urls</fieldname>
 			<fielddescr>URL list</fielddescr>
+			<fieldname>urls</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>expressions</fieldname>
 			<fielddescr>Expressions</fielddescr>
+			<fieldname>expressions</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>redir</fieldname>
 			<fielddescr>Redirect</fielddescr>
+			<fieldname>redir</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
 		</columnitem>
 	</adddeleteeditpagefields>
 	<fields>
 		<field>
-			<fieldname>name</fieldname>
 			<fielddescr>Name</fielddescr>
+			<fieldname>name</fieldname>
 			<description>				
 				You may enter name here. Name must consist of minimum 2 symbols, first from which letter. &lt;br&gt;
 				All other symbols must be [a-Z_0-9].
@@ -79,8 +88,8 @@
 			<required/>
 		</field>
 		<field>
-			<fieldname>domains</fieldname>
 			<fielddescr>Domains list</fielddescr>
+			<fieldname>domains</fieldname>
 			<description>
 				Enter destination domains here. For separate domains names use ' '(space). 
 				&lt;p&gt; &lt;b&gt;Example:&lt;/b&gt; 'mail.ru e-mail.ru yahoo.com' .
@@ -102,8 +111,8 @@
 			<rows>10</rows>
 		</field>
 		<field>
-			<fieldname>urls</fieldname>
 			<fielddescr>URLs list</fielddescr>
+			<fieldname>urls</fieldname>
 			<description>
 				Enter url's here. 
 				For separate urls's use ' '(space). 
@@ -114,22 +123,22 @@
 			<rows>10</rows>
 		</field>
 		<field>
-			<fieldname>redir</fieldname>
 			<fielddescr>Redirect</fielddescr>
+			<fieldname>redir</fieldname>
 			<description>Enter redirection URL or Error page message for this rule, or leave blank.</description>
 			<type>textarea</type>
 			<cols>60</cols>
                      <rows>5</rows>
 		</field>
 		<field>
-			<fieldname>enablelog</fieldname>
 			<fielddescr>Enable log</fielddescr>
-			<type>checkbox</type>
+			<fieldname>enablelog</fieldname>
 			<description>Check this for enable log.</description>
+			<type>checkbox</type>
 		</field>
 		<field>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
 			<description>You may enter a description here for your reference (not parsed).</description>
 			<type>input</type>
 			<size>90</size>
diff --git a/packages/squidGuard/squidguard_log.xml b/packages/squidGuard/squidguard_log.xml
index 16f06a6a..9769c3fb 100644
--- a/packages/squidGuard/squidguard_log.xml
+++ b/packages/squidGuard/squidguard_log.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-	<include_file>squidguard.inc</include_file>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
+
 	<name>squidguardlog</name>
+	<version>none</version>
 	<title>Proxy server filter SquidGuard: Log</title>
+	<include_file>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>
@@ -42,18 +51,17 @@
 	</tabs>
 	<fields>
 		<field>
-			<fieldname>logtype</fieldname>
 			<fielddescr>Log type</fielddescr>
+			<fieldname>logtype</fieldname>
 			<description>LOG</description>
 			<type>select</type>
 			<value>access_log</value>
 			<options>
-				<option><value>access_log</value><name>User access log</name></option>
-			    	<option><value>webgui_log</value><name>WebGUI log</name></option>
-			    	<option><value>squidguard_log</value><name>squidGuard log</name></option>
+				<option><name>User access log</name><value>access_log</value></option>
+			    <option><name>WebGUI log</name><value>webgui_log</value></option>
+			    <option><name>squidGuard log</name><value>squidguard_log</value></option>
 			</options> 
 		</field>
-
 	</fields>
 	<custom_php_command_before_form>
 		squidguard_before_form_log(&amp;$pkg);
diff --git a/packages/squidGuard/squidguard_rewr.xml b/packages/squidGuard/squidguard_rewr.xml
index e5290d49..6dcdec5e 100644
--- a/packages/squidGuard/squidguard_rewr.xml
+++ b/packages/squidGuard/squidguard_rewr.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-	<include_file>squidguard.inc</include_file>
+	<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>
+
 	<tabs>
 		<tab>
 			<text>General settings</text>
@@ -40,18 +48,18 @@
 	</tabs>
 	<adddeleteeditpagefields>
 		<columnitem>
-			<fieldname>name</fieldname>
 			<fielddescr>Name</fielddescr>
+			<fieldname>name</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
 		</columnitem>
 	</adddeleteeditpagefields>
 	<fields>		
 		<field>
-			<fieldname>name</fieldname>
 			<fielddescr>Name</fielddescr>
+			<fieldname>name</fieldname>
 			<description>
 				You may enter name here. Name must consist of minimum 2 symbols, first from which letter. &lt;br&gt;
 				All other symbols must be [a-Z_0-9].				
@@ -61,14 +69,14 @@
 			<size>100</size>
 		</field>
 		<field>
-			<fieldname>enablelog</fieldname>
 			<fielddescr>Enable log</fielddescr>
+			<fieldname>enablelog</fieldname>
 			<type>checkbox</type>
 			<description>Check this for enable log.</description>
 		</field>
 		<field>
-			<fieldname>description</fieldname>
 			<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>
@@ -109,8 +117,8 @@
 			</rowhelper>
 		</field>
 		<field>
-			<fieldname>note</fieldname>
 			<fielddescr>Note</fielddescr>
+			<fieldname>note</fieldname>
 			<type>checkbox</type>
 			<description>
 				&lt;b&gt;Rewrite rule&lt;/b&gt;-define how url will are replaced.&lt;br&gt;
diff --git a/packages/squidGuard/squidguard_src.xml b/packages/squidGuard/squidguard_src.xml
index 1b79cb27..3a291c42 100644
--- a/packages/squidGuard/squidguard_src.xml
+++ b/packages/squidGuard/squidguard_src.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-	<include_file>squidguard.inc</include_file>
+	<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>
+
 	<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>
@@ -42,33 +51,33 @@
 	</tabs>
 	<adddeleteeditpagefields>
 		<columnitem>
-			<fieldname>name</fieldname>
 			<fielddescr>Source name</fielddescr>
+			<fieldname>name</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>iplist</fieldname>
 			<fielddescr>IP list</fielddescr>
+			<fieldname>iplist</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
 		</columnitem>
 	</adddeleteeditpagefields>
 	<fields>
 		<field>
-			<fieldname>name</fieldname>
 			<fielddescr>Source name</fielddescr>
+			<fieldname>name</fieldname>
 			<description>
 				You can enter name here. Name consist minimum 2 symbols, first from which letter. &lt;br&gt;
 				All other symbols is [a-Z_0-9]. Source name must be &lt;b&gt;unique&lt;/b&gt; .
 			</description>
 			<type>input</type>
-			<required/>
 			<size>80</size>
+			<required/>
 		</field>
 		<field>
-			<fieldname>iplist</fieldname>
 			<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; 
@@ -84,14 +93,14 @@
 			<rows>10</rows>
 		</field>
 		<field>
-			<fieldname>enablelog</fieldname>
 			<fielddescr>Enable log</fielddescr>
-			<type>checkbox</type>
+			<fieldname>enablelog</fieldname>
 			<description>Check this for enable log.</description>
+			<type>checkbox</type>
 		</field>
 		<field>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
 			<description></description>
 			<type>input</type>
 			<size>80</size>
diff --git a/packages/squidGuard/squidguard_time.xml b/packages/squidGuard/squidguard_time.xml
index 53ebcd2e..89f37590 100644
--- a/packages/squidGuard/squidguard_time.xml
+++ b/packages/squidGuard/squidguard_time.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
-	<include_file>squidguard.inc</include_file>
+	<description>Describe your package here</description>
+	<requirements>Describe your package requirements here</requirements>
+	<faq>Currently there are no FAQ items provided.</faq>
+
 	<name>squidguardtime</name>
+	<version>none</version>
 	<title>Proxy server filter SquidGuard: Times</title>
+	<include_file>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>
@@ -42,22 +51,22 @@
 	</tabs>
 	<adddeleteeditpagefields>
 		<columnitem>
-			<fieldname>name</fieldname>
 			<fielddescr>Timename</fielddescr>
+			<fieldname>name</fieldname>
 		</columnitem>
 		<columnitem>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
 		</columnitem>
 	</adddeleteeditpagefields>
 	<fields>
 		<field>
-			<fieldname>name</fieldname>
 			<fielddescr>Name</fielddescr>
+			<fieldname>name</fieldname>
 			<description>Enter the time name here.</description>
 			<type>input</type>
-			<required/>
 			<size>80</size>
+			<required/>
 		</field>
 		<field>
   			<type>rowhelper</type> 
@@ -70,8 +79,8 @@
 					<type>select</type>
 					<value>weekly</value>
 					<options>
-			    			<option><value>weekly</value><name>Weekly</name></option>
-			    			<option><value>date</value><name>Date</name></option>
+			    			<option><name>Weekly</name><value>weekly</value></option>
+			    			<option><name>Date</name><value>date</value></option>
 					</options> 
   				</rowhelperfield>
  				<rowhelperfield>
@@ -81,35 +90,35 @@
 					<type>select</type>
 					<value>*</value>
 					<options>
-			    			<option><value>*</value><name>all</name></option>
-			    			<option><value>mon</value><name>mon</name></option>
-			    			<option><value>tue</value><name>tue</name></option>
-			    			<option><value>wed</value><name>wed</name></option>
-			    			<option><value>thu</value><name>thu</name></option>
-			    			<option><value>fri</value><name>fri</name></option>
-			    			<option><value>sat</value><name>sat</name></option>
-			    			<option><value>sun</value><name>sun</name></option>
+			    			<option><name>all</name><value>*</value></option>
+			    			<option><name>mon</name><value>mon</value></option>
+			    			<option><name>tue</name><value>tue</value></option>
+			    			<option><name>wed</name><value>wed</value></option>
+			    			<option><name>thu</name><value>thu</value></option>
+			    			<option><name>fri</name><value>fri</value></option>
+			    			<option><name>sat</name><value>sat</value></option>
+			    			<option><name>sun</name><value>sun</value></option>
 					</options> 
   				</rowhelperfield>
  				<rowhelperfield>
-  					<type>input</type> 
-					<size>40</size>
-  					<fieldname>daterange</fieldname> 
   					<fielddescr>Date or Date range</fielddescr> 
+  					<fieldname>daterange</fieldname> 
   					<description>00:00-08:00 15:00-21:00 Format: *.01.01</description> 
+  					<type>input</type> 
+					<size>40</size>
   				</rowhelperfield>
  				<rowhelperfield>
-  					<type>input</type> 
-					<size>20</size>
-  					<fieldname>timerange</fieldname> 
   					<fielddescr>Time range</fielddescr> 
+  					<fieldname>timerange</fieldname> 
   					<description>00:00-08:00</description> 
+  					<type>input</type> 
+					<size>20</size>
   				</rowhelperfield>
   			</rowhelper>
 		</field>
 		<field>
-			<fieldname>description</fieldname>
 			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
 			<description>You may enter a description here for your reference (not parsed).</description>
 			<type>input</type>
 			<size>80</size>