havp update new version ; squidGuard fix small bug

8 files changed, 19 insertions, 18 deletions

diff --git a/config/squidGuard/squidguard.xml b/config/squidGuard/squidguard.xml
index b00e9ed8..e38da835 100644
--- a/config/squidGuard/squidguard.xml
+++ b/config/squidGuard/squidguard.xml
@@ -7,13 +7,13 @@
     <faq>Currently there are no FAQ items provided.</faq>
 
         <name>squidguardgeneral</name>
-        <version>1.2.0_1</version>
-        <title>Proxy Content filter SquidGuard: General settings</title>
+        <version>1.2.0_2</version>
+        <title>Proxy filter SquidGuard: General settings</title>
         <include_file>/usr/local/pkg/squidguard.inc</include_file>
 
         <!-- Installation -->
         <menu>
-                <name>Proxy Content filter</name>
+                <name>Proxy filter</name>
                 <tooltiptext>Modify the proxy server's filter settings</tooltiptext>
                 <section>Services</section>
                 <url>/pkg_edit.php?xml=squidguard.xml&amp;id=0</url>
diff --git a/config/squidGuard/squidguard_acl.xml b/config/squidGuard/squidguard_acl.xml
index a71979a3..fda12197 100644
--- a/config/squidGuard/squidguard_acl.xml
+++ b/config/squidGuard/squidguard_acl.xml
@@ -8,7 +8,7 @@
 
         <name>squidguardacl</name>
         <version>none</version>
-        <title>Proxy Content filter SquidGuard: Access Control List (ACL)</title>
+        <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>
@@ -223,7 +223,7 @@
                         <fielddescr>Spec: Use safe search engine</fielddescr>
                         <fieldname>safesearch</fieldname>
                         <description>
-                                To protect your children from adult content, you can use the protected mode of search engines. 
+                                To protect your children from adult content, you can use the protected mode of search engines.
                                 Now it is supported by Google, Yandex, Yahoo, MSN, Live Search. Make sure that the search engines can, and others, it is recommended to prohibit.
                                 &lt;br&gt;Note: ! This option overrides 'Rewrite' setting. !
                         </description>
diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc
index f683a19c..1d609e2a 100644
--- a/config/squidGuard/squidguard_configurator.inc
+++ b/config/squidGuard/squidguard_configurator.inc
@@ -52,8 +52,8 @@ require_once('squid.inc');
 
 /* Allow additional execution time 0 = no limit. */
 ini_set('max_execution_time', '3600');
-ini_set('max_input_time', '3600');
-ini_set('memory_limit', '32M');
+ini_set('max_input_time',     '3600');
+ini_set('memory_limit',       '100M');
 
 # ------------------------------------------------------------------------------
 # files header
@@ -872,7 +872,8 @@ function sg_create_config()
         }
 
         # log
-        sg_addlog("sg_create_config: add rewrites: \n success $log_entr_added \n error $log_entr_err", 1);
+        if (!empty($log_entr_added)) sg_addlog("sg_create_config: add rewrites: success $log_entr_added", 1);
+        if (!empty($log_entr_err))   sg_addlog("sg_create_config: add rewrites: error $log_entr_err", 1);
     }
 
     # ----------------------------------------
diff --git a/config/squidGuard/squidguard_default.xml b/config/squidGuard/squidguard_default.xml
index 78401918..f3a7428c 100644
--- a/config/squidGuard/squidguard_default.xml
+++ b/config/squidGuard/squidguard_default.xml
@@ -8,7 +8,7 @@
 
         <name>squidguarddefault</name>
         <version>none</version>
-        <title>Proxy Content filter SquidGuard: Default</title>
+        <title>Proxy filter SquidGuard: Default</title>
         <include_file>/usr/local/pkg/squidguard.inc</include_file>
 
         <tabs>
@@ -106,7 +106,7 @@
                         <fielddescr>Spec: Use safe search engine</fielddescr>
                         <fieldname>safesearch</fieldname>
                         <description>
-                                To protect your children from adult content, you can use the protected mode of search engines. 
+                                To protect your children from adult content, you can use the protected mode of search engines.
                                 Now it is supported by Google, Yandex, Yahoo, MSN, Live Search. Make sure that the search engines can, and others, it is recommended to prohibit.
                                 &lt;br&gt;Note: ! This option overrides 'Rewrite' setting. !
                         </description>
diff --git a/config/squidGuard/squidguard_dest.xml b/config/squidGuard/squidguard_dest.xml
index fa9d4ac2..35bbb6f8 100644
--- a/config/squidGuard/squidguard_dest.xml
+++ b/config/squidGuard/squidguard_dest.xml
@@ -8,7 +8,7 @@
 
         <name>squidguarddest</name>
         <version>none</version>
-        <title>Proxy Content filter SquidGuard: Destinations</title>
+        <title>Proxy filter SquidGuard: Destinations</title>
         <include_file>/usr/local/pkg/squidguard.inc</include_file>
 
         <delete_string>A proxy server user has been deleted.</delete_string>
diff --git a/config/squidGuard/squidguard_log.xml b/config/squidGuard/squidguard_log.xml
index ae781562..ed3c7a9d 100644
--- a/config/squidGuard/squidguard_log.xml
+++ b/config/squidGuard/squidguard_log.xml
@@ -8,7 +8,7 @@
 
 	<name>squidguardlog</name>
 	<version>none</version>
-	<title>Proxy Content filter SquidGuard: Log</title>
+	<title>Proxy filter SquidGuard: Log</title>
 	<include_file>/usr/local/pkg/squidguard.inc</include_file>
 
 	<delete_string>A proxy server user has been deleted.</delete_string>
@@ -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 @@
 			<active/>
 		</tab>
 	</tabs>
-	
+
 	<fields>
 		<field>
 			<fielddescr>Log type</fielddescr>
@@ -59,14 +59,14 @@
 			    	<option><name>squidGuard log</name><value>squidguard_log</value></option>
 			    	<option><name>squid config</name><value>squid_config</value></option>
 			    	<option><name>squidGuard config</name><value>squidguard_config</value></option>
-			</options> 
+			</options>
 		</field>
 	</fields>
 
 	<custom_php_command_before_form>
 		squidguard_before_form_log(&amp;$pkg);
 	</custom_php_command_before_form>
-	<custom_php_after_form_command> 
+	<custom_php_after_form_command>
         squidGuard_print_javascript();
 	</custom_php_after_form_command>
 	<custom_php_validation_command>
diff --git a/config/squidGuard/squidguard_rewr.xml b/config/squidGuard/squidguard_rewr.xml
index d126a9ae..da811b14 100644
--- a/config/squidGuard/squidguard_rewr.xml
+++ b/config/squidGuard/squidguard_rewr.xml
@@ -8,7 +8,7 @@
 
 	<name>squidguardrewrite</name>
 	<version>none</version>
-	<title>Proxy Content filter SquidGuard: Rewrites</title>
+	<title>Proxy filter SquidGuard: Rewrites</title>
 	<include_file>/usr/local/pkg/squidguard.inc</include_file>
 
 	<tabs>
diff --git a/config/squidGuard/squidguard_time.xml b/config/squidGuard/squidguard_time.xml
index 623f7d0a..df3bf165 100644
--- a/config/squidGuard/squidguard_time.xml
+++ b/config/squidGuard/squidguard_time.xml
@@ -8,7 +8,7 @@
 
 	<name>squidguardtime</name>
 	<version>none</version>
-	<title>Proxy Content filter SquidGuard: Times</title>
+	<title>Proxy filter SquidGuard: Times</title>
 	<include_file>/usr/local/pkg/squidguard.inc</include_file>
 
 	<delete_string>A proxy server user has been deleted.</delete_string>