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

Minor - Code styling changes (during #8268)

Browse Source
1.9.x
Yannick Warnier 11 years ago
parent c6e8a233e4
commit f00c75d42f
1 changed files with 119 additions and 59 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. 120
      main/inc/local.inc.php

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

@ -144,7 +144,10 @@ $cidReq = isset($_GET["cidReq"]) ? Database::escape_string($_GET["cidReq"]) : $c
$cidReset = isset($cidReset) ? Database::escape_string($cidReset) : '';
// $cidReset can be set in URL-parameter
$cidReset = (isset($_GET['cidReq']) && ((isset($_SESSION['_cid']) && $_GET['cidReq']!=$_SESSION['_cid']) || (!isset($_SESSION['_cid'])))) ? Database::escape_string($_GET["cidReq"]) : $cidReset;
$cidReset = (
isset($_GET['cidReq']) && ((isset($_SESSION['_cid'])
&& $_GET['cidReq']!=$_SESSION['_cid']) || (!isset($_SESSION['_cid'])))
) ? Database::escape_string($_GET["cidReq"]) : $cidReset;
// $cDir is a special url param sent by courses/.htaccess
$cDir = (!empty($_GET['cDir']) ? $_GET['cDir'] : null);
@ -217,11 +220,11 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
}
$cas_login = false;
if ($cas_activated AND !isset($_user['user_id']) and !isset($_POST['login']) && !$logout) {
if ($cas_activated and !isset($_user['user_id']) and !isset($_POST['login']) && !$logout) {
require_once(api_get_path(SYS_PATH).'main/auth/cas/authcas.php');
$cas_login = cas_is_authenticated();
}
if ((isset($_POST['login']) AND isset($_POST['password']) ) OR ($cas_login) ) {
if ((isset($_POST['login']) and isset($_POST['password'])) or ($cas_login)) {
// $login && $password are given to log in
if ($cas_login && empty($_POST['login'])) {
@ -299,10 +302,12 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
$password = api_get_encrypted_password(trim(stripslashes($password)));
// Check the user's password
if (($password == $uData['password'] OR $cas_login) AND (trim($login) == $uData['username'])) {
if (($password == $uData['password'] or $cas_login) and (trim($login) == $uData['username'])) {
$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'])) {
if (!empty($extAuthSource[$update_type]['updateUser'])
&& file_exists($extAuthSource[$update_type]['updateUser'])
) {
include_once $extAuthSource[$update_type]['updateUser'];
}
@ -310,17 +315,24 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
if ($uData['active'] == '1') {
// Check if the expiration date has not been reached
if ($uData['expiration_date'] > date('Y-m-d H:i:s') OR $uData['expiration_date'] == '0000-00-00 00:00:00') {
if ($uData['expiration_date'] > date('Y-m-d H:i:s')
or $uData['expiration_date'] == '0000-00-00 00:00:00'
) {
global $_configuration;
if (isset($_configuration['multiple_access_urls']) && $_configuration['multiple_access_urls']) {
if (isset($_configuration['multiple_access_urls'])
&& $_configuration['multiple_access_urls']
) {
//Check if user is an admin
$my_user_is_admin = UserManager::is_admin($uData['user_id']);
// This user is subscribed in these sites => $my_url_list
$my_url_list = api_get_access_url_from_user($uData['user_id']);
//Check the access_url configuration setting if the user is registered in the access_url_rel_user table
//Check the access_url configuration setting if
// the user is registered in the access_url_rel_user table
//Getting the current access_url_id of the platform
$current_access_url_id = api_get_current_access_url_id();
@ -342,7 +354,8 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
// Fix cas redirection loop
// https://support.chamilo.org/issues/6124
$location = api_get_path(WEB_PATH).'index.php?loginFailed=1&error=access_url_inactive';
$location = api_get_path(WEB_PATH)
.'index.php?loginFailed=1&error=access_url_inactive';
if ($cas_login) {
cas_logout(null, $location);
} else {
@ -350,8 +363,10 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
}
exit;
}
} else { //Only admins of the "main" (first) Chamilo portal can login wherever they want
if (in_array(1, $my_url_list)) { //Check if this admin have the access_url_id = 1 which means the principal
} else {
//Only admins of the "main" (first) Chamilo portal can login wherever they want
if (in_array(1, $my_url_list)) {
//Check if this admin have the access_url_id = 1 which means the principal
ConditionalLogin::check_conditions($uData);
$_user['user_id'] = $uData['user_id'];
$_user['status'] = $uData['status'];
@ -368,7 +383,10 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
$loginFailed = true;
Session::erase('_uid');
Session::write('loginFailed', '1');
header('Location: '.api_get_path(WEB_PATH).'index.php?loginFailed=1&error=access_url_inactive');
header(
'Location: '.api_get_path(WEB_PATH)
.'index.php?loginFailed=1&error=access_url_inactive'
);
exit;
}
}
@ -386,14 +404,20 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
$loginFailed = true;
Session::erase('_uid');
Session::write('loginFailed', '1');
header('Location: '.api_get_path(WEB_PATH).'index.php?loginFailed=1&error=account_expired');
header(
'Location: '.api_get_path(WEB_PATH)
.'index.php?loginFailed=1&error=account_expired'
);
exit;
}
} else {
$loginFailed = true;
Session::erase('_uid');
Session::write('loginFailed', '1');
header('Location: '.api_get_path(WEB_PATH).'index.php?loginFailed=1&error=account_inactive');
header(
'Location: '.api_get_path(WEB_PATH)
.'index.php?loginFailed=1&error=account_inactive'
);
exit;
}
} else {
@ -419,7 +443,10 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
}
}
header('Location: '.api_get_path(WEB_PATH).'index.php?loginFailed=1&error=user_password_incorrect');
header(
'Location: '.api_get_path(WEB_PATH)
.'index.php?loginFailed=1&error=user_password_incorrect'
);
exit;
}
@ -428,7 +455,9 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
//e.g. registered by a teacher
//do nothing (code may be added later)
}
} elseif (!empty($extAuthSource[$uData['auth_source']]['login']) && file_exists($extAuthSource[$uData['auth_source']]['login'])) {
} elseif (!empty($extAuthSource[$uData['auth_source']]['login'])
&& file_exists($extAuthSource[$uData['auth_source']]['login'])
) {
/*
* Process external authentication
* on the basis of the given login name
@ -442,7 +471,13 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
/* >>>>>>>> External authentication modules <<<<<<<<< */
} else { // no standard Chamilo login - try external authentification
//huh... nothing to do... we shouldn't get here
error_log('Chamilo Authentication file defined in $extAuthSource could not be found - this might prevent your system from doing the corresponding authentication process',0);
error_log(
'Chamilo Authentication file defined in'.
' $extAuthSource could not be found - this might prevent'.
' your system from doing the corresponding authentication'.
' process',
0
);
}
} else {
// login failed, Database::num_rows($result) <= 0
@ -471,17 +506,27 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
if (!empty($thisAuthSource['newUser']) && file_exists($thisAuthSource['newUser'])) {
include_once($thisAuthSource['newUser']);
} else {
error_log('Chamilo Authentication file '. $thisAuthSource['newUser']. ' could not be found - this might prevent your system from using the authentication process in the user creation process',0);
error_log(
'Chamilo Authentication file '. $thisAuthSource['newUser'].
' could not be found - this might prevent your system from using'.
' the authentication process in the user creation process',
0
);
}
}
} //end if is_array($extAuthSource)
if ($loginFailed) { //If we are here username given is wrong
Session::write('loginFailed', '1');
header('Location: '.api_get_path(WEB_PATH).'index.php?loginFailed=1&error=user_password_incorrect');
header(
'Location: '.api_get_path(WEB_PATH)
.'index.php?loginFailed=1&error=user_password_incorrect'
);
exit;
}
} //end else login failed
} elseif (api_get_setting('sso_authentication') === 'true' && !in_array('webservices', explode('/', $_SERVER['REQUEST_URI']))) {
} elseif (api_get_setting('sso_authentication') === 'true'
&& !in_array('webservices', explode('/', $_SERVER['REQUEST_URI']))
) {
/**
* TODO:
* - Work on a better validation for webservices paths. Current is very poor and exit
@ -524,19 +569,25 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
if (!empty($master_urls)) {
$master_auth_uri = api_get_setting('sso_authentication_auth_uri');
foreach ($master_urls as $mu) {
if (empty($mu)) { continue; }
if (empty($mu)) {
continue;
}
// For each URL, check until we find *one* that matches the $_GET['sso_referer'],
// then skip other possibilities
// Do NOT compare the whole referer, as this might cause confusing errors with friendly urls,
// like in Drupal /?q=user& vs /user?
$referer = substr($_GET['sso_referer'], 0, strrpos($_GET['sso_referer'],'/'));
if ($protocol.trim($mu) === $referer) {
$referrer = substr($_GET['sso_referer'], 0, strrpos($_GET['sso_referer'], '/'));
if ($protocol.trim($mu) === $referrer) {
$matches_domain = true;
break;
}
}
} else {
error_log('Your sso_authentication_master param is empty. Check the platform configuration, security section. It can be a list of comma-separated domains');
error_log(
'Your sso_authentication_master param is empty. '.
'Check the platform configuration, security section. '.
'It can be a list of comma-separated domains'
);
}
}
if ($matches_domain) {
@ -586,7 +637,9 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
// check if the account is active (not locked)
if ($uData['active']=='1') {
// check if the expiration date has not been reached
if ($uData['expiration_date']>date('Y-m-d H:i:s') OR $uData['expiration_date']=='0000-00-00 00:00:00') {
if ($uData['expiration_date']>date('Y-m-d H:i:s')
or $uData['expiration_date']=='0000-00-00 00:00:00'
) {
$_user['user_id'] = $uData['user_id'];
$_user['status'] = $uData['status'];
@ -614,7 +667,13 @@ if (!empty($_SESSION['_user']['user_id']) && !($login || $logout)) {
}
} else {
//Redirect to the subscription form
header('Location: '.api_get_path(WEB_CODE_PATH).'auth/inscription.php?username='.$res['openid.sreg.nickname'].'&email='.$res['openid.sreg.email'].'&openid='.$res['openid.identity'].'&openid_msg=idnotfound');
header(
'Location: '.api_get_path(WEB_CODE_PATH)
.'auth/inscription.php?username='.$res['openid.sreg.nickname']
.'&email='.$res['openid.sreg.email']
.'&openid='.$res['openid.identity']
.'&openid_msg=idnotfound'
);
Session::write('loginFailed', '1');
exit;
//$loginFailed = true;
@ -651,7 +710,9 @@ if (isset($use_anonymous) && $use_anonymous) {
// if there is a cDir parameter in the URL (coming from courses/.htaccess redirection)
if (!empty($cDir)) {
$c = CourseManager::get_course_id_from_path($cDir);
if ($c) { $cidReq = $c; }
if ($c) {
$cidReq = $c;
}
}
// if the requested course is different from the course in session
@ -818,7 +879,7 @@ if (isset($cidReset) && $cidReset) {
}
}
if (empty($_SESSION['_course']) OR empty($_SESSION['_cid'])) { //no previous values...
if (empty($_SESSION['_course']) or empty($_SESSION['_cid'])) { //no previous values...
$_cid = -1; //set default values that will be caracteristic of being unset
$_course = -1;
} else {
@ -927,8 +988,7 @@ $is_courseAdmin = false;
$is_courseTutor = false;
$is_courseMember = false;
if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset))
{
if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
if (isset($_cid) && $_cid) {
$my_user_id = isset($user_id) ? intval($user_id) : 0;
$variable = 'accept_legal_'.$my_user_id.'_'.$_course['real_id'].'_'.$session_id;

Write Preview
Loading…
Cancel
Save