From 4b6afee605c5a82de84ea535361c711e5bbd88cd Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 17 Apr 2013 14:21:43 +0200 Subject: [PATCH] Removing require_once of libs already added in the autoload script --- custompages/first_login.php | 18 +-- main/admin/settings.lib.php | 3 +- main/admin/system_status.php | 1 - main/blog/blog_admin.php | 9 +- main/course_progress/thematic_controller.php | 42 +++--- main/create_course/add_course.php | 4 - main/dashboard/index.php | 20 ++- main/gradebook/gradebook_flatview.php | 1 - main/gradebook/gradebook_showlog_eval.php | 7 +- main/gradebook/gradebook_showlog_link.php | 1 - main/gradebook/index.php | 130 ++++++++-------- main/gradebook/lib/be/category.class.php | 3 - main/gradebook/lib/fe/exportgradebook.php | 66 ++++---- main/gradebook/lib/fe/flatviewtable.class.php | 75 +++++----- main/gradebook/lib/fe/userform.class.php | 1 - main/gradebook/user_stats.php | 1 - main/help/allowed_html_tags.php | 3 +- main/inc/ajax/course.ajax.php | 30 ++-- main/inc/ajax/course_home.ajax.php | 2 +- main/inc/ajax/exercise.ajax.php | 2 +- main/inc/ajax/extra_field.ajax.php | 10 +- main/inc/ajax/install.ajax.php | 93 ++++++------ main/inc/ajax/link.ajax.php | 26 ++-- main/inc/ajax/notebook.ajax.php | 4 +- main/inc/ajax/online.ajax.php | 4 +- main/inc/ajax/skill.ajax.php | 141 +++++++++--------- main/inc/ajax/social.ajax.php | 3 +- main/inc/ajax/thematic.ajax.php | 122 ++++++++------- main/inc/ajax/timeline.ajax.php | 10 +- main/inc/ajax/user_manager.ajax.php | 2 +- main/inc/ajax/work.ajax.php | 8 +- main/inc/lib/link.lib.php | 3 +- main/inc/lib/main_api.lib.php | 5 + main/inc/lib/nanogong.lib.php | 1 - main/inc/lib/notebook.lib.php | 9 +- .../lib/search/xapian/XapianIndexer.class.php | 2 +- main/inc/lib/search/xapian/XapianQuery.php | 2 +- main/inc/lib/skill.lib.php | 10 +- main/notebook/index.php | 4 +- main/reservation/rsys.php | 4 +- main/social/home.php | 1 - main/social/skills_tree.php | 2 - main/timeline/view.php | 6 +- main/tracking/lp_results_by_user.php | 1 - main/tracking/question_course_report.php | 1 - 45 files changed, 427 insertions(+), 466 deletions(-) diff --git a/custompages/first_login.php b/custompages/first_login.php index 6f3c6b512d..35c851a4f1 100644 --- a/custompages/first_login.php +++ b/custompages/first_login.php @@ -7,9 +7,9 @@ /** * Initialization */ -require_once('language.php'); -require_once(dirname(__FILE__).'/../main/inc/global.inc.php'); -require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php'); +require_once 'language.php'; +require_once dirname(__FILE__).'/../main/inc/global.inc.php'; + /** * Security checks */ @@ -17,8 +17,8 @@ if (! isset($_SESSION['conditional_login']['uid'])) die("Not Authorised"); if (isset($_POST['password'])){ - $u = UserManager::get_user_info_by_id($_SESSION['conditional_login']['uid']); - if ($_POST['password'] != $_POST['password2']) { + $u = UserManager::get_user_info_by_id($_SESdiagnoser.lib.phpSION['conditional_login']['uid']); + if ($_POST['password'] != $_POST['password2']) { header('Location: '. api_get_self().'?invalid=2'); exit(); } @@ -59,11 +59,11 @@ if ($_GET['invalid'] == 2) { '; $content = '
'; diff --git a/main/tracking/lp_results_by_user.php b/main/tracking/lp_results_by_user.php index 2bce6329b2..2bde64ee83 100644 --- a/main/tracking/lp_results_by_user.php +++ b/main/tracking/lp_results_by_user.php @@ -14,7 +14,6 @@ $language_file = array ('registration', 'index', 'tracking', 'exercice','survey'); require_once '../inc/global.inc.php'; -require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; require_once api_get_path(LIBRARY_PATH).'pear/Spreadsheet_Excel_Writer/Writer.php'; $this_section = SECTION_TRACKING; diff --git a/main/tracking/question_course_report.php b/main/tracking/question_course_report.php index 1aebdda068..26e1c76adb 100644 --- a/main/tracking/question_course_report.php +++ b/main/tracking/question_course_report.php @@ -12,7 +12,6 @@ require_once '../inc/global.inc.php'; require_once api_get_path(SYS_CODE_PATH).'exercice/exercise.class.php'; require_once api_get_path(SYS_CODE_PATH).'exercice/question.class.php'; -require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'; require_once api_get_path(LIBRARY_PATH).'pear/Spreadsheet_Excel_Writer/Writer.php'; require_once api_get_path(SYS_CODE_PATH).'newscorm/learnpathList.class.php';