diff --git a/main/install/install_functions.inc.php b/main/install/_install_functions.inc.php old mode 100755 new mode 100644 similarity index 100% rename from main/install/install_functions.inc.php rename to main/install/_install_functions.inc.php diff --git a/main/install/install_upgrade.lib.php b/main/install/_install_upgrade.lib.php old mode 100755 new mode 100644 similarity index 100% rename from main/install/install_upgrade.lib.php rename to main/install/_install_upgrade.lib.php diff --git a/main/install/index.php b/main/install/index.php index 20ab63499c..ad5b10bc28 100755 --- a/main/install/index.php +++ b/main/install/index.php @@ -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 diff --git a/main/install/install_db.inc.php b/main/install/install_db.inc.php index 4b5c33d905..bae012a2d4 100755 --- a/main/install/install_db.inc.php +++ b/main/install/install_db.inc.php @@ -9,8 +9,6 @@ ============================================================================== */ -require_once 'install_upgrade.lib.php'; - /* ============================================================================== MAIN CODE diff --git a/main/install/update-db-1.6.x-1.8.0.inc.php b/main/install/update-db-1.6.x-1.8.0.inc.php index 169388cace..c79c8adf5d 100755 --- a/main/install/update-db-1.6.x-1.8.0.inc.php +++ b/main/install/update-db-1.6.x-1.8.0.inc.php @@ -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) { diff --git a/main/install/update-db-1.8.0-1.8.2.inc.php b/main/install/update-db-1.8.0-1.8.2.inc.php index 50c594d80f..b1936c7d28 100755 --- a/main/install/update-db-1.8.0-1.8.2.inc.php +++ b/main/install/update-db-1.8.0-1.8.2.inc.php @@ -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) { diff --git a/main/install/update-db-1.8.2-1.8.3.inc.php b/main/install/update-db-1.8.2-1.8.3.inc.php index 0ae29b4a07..cf71216f73 100755 --- a/main/install/update-db-1.8.2-1.8.3.inc.php +++ b/main/install/update-db-1.8.2-1.8.3.inc.php @@ -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) { diff --git a/main/install/update-db-1.8.3-1.8.4.inc.php b/main/install/update-db-1.8.3-1.8.4.inc.php index 0de8fe8e1a..0695db4efe 100755 --- a/main/install/update-db-1.8.3-1.8.4.inc.php +++ b/main/install/update-db-1.8.3-1.8.4.inc.php @@ -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) { diff --git a/main/install/update-db-1.8.4-1.8.5.inc.php b/main/install/update-db-1.8.4-1.8.5.inc.php index 0bb299a7d4..ef4676ce0f 100755 --- a/main/install/update-db-1.8.4-1.8.5.inc.php +++ b/main/install/update-db-1.8.4-1.8.5.inc.php @@ -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) { diff --git a/main/install/update-db-1.8.5-1.8.6.inc.php b/main/install/update-db-1.8.5-1.8.6.inc.php index fa598af0fc..6a07e8abeb 100755 --- a/main/install/update-db-1.8.5-1.8.6.inc.php +++ b/main/install/update-db-1.8.5-1.8.6.inc.php @@ -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) { diff --git a/main/install/update-db-1.8.6-1.8.6.1.inc.php b/main/install/update-db-1.8.6-1.8.6.1.inc.php index b0a727ae52..750f7cfe72 100755 --- a/main/install/update-db-1.8.6-1.8.6.1.inc.php +++ b/main/install/update-db-1.8.6-1.8.6.1.inc.php @@ -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) { diff --git a/main/install/update-db-1.8.6.1-1.8.6.2.inc.php b/main/install/update-db-1.8.6.1-1.8.6.2.inc.php index 7e37d599ff..345e21b70e 100755 --- a/main/install/update-db-1.8.6.1-1.8.6.2.inc.php +++ b/main/install/update-db-1.8.6.1-1.8.6.2.inc.php @@ -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) { diff --git a/main/install/update-db-1.8.6.2-1.8.7.inc.php b/main/install/update-db-1.8.6.2-1.8.7.inc.php index dc76b6a0ab..a1c50c112a 100755 --- a/main/install/update-db-1.8.6.2-1.8.7.inc.php +++ b/main/install/update-db-1.8.6.2-1.8.7.inc.php @@ -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) { diff --git a/main/install/update-files-1.6.x-1.8.0.inc.php b/main/install/update-files-1.6.x-1.8.0.inc.php index 38e4c1ec8c..148eb5d2b6 100755 --- a/main/install/update-files-1.6.x-1.8.0.inc.php +++ b/main/install/update-files-1.6.x-1.8.0.inc.php @@ -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'; /* ============================================================================== diff --git a/tests/test_suite.php b/tests/test_suite.php index 24ccde21cf..fa54875136 100755 --- a/tests/test_suite.php +++ b/tests/test_suite.php @@ -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();