|
@@ -110,7 +110,7 @@ error_reporting(E_ALL);
|
|
|
// Upgrading from any subversion of 1.6 is just like upgrading from 1.6.5
|
|
|
$update_from_version_6 = array('1.6', '1.6.1', '1.6.2', '1.6.3', '1.6.4', '1.6.5');
|
|
|
// Upgrading from any subversion of 1.8 avoids the additional step of upgrading from 1.6
|
|
|
-$update_from_version_8 = array('1.8', '1.8.2', '1.8.3', '1.8.4', '1.8.5', '1.8.6', '1.8.6.1', '1.8.6.2','1.8.7','1.8.7.1','1.8.8','1.8.8.2', '1.8.8.4', '1.8.8.6');
|
|
|
+$update_from_version_8 = array('1.8', '1.8.2', '1.8.3', '1.8.4', '1.8.5', '1.8.6', '1.8.6.1', '1.8.6.2','1.8.7','1.8.7.1','1.8.8','1.8.8.2', '1.8.8.4', '1.8.8.6', '1.9.0');
|
|
|
|
|
|
$my_old_version = '';
|
|
|
$tmp_version = get_config_param('dokeos_version');
|
|
@@ -763,13 +763,15 @@ if (@$_POST['step2']) {
|
|
|
|
|
|
$_configuration['main_database'] = $dbNameForm;
|
|
|
//$urlAppendPath = get_config_param('urlAppend');
|
|
|
- Log::notice('Starting migration process from '.$my_old_version.' ('.time().')');
|
|
|
-
|
|
|
- if ($userPasswordCrypted == '1') {
|
|
|
- $userPasswordCrypted = 'md5';
|
|
|
- } elseif ($userPasswordCrypted == '0') {
|
|
|
- $userPasswordCrypted = 'none';
|
|
|
- }
|
|
|
+ Log::notice('Starting migration process from old version: '.$my_old_version.' ('.time().')');
|
|
|
+
|
|
|
+ if (isset($userPasswordCrypted)) {
|
|
|
+ if ($userPasswordCrypted == '1') {
|
|
|
+ $userPasswordCrypted = 'md5';
|
|
|
+ } elseif ($userPasswordCrypted == '0') {
|
|
|
+ $userPasswordCrypted = 'none';
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
//Setting the single db form
|
|
|
if (in_array($_POST['old_version'], $update_from_version_6)) {
|
|
@@ -842,11 +844,14 @@ if (@$_POST['step2']) {
|
|
|
include 'update-configuration.inc.php';
|
|
|
case '1.8.8.4':
|
|
|
case '1.8.8.6':
|
|
|
- include 'update-db-1.8.8-1.9.0.inc.php';
|
|
|
- //include 'update-files-1.8.8-1.9.0.inc.php';
|
|
|
+ include 'update-db-1.8.8-1.9.0.inc.php';
|
|
|
//Only updates the configuration.inc.php with the new version
|
|
|
include 'update-configuration.inc.php';
|
|
|
-
|
|
|
+ case '1.9.0':
|
|
|
+ case '1.9.2':
|
|
|
+ case '1.9.4':
|
|
|
+ include 'update-db-1.9.0-1.10.0.inc.php';
|
|
|
+ include 'update-configuration.inc.php';
|
|
|
break;
|
|
|
default:
|
|
|
break;
|