From acd21a2d1494d4e37c1b4d845a68ef201e31e71a Mon Sep 17 00:00:00 2001 From: moodler Date: Fri, 4 Mar 2005 14:53:23 +0000 Subject: [PATCH] OK, finally fixed that refresh bug in Firefox! Added styles too. --- message/lib.php | 16 +++++++++++----- message/user.php | 44 ++++++++++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/message/lib.php b/message/lib.php index ca0f5756029..561ee36d3a0 100644 --- a/message/lib.php +++ b/message/lib.php @@ -904,17 +904,23 @@ function message_get_history($user1, $user2) { } function message_format_message(&$message, &$user, $format='', $keywords='') { - if (empty($format)) { - $format = get_string('strftimedaytime'); + + static $dateformat; + + if (empty($dateformat)) { + if ($format) { + $dateformat = $format; + } else { + $format = get_string('strftimedaytime'); + } } - $time = userdate($message->timecreated, $format); + $time = userdate($message->timecreated, $dateformat); $options->para = false; $messagetext = format_text($message->message, $message->format, $options); if ($keywords) { $messagetext = highlight($keywords, $messagetext); } - return '

'.s($user->firstname).' ['.$time.']: '. - $messagetext.'

'; + return '
'.s(fullname($user)).' ['.$time.']: '.$messagetext.'
'; } /* diff --git a/message/user.php b/message/user.php index 5312031241b..7c2dcf69d1d 100644 --- a/message/user.php +++ b/message/user.php @@ -88,7 +88,7 @@ } echo ''; echo '
'; - echo '
'; + echo '
'; if ($contact = get_record('message_contacts', 'userid', $USER->id, 'contactid', $user->id)) { if ($contact->blocked) { message_contact_link($user->id, 'add', false, 'user.php?id='.$user->id.'&frame=info'); @@ -134,17 +134,17 @@ header("Refresh: $CFG->message_chat_refresh; url=user.php?id=$user->id&frame=refresh"); echo ''."\n"; - echo ''; + echo ' '; echo ''."\n"; echo ''."\n"; + echo ''."\n"; if (!empty($playbeep)) { - echo ''."\n"; echo ''; - echo ''."\n"; } + + sleep($CFG->message_chat_refresh); + // Javascript for Mozilla to cope with the redirect bug from editor being on in this page + echo ''."\n"; + + echo ''."\n"; echo ''."\n"; break; @@ -226,15 +238,19 @@ $options->para = false; $options->newlines = true; $message = format_text($message, $format, $options, 0); + $message = str_replace("\r", ' ', $message); $message = str_replace("\n", ' ', $message); + $time = userdate(time(), get_string('strftimedaytime')); + $message = '
'.fullname($USER).' '. + '['.$time.']: '. + ''.$message.'
'; + $message = addslashes($message); // So Javascript can write it + $message = str_replace(''.$USER->firstname.' ['.$time.']: '.$message.'

'; - $script = "\n\n";