From 927a78087c6933f6376c165e7e15492fa3bd2ee6 Mon Sep 17 00:00:00 2001
From: defacer <defacer>
Date: Thu, 1 Mar 2007 07:19:57 +0000
Subject: [PATCH] Merging from MOODLE_16_STABLE: Fix for MDL-8515: Prefixing
chat messages with a slash should not hide the user's name unless it's a
special command we handle.
I completely removed the emoticon handling case, but it seems like it was
not needed for a long time now? Emoticons work just fine without it.
---
mod/chat/lib.php | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index fc27434381..a923cbc0cb 100644
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -561,9 +561,13 @@ function chat_format_message_manually($message, $courseid, $sender, $currentuser
$options = new object();
$options->para = false;
$text = format_text($text, FORMAT_MOODLE, $options, $courseid);
+
// And now check for special cases
+ $special = false;
+
if (substr($text, 0, 5) == 'beep ') {
- /// It's a beep!
+ /// It's a beep!
+ $special = true;
$beepwho = trim(substr($text, 5));
if ($beepwho == 'all') { // everyone
@@ -580,21 +584,15 @@ function chat_format_message_manually($message, $courseid, $sender, $currentuser
} else { //something is not caught?
return false;
}
- } else if (substr($text, 0, 1) == ':') { /// It's an MOO emote
- $outinfo = $message->strtime;
- $outmain = $sender->firstname.' '.substr($text, 1);
-
} else if (substr($text, 0, 1) == '/') { /// It's a user command
-
- if (substr($text, 0, 4) == "/me ") {
+ if (trim(substr($text, 0, 4)) == '/me') {
+ $special = true;
$outinfo = $message->strtime;
$outmain = $sender->firstname.' '.substr($text, 4);
- } else {
- $outinfo = $message->strtime;
- $outmain = $text;
}
+ }
- } else { /// It's a normal message
+ if(!$special) {
$outinfo = $message->strtime.' '.$sender->firstname;
$outmain = $text;
}
--
2.39.5