Removing require libs already loaded in global.inc.php (autoloading)

13 years ago · 75523ff530
parent f8186898d7
commit 75523ff530
28 changed files with 184 additions and 228 deletions
--- a/main/admin/class_import.php
+++ b/main/admin/class_import.php
@ -54,7 +54,6 @@ $cidReset = true;

 // Including some necessary dokeos files.
 include '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'import.lib.php';

 // Setting the section (for the tabs).
 $this_section = SECTION_PLATFORM_ADMIN;
--- a/main/admin/course_import.php
+++ b/main/admin/course_import.php
@ -158,7 +158,6 @@ require_once '../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script();

-require_once api_get_path(LIBRARY_PATH).'import.lib.php';
 $defined_auth_sources[] = PLATFORM_AUTH_SOURCE;

 if (is_array($extAuthSource)) {
--- a/main/admin/user_export.php
+++ b/main/admin/user_export.php
@ -15,7 +15,6 @@ require_once '../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;

 api_protect_admin_script();
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';

 // Database table definitions
 $course_table 		= Database :: get_main_table(TABLE_MAIN_COURSE);
--- a/main/admin/usergroup_export.php
+++ b/main/admin/usergroup_export.php
@ -15,7 +15,6 @@ require_once '../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;

 api_protect_admin_script();
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';

 $tool_name = get_lang('Export');

--- a/main/admin/usergroup_user_import.php
+++ b/main/admin/usergroup_user_import.php
@ -129,8 +129,6 @@ require_once '../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);

-require_once api_get_path(LIBRARY_PATH) . 'import.lib.php';
-
 $tool_name = get_lang('AddUsersToAClass') . ' CSV';

 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
--- a/main/attendance/index.php
+++ b/main/attendance/index.php
@ -15,12 +15,9 @@ $language_file = array ('course_description', 'course_info', 'userInfo', 'admin'
 // including files
 require_once '../inc/global.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';
-require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
 require_once api_get_path(LIBRARY_PATH).'app_view.php';
-require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
 require_once 'attendance_controller.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/fe/exportgradebook.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';

 $current_course_tool  = TOOL_ATTENDANCE;

--- a/main/course_progress/index.php
+++ b/main/course_progress/index.php
@ -14,12 +14,9 @@ $language_file = array ('course_description', 'userInfo', 'admin');

 // including files
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'thematic.lib.php';
 require_once api_get_path(LIBRARY_PATH).'app_view.php';
 require_once 'thematic_controller.php';

-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
-
 // current section
 $this_section = SECTION_COURSES;

--- a/main/coursecopy/classes/CourseRestorer.class.php
+++ b/main/coursecopy/classes/CourseRestorer.class.php
@ -1516,7 +1516,6 @@ class CourseRestorer
                            $question_order = $quiz->question_orders[$index] ? $quiz->question_orders[$index] : ++$order;
                            $sql = "INSERT IGNORE INTO ".$table_rel." SET c_id = ".$this->destination_course_id.", question_id = ".$qid.", exercice_id = ".$new_id.", question_order = ".$question_order;
                            Database::query($sql);
-
                        }
                    }
                }
--- a/main/gradebook/gradebook.php
+++ b/main/gradebook/gradebook.php
@ -32,7 +32,6 @@ require_once 'lib/gradebook_data_generator.class.php';
 require_once 'lib/fe/gradebooktable.class.php';
 require_once 'lib/fe/displaygradebook.php';
 require_once 'lib/fe/userform.class.php';
-require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
 $htmlHeadXtra[] = '<script>
 $(document).ready( function() {
 	for (i=0;i<$(".actions").length;i++) {
--- a/main/gradebook/gradebook_view_result.php
+++ b/main/gradebook/gradebook_view_result.php
@ -17,13 +17,10 @@ require_once 'lib/gradebook_functions.inc.php';
 require_once 'lib/fe/displaygradebook.php';
 require_once 'lib/fe/evalform.class.php';
 require_once 'lib/fe/dataform.class.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'import.lib.php';
 require_once 'lib/results_data_generator.class.php';
 require_once 'lib/fe/resulttable.class.php';
 require_once 'lib/fe/exportgradebook.php';
 require_once 'lib/scoredisplay.class.php';
-require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php';

 api_block_anonymous_users();
--- a/main/gradebook/user_info.php
+++ b/main/gradebook/user_info.php
@ -8,10 +8,8 @@
 * Init
 */
 $language_file = 'gradebook';
-//$cidReset = true;
+
 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'import.lib.php';
 api_block_anonymous_users();

 if (isset($_GET['userid'])) {
--- a/main/group/group_overview.php
+++ b/main/group/group_overview.php
@ -28,10 +28,6 @@ api_protect_course_script(true);

 $nameTools = get_lang('GroupOverview');

-/*	Libraries */
-
-include_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
-
 if (isset($_GET['action'])) {
 	switch ($_GET['action']) {
 		case 'export':
--- a/main/inc/global.inc.php
+++ b/main/inc/global.inc.php
@ -154,8 +154,8 @@ $app['languages_file'] = array();
 $app['installed'] = $alreadyInstalled;

 //Loading $app settings
-//require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/prod.php';
-require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/dev.php';
+require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/prod.php';
+//require_once __DIR__.'/../../src/ChamiloLMS/Resources/config/dev.php';

 //Setting HttpCacheService provider in order to use do: $app['http_cache']->run();
 /*
--- a/main/mySpace/course.php
+++ b/main/mySpace/course.php
@ -14,8 +14,6 @@ $language_file = array ('admin', 'registration', 'index', 'tracking');
 $cidReset = true;

 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
-require_once api_get_path(LIBRARY_PATH).'thematic.lib.php';

 $this_section = SECTION_TRACKING;
 $id_session = intval($_GET['id_session']);
--- a/main/mySpace/index.php
+++ b/main/mySpace/index.php
@ -16,7 +16,6 @@ $cidReset = true;
 require_once '../inc/global.inc.php';

 // including additional libraries
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
 require_once 'myspace.lib.php';

 // the section (for the tabs)
--- a/main/mySpace/lp_tracking.php
+++ b/main/mySpace/lp_tracking.php
@ -20,10 +20,8 @@ if (isset($_GET['from']) && $_GET['from'] == 'myspace') {
 } else {
 	$this_section = SECTION_COURSES;
 }
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpath.class.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathItem.class.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';

 $session_id  = isset($_REQUEST['id_session']) && !empty($_REQUEST['id_session']) ? intval($_REQUEST['id_session']) : api_get_session_id();

--- a/main/mySpace/myStudents.php
+++ b/main/mySpace/myStudents.php
@ -12,7 +12,6 @@ $language_file = array('registration', 'index', 'tracking', 'exercice', 'admin',

 require_once '../inc/global.inc.php';

-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpath.class.php';
 require_once api_get_path(SYS_CODE_PATH).'mySpace/myspace.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/gradebookitem.class.php';
@ -20,7 +19,6 @@ require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/evaluation.class.php'
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/result.class.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/linkfactory.class.php';
 require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/be/category.class.php';
-require_once api_get_path(LIBRARY_PATH).'attendance.lib.php';
 require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';

 api_block_anonymous_users();
--- a/main/mySpace/myspace.lib.php
+++ b/main/mySpace/myspace.lib.php
@ -7,7 +7,6 @@
 /**
 * Init
 */
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
 /**
 * MySpace class definition
 */
--- a/main/mySpace/session.php
+++ b/main/mySpace/session.php
@ -11,7 +11,6 @@ $language_file = array ('registration', 'index', 'trad4all', 'tracking', 'admin'
 $cidReset = true;

 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';

 api_block_anonymous_users();

--- a/main/mySpace/student.php
+++ b/main/mySpace/student.php
@ -12,7 +12,6 @@ $language_file = array ('registration', 'index', 'tracking', 'admin');
 $cidReset = true;

 require_once '../inc/global.inc.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';

 api_block_anonymous_users();

--- a/main/mySpace/user_import.php
+++ b/main/mySpace/user_import.php
@ -17,8 +17,6 @@ require_once 'myspace.lib.php';

 $this_section = SECTION_PLATFORM_ADMIN; // TODO: Platform admin section?

-require_once api_get_path(LIBRARY_PATH).'import.lib.php';
-
 $tool_name = get_lang('ImportUserListXMLCSV');
 api_block_anonymous_users();

--- a/main/tracking/courseLog.php
+++ b/main/tracking/courseLog.php
@ -47,7 +47,6 @@ require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathItem.class.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/scorm.class.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/scormItem.class.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH).'statsUtils.lib.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';
--- a/main/tracking/course_log_resources.php
+++ b/main/tracking/course_log_resources.php
@ -47,7 +47,6 @@ require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathItem.class.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/scorm.class.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/scormItem.class.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH).'statsUtils.lib.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';
--- a/main/tracking/course_log_tools.php
+++ b/main/tracking/course_log_tools.php
@ -41,7 +41,6 @@ require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathItem.class.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/scorm.class.php';
 require_once api_get_path(SYS_CODE_PATH).'newscorm/scormItem.class.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
 require_once api_get_path(LIBRARY_PATH).'statsUtils.lib.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'resourcelinker/resourcelinker.inc.php';
 require_once api_get_path(SYS_CODE_PATH).'survey/survey.lib.php';
--- a/main/tracking/lp_results_by_user.php
+++ b/main/tracking/lp_results_by_user.php
@ -218,7 +218,7 @@ if ($export_to_csv) {
 	exit;
 }
 function export_complete_report_csv($filename, $array) {
-        require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';
+
        $header[] = array(get_lang('Course'),get_lang('LearningPath'), get_lang('Exercise'), get_lang('User'),get_lang('Attempt'), get_lang('Date'),get_lang('Results'));
        if (!empty($array)) {
            $array = array_merge($header, $array);
--- a/tests/main/dropbox/dropbox_functions.inc.test.php
+++ b/tests/main/dropbox/dropbox_functions.inc.test.php
@ -1,6 +1,4 @@
 <?php
-//include_once(api_get_path(LIBRARY_PATH)."/pclzip/pclzip.lib.php");
-require_once(api_get_path(LIBRARY_PATH).'document.lib.php');
 class TestDropboxFunctions extends UnitTestCase {

 	/**
--- a/tests/main/inc/lib/export.lib.inc.test.php
+++ b/tests/main/inc/lib/export.lib.inc.test.php
@ -1,6 +1,4 @@
 <?php
-require_once(api_get_path(LIBRARY_PATH).'export.lib.inc.php');
-require_once(api_get_path(LIBRARY_PATH).'document.lib.php');

 /** Test about export csv using class document manager
 * @author Arthur portugal
--- a/tests/main/inc/lib/sortable_table.class.test.php
+++ b/tests/main/inc/lib/sortable_table.class.test.php
@ -1,6 +1,4 @@
 <?php
-require_once api_get_path(LIBRARY_PATH).'sortable_table.class.php';
-require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php';

 class TestSortableTable extends UnitTestCase {