moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Messaging MDL-17581 Various fixes to use the new fields names

Browse source
This commit is contained in:
moodler 2009-01-19 04:35:09 +00:00
parent 9133d4ad58
commit 3d14359585
2 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
message/lib.php
View file

@ -1,5 +1,5 @@
<?php <?php
/// library functions for messaging ///// library functions for messaging %Id%
require_once($CFG->libdir.'/eventslib.php'); require_once($CFG->libdir.'/eventslib.php');
@ -455,7 +455,7 @@ function message_print_search_results($frm) {
echo '<td class="contact">'; echo '<td class="contact">';
message_print_user($userto, $tocontact, $toblocked); message_print_user($userto, $tocontact, $toblocked);
echo '</td>'; echo '</td>';
echo '<td class="summary">'.message_get_fragment($message->message, $keywords); echo '<td class="summary">'.message_get_fragment($message->fullmessage, $keywords);
echo '<br /><div class="link">'; echo '<br /><div class="link">';
message_history_link($message->useridto, $message->useridfrom, false, message_history_link($message->useridto, $message->useridfrom, false,
$keywordstring, 'm'.$message->id, $strcontext); $keywordstring, 'm'.$message->id, $strcontext);
@ -719,17 +719,17 @@ function message_search($searchterms, $fromme=true, $tome=true, $courseid='none'
if (substr($searchterm,0,1) == "+") { if (substr($searchterm,0,1) == "+") {
$searchterm = substr($searchterm,1); $searchterm = substr($searchterm,1);
$searchterm = preg_quote($searchterm, '|'); $searchterm = preg_quote($searchterm, '|');
$searchcond[] = "m.message $REGEXP :ss$i"; $searchcond[] = "m.fullmessage $REGEXP :ss$i";
$params['ss'.$i] = "(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)"; $params['ss'.$i] = "(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)";
} else if (substr($searchterm,0,1) == "-") { } else if (substr($searchterm,0,1) == "-") {
$searchterm = substr($searchterm,1); $searchterm = substr($searchterm,1);
$searchterm = preg_quote($searchterm, '|'); $searchterm = preg_quote($searchterm, '|');
$searchcond[] = "m.message $NOTREGEXP :ss$i"; $searchcond[] = "m.fullmessage $NOTREGEXP :ss$i";
$params['ss'.$i] = "(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)"; $params['ss'.$i] = "(^|[^a-zA-Z0-9])$searchterm([^a-zA-Z0-9]|$)";
} else { } else {
$searchcond[] = "m.message $NOT $LIKE :ss$i"; $searchcond[] = "m.fullmessage $NOT $LIKE :ss$i";
$params['ss'.$i] = "%$searchterm%"; $params['ss'.$i] = "%$searchterm%";
} }
} }
@ -751,10 +751,10 @@ function message_search($searchterms, $fromme=true, $tome=true, $courseid='none'
/// c. Messages to and from user /// c. Messages to and from user
if ($courseid == SITEID) { /// admin is searching all messages if ($courseid == SITEID) { /// admin is searching all messages
$m_read = $DB->get_records_sql("SELECT m.id, m.useridto, m.useridfrom, m.message, m.timecreated $m_read = $DB->get_records_sql("SELECT m.id, m.useridto, m.useridfrom, m.fullmessage, m.timecreated
FROM {message_read} m FROM {message_read} m
WHERE $searchcond", $params); WHERE $searchcond", $params);
$m_unread = $DB->get_records_sql("SELECT m.id, m.useridto, m.useridfrom, m.message, m.timecreated $m_unread = $DB->get_records_sql("SELECT m.id, m.useridto, m.useridfrom, m.fullmessage, m.timecreated
FROM {message} m FROM {message} m
WHERE $searchcond", $params); WHERE $searchcond", $params);
@ -779,10 +779,10 @@ function message_search($searchterms, $fromme=true, $tome=true, $courseid='none'
$params['userid'] = $userid; $params['userid'] = $userid;
} }
$m_read = $DB->get_records_sql("SELECT m.id, m.useridto, m.useridfrom, m.message, m.timecreated $m_read = $DB->get_records_sql("SELECT m.id, m.useridto, m.useridfrom, m.fullmessage, m.timecreated
FROM {message_read} m FROM {message_read} m
WHERE $searchcond", $params); WHERE $searchcond", $params);
$m_unread = $DB->get_records_sql("SELECT m.id, m.useridto, m.useridfrom, m.message, m.timecreated $m_unread = $DB->get_records_sql("SELECT m.id, m.useridto, m.useridfrom, m.fullmessage, m.timecreated
FROM {message} m FROM {message} m
WHERE $searchcond", $params); WHERE $searchcond", $params);
@ -933,7 +933,7 @@ function message_format_message(&$message, &$user, $format='', $keywords='', $cl
$time = userdate($message->timecreated, $dateformat); $time = userdate($message->timecreated, $dateformat);
$options = new object(); $options = new object();
$options->para = false; $options->para = false;
$messagetext = format_text($message->message, $message->format, $options); $messagetext = format_text($message->fullmessage, $message->fullmessageformat, $options);
if ($keywords) { if ($keywords) {
$messagetext = highlight($keywords, $messagetext); $messagetext = highlight($keywords, $messagetext);
} }

6
message/refresh.php
View file

@ -57,11 +57,7 @@
$options = new object(); $options = new object();
$options->para = false; $options->para = false;
$options->newlines = true; $options->newlines = true;
if ($message->format == FORMAT_HTML){ $printmessage = format_text($message->fullmessage, $message->fullmessageformat, $options, 0);
$printmessage = format_text($message->fullmessagehtml, $message->format, $options, 0);
} else{
$printmessage = format_text($message->fullmessage, $message->format, $options, 0);
}
$printmessage = '<div class="message other"><span class="author">'.s($userfullname).'</span> '. $printmessage = '<div class="message other"><span class="author">'.s($userfullname).'</span> '.
'<span class="time">['.$time.']</span>: '. '<span class="time">['.$time.']</span>: '.
'<span class="content">'.$printmessage.'</span></div>'; '<span class="content">'.$printmessage.'</span></div>';