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 r9992] replace $_uid with $_user['user_id']

Browse Source
skala
Patrick Cool 19 years ago
parent 68e71769f9
commit 99715eefae
9 changed files with 77 additions and 62 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. 24
      index.php
  2. 7
      myStudents.php
  3. 4
      newsList.php
  4. 12
      plugin/messages/functions.inc.php
  5. 4
      plugin/messages/new_message.php
  6. 70
      user_portal.php
  7. 2
      webchatdeny.php
  8. 12
      whoisonline.php
  9. 4
      whoisonlinesession.php

24
index.php
Unescape View File

@ -98,7 +98,7 @@ if ($_GET['logout'])
api_sql_query($s_sql_update_logout_date);
//LoginDelete($_uid, $statsDbName);
//LoginDelete(".$_user['user_id'].", $statsDbName);
LoginDelete($_GET["uid"], $statsDbName);
api_session_destroy();
@ -151,7 +151,7 @@ $dateFormatForInfosFromCourses = $dateFormatLong;
//define("CONFVAL_limitPreviewTo",SCRIPTVAL_NewEntriesOfTheDay);
//define("CONFVAL_limitPreviewTo",SCRIPTVAL_NoTimeLimit);
define("CONFVAL_limitPreviewTo", SCRIPTVAL_NewEntriesOfTheDayOfLastLogin);
if (isset ($_uid))
if (isset ($_user['user_id']))
{
$nameTools = api_get_setting('siteName');
}
@ -203,16 +203,15 @@ if ($_POST["submitAuth"])
{
// To ensure legacy compatibility, we set the following variables.
// But they should be removed at last.
$uid = $_uid;
$lastname = $_user['lastName'];
$firstname = $_user['firstName'];
$email = $_user['mail'];
$status = $uData['status'];
if (isset ($_uid))
$lastname = $_user['lastName'];
$firstname = $_user['firstName'];
$email = $_user['mail'];
$status = $uData['status'];
if (isset ($_user['user_id']))
{
$sqlLastLogin = "SELECT UNIX_TIMESTAMP(login_date)
FROM $track_login_table
WHERE login_user_id = '$_uid'
WHERE login_user_id = '".$_user['user_id']."'
ORDER BY login_date DESC LIMIT 1";
$resLastLogin = api_sql_query($sqlLastLogin, __FILE__, __LINE__);
if (!$resLastLogin)
@ -281,8 +280,7 @@ function display_anonymous_right_menu()
$platformLanguage = api_get_setting('platformLanguage');
$_uid = api_get_user_id();
if ( !(isset($_uid) && $_uid) ) // only display if the user isn't logged in
if ( !(isset(api_get_user_id()) && api_get_user_id()) ) // only display if the user isn't logged in
{
api_display_language_form();
echo '<br />';
@ -325,7 +323,7 @@ function display_anonymous_right_menu()
echo '</ul>';
echo '</div>';
if ($_uid)
if (api_get_user_id())
{
api_plugin('campushomepage_menu');
}
@ -554,7 +552,7 @@ echo '<div class="maincontent">';
Plugins for loginpage_main AND campushomepage_main
-----------------------------------------------------------------------------
*/
if (!$_uid)
if (!api_get_user_id())
{
api_plugin('loginpage_main');
}

7
myStudents.php
Unescape View File

@ -146,7 +146,7 @@ function exportCsv($a_infosUser,$tableTitle,$a_header,$a_dataLearnpath,$a_dataEx
<?php
$sqlSessions = "SELECT id
FROM $tbl_session
WHERE id_coach = $_uid
WHERE id_coach = '".$_user['user_id']."'
";
$resultSessions = api_sql_query($sqlSessions);
@ -154,8 +154,7 @@ function exportCsv($a_infosUser,$tableTitle,$a_header,$a_dataLearnpath,$a_dataEx
$sqlSessions = "SELECT DISTINCT id_session as id
FROM $tbl_session_course
WHERE id_coach = $_uid
";
WHERE id_coach = ".$_user['user_id']."'";
$resultSessions = api_sql_query($sqlSessions);
$a_sessions = array_merge($a_sessions,api_store_result($resultSessions));
@ -803,7 +802,7 @@ function exportCsv($a_infosUser,$tableTitle,$a_header,$a_dataLearnpath,$a_dataEx
</td>
<td align="center">
<?php
if($_uid == $a_cours['id_coach'])
if($_user['user_id'] == $a_cours['id_coach'])
{
echo '<a href="'.$_SERVER['PHP_SELF'].'?student='.$a_infosUser['user_id'].'&details=true&course='.$a_cours['code'].'#infosStudent"> -> </a>';
}

4
newsList.php
Unescape View File

@ -18,10 +18,10 @@
$start = 0;
}
if (isset($_uid))
if (isset($_user['user_id']))
{
$visibility = api_is_allowed_to_create_course() ? VISIBLE_TEACHER : VISIBLE_STUDENT;
SystemAnnouncementManager :: display_all_announcements($visibility, $announcement, $start, $_uid);
SystemAnnouncementManager :: display_all_announcements($visibility, $announcement, $start, $_user['user_id']);
}
else
{

12
plugin/messages/functions.inc.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: functions.inc.php 9928 2006-11-09 13:59:07Z evie_em $
<?php // $Id: functions.inc.php 9992 2006-11-15 12:25:28Z pcool $
/*
==============================================================================
Dokeos - elearning and course management software
@ -29,14 +29,14 @@ define ("MESSAGES_DATABASE", "messages");
* Displays a select list containing the users
* who are currently online. Used when composing a message.
*/
function display_select_user_list($_uid,$_name,$width,$size)
function display_select_user_list($user_id,$_name,$width,$size)
{
$MINUTE=30;
global $statsDbName;
$userlist = WhoIsOnline($_uid,$statsDbName,$MINUTE);
$userlist = WhoIsOnline($user_id,$statsDbName,$MINUTE);
echo '<select size="'.$size.'" style="width: '.$width.'px;" name="'.$_name.'">';
foreach($userlist as $row)
echo "<option value=\"$row[0]\">".GetFullUserName($row[0]).($_uid==$row[0]?("&nbsp;(".get_lang('Myself').")"):(""))."</option>\n";
echo "<option value=\"$row[0]\">".GetFullUserName($row[0]).($user_id==$row[0]?("&nbsp;(".get_lang('Myself').")"):(""))."</option>\n";
echo "</select>";
}
@ -139,9 +139,9 @@ function get_new_messages()
*/
function users_connected_by_id()
{
global $statsDbName, $_uid;
global $statsDbName, $_user;
$MINUTE=30;
$user_connect = WhoIsOnline($_uid,$statsDbName,$MINUTE);
$user_connect = WhoIsOnline($_user['user_id'],$statsDbName,$MINUTE);
for ($i=0; $i<count($user_connect); $i++)
{
$user_id_list[$i]=$user_connect[$i][0];

4
plugin/messages/new_message.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: new_message.php 9931 2006-11-10 09:09:51Z evie_em $
<?php // $Id: new_message.php 9992 2006-11-15 12:25:28Z pcool $
/*
==============================================================================
Dokeos - elearning and course management software
@ -152,7 +152,7 @@ if(!isset($_POST['compose']))
}
else
{
show_compose_to_any($_uid);
show_compose_to_any($_user['user_id']);
}
}
else

70
user_portal.php
Unescape View File

@ -234,26 +234,33 @@ function get_personal_course_list($user_id)
return $personal_course_list;
}
function get_personal_session_course_list($user_id, $list_sessions){
global $_uid;
$tbl_course = Database :: get_main_table(MAIN_COURSE_TABLE);
$tbl_user = Database :: get_main_table(MAIN_USER_TABLE);
$tbl_session = Database :: get_main_table(MAIN_SESSION_TABLE);
$tbl_course_user = Database :: get_main_table(MAIN_COURSE_USER_TABLE);
$tbl_session_course = Database :: get_main_table(MAIN_SESSION_COURSE_TABLE);
$tbl_session_course_user = Database :: get_main_table(MAIN_SESSION_COURSE_USER_TABLE);
$tbl_session_rel_user = Database :: get_main_table(MAIN_SESSION_USER_TABLE);
$personal_course_list_sql="";
/**
* Enter description here...
*
* @param unknown_type $user_id
* @param unknown_type $list_sessions
* @return unknown
*
*/
function get_personal_session_course_list($user_id, $list_sessions)
{
// table definitions
$tbl_course = Database :: get_main_table(MAIN_COURSE_TABLE);
$tbl_user = Database :: get_main_table(MAIN_USER_TABLE);
$tbl_session = Database :: get_main_table(MAIN_SESSION_TABLE);
$tbl_course_user = Database :: get_main_table(MAIN_COURSE_USER_TABLE);
$tbl_session_course = Database :: get_main_table(MAIN_SESSION_COURSE_TABLE);
$tbl_session_course_user = Database :: get_main_table(MAIN_SESSION_COURSE_USER_TABLE);
$tbl_session_rel_user = Database :: get_main_table(MAIN_SESSION_USER_TABLE);
// variable initialisation
$personal_course_list_sql = '';
$personal_course_list = array();
// get the list of sessions where the user is subscribed / coach
$result=api_sql_query("SELECT DISTINCT id, name, date_start, date_end, 5 as s
FROM session_rel_user, session
WHERE id_session=id AND id_user=$_uid ORDER BY date_start, date_end, name",__FILE__,__LINE__);
WHERE id_session=id AND id_user=$user_id ORDER BY date_start, date_end, name",__FILE__,__LINE__);
$Sessions=api_store_result($result);
@ -261,7 +268,7 @@ function get_personal_session_course_list($user_id, $list_sessions){
$result=api_sql_query("SELECT DISTINCT id, name, date_start, date_end, 2 as s
FROM $tbl_session as session
INNER JOIN $tbl_session_course as session_rel_course
ON session_rel_course.id_coach = $_uid
ON session_rel_course.id_coach = $user_id
ORDER BY date_start, date_end, name",__FILE__,__LINE__);
//global $sessionIsCoach;
@ -271,7 +278,7 @@ function get_personal_session_course_list($user_id, $list_sessions){
$result=api_sql_query("SELECT DISTINCT id, name, date_start, date_end, 2 as s
FROM $tbl_session as session
WHERE session.id_coach = $_uid
WHERE session.id_coach = $user_id
ORDER BY date_start, date_end, name",__FILE__,__LINE__);
$Sessions = array_merge($Sessions , api_store_result($result));
@ -279,7 +286,8 @@ function get_personal_session_course_list($user_id, $list_sessions){
if(api_is_allowed_to_create_course())
{
foreach($Sessions as $enreg){
foreach($Sessions as $enreg)
{
$id_session = $enreg['id'];
$personal_course_list_sql = "SELECT DISTINCT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, CONCAT(user.lastname,' ',user.firstname) t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name
FROM $tbl_session_course as session_course
@ -305,7 +313,8 @@ function get_personal_session_course_list($user_id, $list_sessions){
}
foreach($Sessions as $enreg){
foreach($Sessions as $enreg)
{
$id_session = $enreg['id'];
$personal_course_list_sql = "SELECT DISTINCT course.code k, course.directory d, course.visual_code c, course.db_name db, course.title i, CONCAT(user.lastname,' ',user.firstname) t, email, course.course_language l, 1 sort, category_code user_course_cat, date_start, date_end, session.id as id_session, session.name as session_name
FROM $tbl_session_course as session_course
@ -327,15 +336,14 @@ function get_personal_session_course_list($user_id, $list_sessions){
{
$key = $result_row['id_session'].' - '.$result_row['k'];
$result_row['s'] = $enreg['s'];
if(!isset($personal_course_list[$key])) {
if(!isset($personal_course_list[$key]))
{
$personal_course_list[$key] = $result_row;
}
}
}
return $personal_course_list;
}
/*
@ -345,16 +353,25 @@ function get_personal_session_course_list($user_id, $list_sessions){
*/
/**
* Warning: this function defines a global.
* @todo use the correct get_path function
*/
function display_admin_links()
{
global $rootAdminWeb;
echo "<li><a href=\"".$rootAdminWeb."\">".get_lang("PlatformAdmin")."</a></li>";
}
/**
* Enter description here...
*
*/
function display_create_course_link()
{
echo "<li><a href=\"main/create_course/add_course.php\">".get_lang("CourseCreate")."</a></li>";
}
/**
* Enter description here...
*
*/
function display_edit_course_list_links()
{
echo "<li><a href=\"main/auth/courses.php\">".get_lang("CourseManagement")."</a></li>";
@ -762,9 +779,10 @@ function show_notification($mycours)
*/
function get_user_course_categories()
{
global $_uid;
global $_user;
$table_category = Database::get_user_personal_table(USER_COURSE_CATEGORY_TABLE);
$sql = "SELECT * FROM ".$table_category." WHERE user_id='".$_uid."'";
$sql = "SELECT * FROM ".$table_category." WHERE user_id='".$_user['user_id']."'";
$result = api_sql_query($sql,__FILE__,__LINE__);
while ($row = mysql_fetch_array($result))
{
@ -845,11 +863,11 @@ else
if(api_get_setting('use_session_mode')=='true' && !$nosession)
{
$personal_course_list = get_personal_session_course_list($_uid);
$personal_course_list = get_personal_session_course_list($_user['user_id']);
}
else
{
$personal_course_list = get_personal_course_list($_uid);
$personal_course_list = get_personal_course_list($_user['user_id']);
}
foreach ($personal_course_list as $mycours)
{

2
webchatdeny.php
Unescape View File

@ -32,7 +32,7 @@ include_once('./main/inc/global.inc.php');
$track_user_table = Database::get_main_table(MAIN_USER_TABLE);
$sql="update $track_user_table set chatcall_user_id = '', chatcall_date = '', chatcall_text='DENIED' where (user_id = $_uid)";
$sql="update $track_user_table set chatcall_user_id = '', chatcall_date = '', chatcall_text='DENIED' where (user_id = ".$_user['user_id'].")";
$result=api_sql_query($sql,__FILE__,__LINE__);
Display::display_header();

12
whoisonline.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: whoisonline.php 9672 2006-10-24 12:04:30Z evie_em $
<?php // $Id: whoisonline.php 9992 2006-11-15 12:25:28Z pcool $
/*
==============================================================================
Dokeos - elearning and course management software
@ -48,7 +48,7 @@ if ($_GET['chatid'] != '') {
$time = time();
$time = date("Y-m-d H:i:s", $time);
$chatid = addslashes($_GET['chatid']);
$sql="update $track_user_table set chatcall_user_id = '".mysql_real_escape_string($_uid)."', chatcall_date = '".mysql_real_escape_string($time)."', chatcall_text = '' where (user_id = ".mysql_real_escape_string($chatid).")";
$sql="update $track_user_table set chatcall_user_id = '".mysql_real_escape_string($_user['user_id'])."', chatcall_date = '".mysql_real_escape_string($time)."', chatcall_text = '' where (user_id = ".mysql_real_escape_string($chatid).")";
$result=api_sql_query($sql,__FILE__,__LINE__);
//redirect caller to chat
@ -211,15 +211,15 @@ function display_productions($user_id)
// This if statement prevents users accessing the who's online feature when it has been disabled.
if ((get_setting('showonline','world') == 'true' AND !$_uid) OR (get_setting('showonline','users') == 'true' AND $_uid))
if ((get_setting('showonline','world') == 'true' AND !$_user['user_id']) OR (get_setting('showonline','users') == 'true' AND $_user['user_id']))
{
if(isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0)
{
$user_list = Who_is_online_in_this_course($_uid,api_get_setting('time_limit_whosonline'),$_GET['cidReq']);
$user_list = Who_is_online_in_this_course($_user['user_id'],api_get_setting('time_limit_whosonline'),$_GET['cidReq']);
}
else
{
$user_list = WhoIsOnline($_uid,$statsDbName,api_get_setting('time_limit_whosonline'));
$user_list = WhoIsOnline($_user['user_id'],$statsDbName,api_get_setting('time_limit_whosonline'));
}
$total=count($user_list);
@ -234,7 +234,7 @@ if ((get_setting('showonline','world') == 'true' AND !$_uid) OR (get_setting('sh
}
else
{
if(0) // if ($_uid && $_GET["id"] != $_uid)
if(0) // if ($_user['user_id'] && $_GET["id"] != $_user['user_id'])
{
echo '<a href="'.$_SERVER['PHP_SELF'].'?chatid='.$_GET['id'].'">'.get_lang('SendChatRequest').'</a>';
}

4
whoisonlinesession.php
Unescape View File

@ -43,7 +43,7 @@ Display::display_header(get_lang('UserOnlineListSession'));
date_end
FROM session
INNER JOIN session_rel_course
ON session_rel_course.id_coach = $_uid
ON session_rel_course.id_coach = ".$_user['user_id']."
ORDER BY date_start, date_end, name",__FILE__,__LINE__);
$sessionIsCoach = api_store_result($result);
@ -53,7 +53,7 @@ Display::display_header(get_lang('UserOnlineListSession'));
date_start,
date_end
FROM session
WHERE session.id_coach = $_uid
WHERE session.id_coach = ".$_user['user_id']."
ORDER BY date_start, date_end, name",__FILE__,__LINE__);
$sessionIsCoach = array_merge($sessionIsCoach , api_store_result($result));

Write Preview
Loading…
Cancel
Save