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 r21777] Added install scripts for 1.8.6.1 (improvements for UTF-8 and other minor improvements)

Browse Source
skala
Yannick Warnier 17 years ago
parent 7318d62ae5
commit f0dffdad80
3 changed files with 460 additions and 29 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. 39
      main/install/index.php
  2. 312
      main/install/update-db-1.8.6-1.8.6.1.inc.php
  3. 138
      main/install/update-files-1.8.6-1.8.6.1.inc.php

39
main/install/index.php
Unescape View File

@ -1,28 +1,5 @@
<?php
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2008 Dokeos SPRL
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) Olivier Brouckaert
Copyright (c) Roan Embrechts, Vrije Universiteit Brussel
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
<?php //$id: $
/* For licensing terms, see /dokeos_license.txt */
/**
==============================================================================
* GOAL : Dokeos installation
@ -201,7 +178,7 @@ error_reporting(E_COMPILE_ERROR | E_ERROR | E_CORE_ERROR);
//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');
$update_from_version_8=array('1.8','1.8.2','1.8.3','1.8.4','1.8.5','1.8.6');
$my_old_version = '';
$tmp_version = get_config_param('dokeos_version');
if(!empty($_POST['old_version']))
@ -217,8 +194,9 @@ elseif(!empty($dokeos_version)) //variable coming from installedVersion, normall
$my_old_version = $dokeos_version;
}
$new_version = '1.8.6';
$new_version_stable = true;
$new_version = '1.8.6.1';
$new_version_stable = false;
$new_version_major = false;
/*
==============================================================================
STEP 1 : INITIALIZES FORM VARIABLES IF IT IS THE FIRST VISIT
@ -780,7 +758,7 @@ elseif($_POST['step6'])
//STEP 6 : INSTALLATION PROCESS
if($installType == 'update')
{
if(empty($my_old_version)){$my_old_version='1.8.5';} //we guess
if(empty($my_old_version)){$my_old_version='1.8.6';} //we guess
$_configuration['main_database'] = $dbNameForm;
//$urlAppendPath = get_config_param('urlAppend');
error_log('Starting migration process from '.$my_old_version.' ('.time().')',0);
@ -819,6 +797,9 @@ elseif($_POST['step6'])
case '1.8.5':
include('update-db-1.8.5-1.8.6.inc.php');
include('update-files-1.8.5-1.8.6.inc.php');
case '1.8.6':
include('update-db-1.8.6-1.8.6.1.inc.php');
include('update-files-1.8.6-1.8.6.1.inc.php');
default:
break;

312
main/install/update-db-1.8.6-1.8.6.1.inc.php
Unescape View File

@ -0,0 +1,312 @@
<?php // $Id: $
/* See license terms in /dokeos_license.txt */
/**
==============================================================================
* Update the Dokeos database from an older version
* Notice : This script has to be included by index.php or update_courses.php
*
* @package dokeos.install
* @todo
* - conditional changing of tables. Currently we execute for example
* ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
* - reorganise code into functions
* @todo use database library
==============================================================================
*/
//load helper functions
require_once("install_upgrade.lib.php");
require_once('../inc/lib/image.lib.php');
$old_file_version = '1.8.6';
$new_file_version = '1.8.6.1';
//remove memory and time limits as much as possible as this might be a long process...
if(function_exists('ini_set'))
{
ini_set('memory_limit',-1);
ini_set('max_execution_time',0);
}else{
error_log('Update-db script: could not change memory and time limits',0);
}
/*
==============================================================================
MAIN CODE
==============================================================================
*/
//check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
{
//check if the current Dokeos install is elligible for update
if (!file_exists('../inc/conf/configuration.php'))
{
echo '<b>'.get_lang('Error').' !</b> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br><br>
'.get_lang('PleasGoBackToStep1').'.
<p><button type="submit" class="back" name="step1" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
</td></tr></table></form></body></html>';
exit ();
}
//get_config_param() comes from install_functions.inc.php and
//actually gets the param from
$_configuration['db_glue'] = get_config_param('dbGlu');
if ($singleDbForm)
{
$_configuration['table_prefix'] = get_config_param('courseTablePrefix');
$_configuration['main_database'] = get_config_param('mainDbName');
$_configuration['db_prefix'] = get_config_param('dbNamePrefix');
}
$dbScormForm = eregi_replace('[^a-z0-9_-]', '', $dbScormForm);
if (!empty ($dbPrefixForm) && !ereg('^'.$dbPrefixForm, $dbScormForm))
{
$dbScormForm = $dbPrefixForm.$dbScormForm;
}
if (empty ($dbScormForm) || $dbScormForm == 'mysql' || $dbScormForm == $dbPrefixForm)
{
$dbScormForm = $dbPrefixForm.'scorm';
}
$res = @mysql_connect($dbHostForm, $dbUsernameForm, $dbPassForm);
//if error on connection to the database, show error and exit
if ($res === false)
{
//$no = mysql_errno();
//$msg = mysql_error();
//echo '<hr>['.$no.'] - '.$msg.'<hr>';
echo get_lang('DBServerDoesntWorkOrLoginPassIsWrong').'.<br /><br />' .
' '.get_lang('PleaseCheckTheseValues').' :<br /><br />
<b>'.get_lang('DBHost').'</b> : '.$dbHostForm.'<br />
<b>'.get_lang('DBLogin').'</b> : '.$dbUsernameForm.'<br />
<b>'.get_lang('DBPassword').'</b> : '.$dbPassForm.'<br /><br />
'.get_lang('PleaseGoBackToStep').' '. (defined('DOKEOS_INSTALL') ? '3' : '1').'.
<p><button type="submit" class="back" name="step'. (defined('DOKEOS_INSTALL') ? '3' : '1').'" value="&lt; '.get_lang('Back').'">'.get_lang('Back').'</button></p>
</td></tr></table></form></body></html>';
exit ();
}
// The Dokeos system has not been designed to use special SQL modes that were introduced since MySQL 5
@mysql_query("set session sql_mode='';");
$dblistres = mysql_list_dbs();
$dblist = array();
while ($row = mysql_fetch_object($dblistres)) {
$dblist[] = $row->Database;
}
/*
-----------------------------------------------------------
Normal upgrade procedure:
start by updating main, statistic, user databases
-----------------------------------------------------------
*/
//if this script has been included by index.php, not update_courses.php, so
// that we want to change the main databases as well...
$only_test = false;
$log = 0;
if (defined('DOKEOS_INSTALL'))
{
if ($singleDbForm)
{
$dbStatsForm = $dbNameForm;
$dbScormForm = $dbNameForm;
$dbUserForm = $dbNameForm;
}
/**
* Update the databases "pre" migration
*/
include ("../lang/english/create_course.inc.php");
if ($languageForm != 'english')
{
//languageForm has been escaped in index.php
include ("../lang/$languageForm/create_course.inc.php");
}
//get the main queries list (m_q_list)
$m_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql','main');
if(count($m_q_list)>0)
{
//now use the $m_q_list
/**
* We connect to the right DB first to make sure we can use the queries
* without a database name
*/
if(strlen($dbNameForm)>40){
error_log('Database name '.$dbNameForm.' is too long, skipping',0);
}elseif(!in_array($dbNameForm,$dblist)){
error_log('Database '.$dbNameForm.' was not found, skipping',0);
}else{
mysql_select_db($dbNameForm);
foreach($m_q_list as $query){
if($only_test){
error_log("mysql_query($dbNameForm,$query)",0);
}else{
$res = mysql_query($query);
if($log)
{
error_log("In $dbNameForm, executed: $query",0);
}
}
}
}
}
//get the stats queries list (s_q_list)
$s_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql','stats');
if(count($s_q_list)>0)
{
//now use the $s_q_list
/**
* We connect to the right DB first to make sure we can use the queries
* without a database name
*/
if(strlen($dbStatsForm)>40){
error_log('Database name '.$dbStatsForm.' is too long, skipping',0);
}elseif(!in_array($dbStatsForm,$dblist)){
error_log('Database '.$dbStatsForm.' was not found, skipping',0);
}else{
mysql_select_db($dbStatsForm);
foreach($s_q_list as $query){
if($only_test){
error_log("mysql_query($dbStatsForm,$query)",0);
}else{
$res = mysql_query($query);
if($log)
{
error_log("In $dbStatsForm, executed: $query",0);
}
}
}
}
}
//get the user queries list (u_q_list)
$u_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql','user');
if(count($u_q_list)>0)
{
//now use the $u_q_list
/**
* We connect to the right DB first to make sure we can use the queries
* without a database name
*/
if(strlen($dbUserForm)>40){
error_log('Database name '.$dbUserForm.' is too long, skipping',0);
}elseif(!in_array($dbUserForm,$dblist)){
error_log('Database '.$dbUserForm.' was not found, skipping',0);
}else{
mysql_select_db($dbUserForm);
foreach($u_q_list as $query){
if($only_test){
error_log("mysql_query($dbUserForm,$query)",0);
error_log("In $dbUserForm, executed: $query",0);
}else{
$res = mysql_query($query);
}
}
}
}
//the SCORM database doesn't need a change in the pre-migrate part - ignore
}
/*
-----------------------------------------------------------
Update the Dokeos course databases
this part can be accessed in two ways:
- from the normal upgrade process
- from the script update_courses.php,
which is used to upgrade more than MAX_COURSE_TRANSFER courses
Every time this script is accessed, only
MAX_COURSE_TRANSFER courses are upgraded.
-----------------------------------------------------------
*/
$prefix = '';
if ($singleDbForm)
{
$prefix = get_config_param ('table_prefix');
}
//get the courses databases queries list (c_q_list)
$c_q_list = get_sql_file_contents('migrate-db-'.$old_file_version.'-'.$new_file_version.'-pre.sql','course');
if(count($c_q_list)>0)
{
//get the courses list
if(strlen($dbNameForm)>40)
{
error_log('Database name '.$dbNameForm.' is too long, skipping',0);
}
elseif(!in_array($dbNameForm,$dblist))
{
error_log('Database '.$dbNameForm.' was not found, skipping',0);
}
else
{
mysql_select_db($dbNameForm);
$res = mysql_query("SELECT code,db_name,directory,course_language FROM course WHERE target_course_code IS NULL ORDER BY code");
if($res===false){die('Error while querying the courses list in update_db.inc.php');}
if(mysql_num_rows($res)>0)
{
$i=0;
$list = array();
//while( ($i < MAX_COURSE_TRANSFER) && ($row = mysql_fetch_array($res)))
while($row = mysql_fetch_array($res))
{
$list[] = $row;
$i++;
}
foreach($list as $row_course)
{
//now use the $c_q_list
/**
* We connect to the right DB first to make sure we can use the queries
* without a database name
*/
if (!$singleDbForm) //otherwise just use the main one
{
mysql_select_db($row_course['db_name']);
}
foreach($c_q_list as $query)
{
if ($singleDbForm) //otherwise just use the main one
{
$query = preg_replace('/^(UPDATE|ALTER TABLE|CREATE TABLE|DROP TABLE|INSERT INTO|DELETE FROM)\s+(\w*)(.*)$/',"$1 $prefix{$row_course['db_name']}_$2$3",$query);
}
if($only_test)
{
error_log("mysql_query(".$row_course['db_name'].",$query)",0);
}
else
{
$res = mysql_query($query);
if($log)
{
error_log("In ".$row_course['db_name'].", executed: $query",0);
}
}
}
}
}
}
}
}
else
{
echo 'You are not allowed here !';
}
?>

138
main/install/update-files-1.8.6-1.8.6.1.inc.php
Unescape View File

@ -0,0 +1,138 @@
<?php
/* See license terms in /dokeos_license.txt */
/**
==============================================================================
* Updates the Dokeos files from version 1.8.5 to version 1.8.6
* This script operates only in the case of an update, and only to change the
* active version number (and other things that might need a change) in the
* current configuration file.
* As of 1.8.5, the Dokeos version has been added to configuration.php to
* allow for edition (inc/conf is one of the directories that needs write
* permissions on upgrade).
* Being in configuration.php, it benefits from the configuration.dist.php
* advantages that a new version doesn't overwrite it, thus letting the old
* version be available until the end of the installation.
* @package dokeos.install
==============================================================================
*/
require_once("../inc/lib/main_api.lib.php");
require_once("../inc/lib/fileUpload.lib.php");
require_once('../inc/lib/database.lib.php');
if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
{
// Edit the Dokeos config file
$file = file('../inc/conf/configuration.php');
$fh = fopen('../inc/conf/configuration.php','w');
$found_version = false;
$found_stable = false;
foreach($file as $line)
{
$ignore = false;
if(stristr($line,'$_configuration[\'dokeos_version\']'))
{
$found_version = true;
$line = '$_configuration[\'dokeos_version\'] = \''.$new_version.'\';'."\r\n";
}
elseif(stristr($line,'$_configuration[\'dokeos_stable\']'))
{
$found_stable = true;
$line = '$_configuration[\'dokeos_stable\'] = '.($new_version_stable?'true':'false').';'."\r\n";
}
elseif(stristr($line,'$userPasswordCrypted'))
{
$line = '$userPasswordCrypted = \''.($userPasswordCrypted).'\';'."\r\n";
}
elseif(stristr($line,'?>'))
{
//ignore the line
$ignore = true;
}
if(!$ignore)
{
fwrite($fh,$line);
}
}
if(!$found_version)
{
fwrite($fh,'$_configuration[\'dokeos_version\'] = \''.$new_version.'\';'."\r\n");
}
if(!$found_stable)
{
fwrite($fh,'$_configuration[\'dokeos_stable\'] = '.($new_version_stable?'true':'false').';'."\r\n");
}
fwrite($fh,'?>');
fclose($fh);
$sys_course_path = $pathForm.'courses/';
//$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
//linking
$link = mysql_connect($dbHostForm, $dbUsernameForm, $dbPassForm);
mysql_select_db($dbNameForm,$link);
$db_name = $dbNameForm;
$sql = "SELECT * FROM $db_name.course";
error_log('Getting courses for files updates: '.$sql,0);
$result=mysql_query($sql);
$perm = api_get_setting('permissions_for_new_directories');
$perm = octdec(!empty($perm)?$perm:'0770');
$old_umask = umask(0);
while($courses_directories=mysql_fetch_array($result))
{
$currentCourseRepositorySys = $sys_course_path.$courses_directories['directory'].'/';
$db_name = $courses_directories['db_name'];
$origCRS = $updatePath.'courses/'.$courses_directories['directory'];
if(!is_dir($origCRS)){
error_log('Directory '.$origCRS.' does not exist. Skipping.',0);
continue;
}
//move everything to the new hierarchy (from old path to new path)
error_log('Renaming '.$origCRS.' to '.$sys_course_path.$courses_directories['directory'],0);
rename($origCRS,$sys_course_path.$courses_directories['directory']);
error_log('Creating dirs in '.$currentCourseRepositorySys,0);
//DOCUMENT FOLDER
//document > shared_folder
if(!is_dir($currentCourseRepositorySys."document/shared_folder")){
mkdir($currentCourseRepositorySys."document/shared_folder",$perm);
}
//UPLOAD FOLDER
//upload > forum > images
if(!is_dir($currentCourseRepositorySys."upload/forum/images")){
mkdir($currentCourseRepositorySys."upload/forum/images",$perm);
}
//upload > learning_path
if(!is_dir($currentCourseRepositorySys."upload/learning_path")){
mkdir($currentCourseRepositorySys."upload/learning_path",$perm);
}
//upload > learning_path > images
if(!is_dir($currentCourseRepositorySys."upload/learning_path/images")){
mkdir($currentCourseRepositorySys."upload/learning_path/images",$perm);
}
//upload > calendar
if(!is_dir($currentCourseRepositorySys."upload/calendar")){
mkdir($currentCourseRepositorySys."upload/calendar",$perm);
}
//upload > calendar > images
if(!is_dir($currentCourseRepositorySys."upload/calendar/images")){
mkdir($currentCourseRepositorySys."upload/calendar/images",$perm);
}
}
}
else
{
echo 'You are not allowed here !';
}
?>
Write Preview
Loading…
Cancel
Save