From 9167608794b5e3c36bf723a5ba9414be42582ed4 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Thu, 10 Oct 2019 14:55:45 +0200
Subject: [PATCH] set version to 0.10.1 for maintenance release

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 admin_autoupdate.php                             | 2 ++
 install/froxlor.sql                              | 2 +-
 install/updates/froxlor/0.10/update_0.10.inc.php | 7 ++++++-
 lib/Froxlor/Froxlor.php                          | 2 +-
 lib/Froxlor/Validate/Validate.php                | 3 +--
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/admin_autoupdate.php b/admin_autoupdate.php
index f997870001..67bc31223f 100644
--- a/admin_autoupdate.php
+++ b/admin_autoupdate.php
@@ -178,6 +178,8 @@
 			$zip->close();
 			// success - remove unused archive
 			@unlink($localArchive);
+			// wait a bit before we redirect to be sure
+			sleep(2);
 		} else {
 			// error
 			\Froxlor\UI\Response::redirectTo($filename, array(
diff --git a/install/froxlor.sql b/install/froxlor.sql
index da14ee16f4..7958193336 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -685,7 +685,7 @@ opcache.interned_strings_buffer'),
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
 	('panel', 'customer_hide_options', ''),
 	('panel', 'is_configured', '0'),
-	('panel', 'version', '0.10.0'),
+	('panel', 'version', '0.10.1'),
 	('panel', 'db_version', '201910090');
 
 
diff --git a/install/updates/froxlor/0.10/update_0.10.inc.php b/install/updates/froxlor/0.10/update_0.10.inc.php
index 33b82bcadd..8961c27b0e 100644
--- a/install/updates/froxlor/0.10/update_0.10.inc.php
+++ b/install/updates/froxlor/0.10/update_0.10.inc.php
@@ -320,7 +320,7 @@
 		lastStepStatus(0);
 	} else {
 		if (empty($del_list)) {
-			// non of the files existed
+			// none of the files existed
 			lastStepStatus(0);
 		} else {
 			lastStepStatus(1, 'manual commands needed');
@@ -354,3 +354,8 @@
 
 	\Froxlor\Froxlor::updateToDbVersion('201910090');
 }
+
+if (\Froxlor\Froxlor::isFroxlorVersion('0.10.0')) {
+        showUpdateStep("Updating from 0.10.0 to 0.10.1 final", false);
+        \Froxlor\Froxlor::updateToVersion('0.10.1');
+}
diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php
index a9382f050f..429c5e840e 100644
--- a/lib/Froxlor/Froxlor.php
+++ b/lib/Froxlor/Froxlor.php
@@ -7,7 +7,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '0.10.0';
+	const VERSION = '0.10.1';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '201910090';
diff --git a/lib/Froxlor/Validate/Validate.php b/lib/Froxlor/Validate/Validate.php
index 3e77b5958c..1902073571 100644
--- a/lib/Froxlor/Validate/Validate.php
+++ b/lib/Froxlor/Validate/Validate.php
@@ -23,8 +23,6 @@ class Validate
 	 */
 	public static function validate($str, $fieldname, $pattern = '', $lng = '', $emptydefault = array(), $throw_exception = false)
 	{
-		global $log;
-
 		if (! is_array($emptydefault)) {
 			$emptydefault_array = array(
 				$emptydefault
@@ -48,6 +46,7 @@ public static function validate($str, $fieldname, $pattern = '', $lng = '', $emp
 				// everything else is removed from the string.
 				$allowed = "/[^a-z0-9\\040\\.\\-\\_\\\\]/i";
 				$str = preg_replace($allowed, "", $str);
+				$log = \Froxlor\FroxlorLogger::getInstanceOf();
 				$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_WARNING, "cleaned bad formatted string (" . $str . ")");
 			}
 		}