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

Fix who is online in session see BT#14262

Browse Source 
- Fixed queries using access url id.
pull/2539/head
jmontoyaa 7 years ago
parent e7efd37be4
commit 3ee4e663da
2 changed files with 120 additions and 90 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/lib/online.inc.php
  2. 192
      whoisonlinesession.php

18
main/inc/lib/online.inc.php
Unescape View File

@ -536,17 +536,29 @@ function whoIsOnlineInThisSessionCount($timeLimit, $sessionId)
$tableUser = Database::get_main_table(TABLE_MAIN_USER);
$timeLimit = Database::escape_string($timeLimit);
$online_time = time() - $timeLimit * 60;
$current_date = api_get_utc_datetime($online_time);
$urlCondition = '';
$urlJoin = '';
if (api_is_multiple_url_enabled()) {
$accessUrlUser = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$urlId = api_get_current_access_url_id();
$urlJoin = " INNER JOIN $accessUrlUser a ON (a.user_id = u.id) ";
$urlCondition = " AND a.access_url_id = $urlId ";
}
$query = "SELECT count(login_user_id) as count
FROM $tblTrackOnline o INNER JOIN $tableUser u
FROM $tblTrackOnline o
INNER JOIN $tableUser u
ON (login_user_id = u.id)
$urlJoin
WHERE
u.status <> '".ANONYMOUS."' AND
session_id = $sessionId AND
login_date >= '$current_date' ";
login_date >= '$current_date'
$urlCondition
";
$result = Database::query($query);
if (Database::num_rows($result) > 0) {

192
whoisonlinesession.php
Unescape View File

@ -6,9 +6,15 @@
*
* @package chamilo.main
*/
include_once './main/inc/global.inc.php';
require_once './main/inc/global.inc.php';
api_block_anonymous_users();
$userId = api_get_user_id();
if (empty($userId)) {
api_not_allowed(true);
}
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
@ -41,103 +47,115 @@ Display::display_header(get_lang('UserOnlineListSession'));
</tr>
<?php
$session_is_coach = [];
$sql = "SELECT DISTINCT session.id,
name,
access_start_date,
access_end_date
FROM $tbl_session as session
INNER JOIN $tbl_session_course_user as srcru
ON
srcru.user_id = ".$userId." AND
srcru.status=2 AND
session.id = srcru.session_id
ORDER BY access_start_date, access_end_date, name";
$result = Database::query($sql);
if (isset($_user['user_id']) && $_user['user_id'] != '') {
$_user['user_id'] = intval($_user['user_id']);
$sql = "SELECT DISTINCT session.id,
name,
access_start_date,
access_end_date
FROM $tbl_session as session
INNER JOIN $tbl_session_course_user as srcru
ON
srcru.user_id = ".$_user['user_id']." AND
srcru.status=2 AND
session.id = srcru.session_id
ORDER BY access_start_date, access_end_date, name";
$result = Database::query($sql);
while ($session = Database:: fetch_array($result)) {
$session_is_coach[$session['id']] = $session;
}
while ($session = Database:: fetch_array($result)) {
$session_is_coach[$session['id']] = $session;
}
$sql = "SELECT DISTINCT session.id,
name,
access_start_date,
access_end_date
FROM $tbl_session as session
WHERE session.id_coach = ".$userId."
ORDER BY access_start_date, access_end_date, name";
$result = Database::query($sql);
while ($session = Database:: fetch_array($result)) {
$session_is_coach[$session['id']] = $session;
}
$sql = "SELECT DISTINCT session.id,
name,
access_start_date,
access_end_date
FROM $tbl_session as session
WHERE session.id_coach = ".$_user['user_id']."
ORDER BY access_start_date, access_end_date, name";
$result = Database::query($sql);
while ($session = Database:: fetch_array($result)) {
$session_is_coach[$session['id']] = $session;
}
if (empty($time_limit)) {
$time_limit = api_get_setting('time_limit_whosonline');
} else {
$time_limit = 60;
}
if (empty($time_limit)) {
$time_limit = api_get_setting('time_limit_whosonline');
} else {
$time_limit = 60;
}
$online_time = time() - $time_limit * 60;
$current_date = api_get_utc_datetime($online_time);
$students_online = [];
foreach ($session_is_coach as $session) {
$sql = "SELECT DISTINCT last_access.access_user_id,
last_access.access_date,
last_access.c_id,
last_access.access_session_id,
".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." as name,
user.email
FROM ".Database::get_main_table(TABLE_STATISTIC_TRACK_E_LASTACCESS)." AS last_access
INNER JOIN ".Database::get_main_table(TABLE_MAIN_USER)." AS user
ON user.user_id = last_access.access_user_id
WHERE access_session_id='".$session['id']."'
AND access_date >= '$current_date'
GROUP BY access_user_id";
$urlCondition = '';
$urlJoin = '';
if (api_is_multiple_url_enabled()) {
$accessUrlUser = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$urlId = api_get_current_access_url_id();
$urlJoin = " INNER JOIN $accessUrlUser a ON (a.user_id = user.id) ";
$urlCondition = " AND a.access_url_id = $urlId ";
}
$result = Database::query($sql);
while ($user_list = Database::fetch_array($result)) {
$students_online[$user_list['access_user_id']] = $user_list;
}
$online_time = time() - $time_limit * 60;
$current_date = api_get_utc_datetime($online_time);
$students_online = [];
foreach ($session_is_coach as $session) {
$sql = "SELECT DISTINCT last_access.login_user_id,
last_access.login_date,
last_access.c_id,
last_access.session_id,
".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." as name,
user.email
FROM ".Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE)." AS last_access
INNER JOIN ".Database::get_main_table(TABLE_MAIN_USER)." AS user
ON user.id = last_access.login_user_id
$urlJoin
WHERE
session_id ='".$session['id']."' AND
login_date >= '$current_date'
$urlCondition
GROUP BY login_user_id";
$result = Database::query($sql);
while ($user_list = Database::fetch_array($result)) {
$students_online[$user_list['login_user_id']] = $user_list;
}
}
if (count($students_online) > 0) {
foreach ($students_online as $student_online) {
echo "<tr>
<td>
";
echo $student_online['name'];
echo " </td>
<td>
";
$courseInfo = api_get_course_info_by_id($student_online['c_id']);
echo $courseInfo['title'];
echo " </td>
<td>
";
if (!empty($student_online['email'])) {
echo $student_online['email'];
} else {
echo get_lang('NoEmail');
}
echo " </td>
<td>
";
echo '<a href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>';
echo " </td>
</tr>
";
if (count($students_online) > 0) {
foreach ($students_online as $student_online) {
echo "<tr>
<td>
";
echo $student_online['name'];
echo " </td>
<td>
";
$courseInfo = api_get_course_info_by_id($student_online['c_id']);
echo $courseInfo['title'];
echo " </td>
<td>
";
if (!empty($student_online['email'])) {
echo $student_online['email'];
} else {
echo get_lang('NoEmail');
}
} else {
echo ' <tr>
<td colspan="4">
'.get_lang('NoOnlineStudents').'
</td>
</tr>
';
echo " </td>
<td>
";
echo '<a
target="_blank"
href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['session_id'].'"> -> </a>';
echo " </td>
</tr>
";
}
} else {
echo ' <tr>
<td colspan="4">
'.get_lang('NoOnlineStudents').'
</td>
</tr>
';
}
?>
</table>
<?php

Write Preview
Loading…
Cancel
Save