Changes in GUI:

sources
- add user name support
acl, destination
- add redirection type
general page
- remove redirection type
- add error-showing when 'Apply' changes
Also many optimisations in .inc files.

1 files changed, 22 insertions, 17 deletions

diff --git a/packages/squidGuard/squidguard_time.xml b/packages/squidGuard/squidguard_time.xml
index 76b781ab..623f7d0a 100644
--- a/packages/squidGuard/squidguard_time.xml
+++ b/packages/squidGuard/squidguard_time.xml
@@ -29,7 +29,7 @@
 		</tab>
 		<tab>
 			<text>Destinations</text>
-			<url>/pkg.php?xml=squidguard_dest.xml</url>			
+			<url>/pkg.php?xml=squidguard_dest.xml</url>
 		</tab>
 		<tab>
 			<text>Times</text>
@@ -45,7 +45,7 @@
 			<url>/pkg_edit.php?xml=squidguard_log.xml</url>
 		</tab>
 	</tabs>
-	
+
 	<adddeleteeditpagefields>
 		<columnitem>
 			<fielddescr>Timename</fielddescr>
@@ -60,14 +60,18 @@
 		<field>
 			<fielddescr>Name</fielddescr>
 			<fieldname>name</fieldname>
-			<description>Enter the time name here.</description>
+			<description>
+			       Enter the unique 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].
+            </description>
 			<type>input</type>
 			<required/>
-			<size>80</size>
+			<size>100</size>
 		</field>
 		<field>
 			<fielddescr>Values</fielddescr>
-  			<type>rowhelper</type> 
+  			<type>rowhelper</type>
  			<rowhelper>
  				<rowhelperfield>
 					<fielddescr>Time type</fielddescr>
@@ -78,7 +82,7 @@
 					<options>
 			    			<option><name>Weekly</name><value>weekly</value></option>
 			    			<option><name>Date</name><value>date</value></option>
-					</options> 
+					</options>
   				</rowhelperfield>
  				<rowhelperfield>
 					<fielddescr>Days</fielddescr>
@@ -95,20 +99,21 @@
 			    			<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> 
+					</options>
   				</rowhelperfield>
  				<rowhelperfield>
-  					<fielddescr>Date or Date range</fielddescr> 
-  					<fieldname>daterange</fieldname> 
-  					<type>input</type> 
+  					<fielddescr>Date or Date range</fielddescr>
+  					<fieldname>daterange</fieldname>
+  					<type>input</type>
 					<size>40</size>
   				</rowhelperfield>
  				<rowhelperfield>
-  					<fielddescr>Time range</fielddescr> 
-  					<fieldname>sg_timerange</fieldname> 
-  					<description>00:00-08:00</description> 
-  					<type>input</type> 
+  					<fielddescr>Time range</fielddescr>
+  					<fieldname>sg_timerange</fieldname>
+  					<description>00:00-08:00</description>
+  					<type>input</type>
 					<size>20</size>
+					<value>00:00-23:59</value>
   				</rowhelperfield>
   			</rowhelper>
 		</field>
@@ -116,7 +121,7 @@
 			<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; Note: &lt;/b&gt; &lt;br&gt;
 				Field &lt;b&gt;'Date or date range'&lt;/b&gt; have format 'yyyy.mm.dd'; 'yyyy.mm.dd-yyyy.mm.dd'; or use '*' in format. &lt;br&gt;
 				Example: '2007.05.01'; '2007.04.14-2007.04.17'; '*.12.24'; '2007.*.01'; &lt;br&gt;
 				Field &lt;b&gt;'Time range'&lt;/b&gt; have format 'hh:mm-hh:mm'. Example: '08:00-18:00';
@@ -125,8 +130,8 @@
 			<size>80</size>
 		</field>
 	</fields>
-	
-	<custom_php_after_form_command> 
+
+	<custom_php_after_form_command>
 		squidGuard_print_javascript();
 	</custom_php_after_form_command>
 	<custom_php_validation_command>