From c26dcd29b47b1b537bd8b56dbe1ef0e69b38ce7a Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 11 Aug 2011 11:58:34 +0200 Subject: [PATCH] Moving sortableclass.lib.php and usermanager.lib.php in global.inc.php --- main/admin/course_information.php | 1 - main/admin/course_list.php | 1 - main/admin/settings.php | 1 - main/admin/statistics/index.php | 1 - main/admin/user_list.php | 2 -- main/attendance/index.php | 2 -- main/blog/blog_admin.php | 1 - main/course_progress/index.php | 2 -- main/document/document.php | 2 -- main/glossary/index.php | 1 - main/inc/global.inc.php | 2 +- main/mySpace/course.php | 2 +- main/mySpace/index.php | 2 -- main/mySpace/myspace.lib.php | 2 -- main/mySpace/session.php | 1 - main/mySpace/student.php | 2 -- main/session/index.php | 2 -- main/survey/survey.lib.php | 3 --- main/survey/survey_invitation.php | 2 -- main/survey/survey_list.php | 2 -- main/tracking/courseLog.php | 3 +-- main/user/class.php | 1 - main/user/subscribe_class.php | 1 - main/user/subscribe_user.php | 6 ------ main/user/user.php | 2 -- main/wiki/index.php | 2 -- 26 files changed, 3 insertions(+), 46 deletions(-) diff --git a/main/admin/course_information.php b/main/admin/course_information.php index 93f328ec71..491380da3f 100755 --- a/main/admin/course_information.php +++ b/main/admin/course_information.php @@ -13,7 +13,6 @@ $language_file = 'admin'; $cidReset = true; require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; $this_section=SECTION_PLATFORM_ADMIN; diff --git a/main/admin/course_list.php b/main/admin/course_list.php index ca95619d34..59ea998a47 100755 --- a/main/admin/course_list.php +++ b/main/admin/course_list.php @@ -18,7 +18,6 @@ $this_section = SECTION_PLATFORM_ADMIN; api_protect_admin_script(); require_once api_get_path(LIBRARY_PATH).'course.lib.php'; require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once '../gradebook/lib/be/gradebookitem.class.php'; require_once '../gradebook/lib/be/category.class.php'; diff --git a/main/admin/settings.php b/main/admin/settings.php index ebd9fa891d..3a78ca8f15 100755 --- a/main/admin/settings.php +++ b/main/admin/settings.php @@ -26,7 +26,6 @@ $cidReset = true; // Including some necessary library files. require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; require_once api_get_path(LIBRARY_PATH).'fileManage.lib.php'; require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php'; diff --git a/main/admin/statistics/index.php b/main/admin/statistics/index.php index 369bf1b4c0..a0809600dc 100755 --- a/main/admin/statistics/index.php +++ b/main/admin/statistics/index.php @@ -9,7 +9,6 @@ $language_file = array('admin', 'tracking'); $cidReset = true; require_once '../../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; api_protect_admin_script(); $interbreadcrumb[] = array ('url' => '../index.php', 'name' => get_lang('PlatformAdmin')); diff --git a/main/admin/user_list.php b/main/admin/user_list.php index 9d041f0913..1ffe240731 100755 --- a/main/admin/user_list.php +++ b/main/admin/user_list.php @@ -10,11 +10,9 @@ $language_file = array ('registration','admin'); $cidReset = true; require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; require_once api_get_path(LIBRARY_PATH).'security.lib.php'; require_once api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php'; -require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php'; global $_configuration; // Blocks the possibility to delete a user diff --git a/main/attendance/index.php b/main/attendance/index.php index eb81d9fff1..88e706744b 100755 --- a/main/attendance/index.php +++ b/main/attendance/index.php @@ -18,9 +18,7 @@ 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(LIBRARY_PATH).'usermanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php'; require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/fe/exportgradebook.php'; diff --git a/main/blog/blog_admin.php b/main/blog/blog_admin.php index 1d9e3412d5..03eda37269 100755 --- a/main/blog/blog_admin.php +++ b/main/blog/blog_admin.php @@ -12,7 +12,6 @@ $language_file = 'blog'; require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; $this_section=SECTION_COURSES; diff --git a/main/course_progress/index.php b/main/course_progress/index.php index 6c967fdec7..19c1bbddc0 100755 --- a/main/course_progress/index.php +++ b/main/course_progress/index.php @@ -18,9 +18,7 @@ require_once api_get_path(LIBRARY_PATH).'attendance.lib.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).'usermanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; //require_once api_get_path(SYS_CODE_PATH).'gradebook/lib/gradebook_functions.inc.php'; diff --git a/main/document/document.php b/main/document/document.php index e62b533253..29797746d0 100755 --- a/main/document/document.php +++ b/main/document/document.php @@ -42,10 +42,8 @@ require_once 'document.inc.php'; $lib_path = api_get_path(LIBRARY_PATH); /* Libraries */ -require_once $lib_path.'usermanager.lib.php'; require_once $lib_path.'document.lib.php'; require_once $lib_path.'fileUpload.lib.php'; -require_once $lib_path.'sortabletable.class.php'; require_once $lib_path.'formvalidator/FormValidator.class.php'; require_once $lib_path.'fileDisplay.lib.php'; require_once $lib_path.'tablesort.lib.php'; diff --git a/main/glossary/index.php b/main/glossary/index.php index d40ed17957..1c4fd2fc37 100755 --- a/main/glossary/index.php +++ b/main/glossary/index.php @@ -11,7 +11,6 @@ $language_file = array('glossary'); // Including the global initialization file. require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'glossary.lib.php'; // The section (tabs). diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php index 1210660fb8..51d5b03719 100755 --- a/main/inc/global.inc.php +++ b/main/inc/global.inc.php @@ -101,8 +101,8 @@ require_once $lib_path.'security.lib.php'; require_once $lib_path.'events.lib.inc.php'; require_once $lib_path.'debug.lib.php'; -require_once $lib_path.'usermanager.lib.php'; require_once $lib_path.'sortabletable.class.php'; +require_once $lib_path.'usermanager.lib.php'; require_once $lib_path.'message.lib.php'; require_once $lib_path.'social.lib.php'; diff --git a/main/mySpace/course.php b/main/mySpace/course.php index f47c7c4e47..92bb351394 100755 --- a/main/mySpace/course.php +++ b/main/mySpace/course.php @@ -10,7 +10,7 @@ $language_file = array ('admin', 'registration', 'index', 'trad4all', 'tracking' $cidReset = true; require '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; + require_once api_get_path(LIBRARY_PATH).'tracking.lib.php'; require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php'; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; diff --git a/main/mySpace/index.php b/main/mySpace/index.php index 4e3db07456..9b37ecfcf9 100755 --- a/main/mySpace/index.php +++ b/main/mySpace/index.php @@ -9,10 +9,8 @@ $cidReset = true; require_once '../inc/global.inc.php'; // including additional libraries -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'tracking.lib.php'; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; -require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php'; require_once 'myspace.lib.php'; diff --git a/main/mySpace/myspace.lib.php b/main/mySpace/myspace.lib.php index 159b5251e8..cd65e78039 100755 --- a/main/mySpace/myspace.lib.php +++ b/main/mySpace/myspace.lib.php @@ -1,9 +1,7 @@ function setFocus(){ diff --git a/main/survey/survey_invitation.php b/main/survey/survey_invitation.php index 705edcd1f0..51e0ab93fc 100755 --- a/main/survey/survey_invitation.php +++ b/main/survey/survey_invitation.php @@ -16,8 +16,6 @@ $language_file = 'survey'; require '../inc/global.inc.php'; // Including additional libraries -//require_once api_get_path(LIBRARY_PATH).'survey.lib.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once 'survey.lib.php'; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; diff --git a/main/survey/survey_list.php b/main/survey/survey_list.php index 5a5038c0b3..ccc672751b 100755 --- a/main/survey/survey_list.php +++ b/main/survey/survey_list.php @@ -23,8 +23,6 @@ require_once '../inc/global.inc.php'; $this_section = SECTION_COURSES; // Including additional libraries -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; -//require_once api_get_path(LIBRARY_PATH).'survey.lib.php'; require_once 'survey.lib.php'; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php index b8d0b50a75..efe1b5d6ca 100755 --- a/main/tracking/courseLog.php +++ b/main/tracking/courseLog.php @@ -39,7 +39,7 @@ if (!$is_allowedToTrack) { } // Including additional libraries. -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.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(SYS_CODE_PATH).'newscorm/learnpathList.class.php'; @@ -47,7 +47,6 @@ 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).'tracking.lib.php'; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; -require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php'; require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; require_once api_get_path(LIBRARY_PATH).'statsUtils.lib.inc.php'; diff --git a/main/user/class.php b/main/user/class.php index cd52c7e47b..51e53073e4 100755 --- a/main/user/class.php +++ b/main/user/class.php @@ -12,7 +12,6 @@ include ('../inc/global.inc.php'); $this_section = SECTION_COURSES; require_once (api_get_path(LIBRARY_PATH).'course.lib.php'); -require_once (api_get_path(LIBRARY_PATH).'sortabletable.class.php'); require_once (api_get_path(LIBRARY_PATH).'classmanager.lib.php'); require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'); diff --git a/main/user/subscribe_class.php b/main/user/subscribe_class.php index 74cc4b8a24..b5f6957945 100755 --- a/main/user/subscribe_class.php +++ b/main/user/subscribe_class.php @@ -17,7 +17,6 @@ if(api_get_setting('use_session_mode')=='true') { } require_once (api_get_path(LIBRARY_PATH).'course.lib.php'); -require_once (api_get_path(LIBRARY_PATH).'sortabletable.class.php'); require_once (api_get_path(LIBRARY_PATH).'classmanager.lib.php'); require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'); diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php index 4cc7fd91f1..d8b1debbde 100755 --- a/main/user/subscribe_user.php +++ b/main/user/subscribe_user.php @@ -24,13 +24,7 @@ if (!api_is_allowed_to_edit()) { // including additional libraries require_once api_get_path(LIBRARY_PATH).'course.lib.php'; require_once api_get_path(LIBRARY_PATH).'sessionmanager.lib.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; -require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php'; - -/* MAIN CODE */ - -/* Header */ $tool_name = get_lang("SubscribeUserToCourse"); if ($_REQUEST['type']=='teacher') { diff --git a/main/user/user.php b/main/user/user.php index d9890f3e11..08be9d7208 100755 --- a/main/user/user.php +++ b/main/user/user.php @@ -35,9 +35,7 @@ api_protect_course_script(true); /* Libraries */ require_once api_get_path(LIBRARY_PATH).'export.lib.inc.php'; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; -require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php'; global $_configuration; diff --git a/main/wiki/index.php b/main/wiki/index.php index 145296ca01..721f0d2f22 100755 --- a/main/wiki/index.php +++ b/main/wiki/index.php @@ -22,9 +22,7 @@ $this_section = SECTION_COURSES; require_once api_get_path(LIBRARY_PATH).'course.lib.php'; require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php'; -require_once api_get_path(LIBRARY_PATH).'security.lib.php'; require_once api_get_path(LIBRARY_PATH).'mail.lib.inc.php'; -require_once api_get_path(LIBRARY_PATH).'sortabletable.class.php'; require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; require_once 'wiki.inc.php';