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

Feature #272 - Installation scripts: Duplicate code elimination.

Browse Source
skala
Ivan Tcholakov 15 years ago
parent dc9ca4cea6
commit c24805962d
20 changed files with 39 additions and 177 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. 19
      main/install/index.php
  2. 14
      main/install/install.lib.php
  3. 9
      main/install/install_db.inc.php
  4. 12
      main/install/update-db-1.6.x-1.8.0.inc.php
  5. 12
      main/install/update-db-1.8.0-1.8.2.inc.php
  6. 12
      main/install/update-db-1.8.2-1.8.3.inc.php
  7. 12
      main/install/update-db-1.8.3-1.8.4.inc.php
  8. 12
      main/install/update-db-1.8.4-1.8.5.inc.php
  9. 19
      main/install/update-db-1.8.5-1.8.6.inc.php
  10. 15
      main/install/update-db-1.8.6-1.8.6.1.inc.php
  11. 15
      main/install/update-db-1.8.6.1-1.8.6.2.inc.php
  12. 15
      main/install/update-db-1.8.6.2-1.8.7.inc.php
  13. 17
      main/install/update-db-scorm-1.6.x-1.8.0.inc.php
  14. 4
      main/install/update-files-1.6.x-1.8.0.inc.php
  15. 4
      main/install/update-files-1.8.3-1.8.4.inc.php
  16. 4
      main/install/update-files-1.8.4-1.8.5.inc.php
  17. 6
      main/install/update-files-1.8.5-1.8.6.inc.php
  18. 6
      main/install/update-files-1.8.6-1.8.6.1.inc.php
  19. 5
      main/install/update-files-1.8.6.1-1.8.6.2.inc.php
  20. 4
      main/install/update-files-1.8.6.2-1.8.7.inc.php

19
main/install/index.php
Unescape View File

@ -637,6 +637,17 @@ if ($_POST['step2']) {
if ($installType == 'update') {
require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
require_once api_get_path(LIBRARY_PATH).'image.lib.php';
remove_memory_and_time_limits();
database_server_connect();
// Inializing global variables that are to be used by the included scripts.
$dblist = Database::get_databases();
$perm = api_get_permissions_for_new_directories();
$perm_file = api_get_permissions_for_new_files();
if (empty($my_old_version)) { $my_old_version = '1.8.6'; } //we guess
$_configuration['main_database'] = $dbNameForm;
//$urlAppendPath = get_config_param('urlAppend');
@ -690,6 +701,14 @@ if ($_POST['step2']) {
} else {
set_file_folder_permissions();
database_server_connect();
// Initialization of the database encoding to be used.
Database::query("SET SESSION character_set_server='utf8';");
Database::query("SET SESSION collation_server='utf8_general_ci';");
Database::query("SET CHARACTER SET 'utf8';");
include 'install_db.inc.php';
include 'install_files.inc.php';
}

14
main/install/install.lib.php
Unescape View File

@ -51,6 +51,18 @@ function database_server_connect() {
@Database::query("set session sql_mode='';"); // Disabling special SQL modes (MySQL 5)
}
/**
* Removes memory and time limits as much as possible.
*/
function remove_memory_and_time_limits() {
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);
}
}
/**
* We assume this function is called from install scripts that reside inside the install folder.
*/
@ -1152,7 +1164,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
$error = false;
//First, attempt to set writing permissions if we don't have them yet
// First, attempt to set writing permissions if we don't have them yet
$perm = api_get_permissions_for_new_directories();
$perm_file = api_get_permissions_for_new_files();

9
main/install/install_db.inc.php
Unescape View File

@ -22,15 +22,6 @@ if (!defined('SYSTEM_INSTALLATION')) {
exit;
}
set_file_folder_permissions();
database_server_connect();
// Initialization of the database encoding to be used.
Database::query("SET SESSION character_set_server='utf8';");
Database::query("SET SESSION collation_server='utf8_general_ci';");
Database::query("SET CHARACTER SET 'utf8';");
$urlForm = api_add_trailing_slash($urlForm);
switch ($encryptPassForm) {

12
main/install/update-db-1.6.x-1.8.0.inc.php
Unescape View File

@ -18,14 +18,6 @@
==============================================================================
*/
// 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
@ -62,10 +54,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
$dbScormForm = $dbPrefixForm.'scorm';
}
database_server_connect();
$dblist = Database::get_databases();
/*
-----------------------------------------------------------
Normal upgrade procedure:

12
main/install/update-db-1.8.0-1.8.2.inc.php
Unescape View File

@ -18,14 +18,6 @@
==============================================================================
*/
// 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
@ -62,10 +54,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
$dbScormForm = $dbPrefixForm.'scorm';
}
database_server_connect();
$dblist = Database::get_databases();
/*
-----------------------------------------------------------
Normal upgrade procedure:

12
main/install/update-db-1.8.2-1.8.3.inc.php
Unescape View File

@ -18,14 +18,6 @@
==============================================================================
*/
// 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
@ -62,10 +54,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
$dbScormForm = $dbPrefixForm.'scorm';
}
database_server_connect();
$dblist = Database::get_databases();
/*
-----------------------------------------------------------
Normal upgrade procedure:

12
main/install/update-db-1.8.3-1.8.4.inc.php
Unescape View File

@ -18,14 +18,6 @@
==============================================================================
*/
// 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
@ -61,10 +53,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
$dbScormForm = $dbPrefixForm.'scorm';
}
database_server_connect();
$dblist = Database::get_databases();
/*
-----------------------------------------------------------
Normal upgrade procedure:

12
main/install/update-db-1.8.4-1.8.5.inc.php
Unescape View File

@ -21,14 +21,6 @@
$old_file_version = '1.8.4';
$new_file_version = '1.8.5';
// 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
@ -64,10 +56,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
$dbScormForm = $dbPrefixForm.'scorm';
}
database_server_connect();
$dblist = Database::get_databases();
/*
-----------------------------------------------------------
Normal upgrade procedure:

19
main/install/update-db-1.8.5-1.8.6.inc.php
Unescape View File

@ -18,20 +18,9 @@
==============================================================================
*/
// Load helper functions
require_once '../inc/lib/image.lib.php';
$old_file_version = '1.8.5';
$new_file_version = '1.8.6';
// 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
@ -41,7 +30,7 @@ if (function_exists('ini_set')) {
// Check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
//check if the current Dokeos install is elligible for update
// Check if the current Dokeos install is elligible for update
if (!file_exists('../inc/conf/configuration.php')) {
echo '<strong>'.get_lang('Error').' !</strong> Dokeos '.implode('|', $updateFromVersion).' '.get_lang('HasNotBeenFound').'.<br /><br />
'.get_lang('PleasGoBackToStep1').'.
@ -68,12 +57,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
$dbScormForm = $dbPrefixForm.'scorm';
}
database_server_connect();
$dblist = Database::get_databases();
$perm = api_get_permissions_for_new_directories();
/*
-----------------------------------------------------------
Normal upgrade procedure:

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

@ -18,20 +18,9 @@
==============================================================================
*/
//load helper functions
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
@ -68,10 +57,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
$dbScormForm = $dbPrefixForm.'scorm';
}
database_server_connect();
$dblist = Database::get_databases();
/*
-----------------------------------------------------------
Normal upgrade procedure:

15
main/install/update-db-1.8.6.1-1.8.6.2.inc.php
Unescape View File

@ -18,20 +18,9 @@
==============================================================================
*/
// Load helper functions
require_once '../inc/lib/image.lib.php';
$old_file_version = '1.8.6.1';
$new_file_version = '1.8.6.2';
// 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
@ -68,10 +57,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
$dbScormForm = $dbPrefixForm.'scorm';
}
database_server_connect();
$dblist = Database::get_databases();
/*
-----------------------------------------------------------
Normal upgrade procedure:

15
main/install/update-db-1.8.6.2-1.8.7.inc.php
Unescape View File

@ -18,20 +18,9 @@
==============================================================================
*/
// Load helper functions
require_once '../inc/lib/image.lib.php';
$old_file_version = '1.8.6.2';
$new_file_version = '1.8.7';
// 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
@ -68,10 +57,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
$dbScormForm = $dbPrefixForm.'scorm';
}
database_server_connect();
$dblist = Database::get_databases();
/*
-----------------------------------------------------------
Normal upgrade procedure:

17
main/install/update-db-scorm-1.6.x-1.8.0.inc.php
Unescape View File

@ -11,21 +11,14 @@
/**
* Include mandatory libraries
*/
require_once '../inc/lib/main_api.lib.php';
require_once '../inc/lib/database.lib.php';
require_once '../inc/lib/document.lib.php';
//require_once '../inc/lib/fileDisplay.lib.php';
//require_once '../inc/lib/fileUpload.lib.php'; //replace_dangerous_char()
require_once '../inc/lib/fileManage.lib.php'; //check_name_exists()
//include_once '../inc/lib/pclzip/pclzip.lib.php';
require_once '../newscorm/learnpath.class.php';
require_once '../newscorm/scorm.class.php';
ini_set('max_execution_time', 0);
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php'; //check_name_exists()
require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpath.class.php';
require_once api_get_path(SYS_CODE_PATH).'newscorm/scorm.class.php';
$loglevel = 0;
//get table prefix from $prefix variable declared in update-db-....inc.php
// Get table prefix from $prefix variable declared in update-db-....inc.php
$table_prefix = $prefix;
$sys_course_path = $pathForm.'courses/';
$upd_course_path = $proposedUpdatePath.'courses/';

4
main/install/update-files-1.6.x-1.8.0.inc.php
Unescape View File

@ -22,8 +22,6 @@
==============================================================================
*/
require_once '../inc/lib/fileUpload.lib.php';
/*
==============================================================================
FUNCTIONS
@ -55,8 +53,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
error_log('Getting courses for files updates: '.$sql, 0);
$result = Database::query($sql);
$perm = api_get_permissions_for_new_directories();
while ($courses_directories = Database::fetch_array($result)) {
$currentCourseRepositorySys = $sys_course_path.$courses_directories["directory"]."/";

4
main/install/update-files-1.8.3-1.8.4.inc.php
Unescape View File

@ -18,10 +18,6 @@
==============================================================================
*/
require_once '../inc/lib/main_api.lib.php';
require_once '../inc/lib/fileUpload.lib.php';
require_once '../inc/lib/database.lib.php';
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
// Edit the configuration file

4
main/install/update-files-1.8.4-1.8.5.inc.php
Unescape View File

@ -18,10 +18,6 @@
==============================================================================
*/
require_once '../inc/lib/main_api.lib.php';
require_once '../inc/lib/fileUpload.lib.php';
require_once '../inc/lib/database.lib.php';
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
// Edit the configuration file

6
main/install/update-files-1.8.5-1.8.6.inc.php
Unescape View File

@ -18,10 +18,6 @@
==============================================================================
*/
require_once '../inc/lib/main_api.lib.php';
require_once '../inc/lib/fileUpload.lib.php';
require_once '../inc/lib/database.lib.php';
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
// Edit the configuration file
@ -71,8 +67,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
error_log('Getting courses for files updates: '.$sql, 0);
$result = Database::query($sql);
$perm = api_get_permissions_for_new_directories();
while ($courses_directories = Database::fetch_array($result)) {
$currentCourseRepositorySys = $sys_course_path.$courses_directories['directory'].'/';

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

@ -18,10 +18,6 @@
==============================================================================
*/
require_once '../inc/lib/main_api.lib.php';
require_once '../inc/lib/fileUpload.lib.php';
require_once '../inc/lib/database.lib.php';
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
// Edit the configuration file
@ -56,8 +52,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
fwrite($fh, '?>');
fclose($fh);
$perm = api_get_permissions_for_new_directories();
//// Ccreate a specific directory for global thumbails
// home > default_platform_document > template_thumb
if (!is_dir($pathForm.'home/default_platform_document/template_thumb')) {

5
main/install/update-files-1.8.6.1-1.8.6.2.inc.php
Unescape View File

@ -12,11 +12,8 @@
==============================================================================
*/
require_once '../inc/lib/main_api.lib.php';
require_once '../inc/lib/fileUpload.lib.php';
require_once '../inc/lib/database.lib.php';
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
// Edit the configuration file
$file = file('../inc/conf/configuration.php');
$fh = fopen('../inc/conf/configuration.php', 'w');

4
main/install/update-files-1.8.6.2-1.8.7.inc.php
Unescape View File

@ -12,10 +12,6 @@
==============================================================================
*/
require_once '../inc/lib/main_api.lib.php';
require_once '../inc/lib/fileUpload.lib.php';
require_once '../inc/lib/database.lib.php';
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
// Start coding here...

Write Preview
Loading…
Cancel
Save