maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

set version to 0.10.1 for maintenance release

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-10-10 14:55:45 +02:00
parent 050af61082
commit 9167608794
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_autoupdate.php
View File

@@ -178,6 +178,8 @@ elseif ($page == 'extract') {
$zip->close(); $zip->close();
// success - remove unused archive // success - remove unused archive
@unlink($localArchive); @unlink($localArchive);
// wait a bit before we redirect to be sure
sleep(2);
} else { } else {
// error // error
\Froxlor\UI\Response::redirectTo($filename, array( \Froxlor\UI\Response::redirectTo($filename, array(

2
install/froxlor.sql
View File

@@ -685,7 +685,7 @@ opcache.interned_strings_buffer'),
('panel', 'password_special_char', '!?<>§$%+#=@'), ('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'customer_hide_options', ''), ('panel', 'customer_hide_options', ''),
('panel', 'is_configured', '0'), ('panel', 'is_configured', '0'),
('panel', 'version', '0.10.0'), ('panel', 'version', '0.10.1'),
('panel', 'db_version', '201910090'); ('panel', 'db_version', '201910090');

7
install/updates/froxlor/0.10/update_0.10.inc.php
View File

@@ -320,7 +320,7 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201907270')) {
lastStepStatus(0); lastStepStatus(0);
} else { } else {
if (empty($del_list)) { if (empty($del_list)) {
// non of the files existed // none of the files existed
lastStepStatus(0); lastStepStatus(0);
} else { } else {
lastStepStatus(1, 'manual commands needed'); lastStepStatus(1, 'manual commands needed');
@@ -354,3 +354,8 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201910030')) {
\Froxlor\Froxlor::updateToDbVersion('201910090'); \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');
}

2
lib/Froxlor/Froxlor.php
View File

@@ -7,7 +7,7 @@ final class Froxlor
{ {
// Main version variable // Main version variable
const VERSION = '0.10.0'; const VERSION = '0.10.1';
// Database version (YYYYMMDDC where C is a daily counter) // Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '201910090'; const DBVERSION = '201910090';

3
lib/Froxlor/Validate/Validate.php
View File

@@ -23,8 +23,6 @@ class Validate
*/ */
public static function validate($str, $fieldname, $pattern = '', $lng = '', $emptydefault = array(), $throw_exception = false) public static function validate($str, $fieldname, $pattern = '', $lng = '', $emptydefault = array(), $throw_exception = false)
{ {
global $log;
if (! is_array($emptydefault)) { if (! is_array($emptydefault)) {
$emptydefault_array = array( $emptydefault_array = array(
$emptydefault $emptydefault
@@ -48,6 +46,7 @@ class Validate
// everything else is removed from the string. // everything else is removed from the string.
$allowed = "/[^a-z0-9\\040\\.\\-\\_\\\\]/i"; $allowed = "/[^a-z0-9\\040\\.\\-\\_\\\\]/i";
$str = preg_replace($allowed, "", $str); $str = preg_replace($allowed, "", $str);
$log = \Froxlor\FroxlorLogger::getInstanceOf();
$log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_WARNING, "cleaned bad formatted string (" . $str . ")"); $log->logAction(\Froxlor\FroxlorLogger::USR_ACTION, LOG_WARNING, "cleaned bad formatted string (" . $str . ")");
} }
} }