diff -Naurw moodle-clean/moodle/blocks/online_users/block_online_users.php moodle-live/blocks/online_users/block_online_users.php --- moodle-clean/moodle/blocks/online_users/block_online_users.php 2008-03-03 12:10:53.000000000 +0000 +++ moodle-live/blocks/online_users/block_online_users.php 2009-01-19 11:02:38.000000000 +0000 @@ -8,7 +8,7 @@ class block_online_users extends block_base { function init() { $this->title = get_string('blockname','block_online_users'); - $this->version = 2007101509; + $this->version = 2009011900; } function has_config() {return true;} @@ -28,6 +28,11 @@ return $this->content; } + if(empty($CFG->block_online_users_showallrelated)){ + $CFG->block_online_users_showallrelated=0; + } + + $timetoshowusers = 300; //Seconds default if (isset($CFG->block_online_users_timetosee)) { $timetoshowusers = $CFG->block_online_users_timetosee * 60; @@ -62,6 +67,13 @@ $groupselect "; $order = "ORDER BY lastaccess DESC "; + } elseif($CFG->block_online_users_showallrelated){ + + $select='SELECT u.id, u.username, u.firstname, u.lastname, u.picture, u.lastaccess '; + $from= 'FROM '.$CFG->prefix.'user as u join '.$CFG->prefix.'role_assignments on userid=u.id join '.$CFG->prefix.'context on contextid='.$CFG->prefix.'context.id and contextlevel=50 '; + $where='WHERE u.lastaccess > '.$timefrom.' and instanceid='.$COURSE->id.' '; + $order='ORDER BY lastaccess DESC'; + } else { // Course-level $courseselect = "AND ul.courseid = '".$COURSE->id."'"; $select = "SELECT u.id, u.username, u.firstname, u.lastname, u.picture, max(ul.timeaccess) as lastaccess "; diff -Naurw moodle-clean/moodle/blocks/online_users/lang/en_utf8/block_online_users.php moodle-live/blocks/online_users/lang/en_utf8/block_online_users.php --- moodle-clean/moodle/blocks/online_users/lang/en_utf8/block_online_users.php 1970-01-01 01:00:00.000000000 +0100 +++ moodle-live/blocks/online_users/lang/en_utf8/block_online_users.php 2009-01-14 12:09:03.000000000 +0000 @@ -0,0 +1,5 @@ + \ No newline at end of file diff -Naurw moodle-clean/moodle/blocks/online_users/settings.php moodle-live/blocks/online_users/settings.php --- moodle-clean/moodle/blocks/online_users/settings.php 2007-12-19 17:38:49.000000000 +0000 +++ moodle-live/blocks/online_users/settings.php 2009-01-14 11:25:50.000000000 +0000 @@ -2,5 +2,7 @@ $settings->add(new admin_setting_configtext('block_online_users_timetosee', get_string('timetosee', 'block_online_users'), get_string('configtimetosee', 'block_online_users'), 5, PARAM_INT)); +$settings->add(new admin_setting_configcheckbox('block_online_users_showallrelated', get_string('showallrelated', 'block_online_users'), + get_string('configshowallrelated', 'block_online_users'), '0')); ?>