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

messaging MDL-22320 changed message_popup_window() to work within the new plugin system

Browse Source
This commit is contained in:
Andrew Davis 2010-06-29 03:08:27 +00:00
parent 65c7853e1c
commit 925efca73e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/moodlelib.php
View File

@ -8903,13 +8903,13 @@ function moodle_request_shutdown() {
* JavaScript required to pop up the messaging window.
*/
function message_popup_window() {
global $USER, $DB, $PAGE;
global $USER, $DB, $PAGE, $CFG;
if (defined('MESSAGE_WINDOW') || empty($CFG->messaging)) {
return;
}
if (!isset($USER->id) || isguestuser()) {
if (!isloggedin() || isguestuser()) {
return;
}
@ -8922,14 +8922,16 @@ function message_popup_window() {
return;
}
if (!get_user_preferences('message_showmessagewindow', 1)) {
return;
}
$sql = "SELECT COUNT(mw.id) FROM {message} m
JOIN {message_working} mw ON m.id=mw.unreadmessageid
JOIN {message_processors} p ON mw.processorid=p.id
WHERE m.useridto = :userid AND m.timecreated > :ts AND p.name='popup'";
if ($DB->count_records_sql($sql, array('userid'=>$USER->id, 'ts'=>$USER->message_lastpopup))) {
$jsobj = array('url'=>'/message/index.php?ts='.$USER->message_lastpopup, 'name'=>'message', 'options'=>'menubar=0,location=0,scrollbars,status,resizable,width=400', 'fullscreen'=>0);
$PAGE->requires->js_function_call('openpopup', array(null, $jsobj));
if ($DB->count_records_select('message', 'useridto = ? AND timecreated > ?', array($USER->id, $USER->message_lastpopup))) {
$USER->message_lastpopup = time();
$PAGE->requires->js_function_call('openpopup', array('/message/index.php', 'message',
'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500', 0));
}
}