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

[svn r9980] replace $_uid with $_user['user_id']

Browse Source
skala
Patrick Cool 19 years ago
parent 300f324e7b
commit 52c04c17c6
6 changed files with 36 additions and 37 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. 18
      main/inc/banner.inc.php
  2. 2
      main/inc/global.inc.php
  3. 2
      main/inc/installedVersion.inc.php
  4. 8
      main/inc/lib/debug.lib.inc.php
  5. 2
      main/inc/lib/display.lib.php
  6. 41
      main/inc/local.inc.php

18
main/inc/banner.inc.php
Unescape View File

@ -53,7 +53,7 @@ if (isset ($_cid))
elseif (isset ($nameTools) && $langFile != 'course_home')
{
//Put the name of the user-tools in the header
if (!isset ($_uid))
if (!isset ($_user['user_id']))
echo " ";
elseif(!$noPHP_SELF)
{
@ -100,11 +100,11 @@ echo '<div id="header2">';
echo '<div id="Header2Right">';
echo '<ul>';
if ((api_get_setting('showonline','world') == "true" AND !$_uid) OR (api_get_setting('showonline','users') == "true" AND $_uid) OR (api_get_setting('showonline','course') == "true" AND $_uid AND $_cid))
if ((api_get_setting('showonline','world') == "true" AND !$_user['user_id']) OR (api_get_setting('showonline','users') == "true" AND $_user['user_id']) OR (api_get_setting('showonline','course') == "true" AND $_user['user_id'] AND $_cid))
{
if(api_get_setting("use_session_mode") == "true" && isset($_uid) && api_is_coach())
if(api_get_setting("use_session_mode") == "true" && isset($_user['user_id']) && api_is_coach())
{
echo "<li><a href='".api_get_path(WEB_PATH)."whoisonlinesession.php?id_coach=".$_uid."&referer=".urlencode($_SERVER['REQUEST_URI'])."' target='_top'>Voir les utilisateurs connectés à mes sessions</a></li>";
echo "<li><a href='".api_get_path(WEB_PATH)."whoisonlinesession.php?id_coach=".$_user['user_id']."&referer=".urlencode($_SERVER['REQUEST_URI'])."' target='_top'>Voir les utilisateurs connectés à mes sessions</a></li>";
}
$statistics_database = Database :: get_statistic_database();
@ -114,7 +114,7 @@ if ((api_get_setting('showonline','world') == "true" AND !$_uid) OR (api_get_set
echo "<li>".get_lang('UsersOnline').": ";
// Display the who's online of the platform
if ((api_get_setting('showonline','world') == "true" AND !$_uid) OR (api_get_setting('showonline','users') == "true" AND $_uid))
if ((api_get_setting('showonline','world') == "true" AND !$_user['user_id']) OR (api_get_setting('showonline','users') == "true" AND $_user['user_id']))
{
echo "<a href='".api_get_path(WEB_PATH)."whoisonline.php' target='_top'>".$number."</a>";
}
@ -128,7 +128,7 @@ if ((api_get_setting('showonline','world') == "true" AND !$_uid) OR (api_get_set
echo '</li>';
}
if ($_uid)
if ($_user['user_id'])
{
if (api_is_course_admin() && is_student_view_enabled())
{
@ -168,14 +168,14 @@ echo "<div class=\"clear\">&nbsp;</div>";
User section
-----------------------------------------------------------------------------
*/
if ($_uid)
if ($_user['user_id'])
{
?>
<!-- start user section line with name, my course, my profile, scorm info, etc -->
<form method="get" action="<?php echo api_get_path(WEB_PATH); ?>index.php" class="banner_links" target="_top">
<input type="hidden" name="logout" value="true"/>
<input type="hidden" name="uid" value="<?php echo $_uid; ?>"/>
<input type="hidden" name="uid" value="<?php echo $_user['user_id']; ?>"/>
<ul id="logout">
<li>
<input type="submit" name="submit" value="<?php echo get_lang("Logout"); ?>"
@ -191,7 +191,7 @@ $navigation = array();
// Link to campus homepage
$navigation[SECTION_CAMPUS]['url'] = api_get_path(WEB_PATH).'index.php';
$navigation[SECTION_CAMPUS]['title'] = get_lang('CampusHomepage');
if ($_uid)
if ($_user['user_id'])
{
if(api_get_setting('use_session_mode')=='true')
{

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

@ -141,7 +141,7 @@ require($includePath."/local.inc.php");
include_once($includePath."/lib/online.inc.php");
// check and modify the date of user in the track.e.online table
if (!$x=strpos($_SERVER['PHP_SELF'],'whoisonline.php')) { LoginCheck(isset($_uid) ? $_uid : '',$statsDbName); }
if (!$x=strpos($_SERVER['PHP_SELF'],'whoisonline.php')) { LoginCheck(isset($_user['user_id']) ? $_user['user_id'] : '',$statsDbName); }
// ===== end "who is logged in?" module section =====

2
main/inc/installedVersion.inc.php
Unescape View File

@ -9,6 +9,6 @@
*/
$stable = false;
$dokeos_version = "1.8 beta1";
$dokeos_version = "1.8 beta2";
?>

8
main/inc/lib/debug.lib.inc.php
Unescape View File

@ -310,7 +310,7 @@ function printVar($var, $varName = "@")
*/
function printInit($selection = "*")
{
GLOBAL $uidReset, $cidReset, $gidReset, $uidReq, $cidReq, $gidReq, $_uid, $_cid, $_gid, $_user, $_course, $is_platformAdmin, $is_allowedCreateCourse, $is_courseMember, $is_courseAdmin, $is_allowed_in_course, $is_courseTutor, $_SESSION, $_claro_local_run;
GLOBAL $uidReset, $cidReset, $gidReset, $uidReq, $cidReq, $gidReq, $_user, $_cid, $_gid, $_user, $_course, $is_platformAdmin, $is_allowedCreateCourse, $is_courseMember, $is_courseAdmin, $is_allowed_in_course, $is_courseTutor, $_SESSION, $_claro_local_run;
if ($_claro_local_run)
{
@ -326,7 +326,7 @@ function printInit($selection = "*")
{
echo "<TD valign=\"top\" >USER :
(uid): ".$uid." |
(_uid): ".$_uid." |
(_uid): ".$_user['user_id']." |
(session[_uid]): ".$_SESSION['_uid']."
<PRE>
reset = ".$uidReset." | req = ".$uidReq."<br>
@ -357,7 +357,7 @@ function printInit($selection = "*")
echo "</TR><TR>";
if ($selection == "*" or (strstr($selection, "u") && strstr($selection, "c")))
{
echo "<TD valign=\"top\" colspan=2>USER :".$_uid." in ".$_cid."<PRE>";
echo "<TD valign=\"top\" colspan=2>USER :".$_user['user_id']." in ".$_cid."<PRE>";
echo "_courseUser:";
var_dump($_courseUser);
echo "is_courseMember:";
@ -374,7 +374,7 @@ function printInit($selection = "*")
if ($selection == "*" or (strstr($selection, "u") && strstr($selection, "g")))
{
echo "<td></td><TD valign=\"top\" colspan=2>USER :".$_uid." in ".$_gid."<PRE>";
echo "<td></td><TD valign=\"top\" colspan=2>USER :".$_user['user_id']." in ".$_gid."<PRE>";
echo "</PRE></TD>";
}
echo "</TR></TABLE>";

2
main/inc/lib/display.lib.php
Unescape View File

@ -446,7 +446,7 @@ class Display {
{
$nameTools = $tool_name;
global $_plugins;
global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $clarolineRepositoryWeb, $text_dir, $plugins, $_uid, $rootAdminWeb, $_cid, $interbreadcrumb, $charset, $langFile, $noPHP_SELF;
global $httpHeadXtra, $htmlHeadXtra, $htmlIncHeadXtra, $_course, $_user, $clarolineRepositoryWeb, $text_dir, $plugins, $_user, $rootAdminWeb, $_cid, $interbreadcrumb, $charset, $langFile, $noPHP_SELF;
include (api_get_path(INCLUDE_PATH)."header.inc.php");
}
/**

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

@ -69,14 +69,13 @@ The course id is stored in $_cid session variable.
*
* USER VARIABLES
*
* int $_uid (the user id)
*
* string $_user ['firstName' ]
* string $_user ['lastName' ]
* string $_user ['mail' ]
* string $_user ['lastLogin' ]
* $_user ['official_code']
* $_user ['picture_uri' ]
* string $_user ['official_code']
* string $_user ['picture_uri' ]
* string $_user['user_id']
*
* boolean $is_platformAdmin
* boolean $is_allowedCreateCourse
@ -126,7 +125,7 @@ The course id is stored in $_cid session variable.
*
* 1. The script determines if there is an authentication attempt. This part
* only chek if the login name and password are valid. Afterwards, it set the
* $_uid (user id) and the $uidReset flag. Other user informations are retrieved
* $_user['user_id'] (user id) and the $uidReset flag. Other user informations are retrieved
* later. It's also in this section that optional external authentication
* devices step in.
*
@ -190,13 +189,13 @@ $login = isset($_POST["login"]) ? $_POST["login"] : '';
if (isset($_SESSION['_uid']) && $_SESSION['_uid'] && ! ($login || $logout))
{
// uid is in session => login already done, continue with this value
$_uid = $_SESSION['_uid'];
$_user['user_id'] = $_SESSION['_uid'];
}
else
{
unset($_uid); // uid not in session ? prevent any hacking
unset($_user['user_id']); // uid not in session ? prevent any hacking
if(isset($_POST['login']) && isset($_POST['password'])) // $login && $password are given to log in
{
@ -238,7 +237,7 @@ else
// 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')
{
$_uid = $uData['user_id'];
$_user['user_id'] = $uData['user_id'];
api_session_register('_uid');
}
else
@ -265,7 +264,7 @@ else
exit;
}
if (isset($uData['creator_id']) && $_uid != $uData['creator_id'])
if (isset($uData['creator_id']) && $_user['user_id'] != $uData['creator_id'])
{
//first login for a not self registred
//e.g. registered by a teacher
@ -314,10 +313,10 @@ else
* of the authentication source list
* provided by the configuration settings.
* If the login succeeds, for going further,
* Dokeos needs the $_uid variable to be
* Dokeos needs the $_user['user_id'] variable to be
* set and registered in the session. It's the
* responsability of the external login script
* to provide this $_uid.
* to provide this $_user['user_id'].
*/
if (is_array($extAuthSource))
@ -362,7 +361,7 @@ if (isset($uidReset) && $uidReset) // session data refresh requested
{
$is_platformAdmin = false; $is_allowedCreateCourse = false;
if (isset($_uid) && $_uid) // a uid is given (log in succeeded)
if (isset($_user['user_id']) && $_user['user_id']) // a uid is given (log in succeeded)
{
$user_table = Database::get_main_table(MAIN_USER_TABLE);
$admin_table = Database::get_main_table(MAIN_ADMIN_TABLE);
@ -375,7 +374,7 @@ $admin_table = Database::get_main_table(MAIN_ADMIN_TABLE);
ON `user`.`user_id` = `a`.`user_id`
LEFT JOIN `".$statsDbName."`.`track_e_login` `login`
ON `user`.`user_id` = `login`.`login_user_id`
WHERE `user`.`user_id` = '".$_uid."'
WHERE `user`.`user_id` = '".$_user['user_id']."'
ORDER BY `login`.`login_date` DESC LIMIT 1";
}
else
@ -384,7 +383,7 @@ $admin_table = Database::get_main_table(MAIN_ADMIN_TABLE);
FROM $user_table
LEFT JOIN $admin_table `a`
ON `user`.`user_id` = `a`.`user_id`
WHERE `user`.`user_id` = '".$_uid."'";
WHERE `user`.`user_id` = '".$_user['user_id']."'";
}
$result = api_sql_query($sql,__FILE__,__LINE__);
@ -505,7 +504,7 @@ else // continue with the previous values
if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // session data refresh requested
{
if (isset($_uid) && $_uid && isset($_cid) && $_cid) // have keys to search data
if (isset($_user['user_id']) && $_user['user_id'] && isset($_cid) && $_cid) // have keys to search data
{
if(api_get_setting('use_session_mode') != 'true')
@ -513,7 +512,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // sessi
$course_user_table = Database::get_main_table(MAIN_COURSE_USER_TABLE);
$sql = "SELECT * FROM $course_user_table
WHERE `user_id` = '$_uid'
WHERE `user_id` = '".$_user['user_id']."'
AND `course_code` = '$cidReq'";
$result = api_sql_query($sql,__FILE__,__LINE__);
@ -548,7 +547,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // sessi
INNER JOIN `".$mainDbName."`.`session_rel_course`
ON session_rel_course.id_session = session.id
AND session_rel_course.course_code='$_cid'
WHERE session.id_coach = $_uid";
WHERE session.id_coach = '".$_user['user_id']."'";
$result = api_sql_query($sql,__FILE__,__LINE__);
if($row = mysql_fetch_array($result)){
@ -564,7 +563,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // sessi
$sql = "SELECT 1
FROM `".$mainDbName."`.`session_rel_course`
WHERE session_rel_course.course_code='$_cid'
AND session_rel_course.id_coach = $_uid";
AND session_rel_course.id_coach = '".$_user['user_id']"'";
$result = api_sql_query($sql,__FILE__,__LINE__);
if($row = mysql_fetch_array($result)){
@ -578,7 +577,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // sessi
else {
// vérifier que c pas un élève de la session
$sql = "SELECT * FROM `".$mainDbName."`.`session_rel_course_rel_user`
WHERE `id_user` = '$_uid'
WHERE `id_user` = '".$_user['user_id']."'
AND `course_code` = '$cidReq'";
$result = api_sql_query($sql,__FILE__,__LINE__);
@ -597,7 +596,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // sessi
else
{
$sql = "SELECT * FROM `".$mainDbName."`.`course_rel_user`
WHERE `user_id` = '$_uid'
WHERE `user_id` = '".$_user['user_id']."'
AND `course_code` = '$cidReq'";
$result = api_sql_query($sql,__FILE__,__LINE__);
@ -643,7 +642,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) // sessi
{
if ($_course['visibility'] == COURSE_VISIBILITY_OPEN_WORLD)
$is_allowed_in_course = true;
elseif ($_course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM && isset($_uid) )
elseif ($_course['visibility'] == COURSE_VISIBILITY_OPEN_PLATFORM && isset($_user['user_id']) )
$is_allowed_in_course = true;
elseif ($_course['visibility'] == COURSE_VISIBILITY_REGISTERED && ($is_platformAdmin || $is_courseMember))
$is_allowed_in_course = true;

Write Preview
Loading…
Cancel
Save