chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r13063] Added various changes to enable direct migration from 1.6 to 1.8.4 (yeepee!)

Browse Source
skala
Yannick Warnier 18 years ago
parent a909830717
commit 276d10ee7f
2 changed files with 218 additions and 95 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 138
      main/install/index.php
  2. 75
      main/install/install_functions.inc.php

138
main/install/index.php
Unescape View File

@ -3,7 +3,7 @@
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004 Dokeos S.A.
Copyright (c) 2004-2007 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) Olivier Brouckaert
@ -45,7 +45,7 @@
*/
session_start();
// Including necessary files
require('../inc/installedVersion.inc.php');
@include('../inc/installedVersion.inc.php');
require('../inc/lib/main_api.lib.php');
require('../lang/english/trad4all.inc.php');
@ -76,7 +76,7 @@ if(in_array($install_language,$euro_langs))
header('Content-Type: text/html; charset='. $charset);
}
require_once('install_upgrade.lib.php');
require_once('install_upgrade.lib.php'); //also defines constants
require_once('install_functions.inc.php');
// Some constants
@ -93,8 +93,18 @@ error_reporting(E_COMPILE_ERROR | E_ERROR | E_CORE_ERROR);
// overriding the timelimit (for large campusses that have to be migrated)
@set_time_limit(0);
$update_from_version=array('1.8.3');
//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');
$my_old_version = '';
if(!empty($_POST['old_version']))
{
$my_old_version = $_POST['old_version'];
}
$new_version = '1.8.4';
$new_version_stable = true;
/*
==============================================================================
STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT
@ -102,8 +112,13 @@ $update_from_version=array('1.8.3');
*/
$badUpdatePath=false;
$emptyUpdatePath=true;
$proposedUpdatePath = '';
if(!empty($_POST['updatePath']))
{
$proposedUpdatePath = $_POST['updatePath'];
}
if($_POST['step2_install'] || $_POST['step2_update'])
if($_POST['step2_install'] || $_POST['step2_update_8'] || $_POST['step2_update_6'])
{
if($_POST['step2_install'])
{
@ -114,6 +129,40 @@ if($_POST['step2_install'] || $_POST['step2_update'])
else
{
$installType='update';
if($_POST['step2_update_8'])
{
$emptyUpdatePath = false;
if(empty($_POST['updatePath']))
{
$proposedUpdatePath = $_SERVER['DOCUMENT_ROOT'];
}
else
{
$proposedUpdatePath = $_POST['updatePath'];
}
if(substr($proposedUpdatePath,-1) != '/')
{
$proposedUpdatePath.='/';
}
if(file_exists($proposedUpdatePath))
{
$my_old_version = get_config_param('dokeos_version',$proposedUpdatePath);
if(in_array($my_old_version,$update_from_version_8))
{
$_POST['step2']=1;
}
else
{
$badUpdatePath=true;
}
}
else
{
$badUpdatePath=true;
}
}
else //step2_update_6, presumably
{
if(empty($_POST['updatePath']))
{
$_POST['step1']=1;
@ -125,14 +174,15 @@ if($_POST['step2_install'] || $_POST['step2_update'])
{
$_POST['updatePath'].='/';
}
$_POST['step2']=1;
$badUpdatePath=false;
/* don't verify it to upgrade from 1.8.0 to 1.8.2
if(file_exists($_POST['updatePath']))
{
if(in_array(get_config_param('dokeos_version'),$update_from_version))
//1.6.x
$my_old_version = get_config_param('clarolineVersion',$_POST['updatePath']);
if(in_array($my_old_version,$update_from_version_6))
{
$_POST['step2']=1;
$proposedUpdatePath = $_POST['updatePath'];
}
else
{
@ -142,7 +192,8 @@ if($_POST['step2_install'] || $_POST['step2_update'])
else
{
$badUpdatePath=true;
}*/
}
}
}
}
}
@ -159,11 +210,12 @@ else
$updateFromConfigFile=$_GET['updateFromConfigFile'];
}
/* 1.8.x
if($installType=='update')
{
include_once('../inc/conf/configuration.php');
}
*/
if(!isset($_GET['running']))
{
$dbHostForm='localhost';
@ -245,20 +297,17 @@ else
}
}
// The Steps
$total_steps=7;
if (!$_POST)
{
$current_step=1;
}
elseif (!empty($_POST['language_list']) or !empty($_POST['step1']) or (!empty($_POST['step2_update']) && ($emptyUpdatePath or $badUpdatePath)))
elseif (!empty($_POST['language_list']) or !empty($_POST['step1']) or ((!empty($_POST['step2_update_8']) or (!empty($_POST['step2_update_6']))) && ($emptyUpdatePath or $badUpdatePath)))
{
$current_step=2;
}
elseif (!empty($_POST['step2']) or !empty($_POST['step2_update']))
elseif (!empty($_POST['step2']) or (!empty($_POST['step2_update_8']) or (!empty($_POST['step2_update_6'])) ))
{
$current_step=3;
}
@ -283,7 +332,7 @@ elseif (!empty($_POST['step5']))
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>&mdash; <?php echo get_lang('DokeosInstallation').' &mdash; '.get_lang('Version_').' '.$dokeos_version; ?></title>
<title>&mdash; <?php echo get_lang('DokeosInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?></title>
<style type="text/css" media="screen, projection">
/*<![CDATA[*/
@import "../css/default/default.css";
@ -297,7 +346,7 @@ elseif (!empty($_POST['step5']))
<div id="header">
<div id="header1"><?php echo get_lang('DokeosInstallation').' &mdash; '.get_lang('Version_').' '.$dokeos_version; ?><?php if($installType == 'new') echo ' &ndash; '.get_lang('NewInstallation'); else if($installType == 'update') echo ' &ndash; '.get_lang('UpdateFromDokeosVersion').implode('|',$update_from_version); ?></div>
<div id="header1"><?php echo get_lang('DokeosInstallation').' &mdash; '.get_lang('Version_').' '.$new_version; ?><?php if($installType == 'new') echo ' &ndash; '.get_lang('NewInstallation'); else if($installType == 'update') echo ' &ndash; '.get_lang('UpdateFromDokeosVersion').implode('|',$update_from_version); ?></div>
<div class="clear"></div>
<div id="header2">&nbsp;</div>
<div id="header3">&nbsp;</div>
@ -322,7 +371,7 @@ elseif (!empty($_POST['step5']))
<table cellpadding="6" cellspacing="0" border="0" width="80%" align="center">
<tr>
<td>
<input type="hidden" name="updatePath" value="<?php if(!$badUpdatePath) echo htmlentities($_POST['updatePath']); ?>" />
<input type="hidden" name="updatePath" value="<?php if(!$badUpdatePath) echo htmlentities($proposedUpdatePath); ?>" />
<input type="hidden" name="urlAppendPath" value="<?php echo htmlentities($urlAppendPath); ?>" />
<input type="hidden" name="pathForm" value="<?php echo htmlentities($pathForm); ?>" />
<input type="hidden" name="urlForm" value="<?php echo htmlentities($urlForm); ?>" />
@ -354,6 +403,8 @@ elseif (!empty($_POST['step5']))
<input type="hidden" name="userMailCanBeEmpty" value="<?php echo htmlentities($userMailCanBeEmpty); ?>" />
<input type="hidden" name="encryptPassForm" value="<?php echo htmlentities($encryptPassForm); ?>" />
<input type="hidden" name="session_lifetime" value="<?php echo htmlentities($session_lifetime); ?>" />
<input type="hidden" name="old_version" value="<?php echo htmlentities($my_old_version); ?>" />
<input type="hidden" name="new_version" value="<?php echo htmlentities($new_version); ?>" />
@ -393,11 +444,25 @@ elseif($_POST['step4'])
if(!empty($tmp)) $institutionForm = $tmp;
$tmp = get_config_param_from_db($dbHostForm,$dbUsernameForm,$dbPassForm,$db_name,'InstitutionUrl');
if(!empty($tmp)) $institutionUrlForm = $tmp;
$urlForm = $_configuration['root_web'];
if(in_array($my_old_version,$update_from_version_6))
{ //for version 1.6
$urlForm = get_config_param('rootWeb');
$encryptPassForm = get_config_param('userPasswordCrypted');
$allowSelfReg = get_config_param('allowSelfReg');
$allowSelfRegProf = get_config_param('allowSelfRegProf');
}
else
{ //for version 1.8
$urlForm = $_configuration['root_web'];
$encryptPassForm = get_config_param('userPasswordCrypted');
$allowSelfReg = false;
$tmp = get_config_param_from_db($dbHostForm,$dbUsernameForm,$dbPassForm,$db_name,'allow_registration');
if(!empty($tmp)) $allowSelfReg = $tmp;
$allowSelfRegProf = false;
$tmp = get_config_param_from_db($dbHostForm,$dbUsernameForm,$dbPassForm,$db_name,'allow_registration_as_teacher');
if(!empty($tmp)) $allowSelfRegProf = $tmp;
}
}
display_configuration_settings_form($installType, $urlForm, $languageForm, $emailForm, $adminFirstName, $adminLastName, $adminPhoneForm, $campusForm, $institutionForm, $institutionUrlForm, $encryptPassForm, $allowSelfReg, $allowSelfRegProf, $loginForm, $passForm);
}
elseif($_POST['step5'])
@ -493,10 +558,34 @@ elseif($_POST['step6'])
//STEP 6 : INSTALLATION PROCESS
if($installType == 'update')
{
if(empty($my_old_version)){$my_old_version='1.8.3';} //we guess
$_configuration['main_database'] = $dbNameForm;
//$urlAppendPath = get_config_param('urlAppend');
switch($my_old_version)
{
case '1.6':
case '1.6.0':
case '1.6.1':
case '1.6.2':
case '1.6.3':
case '1.6.4':
case '1.6.5':
include('update-db-1.6.x-1.8.0.inc.php');
include('update-files-1.6.x-1.8.0.inc.php');
//intentionally no break to continue processing
case '1.8':
case '1.8.0':
include('update-db-1.8.0-1.8.2.inc.php');
//intentionally no break to continue processing
case '1.8.2':
include('update-db-1.8.2-1.8.3.inc.php');
//intentionally no break to continue processing
case '1.8.3':
default:
include('update-db-1.8.3-1.8.4.inc.php');
//include('update-files-1.8.0-1.8.2.inc.php');
include('update-files-1.8.3-1.8.4.inc.php');
break;
}
}
else
{
@ -508,9 +597,10 @@ elseif($_POST['step6'])
}
elseif($_POST['step1'] || $badUpdatePath)
{
//STEP 1 : REQUIREMENTS
display_requirements($installType, $badUpdatePath, $update_from_version);
//make sure that proposed path is set, shouldn't be necessary but...
if(empty($proposedUpdatePath)){$proposedUpdatePath = $_POST['updatePath'];}
display_requirements($installType, $badUpdatePath, $proposedUpdatePath, $update_from_version_8, $update_from_version_6);
}
else
{
@ -528,7 +618,7 @@ else
</form>
<br style="clear:both;" />
<div id="footer">
<div class="copyright"><?php echo get_lang('Platform');?> <a href="http://www.dokeos.com"> Dokeos <?php echo $dokeos_version ?></a> &copy; <?php echo date('Y'); ?> </div>
<div class="copyright"><?php echo get_lang('Platform');?> <a href="http://www.dokeos.com"> Dokeos <?php echo $new_version ?></a> &copy; <?php echo date('Y'); ?> </div>
&nbsp;
</div>
</body>

75
main/install/install_functions.inc.php
Unescape View File

@ -137,13 +137,23 @@ function file_to_array($filename)
* and $configFile, and also changes these globals. This can be rewritten.
*
* @param string $param the parameter of which the value is returned
* @param string If we want to give the path rather than take it from POST
* @return string the value of the parameter
* @author Olivier Brouckaert
*/
function get_config_param($param)
function get_config_param($param,$updatePath='')
{
global $configFile, $updateFromConfigFile;
$updatePath = realpath($_POST['updatePath']).'/';
//look if we already have the queried param
if(is_array($configFile) && isset($configFile[$param]))
{
return $configFile[$param];
}
if(empty($updatePath) && !empty($_POST['updatePath']))
{
$updatePath = $_POST['updatePath'];
}
$updatePath = realpath($updatePath).'/';
$updateFromInstalledVersionFile = '';
if(empty($updateFromConfigFile)) //if update from previous install was requested
@ -153,6 +163,10 @@ function get_config_param($param)
{
$updateFromConfigFile='main/inc/conf/configuration.php';
}
elseif(file_exists($updatePath.'claroline/inc/conf/claro_main.conf.php'))
{
$updateFromConfigFile='claroline/inc/conf/claro_main.conf.php';
}
//give up recovering
else
{
@ -164,22 +178,20 @@ function get_config_param($param)
{
$updateFromInstalledVersionFile = $updatePath.'main/inc/installedVersion.inc.php';
}
//look if we already have the queried param
if(is_array($configFile) && isset($configFile[$param]))
{
return $configFile[$param];
}
//the param was not found in global vars, so look into the old config file
elseif(file_exists($updatePath.$updateFromConfigFile))
{
$configFile=array();
$temp=file_to_array($updatePath.$updateFromConfigFile);
$val='';
//make sure the installedVersion file is read first so it is overwritten
//by the config file if the config file contains the version (from 1.8.4)
$temp2 = array();
if(file_exists($updatePath.$updateFromInstalledVersionFile))
{
$temp2 = file_to_array($updatePath.$updateFromInstalledVersionFile);
$temp = array_merge($temp,$temp2);
}
$configFile=array();
$temp=file_to_array($updatePath.$updateFromConfigFile);
$temp = array_merge($temp,$temp2);
$val='';
//parse the config file (TODO clarify why it has to be so complicated)
foreach($temp as $enreg)
@ -352,14 +364,16 @@ function display_language_selection()
/**
* This function displays the requirements for installing Dokeos.
*
* @param unknown_type $installType
* @param unknown_type $badUpdatePath
* @param unknown_type $update_from_version
* @param string $installType
* @param boolean $badUpdatePath
* @param string The updatePath given (if given)
* @param array $update_from_version_8 The different subversions from version 1.8
* @param array $update_from_version_6 The different subversions from version 1.6
*
* @author unknow
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
*/
function display_requirements($installType, $badUpdatePath, $update_from_version)
function display_requirements($installType, $badUpdatePath, $updatePath='', $update_from_version_8=array(), $update_from_version_6=array())
{
echo '<h2>'.display_step_sequence().get_lang('Requirements')."</h2>\n";
@ -525,13 +539,13 @@ function display_requirements($installType, $badUpdatePath, $update_from_version
echo ' </div>';
echo '</div>';
if($installType == 'update' && (empty($_POST['updatePath']) || $badUpdatePath))
if($installType == 'update' && (empty($updatePath) || $badUpdatePath))
{
if($badUpdatePath)
{ ?>
<div style="color:red; background-color:white; font-weight:bold; text-align:center;">
<?php echo get_lang('Error');?>!<br />
Dokeos <?php echo implode('|',$update_from_version).get_lang('HasNotBeenFoundInThatDir'); ?>.
Dokeos <?php echo (isset($_POST['step2_update_6'])?implode('|',$update_from_version_6):implode('|',$update_from_version_8)).' '.get_lang('HasNotBeenFoundInThatDir'); ?>.
</div>
<?php }
else
@ -542,12 +556,12 @@ function display_requirements($installType, $badUpdatePath, $update_from_version
<table border="0" cellpadding="5" align="center">
<tr>
<td><?php echo get_lang('OldVersionRootPath');?>:</td>
<td><input type="text" name="updatePath" size="50" value="<?php echo $badUpdatePath?htmlentities($_POST['updatePath']):$_SERVER['DOCUMENT_ROOT'].'/old_version/'; ?>" /></td>
<td><input type="text" name="updatePath" size="50" value="<?php echo ($badUpdatePath && !empty($updatePath))?htmlentities($updatePath):$_SERVER['DOCUMENT_ROOT'].'/old_version/'; ?>" /></td>
</tr>
<tr>
<td colspan="2" align="center">
<input type="submit" name="step1" value="&lt; <?php echo get_lang('Back');?>" />
<input type="submit" name="step2_update" value="<?php echo get_lang('Next');?> &gt;" />
<input type="submit" name="<?php echo (isset($_POST['step2_update_6'])?'step2_update_6':'step2_update_8');?>" value="<?php echo get_lang('Next');?> &gt;" />
</td>
</tr>
</table>
@ -638,13 +652,16 @@ function display_requirements($installType, $badUpdatePath, $update_from_version
<?php
//real code
echo '<input type="submit" name="step2_update" value="Upgrade from Dokeos ' . implode(', ',$update_from_version) . '"';
echo '<input type="submit" name="step2_update_8" value="Upgrade from Dokeos ' . implode(', ',$update_from_version_8) . '"';
if($error) echo ' disabled="disabled"';
//temporary code for alpha version, disabling upgrade
//echo '<input type="submit" name="step2_update" value="Upgrading is not possible in this beta version"';
//echo ' disabled="disabled"';
//end temp code
echo ' />';
echo '<input type="submit" name="step2_update_6" value="Upgrade from Dokeos ' . implode(', ',$update_from_version_6) . '"';
if($error) echo ' disabled="disabled"';
echo ' />';
echo '</p>';
}
}
@ -712,7 +729,22 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
{
if($installType == 'update')
{
global $_configuration;
global $_configuration, $update_from_version_6;
if(in_array($_POST['old_version'],$update_from_version_6))
{
$dbHostForm=get_config_param('dbHost');
$dbUsernameForm=get_config_param('dbLogin');
$dbPassForm=get_config_param('dbPass');
$dbPrefixForm=get_config_param('dbNamePrefix');
$enableTrackingForm=get_config_param('is_trackingEnabled');
$singleDbForm=get_config_param('singleDbEnabled');
$dbNameForm=get_config_param('mainDbName');
$dbStatsForm=get_config_param('statsDbName');
$dbScormForm=get_config_param('scormDbName');
$dbScormExists=true;
}
else
{
$dbHostForm=$_configuration['db_host'];
$dbUsernameForm=$_configuration['db_user'];
$dbPassForm=$_configuration['db_password'];
@ -725,6 +757,7 @@ function display_database_settings_form($installType, $dbHostForm, $dbUsernameFo
$dbUserForm=$_configuration['user_personal_database'];
$dbScormExists=true;
}
if(empty($dbScormForm))
{

Write Preview
Loading…
Cancel
Save