diff --git a/install/froxlor.sql b/install/froxlor.sql index ce613015..36947984 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -680,8 +680,8 @@ opcache.interned_strings_buffer'), ('panel', 'password_special_char', '!?<>ยง$%+#=@'), ('panel', 'customer_hide_options', ''), ('panel', 'is_configured', '0'), - ('panel', 'version', '0.10.0'), - ('panel', 'db_version', '201902210'); + ('panel', 'version', '0.10.0-rc1'), + ('panel', 'db_version', '201904100'); DROP TABLE IF EXISTS `panel_tasks`; 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 b63c0b89..2dc3e32a 100644 --- a/install/updates/froxlor/0.10/update_0.10.inc.php +++ b/install/updates/froxlor/0.10/update_0.10.inc.php @@ -24,7 +24,7 @@ if (! defined('_CRON_UPDATE')) { } if (\Froxlor\Froxlor::isFroxlorVersion('0.9.40.1')) { - showUpdateStep("Updating from 0.9.40.1 to 0.10.0", false); + showUpdateStep("Updating from 0.9.40.1 to 0.10.0-rc1", false); showUpdateStep("Adding new api keys table"); Database::query("DROP TABLE IF EXISTS `api_keys`;"); @@ -68,7 +68,7 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.9.40.1')) { } lastStepStatus(0); - \Froxlor\Froxlor::updateToVersion('0.10.0'); + \Froxlor\Froxlor::updateToVersion('0.10.0-rc1'); } if (\Froxlor\Froxlor::isDatabaseVersion('201809280')) { @@ -233,3 +233,10 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201902170')) { \Froxlor\Froxlor::updateToDbVersion('201902210'); } + +if (\Froxlor\Froxlor::isDatabaseVersion('201902210')) { + + // set correct version for people that have tested 0.10.0 before + \Froxlor\Froxlor::updateToVersion('0.10.0-rc1'); + \Froxlor\Froxlor::updateToDbVersion('201904100'); +} diff --git a/lib/Froxlor/Cron/Http/Apache.php b/lib/Froxlor/Cron/Http/Apache.php index 18e07b2c..2a6a9058 100644 --- a/lib/Froxlor/Cron/Http/Apache.php +++ b/lib/Froxlor/Cron/Http/Apache.php @@ -784,14 +784,14 @@ class Apache extends HttpConfigBase 'DOMAIN' => $domain['domain'], 'CUSTOMER' => $domain['loginname'] )); - $logfiles_text .= ' ErrorLog "| ' . $command . "\"\n"; + $logfiles_text .= ' ErrorLog "|' . $command . "\"\n"; // replace for access_log $command = \Froxlor\PhpHelper::replaceVariables(Settings::Get('system.logfiles_script'), array( 'LOGFILE' => $access_log, 'DOMAIN' => $domain['domain'], 'CUSTOMER' => $domain['loginname'] )); - $logfiles_text .= ' CustomLog "| ' . $command . '" ' . $logtype . "\n"; + $logfiles_text .= ' CustomLog "|' . $command . '" ' . $logtype . "\n"; } else { // Create the logfile if it does not exist (fixes #46) touch($error_log); diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index 4a5c3d09..2f0e732a 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -7,10 +7,10 @@ final class Froxlor { // Main version variable - const VERSION = '0.10.0'; + const VERSION = '0.10.0-rc1'; // Database version (YYYYMMDDC where C is a daily counter) - const DBVERSION = '201902210'; + const DBVERSION = '201904100'; // Distribution branding-tag (used for Debian etc.) const BRANDING = '';