reverted some unfinished changes in chatd - enter message

diff --git a/mod/chat/chatd.php b/mod/chat/chatd.php
index 21770cf87b0f326ee51d8080a71fccf93733301f..ca70b4303cc05b4eb149240dea933f8cdcd0e22a 100755 (executable)
--- a/mod/chat/chatd.php
+++ b/mod/chat/chatd.php
@@ -531,7 +531,7 @@ class ChatDaemon {
         $this->dismiss_half($sessionid, false);
         $this->write_data($this->conn_sets[$sessionid][CHAT_CONNECTION_CHANNEL], $CHAT_HTMLHEAD_JS);
         $this->trace('Connection accepted: '.$this->conn_sets[$sessionid][CHAT_CONNECTION_CHANNEL].', SID: '.$sessionid.' UID: '.$chatuser->userid.' GID: '.intval($groupid), E_USER_WARNING);
-/*
+
         // Finally, broadcast the "entered the chat" message
 
         $msg = &New stdClass;
@@ -544,7 +544,7 @@ class ChatDaemon {
 
         insert_record('chat_messages', $msg);
         $this->message_broadcast($msg, $this->sets_info[$sessionid]['user']);
-*/
+
         return true;
     }
 

diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 549ace897adb5e193d9f697ae80d16886e0c3501..7a4c6c2e8dc6a8a3632d88785076da81de0088d5 100644 (file)
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -389,15 +389,17 @@ function chat_login_user($chatid, $version, $groupid, $course) {
             return false;
         }
 
-        $message->chatid    = $chatuser->chatid;
-        $message->userid    = $chatuser->userid;
-        $message->groupid   = $groupid;
-        $message->message   = 'enter';
-        $message->system    = 1;
-        $message->timestamp = time();
-
-        if (!insert_record('chat_messages', $message)) {
-            error('Could not insert a chat message!');
+        if ($version == 'header_js') {
+            $message->chatid    = $chatuser->chatid;
+            $message->userid    = $chatuser->userid;
+            $message->groupid   = $groupid;
+            $message->message   = 'enter';
+            $message->system    = 1;
+            $message->timestamp = time();
+
+            if (!insert_record('chat_messages', $message)) {
+                error('Could not insert a chat message!');
+            }
         }
     }