mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

merged fix for MDL-9613, spliting the queries into 2 for site/course block respectively

Browse Source
This commit is contained in:
toyomoyo 2007-09-06 06:25:40 +00:00
parent dae9e82d88
commit 15e3eb6053
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
blocks/online_users/block_online_users.php
View File

@ -55,29 +55,31 @@ class block_online_users extends block_base {
}
if ($COURSE->id == SITEID) { // Site-level
$courseselect = '';
$timeselect = "AND (ul.timeaccess > $timefrom OR u.lastaccess > $timefrom)";
} else {
$select = "SELECT u.id, u.username, u.firstname, u.lastname, u.picture, max(u.lastaccess) as lastaccess ";
$from = "FROM {$CFG->prefix}user u
$groupmembers ";
$where = "WHERE u.lastaccess > $timefrom
$groupselect ";
$order = "ORDER BY lastaccess DESC ";
} else { // Course-level
$courseselect = "AND ul.courseid = '".$COURSE->id."'";
$timeselect = "AND ul.timeaccess > $timefrom";
$select = "SELECT u.id, u.username, u.firstname, u.lastname, u.picture, max(ul.timeaccess) as lastaccess ";
$from = "FROM {$CFG->prefix}user_lastaccess ul,
{$CFG->prefix}user u
$groupmembers ";
$where = "WHERE ul.timeaccess > $timefrom
AND u.id = ul.userid
AND ul.courseid = $COURSE->id
$groupselect ";
$order = "ORDER BY lastaccess DESC ";
}
$groupby = "GROUP BY u.id, u.username, u.firstname, u.lastname, u.picture ";
$SQL = $select . $from . $where . $groupby . $order;
$users = array();
$SQL = "SELECT u.id, u.username, u.firstname, u.lastname, u.picture, u.lastaccess, ul.timeaccess
FROM {$CFG->prefix}user_lastaccess ul,
{$CFG->prefix}user u
$groupmembers
WHERE
ul.userid = u.id
$courseselect
$timeselect
$groupselect
GROUP BY u.id, u.username, u.firstname, u.lastname, u.picture, u.lastaccess, ul.timeaccess
ORDER BY ul.timeaccess DESC";
$users = array();
$pcontext = get_related_contexts_string($context);
if ($pusers = get_records_sql($SQL, 0, 50)) { // We'll just take the most recent 50 maximum
@ -116,7 +118,7 @@ class block_online_users extends block_base {
$this->content->text .= "<ul class='list'>\n";
foreach ($users as $user) {
$this->content->text .= '<li class="listentry">';
$timeago = format_time(time() - max($user->timeaccess, $user->lastaccess)); //bruno to calculate correctly on frontpage
$timeago = format_time(time() - $user->lastaccess); //bruno to calculate correctly on frontpage
if ($user->username == 'guest') {
$this->content->text .= '<div class="user">'.print_user_picture($user->id, $COURSE->id, $user->picture, 16, true, false, '', false);
$this->content->text .= get_string('guestuser').'</div>';