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: Making a switch to the new library file install.lib.php.

Browse Source
skala
Ivan Tcholakov 16 years ago
parent 67e2b7aa66
commit 4ac473256e
15 changed files with 45 additions and 86 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. 0
      main/install/_install_functions.inc.php
  2. 0
      main/install/_install_upgrade.lib.php
  3. 11
      main/install/index.php
  4. 2
      main/install/install_db.inc.php
  5. 5
      main/install/update-db-1.6.x-1.8.0.inc.php
  6. 5
      main/install/update-db-1.8.0-1.8.2.inc.php
  7. 5
      main/install/update-db-1.8.2-1.8.3.inc.php
  8. 5
      main/install/update-db-1.8.3-1.8.4.inc.php
  9. 5
      main/install/update-db-1.8.4-1.8.5.inc.php
  10. 4
      main/install/update-db-1.8.5-1.8.6.inc.php
  11. 4
      main/install/update-db-1.8.6-1.8.6.1.inc.php
  12. 4
      main/install/update-db-1.8.6.1-1.8.6.2.inc.php
  13. 4
      main/install/update-db-1.8.6.2-1.8.7.inc.php
  14. 3
      main/install/update-files-1.6.x-1.8.0.inc.php
  15. 74
      tests/test_suite.php

0
main/install/install_functions.inc.php → main/install/_install_functions.inc.php
Unescape View File

0
main/install/install_upgrade.lib.php → main/install/_install_upgrade.lib.php
Unescape View File

11
main/install/index.php
Unescape View File

@ -53,13 +53,10 @@ if (!function_exists('version_compare') || version_compare( phpversion(), REQUIR
session_start();
// Including necessary core libraries.
require '../inc/lib/main_api.lib.php';
require api_get_path(LIBRARY_PATH).'database.lib.php';
// Including specialized libraries for the installation procedure.
require_once 'install_upgrade.lib.php'; //also defines constants
require_once 'install_functions.inc.php';
// Including necessary libraries.
require_once '../inc/lib/main_api.lib.php';
require_once api_get_path(LIBRARY_PATH).'database.lib.php';
require_once 'install.lib.php';
// The function api_get_setting() might be called within the installation scripts.
// We need to provide some limited support for it through initialization of the

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

@ -9,8 +9,6 @@
==============================================================================
*/
require_once 'install_upgrade.lib.php';
/*
==============================================================================
MAIN CODE

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

@ -36,9 +36,6 @@
==============================================================================
*/
//load helper functions
require_once 'install_upgrade.lib.php';
//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);
@ -66,8 +63,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
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) {

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

@ -36,9 +36,6 @@
==============================================================================
*/
//load helper functions
require_once 'install_upgrade.lib.php';
//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);
@ -65,8 +62,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
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) {

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

@ -36,9 +36,6 @@
==============================================================================
*/
//load helper functions
require_once 'install_upgrade.lib.php';
//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);
@ -65,8 +62,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
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) {

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

@ -36,9 +36,6 @@
==============================================================================
*/
//load helper functions
require_once 'install_upgrade.lib.php';
//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);
@ -64,8 +61,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
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) {

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

@ -14,9 +14,6 @@
==============================================================================
*/
//load helper functions
require_once 'install_upgrade.lib.php';
$old_file_version = '1.8.4';
$new_file_version = '1.8.5';
@ -45,8 +42,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
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) {

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

@ -15,8 +15,8 @@
*/
//load helper functions
require_once 'install_upgrade.lib.php';
require_once '../inc/lib/image.lib.php';
$old_file_version = '1.8.5';
$new_file_version = '1.8.6';
@ -46,8 +46,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
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) {

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

@ -15,8 +15,8 @@
*/
//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';
@ -46,8 +46,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
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) {

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

@ -15,8 +15,8 @@
*/
//load helper functions
require_once 'install_upgrade.lib.php';
require_once '../inc/lib/image.lib.php';
$old_file_version = '1.8.6.1';
$new_file_version = '1.8.6.2';
@ -46,8 +46,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
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) {

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

@ -15,8 +15,8 @@
*/
//load helper functions
require_once 'install_upgrade.lib.php';
require_once '../inc/lib/image.lib.php';
$old_file_version = '1.8.6.2';
$new_file_version = '1.8.7';
@ -46,8 +46,6 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
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) {

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

@ -41,10 +41,7 @@
==============================================================================
*/
require_once '../inc/lib/main_api.lib.php';
require_once '../inc/lib/fileUpload.lib.php';
require_once '../inc/lib/database.lib.php';
require_once 'install_upgrade.lib.php';
/*
==============================================================================

74
tests/test_suite.php
Unescape View File

@ -8,7 +8,7 @@ $maindir = dirname(__FILE__).'/../main/';
$incdir = dirname(__FILE__).'/../main/inc/';
$libdir = dirname(__FILE__).'/../main/inc/lib/';
//Need the ob start and clean else will show the objects
//Need the ob start and clean else will show the objects
require_once $incdir.'global.inc.php';
//List of files than need the tests
@ -28,7 +28,7 @@ require_once $libdir.'xmd.lib.php';
require_once $libdir.'formvalidator/FormValidator.class.php';
//Need the ob start and clean else will show the objects
//Need the ob start and clean else will show the objects
ob_start();
require_once $libdir.'main_api.lib.php';
require_once $libdir.'course_document.lib.php';
@ -45,7 +45,7 @@ require_once $maindir.'admin/statistics/statistics.lib.php';
require_once $maindir.'dropbox/dropbox_class.inc.php';
require_once $maindir.'dropbox/dropbox_functions.inc.php';
require_once $maindir.'survey/survey.lib.php';
require_once $maindir.'install/install_upgrade.lib.php';
require_once $maindir.'install/install.lib.php';
require_once $maindir.'exercice/export/scorm/scorm_classes.php';
require_once $maindir.'exercice/export/qti2/qti2_classes.php';
require_once $maindir.'exercice/export/exercise_import.inc.php';
@ -62,17 +62,17 @@ require_once $libdir.'fileManage.lib.php';
class TestsSuite extends TestSuite {
function setUp() {
global $_configuration, $_user, $_course, $cidReq;
$cidReq = 'COURSETEST';
// check if course exists
// check if course exists
$table_course = Database::get_main_table(TABLE_MAIN_COURSE);
$sql = "SELECT code FROM $table_course WHERE code = '$cidReq' ";
$rs = Database::query($sql, __FILE__, __LINE__);
$row = Database::fetch_row($rs);
if (empty($row[0])) {
// create a course
$course_datos = array(
'wanted_code'=> $cidReq,
@ -89,7 +89,7 @@ class TestsSuite extends TestSuite {
$course_datos['course_language'],$course_datos['course_admin_id'],
$course_datos['db_prefix'], $course_datos['firstExpirationDelay']);
}
$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
$course_cat_table = Database::get_main_table(TABLE_MAIN_CATEGORY);
$sql = "SELECT course.*, course_category.code faCode, course_category.name faName
@ -98,9 +98,9 @@ class TestsSuite extends TestSuite {
ON course.category_code = course_category.code
WHERE course.code = '$cidReq'";
$result = Database::query($sql,__FILE__,__LINE__);
//create the session
if (Database::num_rows($result)>0) {
$cData = Database::fetch_array($result);
$_cid = $cData['code' ];
@ -121,16 +121,16 @@ class TestsSuite extends TestSuite {
$_course['visibility' ] = $cData['visibility'];
$_course['subscribe_allowed'] = $cData['subscribe'];
$_course['unubscribe_allowed'] = $cData['unsubscribe'];
api_session_register('_cid');
api_session_register('_course');
}
$_SESSION['_user']['user_id'] = 1;
$_SESSION['_user']['user_id'] = 1;
$_user['user_id'] = $_SESSION['_user']['user_id'];
$_SESSION['is_courseAdmin'] = 1;
$_SESSION['show'] = showall;
}
function TestsSuite() {
$this->setUp();
@ -147,13 +147,13 @@ class TestsSuite extends TestSuite {
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/classmanager.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/export.lib.inc.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/legal.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/mail.lib.inc.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/mail.lib.inc.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/message.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/online.inc.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/online.inc.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/security.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/specific_fields_manager.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/specific_fields_manager.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/social.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/sortabletable.class.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/sortabletable.class.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/statsUtils.lib.inc.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/tablesort.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/text.lib.test.php');
@ -182,15 +182,15 @@ class TestsSuite extends TestSuite {
$this->addTestFile(dirname(__FILE__).'/main/auth/openid/xrds.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/chat/chat_functions.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/conference/get_translation.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/exercice/hotpotatoes.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/exercice/hotpotatoes.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/newscorm/scorm.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/survey/survey.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/user/userInfoLib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/webservices/user_import/import.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/user/userInfoLib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/webservices/user_import/import.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/work/work.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/glossary.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/notebook.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/permissions/permissions_functions.inc.test.php');
$this->addTestFile(dirname(__FILE__).'/main/permissions/permissions_functions.inc.test.php');
$this->addTestFile(dirname(__FILE__).'/main/resourcelinker/resourcelinker.inc.test.php');
$this->addTestFile(dirname(__FILE__).'/main/survey/survey.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/dropbox/dropbox_class.inc.test.php');
@ -198,17 +198,17 @@ class TestsSuite extends TestSuite {
$this->addTestFile(dirname(__FILE__).'/main/search/search_suggestions.test.php');
$this->addTestFile(dirname(__FILE__).'/main/exercice/export/qti2/qti2_classes.test.php');
$this->addTestFile(dirname(__FILE__).'/main/exercice/export/scorm/scorm_classes.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/usermanager.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/groupmanager.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/image.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/usermanager.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/groupmanager.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/image.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/import.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/internationalization.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/internationalization.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/system_announcements.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/fileUpload.lib.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/main_api.lib.test.php');//this file delete the course
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/main_api.lib.test.php');//this file delete the course
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/debug.lib.inc.test.php');//this file need be to the finish of the tests
*/
*/
//This files has metadata, are deprecated, are not implemented and is not available for the test.
//$this->addTestFile(dirname(__FILE__).'/main/inc/lib/xht.lib.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/inc/lib/xmd.lib.test.php');
@ -216,7 +216,7 @@ class TestsSuite extends TestSuite {
//$this->addTestFile(dirname(__FILE__).'/main/exercice/export/qti2/qti2_export.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/exercice/export/exercise_import.inc.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/exercice/export/scorm/scorm_export.test.php');
/**EJERCICIOS**/
//$this->addTestFile(dirname(__FILE__).'/main/exercice/answer.class.test.php');
//$this->addTestFile(dirname(__FILE__).'/main/exercice/exercise_result.class.test.php');
@ -225,16 +225,16 @@ class TestsSuite extends TestSuite {
//$this->addTestFile(dirname(__FILE__).'/main/exercice/exercise.lib.test.php');falta
//$this->addTestFile(dirname(__FILE__).'/main/exercice/fill_blanks.class.test.php');falta
//$this->addTestFile(dirname(__FILE__).'/main/exercice/freeanswer.class.test.php');falta
/**FORUM*/
$this->addTestFile(dirname(__FILE__).'/main/forum/forumfunction.inc.test.php');
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/main_api.lib.test.php');//this file delete the course,session and the use of api_allow
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/main_api.lib.test.php');//this file delete the course,session and the use of api_allow
$this->addTestFile(dirname(__FILE__).'/main/inc/lib/debug.lib.inc.test.php');//this file need be to the finish of the tests
}
}
$test = &new TestsSuite();

Write Preview
Loading…
Cancel
Save