mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-36321_message_participants' of git://github.com/andyjdavis/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2012-12-12 09:29:33 +13:00
commit 18e4963a74
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
message/lib.php
View File

@ -71,17 +71,6 @@ define('MESSAGE_PERMITTED_MASK', 0x0c); // 1100
*/
define('MESSAGE_DEFAULT_PERMITTED', 'permitted');
//TODO: defaults must be initialised via settings - this is a bad hack! (skodak)
if (!isset($CFG->message_contacts_refresh)) { // Refresh the contacts list every 60 seconds
$CFG->message_contacts_refresh = 60;
}
if (!isset($CFG->message_chat_refresh)) { // Look for new comments every 5 seconds
$CFG->message_chat_refresh = 5;
}
if (!isset($CFG->message_offline_time)) {
$CFG->message_offline_time = 300;
}
/**
* Print the selector that allows the user to view their contacts, course participants, their recent
* conversations etc
@ -179,7 +168,18 @@ function message_print_participants($context, $courseid, $contactselecturl=null,
}
$countparticipants = count_enrolled_users($context);
$participants = get_enrolled_users($context, '', 0, 'u.*', '', $page*MESSAGE_CONTACTS_PER_PAGE, MESSAGE_CONTACTS_PER_PAGE);
list($esql, $params) = get_enrolled_sql($context);
$params['mcuserid'] = $USER->id;
$ufields = user_picture::fields('u');
$sql = "SELECT $ufields, mc.id as contactlistid, mc.blocked
FROM {user} u
JOIN ($esql) je ON je.id = u.id
LEFT JOIN {message_contacts} mc ON mc.contactid = u.id AND mc.userid = :mcuserid
WHERE u.deleted = 0";
$participants = $DB->get_records_sql($sql, $params, $page * MESSAGE_CONTACTS_PER_PAGE, MESSAGE_CONTACTS_PER_PAGE);
$pagingbar = new paging_bar($countparticipants, $page, MESSAGE_CONTACTS_PER_PAGE, $PAGE->url, 'page');
echo $OUTPUT->render($pagingbar);
@ -190,11 +190,23 @@ function message_print_participants($context, $courseid, $contactselecturl=null,
echo html_writer::tag('td', $titletodisplay, array('colspan' => 3, 'class' => 'heading'));
echo html_writer::end_tag('tr');
//todo these need to come from somewhere if the course participants list is to show users with unread messages
$iscontact = true;
$isblocked = false;
foreach ($participants as $participant) {
if ($participant->id != $USER->id) {
$iscontact = false;
$isblocked = false;
if ( $participant->contactlistid ) {
if ($participant->blocked == 0) {
// Is contact. Is not blocked.
$iscontact = true;
$isblocked = false;
} else {
// Is blocked.
$iscontact = false;
$isblocked = true;
}
}
$participant->messagecount = 0;//todo it would be nice if the course participant could report new messages
message_print_contactlist_user($participant, $iscontact, $isblocked, $contactselecturl, $showactionlinks, $user2);
}