From a32c7772c6fea8f48fc7fe649905dc77741e6454 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Thu, 10 Feb 2005 19:14:53 +0000
Subject: [PATCH] fixed deleting of old users when using chatd, other minor
 fixes, reverting of changes in chatmsg - found some weird problems in FF

---
 mod/chat/gui_header_js/chatmsg.php  |  2 --
 mod/chat/gui_header_js/index.php    |  2 +-
 mod/chat/gui_header_js/jsupdate.php |  6 ------
 mod/chat/gui_sockets/index.php      |  2 --
 mod/chat/lib.php                    | 15 ++++++++++++---
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/mod/chat/gui_header_js/chatmsg.php b/mod/chat/gui_header_js/chatmsg.php
index 1e2e4fbff16..b2f9f5d206a 100644
--- a/mod/chat/gui_header_js/chatmsg.php
+++ b/mod/chat/gui_header_js/chatmsg.php
@@ -1,4 +1,2 @@
 <html>
 <body>
-</body>
-</html>
diff --git a/mod/chat/gui_header_js/index.php b/mod/chat/gui_header_js/index.php
index 0fde491fa83..330ab95c690 100644
--- a/mod/chat/gui_header_js/index.php
+++ b/mod/chat/gui_header_js/index.php
@@ -46,7 +46,7 @@
 
     $strchat = get_string('modulename', 'chat'); // must be before current_language() in chat_login_user() to force course language!!!
 
-    if (!$chat_sid = chat_login_user($chat->id, 'header_js', $groupid, $course, true)) {
+    if (!$chat_sid = chat_login_user($chat->id, 'header_js', $groupid, $course)) {
         error('Could not log in to chat room!!');
     }
 
diff --git a/mod/chat/gui_header_js/jsupdate.php b/mod/chat/gui_header_js/jsupdate.php
index ac277428517..7ac6981c0ff 100644
--- a/mod/chat/gui_header_js/jsupdate.php
+++ b/mod/chat/gui_header_js/jsupdate.php
@@ -49,12 +49,6 @@
         <meta http-equiv="content-type" content="text/html; charset=<?php echo get_string('thischarset'); ?>" />
         <script type="text/javascript">
         <!--
-        if (parent.msg.document.getElementById("msgStarted") == null) {
-            parent.msg.document.open("text/html","replace");
-            parent.msg.document.write("<html><head>");
-            parent.msg.document.write("<meta http-equiv=\"content-type\" content=\"text/html; charset=<?php echo get_string('thischarset'); ?>\" />");
-            parent.msg.document.write("</head><body><div style=\"display: none\" id=\"msgStarted\">&nbsp;</div>");
-        }
         <?php
         $beep = false;
         $refreshusers = false;
diff --git a/mod/chat/gui_sockets/index.php b/mod/chat/gui_sockets/index.php
index 25e86aff466..4173b79f1b2 100644
--- a/mod/chat/gui_sockets/index.php
+++ b/mod/chat/gui_sockets/index.php
@@ -44,8 +44,6 @@
         $groupname = '';
     }
 
-    chat_delete_old_users();
-
     $strchat = get_string('modulename', 'chat'); // must be before current_language() in chat_login_user() to force course language!!!
 
     if (!$chat_sid = chat_login_user($chat->id, 'sockets', $groupid, $course)) {
diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index 1b35fe6fdc6..7d5588efc15 100644
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -357,7 +357,7 @@ function chat_get_latest_message($chatid, $groupid=0) {
 //////////////////////////////////////////////////////////////////////
 // login if not already logged in
 
-function chat_login_user($chatid, $version, $groupid, $course, $sendentermsg=false) {
+function chat_login_user($chatid, $version, $groupid, $course) {
     global $USER;
     if ($chatuser = get_record_select('chat_users', "chatid='$chatid' AND userid='$USER->id' AND groupid='$groupid'")) {
         $chatuser->version  = $version;
@@ -387,7 +387,9 @@ function chat_login_user($chatid, $version, $groupid, $course, $sendentermsg=fal
             return false;
         }
 
-        if ($sendentermsg) {
+        if ($version == 'sockets') {
+            // do not send 'enter' message, chatd will do it
+        } else {
             $message->chatid    = $chatuser->chatid;
             $message->userid    = $chatuser->userid;
             $message->groupid   = $groupid;
@@ -409,7 +411,14 @@ function chat_delete_old_users() {
 
     global $CFG;
 
-    $timeold = time() - $CFG->chat_old_ping;
+    if ($CFG->chat_method == 'sockets') {
+        // delete very outdated users not deleted by chatd,
+        // let normal deleting to chatd, because it needs to output the message
+        $timeold = time() - ($CFG->chat_old_ping * 3);
+    } else {
+        $timeold = time() - $CFG->chat_old_ping;
+    }
+
     $query = "lastping < '$timeold'";
 
     if ($oldusers = get_records_select('chat_users', $query) ) {