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

global move loading of classes to autoload

Browse Source
skala
Laurent Opprecht 13 years ago
parent 61ae131d7d
commit c6a0bcbf3c
2 changed files with 11 additions and 10 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. 10
      main/inc/global.inc.php
  2. 11
      main/inc/local.inc.php

10
main/inc/global.inc.php
Unescape View File

@ -98,12 +98,12 @@ require_once $lib_path.'database.lib.php';
require_once $lib_path.'template.lib.php';
require_once $lib_path.'display.lib.php';
require_once $lib_path.'text.lib.php';
require_once $lib_path.'image.lib.php';
//require_once $lib_path.'image.lib.php'; moved to autoload
require_once $lib_path.'array.lib.php';
require_once $lib_path.'security.lib.php';
//require_once $lib_path.'security.lib.php'; moved to autoload
require_once $lib_path.'events.lib.inc.php';
require_once $lib_path.'debug.lib.php';
require_once $lib_path.'rights.lib.php';
//require_once $lib_path.'debug.lib.php'; moved to autoload
//require_once $lib_path.'rights.lib.php'; moved to autoload
require_once $lib_path.'model.lib.php';
//require_once $lib_path.'sortabletable.class.php'; moved to autoload
@ -112,7 +112,7 @@ require_once $lib_path.'message.lib.php';
require_once $lib_path.'social.lib.php';
require_once $lib_path.'notification.lib.php';
require_once $lib_path.'course.lib.php';
require_once $lib_path.'sessionmanager.lib.php';
//require_once $lib_path.'sessionmanager.lib.php'; moved to autoload
require_once $lib_path.'tracking.lib.php';
//require_once $lib_path.'formvalidator/FormValidator.class.php'; moved to autoload

11
main/inc/local.inc.php
Unescape View File

@ -132,9 +132,10 @@
//require_once api_get_path(LIBRARY_PATH).'conditionallogin.lib.php'; moved to autologin
// verified if exists the username and password in session current
if (isset($_SESSION['info_current_user'][1]) && isset($_SESSION['info_current_user'][2])) {
require_once api_get_path(LIBRARY_PATH).'legal.lib.php';
}
//moved to autologin
//if (isset($_SESSION['info_current_user'][1]) && isset($_SESSION['info_current_user'][2])) {
// require_once api_get_path(LIBRARY_PATH).'legal.lib.php';
//}
//Conditional login
if (isset($_SESSION['conditional_login']['uid']) && $_SESSION['conditional_login']['can_login']=== true){
@ -289,7 +290,7 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
// Check the user's password
if ( ($password == $uData['password'] OR $cas_login) AND (trim($login) == $uData['username'])) {
require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
//require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php'); moved to autoload
$update_type = UserManager::get_extra_user_data_by_field($uData['user_id'], 'update_type');
$update_type= $update_type['update_type'];
if (!empty($extAuthSource[$update_type]['updateUser']) && file_exists($extAuthSource[$update_type]['updateUser'])) {
@ -458,7 +459,7 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
* - Work on a better validation for webservices paths. Current is very poor and exit
*/
$subsso = api_get_setting('sso_authentication_subclass');
require_once(api_get_path(SYS_CODE_PATH).'auth/sso/sso.class.php');
//require_once(api_get_path(SYS_CODE_PATH).'auth/sso/sso.class.php'); moved to autologin
if (!empty($subsso)) {
require_once(api_get_path(SYS_CODE_PATH).'auth/sso/sso.'.$subsso.'.class.php');
$subsso = 'sso'.$subsso;

Write Preview
Loading…
Cancel
Save