diff --git a/actions/admin/settings/000.version.php b/actions/admin/settings/000.version.php index b2ac1149..f469b251 100644 --- a/actions/admin/settings/000.version.php +++ b/actions/admin/settings/000.version.php @@ -19,12 +19,18 @@ return array( 'groups' => array( 'version' => array( 'fields' => array( - 'system_dbversion' => array( - 'settinggroup' => 'system', - 'varname' => 'dbversion', + 'panel_version' => array( + 'settinggroup' => 'panel', + 'varname' => 'version', 'type' => 'hidden', 'default' => '', ), + 'panel_frontend' => array( + 'settinggroup' => 'panel', + 'varname' => 'frontend', + 'type' => 'hidden', + 'default' => 'syscp', + ), 'system_last_tasks_run' => array( 'settinggroup' => 'system', 'varname' => 'last_tasks_run', @@ -61,4 +67,4 @@ return array( ), ); -?> \ No newline at end of file +?> diff --git a/install/updates/froxlor/upgrade_syscp.inc.php b/install/updates/froxlor/upgrade_syscp.inc.php index 553e8e6a..62bcb483 100644 --- a/install/updates/froxlor/upgrade_syscp.inc.php +++ b/install/updates/froxlor/upgrade_syscp.inc.php @@ -16,7 +16,7 @@ */ -$updateto = '1.0'; +$updateto = '0.9'; $frontend = 'froxlor'; $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Upgrading SysCP ".$settings['panel']['version']." to Froxlor ". $updateto); @@ -33,7 +33,7 @@ $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname * this is the main upgrade */ if($settings['panel']['frontend'] == 'froxlor' -&& $settings['panel']['version'] == '1.0') +&& $settings['panel']['version'] == '0.9') { /* diff --git a/install/updatesql.php b/install/updatesql.php index ebc91b93..1283a86c 100644 --- a/install/updatesql.php +++ b/install/updatesql.php @@ -31,7 +31,7 @@ require ('../lib/tables.inc.php'); * Inlcudes the MySQL-Connection-Class */ -require ('../lib/class_mysqldb.php'); +require ('../lib/classes/database/class.db.php'); $db = new db($sql['host'], $sql['user'], $sql['password'], $sql['db']); unset($sql['password']); unset($db->password); @@ -112,7 +112,7 @@ if(!isset($settings['panel']['frontend']) } /** - * Upgrading SysCP to Froxlor-1.0 + * Upgrading SysCP to Froxlor-0.9 * * when we reach this part, all necessary updates * should have been installes automatically by the @@ -127,4 +127,4 @@ inserttask('1'); @chmod('../lib/userdata.inc.php', 0440); header('Location: ../index.php'); -?> \ No newline at end of file +?>