L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-27823_bulk_messaging_2' of git://github.com/andyjdavis/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-08-25 10:45:43 +02:00
parent 7b4537561f 2a4d3c98d5
commit 50dabefeef
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+14 -5
View File
@@ -9463,11 +9463,13 @@ function message_popup_window() {
}
//got unread messages so now do another query that joins with the user table
$messagesql = "SELECT m.id, m.smallmessage, m.notification, u.firstname, u.lastname FROM {message} m
JOIN {message_working} mw ON m.id=mw.unreadmessageid
JOIN {message_processors} p ON mw.processorid=p.id
JOIN {user} u ON m.useridfrom=u.id
WHERE m.useridto = :userid AND p.name='popup'";
$messagesql = "SELECT m.id, m.smallmessage, m.fullmessageformat, m.notification, u.firstname, u.lastname
FROM {message} m
JOIN {message_working} mw ON m.id=mw.unreadmessageid
JOIN {message_processors} p ON mw.processorid=p.id
JOIN {user} u ON m.useridfrom=u.id
WHERE m.useridto = :userid
AND p.name='popup'";
//if the user was last notified over an hour ago we can renotify them of old messages
//so don't worry about when the new message was sent
@@ -9503,6 +9505,13 @@ WHERE m.useridto = :userid AND p.name='popup'";
} else {
$smallmessage = $message_users->smallmessage;
}
//prevent html symbols being displayed
if ($message_users->fullmessageformat == FORMAT_HTML) {
$smallmessage = html_to_text($smallmessage);
} else {
$smallmessage = s($smallmessage);
}
} else if ($message_users->notification) {
//its a notification with no smallmessage so just say they have a notification
$smallmessage = get_string('unreadnewnotification', 'message');
message/lib.php
+8 -2
View File
@@ -1944,9 +1944,15 @@ function message_format_message($message, $format='', $keywords='', $class='othe
//if supplied display small messages as fullmessage may contain boilerplate text that shouldnt appear in the messaging UI
if (!empty($message->smallmessage)) {
$messagetext = format_text(s($message->smallmessage), FORMAT_MOODLE, $options);
$messagetext = $message->smallmessage;
} else {
$messagetext = format_text(s($message->fullmessage), $message->fullmessageformat, $options);
$messagetext = $message->fullmessage;
}
if ($message->fullmessageformat == FORMAT_HTML) {
//dont escape html tags by calling s() if html format or they will display in the UI
$messagetext = html_to_text(format_text($messagetext, $message->fullmessageformat, $options));
} else {
$messagetext = format_text(s($messagetext), $message->fullmessageformat, $options);
}
$messagetext .= message_format_contexturl($message);
user/messageselect.php
+1 -1
View File
@@ -91,7 +91,7 @@ $messagebody = $SESSION->emailselect[$id]['messagebody'];
$count = 0;
if ($post = data_submitted()) {
if ($data = data_submitted()) {
foreach ($data as $k => $v) {
if (preg_match('/^(user|teacher)(\d+)$/',$k,$m)) {
if (!array_key_exists($m[2],$SESSION->emailto[$id])) {