Index: openacs-4/packages/chat/chat.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/chat.info,v
diff -u -r1.17 -r1.17.2.1
--- openacs-4/packages/chat/chat.info	27 Apr 2015 07:12:55 -0000	1.17
+++ openacs-4/packages/chat/chat.info	28 Oct 2016 18:57:36 -0000	1.17.2.1
@@ -6,29 +6,31 @@
     <pretty-plural>Chats</pretty-plural>
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
+    <implements-subsite-p>f</implements-subsite-p>
+    <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="5.0d10" url="http://openacs.org/repository/download/apm/chat-5.0d10.apm">
+    <version name="5.0d11" url="http://openacs.org/repository/download/apm/chat-5.0d11.apm">
         <owner url="http://www.openacs.org">Peter Alberer</owner>
         <summary>Server based chat with an html and ajax client.</summary>
-        <release-date>2015-04-25</release-date>
+        <release-date>2016-10-27</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/html">Adapted by Peter Alberer 2006/03/25 to allow java and ajax to coexist. 
 Adapted by Tekne 2006/03/01 to replace JAVA server with AJAX; make use of generalized chat class from xotcl-core.</description>
         <maturity>0</maturity>
 
-        <provides url="chat" version="5.0d10"/>
+        <provides url="chat" version="5.0d11"/>
         <requires url="acs-kernel" version="5.5.0"/>
         <requires url="xotcl-core" version="0.83"/>
 
         <callbacks>
         </callbacks>
         <parameters>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AppletHeight"  default="500" description="Height of the applet"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AppletWidth"  default="700" description="width of the applet"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultClient"  default="ajax" description="Default client interface to use"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ServerHost"  description="Chat server host"/>
-            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ServerPort"  default="8200" description="Listening for chat connection on this port"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="UserColors"  default="#006400 #0000ff #b8860b #bdb76b #8b0000" description="A list of colors to assign to user names in the chat"/>
+            <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="AppletHeight"  default="500" description="Height of the applet"/>
+            <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="AppletWidth"  default="700" description="width of the applet"/>
+            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultClient"  default="ajax" description="Default client interface to use"/>
+            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="ServerHost"  description="Chat server host"/>
+            <parameter scope="instance" datatype="number"  min_n_values="1"  max_n_values="1"  name="ServerPort"  default="8200" description="Listening for chat connection on this port"/>
+            <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="UserColors"  default="#006400 #0000ff #b8860b #bdb76b #8b0000" description="A list of colors to assign to user names in the chat"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/chat/sql/oracle/chat-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/oracle/chat-create.sql,v
diff -u -r1.4 -r1.4.6.1
--- openacs-4/packages/chat/sql/oracle/chat-create.sql	19 Nov 2007 01:14:15 -0000	1.4
+++ openacs-4/packages/chat/sql/oracle/chat-create.sql	28 Oct 2016 18:57:36 -0000	1.4.6.1
@@ -148,7 +148,14 @@
 					   check (auto_flush_p in ('t', 'f')),
 	auto_transcript_p  char(1) default 'f'
 					   constraint chat_rooms_auto_transcript_ck
-					   check (auto_transcript_p in ('t', 'f'))
+					   check (auto_transcript_p in ('t', 'f')),
+	login_messages_p  char(1) default 't'
+					   constraint chat_rooms_login_messages_ck
+					   check (login_messages_p in ('t', 'f')),
+
+	logout_messages_p  char(1) default 't'
+					   constraint chat_rooms_logout_messages_ck
+					   check (logout_messages_p in ('t', 'f'))
 ); 
 
 declare
@@ -245,6 +252,8 @@
         archive_p      in chat_rooms.archive_p%TYPE      default 'f',
 	auto_flush_p   in chat_rooms.auto_flush_p%TYPE	 default 't',
 	auto_transcript_p in chat_rooms.auto_transcript_p%TYPE default 'f',
+	login_messages_p  in chat_rooms.login_messages_p%TYPE default  't',
+	logout_messages_p in chat_rooms.logout_messages_p%TYPE default 't',	
         context_id     in acs_objects.context_id%TYPE    default null,
         creation_date  in acs_objects.creation_date%TYPE default sysdate,
         creation_user  in acs_objects.creation_user%TYPE default null,
@@ -341,6 +350,8 @@
         archive_p      in chat_rooms.archive_p%TYPE      default 'f',
 	auto_flush_p   in chat_rooms.auto_flush_p%TYPE	 default 't',
 	auto_transcript_p in chat_rooms.auto_transcript_p%TYPE default 'f',
+	login_messages_p  in chat_rooms.login_messages_p%TYPE default  't',
+	logout_messages_p in chat_rooms.logout_messages_p%TYPE default 't',	
         context_id     in acs_objects.context_id%TYPE    default null,
         creation_date  in acs_objects.creation_date%TYPE default sysdate,
         creation_user  in acs_objects.creation_user%TYPE default null,
@@ -366,7 +377,9 @@
             active_p, 
             archive_p,
 	    auto_flush_p,
-	    auto_transcript_p)
+	    auto_transcript_p,
+	    login_messages_p,
+	    logout_messages_p)
 	values (
             v_room_id, 
             chat_room.new.pretty_name, 
@@ -375,7 +388,9 @@
             chat_room.new.active_p, 
             chat_room.new.archive_p,
 	    chat_room.new.auto_flush_p,
-	    chat_room.new.auto_transcript_p);
+	    chat_room.new.auto_transcript_p,
+	    chat_room.new.login_messages_p,
+	    chat_room.new.logout_messages_p);
 
         return v_room_id;
     end new;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/sql/oracle/upgrade/upgrade-5.0d10-5.0d11.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/chat/sql/postgresql/chat-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/postgresql/chat-create.sql,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/chat/sql/postgresql/chat-create.sql	20 Jun 2016 09:00:22 -0000	1.8.2.1
+++ openacs-4/packages/chat/sql/postgresql/chat-create.sql	28 Oct 2016 18:57:36 -0000	1.8.2.2
@@ -206,7 +206,10 @@
     -- flush the rooms messages every night at 00:05                    
     auto_flush_p        boolean default 't',
     -- automatically create a transcript after flushing the room
-    auto_transcript_p   boolean default 'f'
+    auto_transcript_p   boolean default 'f',
+    -- allow to set wether we want login/logout messages or not
+    login_messages_p    boolean default 't',
+    logout_messages_p   boolean default 't'
 );
 
 
@@ -341,12 +344,13 @@
 ---------------------------------
 
 
-
 -- added
-select define_function_args('chat_room__new','room_id,pretty_name,description,moderated_p,active_p,archive_p,auto_flush_p,auto_transcript_p,context_id,creation_date,creation_user,creation_ip,object_type');
+select define_function_args(
+       'chat_room__new',
+       'room_id,pretty_name,description,moderated_p,active_p,archive_p,auto_flush_p,auto_transcript_p,login_messages_p,logout_messages_p,context_id,creation_date,creation_user,creation_ip,object_type');
 
 --
--- procedure chat_room__new/13
+-- procedure chat_room__new/15
 --
 CREATE OR REPLACE FUNCTION chat_room__new(
    p_room_id integer,
@@ -357,6 +361,8 @@
    p_archive_p boolean,
    p_auto_flush_p boolean,
    p_auto_transcript_p boolean,
+   p_login_messages_p boolean,
+   p_logout_messages_p boolean,   
    p_context_id integer,
    p_creation_date timestamptz,
    p_creation_user integer,
@@ -375,10 +381,29 @@
      p_context_id
    );
 
-   insert into chat_rooms
-       (room_id, pretty_name, description, moderated_p, active_p, archive_p, auto_flush_p, auto_transcript_p)
-   values
-       (v_room_id, p_pretty_name, p_description, p_moderated_p, p_active_p, p_archive_p, p_auto_flush_p, p_auto_transcript_p);
+   insert into chat_rooms (
+   	    room_id,
+	    pretty_name,
+	    description,
+	    moderated_p,
+	    active_p,
+	    archive_p,
+	    auto_flush_p,
+	    auto_transcript_p,
+	    login_messages_p,
+	    logout_messages_p
+	) values (
+	    v_room_id,
+	    p_pretty_name,
+	    p_description,
+	    p_moderated_p,
+	    p_active_p,
+	    p_archive_p,
+	    p_auto_flush_p,
+	    p_auto_transcript_p,
+	    p_login_messages_p,
+	    p_logout_messages_p
+	);
 
 return v_room_id;
 
@@ -387,8 +412,6 @@
 
 
 
-
-
 ---------------------------------
 
 
@@ -576,7 +599,7 @@
 select define_function_args('chat_room__edit','room_id,pretty_name,description,moderated_p,active_p,archive_p,auto_flush_p,auto_transcript_p');
 
 --
--- procedure chat_room__edit/8
+-- procedure chat_room__edit/10
 --
 CREATE OR REPLACE FUNCTION chat_room__edit(
    p_room_id integer,
@@ -586,21 +609,25 @@
    p_active_p boolean,
    p_archive_p boolean,
    p_auto_flush_p boolean,
-   p_auto_transcript_p boolean
+   p_auto_transcript_p boolean,
+   p_login_messages_p boolean,
+   p_logout_messages_p boolean   
 ) RETURNS integer AS $$
 DECLARE
 BEGIN
 
         update chat_rooms set
-            pretty_name = p_pretty_name,
-            description = p_description,
-            moderated_p = p_moderated_p,
-            active_p    = p_active_p,
-            archive_p   = p_archive_p,
-            auto_flush_p   = p_auto_flush_p,
-            auto_transcript_p   = p_auto_transcript_p
+            pretty_name       = p_pretty_name,
+            description       = p_description,
+            moderated_p       = p_moderated_p,
+            active_p          = p_active_p,
+            archive_p         = p_archive_p,
+            auto_flush_p      = p_auto_flush_p,
+            login_messages_p  = p_login_messages_p,
+            logout_messages_p = p_logout_messages_p	    
         where
             room_id = p_room_id;
+	    
         return 0;
 END;
 $$ LANGUAGE plpgsql;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/chat/sql/postgresql/upgrade/upgrade-5.0d10-5.0d11.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/chat/tcl/chat-ajax-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-ajax-procs.tcl,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	20 Jun 2016 08:40:23 -0000	1.12.2.1
+++ openacs-4/packages/chat/tcl/chat-ajax-procs.tcl	28 Oct 2016 18:57:36 -0000	1.12.2.2
@@ -8,8 +8,18 @@
 }
 
 namespace eval ::chat {
-  ::xo::ChatClass Chat -superclass ::xo::Chat
+    ::xo::ChatClass Chat -superclass ::xo::Chat
 
+    Chat instproc init {} {
+	my instvar chat_id login_messages_p logout_messages_p
+	xo::dc 1row get_options "
+            select login_messages_p,
+                   logout_messages_p
+              from chat_rooms
+             where room_id = :chat_id"
+	next
+    }
+
   Chat instproc render {} {
     my orderby time
     set result ""
@@ -57,8 +67,6 @@
       // register the data sources (for sending messages, receiving updates)
       var pushMessage = registerDataConnection(pushReceiver, '$path/ajax/chat?m=get_new&$context', false);
       var pullUpdates = registerDataConnection(updateReceiver, '$path/ajax/chat?m=get_updates&$context', true);
-      // register an update function to refresh the data sources every 5 seconds
-      var updateInterval = setInterval(updateDataConnections,5000);
       </script>
       <form id='ichat_form' name='ichat_form' action='#' onsubmit='pushMessage.chatSendMsg(\"$send_url\"); return false;'>
       <iframe name='ichat' id='ichat' title='#chat.Conversation_area#' 
@@ -78,6 +86,14 @@
       <input type='submit' value='#chat.Send_Refresh#'>
       </div>
       </form> 
+
+      <script type='text/javascript'>
+      // Get a first update of users when the iframe is ready, then register a 5s interval to get new ones
+      document.getElementById('ichat-users').addEventListener('load', function (event) {
+          updateDataConnections();
+      }, false);
+      var updateInterval = setInterval(updateDataConnections,5000);
+      </script>
     "
   }
 }
Index: openacs-4/packages/chat/tcl/chat-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/Attic/chat-procs-oracle.xql,v
diff -u -r1.2.8.1 -r1.2.8.2
--- openacs-4/packages/chat/tcl/chat-procs-oracle.xql	2 Jul 2016 10:41:20 -0000	1.2.8.1
+++ openacs-4/packages/chat/tcl/chat-procs-oracle.xql	28 Oct 2016 18:57:36 -0000	1.2.8.2
@@ -8,16 +8,17 @@
 
             begin
 	        :1 := chat_room.new (
-	            pretty_name   => :pretty_name,
-	            moderated_p   => :moderated_p,
-                    description   => :description,
-	            active_p      => :active_p,
-                    archive_p     => :archive_p,
-	            context_id    => :context_id,
-	            creation_user => :creation_user,
-	            creation_ip   => :creation_ip
+	            pretty_name       => :pretty_name,
+	            moderated_p       => :moderated_p,
+                    description       => :description,
+	            active_p          => :active_p,
+	            login_messages_p  => :login_messages_p,
+	            logout_messages_p => :logout_messages_p,
+                    archive_p         => :archive_p,
+	            context_id        => :context_id,
+	            creation_user     => :creation_user,
+	            creation_ip       => :creation_ip
 	        );
-
 	    end;
 
       </querytext>
@@ -47,7 +48,7 @@
 <fullquery name="chat_room_name.get_room_name">
       <querytext>
           select pretty_name from chat_rooms where room_id = :room_id
-	
+
       </querytext>
 </fullquery>
 
@@ -107,14 +108,16 @@
       <querytext>
          begin
 	    chat_room.edit (
-	        room_id       => :room_id,
-	        pretty_name   => :pretty_name,
-                description   => :description,
-	        moderated_p   => :moderated_p,
-	        active_p      => :active_p,
-                archive_p     => :archive_p,
-		auto_flush_p  => :auto_flush_p,
-            	auto_transcript_p => :auto_transcript_p
+	        room_id           => :room_id,
+	        pretty_name       => :pretty_name,
+                description       => :description,
+	        moderated_p       => :moderated_p,
+	        active_p          => :active_p,
+                archive_p         => :archive_p,
+		auto_flush_p      => :auto_flush_p,
+            	auto_transcript_p => :auto_transcript_p,
+	        login_messages_p  => :login_messages_p,
+	        logout_messages_p => :logout_messages_p
 	    );
 	end;
      </querytext>
Index: openacs-4/packages/chat/tcl/chat-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/Attic/chat-procs-postgresql.xql,v
diff -u -r1.6.6.1 -r1.6.6.2
--- openacs-4/packages/chat/tcl/chat-procs-postgresql.xql	2 Jul 2016 10:41:20 -0000	1.6.6.1
+++ openacs-4/packages/chat/tcl/chat-procs-postgresql.xql	28 Oct 2016 18:57:36 -0000	1.6.6.2
@@ -12,6 +12,8 @@
              :archive_p,
              :auto_flush_p,
              :auto_transcript_p,
+             :login_messages_p,
+             :logout_messages_p,	     
              :context_id,
              now(),
              :creation_user,
@@ -117,12 +119,14 @@
 	        :description,
 	        :moderated_p,
 	        :active_p,
-            :archive_p,
-            :auto_flush_p,
-            :auto_transcript_p
+		:archive_p,
+		:auto_flush_p,
+		:auto_transcript_p,
+		:login_messages_p,
+		:logout_messages_p		
 	    );
             return 0;
-	end;
+	 end;
      </querytext>
 </fullquery>
 
Index: openacs-4/packages/chat/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-procs.tcl,v
diff -u -r1.11.6.1 -r1.11.6.2
--- openacs-4/packages/chat/tcl/chat-procs.tcl	20 Jun 2016 08:40:23 -0000	1.11.6.1
+++ openacs-4/packages/chat/tcl/chat-procs.tcl	28 Oct 2016 18:57:36 -0000	1.11.6.2
@@ -107,14 +107,22 @@
                 switch $msg {
                     "/enter" {
                         c1 login
-                        set msg [_ xotcl-core.has_entered_the_room]
+			# apisano: I think we don't need explicit
+			# message about entering the room, as this is
+			# already issued by the login method of parent
+			# chat class in xotcl-core.			
+                        # set msg [_ xotcl-core.has_entered_the_room]
                     }
                     "/leave" {
                         c1 logout
-                        set msg [_ xotcl-core.has_left_the_room]
+			# apisano: I think we don't need explicit
+			# message about leaving the room, as this is
+			# already issued by the logout method of parent
+			# chat class in xotcl-core.			
+                        # set msg [_ xotcl-core.has_left_the_room]
                     }
                     default {
-                c1 add_msg -uid $user_id $msg
+			c1 add_msg -uid $user_id $msg
                     }
                 }
 
@@ -146,27 +154,29 @@
     db_exec_plsql post_message {}
 
 }
+
 ad_proc -public chat_room_new {
     {-description ""}
     {-moderated_p f}
     {-active_p t}
     {-archive_p f}
     {-auto_flush_p t}
     {-auto_transcript_p f}
+    {-login_messages_p t}
+    {-logout_messages_p t}
     {-context_id ""}
     {-creation_user ""}
     {-creation_ip ""}
     pretty_name
 
 } {
     Create new chat room. Return room_id if successful else raise error.
-} {
-
+} {    
     db_transaction {
-        set room_id [db_exec_plsql create_room {}]
+        set room_id [db_string create_room {}]
     }
 
-    db_exec_plsql grant_permission {}
+    db_exec_plsql grant_permission {}	
 
     return $room_id
 }
@@ -180,6 +190,8 @@
     archive_p
     auto_flush_p
     auto_transcript_p
+    login_messages_p
+    logout_messages_p
 } {
     Edit information on chat room. All information require.
 } {
@@ -334,10 +346,9 @@
 } {
     Return display name of this user to use in chat.
 } {
-	acs_user::get -user_id $user_id -array user
-	set name [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}]
+    acs_user::get -user_id $user_id -array user
+    set name [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}]
     return $name
-
 }
 
 ad_proc -public chat_message_post {
@@ -354,24 +365,24 @@
         set status "pending"
     }
 
-	set default_client [parameter::get -parameter "DefaultClient" -default "ajax"]
+    set default_client [parameter::get -parameter "DefaultClient" -default "ajax"]
 
-	if {$default_client eq "java"} {
-		set chat_msg "<message><from>[chat_user_name $user_id]</from><from_user_id>$user_id</from_user_id><room_id>$room_id</room_id><body>$message</body><status>$status</status></message>"
-		# Add message to queue. Notify thread responsible for 
-		# broadcast message to applets.
-		nsv_set chat html_message $chat_msg
-		ns_mutex unlock [nsv_get chat new_message]  
-	}
+    if {$default_client eq "java"} {
+	set chat_msg "<message><from>[chat_user_name $user_id]</from><from_user_id>$user_id</from_user_id><room_id>$room_id</room_id><body>$message</body><status>$status</status></message>"
+	# Add message to queue. Notify thread responsible for 
+	# broadcast message to applets.
+	nsv_set chat html_message $chat_msg
+	ns_mutex unlock [nsv_get chat new_message]  
+    }
     
-        # do not write messages to the database if the room should not be archived
-        chat_room_get -room_id $room_id -array room_info
-        if { $room_info(archive_p) == "f" } { return }
-        
-        # write message to the database
-        if {[catch {chat_post_message_to_db -creation_user $user_id $room_id $message} errmsg]} {
-            ns_log error "chat_post_message_to_db: error: $errmsg"
-        }
+    # do not write messages to the database if the room should not be archived
+    chat_room_get -room_id $room_id -array room_info
+    if { $room_info(archive_p) == "f" } { return }
+    
+    # write message to the database
+    if {[catch {chat_post_message_to_db -creation_user $user_id $room_id $message} errmsg]} {
+	ns_log error "chat_post_message_to_db: error: $errmsg"
+    }
 }
 
 
@@ -399,10 +410,21 @@
 
     ns_log debug "chat_message_retrieve: starting message retrieve"
 
-    # The first time html client enter chat room, chat_room variable is not initialize correctly.
-    # Therefore I just hard code the variable.
+    # The first time html client enter chat room, chat_room variable
+    # is not initialize correctly.  Therefore I just hard code the
+    # variable.    
+    # apisano: I don't think hardcoded message should be here anymore,
+    # as message about user entering the room is already issued by the
+    # parent chat class in xotcl-core when we issue the login method    
     if {![nsv_exists chat_room $room_id]} {
-        nsv_set chat_room $room_id [list "<message><from>[chat_user_name $user_id]</from><room_id>$room_id</room_id><body>[_ chat.has_entered_the_room]</body><status>approved</status></message>"]
+	nsv_set chat_room $room_id {}
+        # nsv_set chat_room $room_id [list "
+        #     <message>
+        #         <from>[chat_user_name $user_id]</from>
+        #         <room_id>$room_id</room_id>
+        #         <body>[_ chat.has_entered_the_room]</body>
+        #         <status>approved</status>
+        #     </message>"]
     }
 
     set user_name [chat_user_name $user_id]
Index: openacs-4/packages/chat/www/room-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-edit.tcl,v
diff -u -r1.11.4.1 -r1.11.4.2
--- openacs-4/packages/chat/www/room-edit.tcl	20 Jun 2016 08:40:23 -0000	1.11.4.1
+++ openacs-4/packages/chat/www/room-edit.tcl	28 Oct 2016 18:57:36 -0000	1.11.4.2
@@ -51,44 +51,79 @@
         {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
         {value "f"}
         {help_text "[_ chat.AutoTranscriptHelp]"}
+    }
+    {login_messages_p:boolean(radio)
+        {label "#chat.LoginMessages#" }
+        {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
+        {value "f"}
+        {help_text "[_ chat.LoginMessagesHelp]"}
     }      
+    {logout_messages_p:boolean(radio)
+        {label "#chat.LogoutMessages#" }
+        {options {{"#acs-kernel.common_Yes#" t} {"#acs-kernel.common_no#" f}}}
+        {value "f"}
+        {help_text "[_ chat.LogoutMessagesHelp]"}
+    }      
+    
 } -new_data {
-    if {[catch {set room_id [chat_room_new -moderated_p $moderated_p \
-                              -description $description \
-                              -active_p $active_p \
-                              -archive_p $archive_p \
-                              -auto_flush_p $auto_flush_p \
-                              -auto_transcript_p $auto_transcript_p \
-                              -context_id [ad_conn package_id] \
-                              -creation_user [ad_conn user_id] \
-                              -creation_ip [ad_conn peeraddr] $pretty_name]} errmsg]} {
+    if {[catch {set room_id [chat_room_new \
+				 -moderated_p       $moderated_p \
+				 -description       $description \
+				 -active_p          $active_p \
+				 -archive_p         $archive_p \
+				 -auto_flush_p      $auto_flush_p \
+				 -auto_transcript_p $auto_transcript_p \
+				 -login_messages_p  $login_messages_p \
+				 -logout_messages_p $logout_messages_p \
+				 -context_id        [ad_conn package_id] \
+				 -creation_user     [ad_conn user_id] \
+				 -creation_ip       [ad_conn peeraddr] $pretty_name]} errmsg]} {
         ad_return_complaint 1 "[_ chat.Create_new_room_failed]: $errmsg"
         break
     }
     set comm_id ""
     if {[info commands dotlrn_community::get_community_id] ne ""} {
-      set comm_id [dotlrn_community::get_community_id] 
+	set comm_id [dotlrn_community::get_community_id] 
     }
     if {$comm_id ne ""} {
-      chat_user_grant $room_id $comm_id
+	chat_user_grant $room_id $comm_id
     } else {
-      #-2 Registered Users
-      #chat_user_grant $room_id -2 
-      #0 Unregistered Visitor
-      #chat_user_grant $room_id 0
-      #-1 The Public
-      chat_user_grant $room_id -2
+	#-2 Registered Users
+	#chat_user_grant $room_id -2 
+	#0 Unregistered Visitor
+	#chat_user_grant $room_id 0
+	#-1 The Public
+	chat_user_grant $room_id -2
     }
 } -edit_request {
-    if {[catch {db_1row room_info {
-        select pretty_name, description, moderated_p, archive_p, active_p, auto_flush_p, auto_transcript_p
-        from chat_rooms
-        where room_id = :room_id}} errmsg]} {
+    if {[catch {db_1row room_info "
+        select pretty_name,
+	       description,
+	       moderated_p, 
+               archive_p, 
+               active_p, 
+               auto_flush_p, 
+               auto_transcript_p,
+               login_messages_p,
+               logout_messages_p
+          from chat_rooms
+         where room_id = :room_id"} errmsg]} {
         ad_return_complaint 1 "[_ chat.Room_not_found]."
         break
     }
 } -edit_data {
-    if {[catch {chat_room_edit $room_id $pretty_name $description $moderated_p $active_p $archive_p $auto_flush_p $auto_transcript_p} errmsg]} {
+    if {[catch {chat_room_edit \
+		    $room_id \
+		    $pretty_name \
+		    $description \
+		    $moderated_p \
+		    $active_p \
+		    $archive_p \
+		    $auto_flush_p \
+		    $auto_transcript_p \
+		    $login_messages_p \
+		    $logout_messages_p
+		} errmsg]} {
         ad_return_complaint 1 "[_ chat.Could_not_update_room]: $errmsg"
         break
     }
Index: openacs-4/packages/chat/www/room-enter.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/room-enter.tcl,v
diff -u -r1.7.6.1 -r1.7.6.2
--- openacs-4/packages/chat/www/room-enter.tcl	20 Jun 2016 08:40:23 -0000	1.7.6.1
+++ openacs-4/packages/chat/www/room-enter.tcl	28 Oct 2016 18:57:36 -0000	1.7.6.2
@@ -34,7 +34,11 @@
 switch $client {
     "html" - "ajax" - "html-chat-script" {
         ns_log Notice "YY room-enter: has_entered_the room"
-        chat_message_post $room_id $user_id "[_ chat.has_entered_the_room]." "1"
+	# apisano: I don't think this code should be here anymore, as
+	# message about user entering the room is already issued by
+	# the parent chat class in xotcl-core when we issue the login
+	# method	
+        # chat_message_post $room_id $user_id "[_ chat.has_entered_the_room]." "1"
     }
 }
 
Index: openacs-4/packages/chat/www/room-exit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-exit.tcl,v
diff -u -r1.5.6.1 -r1.5.6.2
--- openacs-4/packages/chat/www/room-exit.tcl	20 Jun 2016 08:40:23 -0000	1.5.6.1
+++ openacs-4/packages/chat/www/room-exit.tcl	28 Oct 2016 18:57:36 -0000	1.5.6.2
@@ -20,7 +20,11 @@
     ad_script_abort
 }
 
-chat_message_post $room_id $user_id "[_ chat.has_left_the_room]." "1"
+# apisano: I don't think this code should be here anymore, as
+# message about user leaving the room is already issued by
+# the parent chat class in xotcl-core when we issue the logout
+# method	
+# chat_message_post $room_id $user_id "[_ chat.has_left_the_room]." "1"
 
 # send to AJAX
 set session_id [ad_conn session_id]
Index: openacs-4/packages/chat/www/room.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.adp,v
diff -u -r1.9.4.1 -r1.9.4.2
--- openacs-4/packages/chat/www/room.adp	20 Jun 2016 08:40:23 -0000	1.9.4.1
+++ openacs-4/packages/chat/www/room.adp	28 Oct 2016 18:57:36 -0000	1.9.4.2
@@ -35,8 +35,16 @@
     <tr class="form-element">
         <td class="form-label">#chat.AutoTranscript#</td>
         <td>@auto_transcript_p@</td>
-    </tr>      
+    </tr>
     <tr class="form-element">
+        <td class="form-label">#chat.LoginMessages#</td>
+        <td>@login_messages_p@</td>
+    </tr>          
+    <tr class="form-element">
+        <td class="form-label">#chat.LogoutMessages#</td>
+        <td>@logout_messages_p@</td>
+    </tr>          
+    <tr class="form-element">
         <td class="form-label">#chat.message_count#</td>
         <td>@message_count@</td>
     </tr>
Index: openacs-4/packages/chat/www/room.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.tcl,v
diff -u -r1.8.4.1 -r1.8.4.2
--- openacs-4/packages/chat/www/room.tcl	20 Jun 2016 08:40:23 -0000	1.8.4.1
+++ openacs-4/packages/chat/www/room.tcl	28 Oct 2016 18:57:36 -0000	1.8.4.2
@@ -50,11 +50,18 @@
 ###
 # Get room basic information.
 ###
-db_1row room_info {
-    select pretty_name, description, moderated_p, active_p, archive_p, auto_flush_p, auto_transcript_p
+db_1row room_info "
+    select pretty_name,
+           description,
+           moderated_p, 
+           active_p, 
+           archive_p, 
+           auto_flush_p, 
+           auto_transcript_p,
+           login_messages_p,
+           logout_messages_p
     from chat_rooms
-    where room_id = :room_id
-}
+    where room_id = :room_id"
 
 # get db-message count
 set message_count [db_string message_count "select count(*) from chat_msgs where room_id = :room_id" -default 0]
Index: openacs-4/packages/chat/www/ajax/chat.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/ajax/Attic/chat.js,v
diff -u -r1.4 -r1.4.6.1
--- openacs-4/packages/chat/www/ajax/chat.js	19 Nov 2007 01:14:17 -0000	1.4
+++ openacs-4/packages/chat/www/ajax/chat.js	28 Oct 2016 18:57:36 -0000	1.4.6.1
@@ -102,14 +102,19 @@
                 var messagesNode = body[0].childNodes[i];
                 if (messagesNode.hasChildNodes()) {
                     var messagesDoc = frames['ichat'].document;
-                    var messagesDiv = frames['ichat'].document.getElementById('messages');
+                    var messagesDiv = messagesDoc.getElementById('messages');
+		    if (messagesDiv == null) {
+			messagesDiv = messagesDoc.createElement('div');
+			messagesDiv.id = 'messages';
+			messagesDoc.body.appendChild(messagesDiv);
+		    }
                     messagesReceiver(messagesNode,messagesDoc,messagesDiv);
                 }                
                 break;
             case "users":
                 var usersNode = body[0].childNodes[i].childNodes[0];
                 var usersDoc = frames['ichat-users'].document;
-                var usersTbody = frames['ichat-users'].document.getElementById('users').tBodies[0];
+                var usersTbody = usersDoc.getElementById('users').tBodies[0];
                 usersReceiver(usersNode,usersDoc,usersTbody);                
                 break;
         }
Index: openacs-4/packages/xotcl-core/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/Attic/chat-procs.tcl,v
diff -u -r1.23.2.2 -r1.23.2.3
--- openacs-4/packages/xotcl-core/tcl/chat-procs.tcl	7 Dec 2015 16:58:07 -0000	1.23.2.2
+++ openacs-4/packages/xotcl-core/tcl/chat-procs.tcl	28 Oct 2016 18:57:36 -0000	1.23.2.3
@@ -3,38 +3,49 @@
 
   @creation-date 2006-02-02
   @author Gustaf Neumann
-  @cvs-id $Id$  
+  @cvs-id $Id$
 }
 
 namespace eval ::xo {
   Class create Message -parameter {time user_id msg color}
   Class create Chat -superclass ::xo::OrderedComposite \
       -parameter {
-        chat_id 
-        user_id 
-        session_id 
+        chat_id
+        user_id
+        session_id
         {mode default}
-        {encoder urlencode} 
-        {timewindow 600} 
+        {encoder urlencode}
+        {timewindow 600}
         {sweepinterval 599}
+        {login_messages_p t}
+        {logout_messages_p t}
       }
 
   Chat instproc init {} {
     my instvar array
     # my log "-- "
     my set now [clock clicks -milliseconds]
-    if {![my exists user_id]}    {my set user_id [ad_conn user_id]}
-    if {![my exists session_id]} {my set session_id [ad_conn session_id]}
+    if {![my exists user_id]} {
+      my set user_id [ad_conn user_id]
+    }
+    if {![my exists session_id]} {
+      my set session_id [ad_conn session_id]
+    }
     set cls [my info class]
     set array $cls-[my set chat_id]
     if {![nsv_exists $cls initialized]} {
       my log "-- initialize $cls"
       $cls initialize_nsvs
       ::xo::clusterwide nsv_set $cls initialized \
-          [ad_schedule_proc -thread "t" [my sweepinterval] $cls sweep_all_chats]
+          [ad_schedule_proc \
+               -thread "t" [my sweepinterval] $cls sweep_all_chats]
     }
-    if {![nsv_exists $array-seen newest]} {::xo::clusterwide nsv_set $array-seen newest 0}
-    if {![nsv_exists $array-color idx]}   {::xo::clusterwide nsv_set $array-color idx 0}
+    if {![nsv_exists $array-seen newest]} {
+      ::xo::clusterwide nsv_set $array-seen newest 0
+    }
+    if {![nsv_exists $array-color idx]} {
+      ::xo::clusterwide nsv_set $array-color idx 0
+    }
     if {[my user_id] != 0 || [my session_id] != 0} {
       my init_user_color
     }
@@ -44,8 +55,9 @@
 
   Chat instproc register_nsvs {msg_id user_id msg color secs} {
     my instvar array now
+    # Tell the system we are back again, in case we were auto logged out
     if { ![nsv_exists $array-login $user_id] } {
-      ::xo::clusterwide nsv_set $array-login $user_id $secs
+      ::xo::clusterwide nsv_set $array-login $user_id [clock seconds]
     }
     ::xo::clusterwide nsv_set $array $msg_id [list $now $secs $user_id $msg $color]
     ::xo::clusterwide nsv_set $array-seen newest $now
@@ -58,12 +70,19 @@
     my instvar array now
     set user_id [expr {[info exists uid] ? $uid : [my set user_id]}]
     set color   [my user_color $user_id]
+    # apisano: the vanilla chat you can include in a xowiki::Object
+    # page is not able to deliver messages like '%'. Usage by the chat
+    # package is fine, but probably something should be done to have a
+    # consistent quoting of special chars.  This commented line is not
+    # ok, because would corrupt some chars in the chat package, which
+    # is our main usage.
+    # set msg [my encode $msg]
     set msg     [ns_quotehtml $msg]
-    my log "-- msg=$msg"
-    
-    if {$get_new 
-        && [info commands ::thread::mutex] ne "" 
-        && [info commands ::bgdelivery] ne ""} { 
+    # my log "-- msg=$msg"
+
+    if {$get_new
+        && [info commands ::thread::mutex] ne ""
+        && [info commands ::bgdelivery] ne ""} {
       # we could use the streaming interface
       my broadcast_msg [Message new -volatile -time [clock seconds] \
                             -user_id $user_id -msg $msg -color $color]
@@ -76,20 +95,20 @@
   Chat instproc current_message_valid {} {
     expr { [my exists user_id] && [my set user_id] != -1 }
   }
-  
+
   Chat instproc active_user_list {} {
     nsv_array get [my set array]-login
   }
-  
+
   Chat instproc nr_active_users {} {
     expr { [llength [nsv_array get [my set array]-login]] / 2 }
   }
-  
+
   Chat instproc last_activity {} {
     if { ![nsv_exists [my set array]-seen last] } { return "-" }
     return [clock format [nsv_get [my set array]-seen last] -format "%d.%m.%y %H:%M:%S"]
   }
-  
+
   Chat instproc check_age {key ago} {
     my instvar array timewindow
     if {$ago > $timewindow} {
@@ -120,7 +139,7 @@
     }
     my render
   }
-  
+
   Chat instproc get_all {} {
     my instvar array now session_id
     foreach {key value} [nsv_array get $array] {
@@ -135,35 +154,32 @@
   }
 
   Chat instproc sweeper {} {
-    my instvar array now
+    my instvar array now logout_messages_p
     my log "--core-chat starting"
     foreach {user timestamp} [nsv_array get $array-last-activity] {
       ns_log Notice "--core-chat at user $user with $timestamp"
       set ago [expr {($now - $timestamp) / 1000}]
       ns_log Notice "--core-chat Checking: now=$now, timestamp=$timestamp, ago=$ago"
       # was 1200
-      if {$ago > 300} { 
-        my add_msg -get_new false -uid $user "auto logout" 
-        nsv_unset $array-last-activity $user 
-        nsv_unset $array-login $user
-        nsv_unset $array-color $user
+      if {$ago > 300} {
+        my logout -user_id $user -msg "auto logout"
         catch {::bgdelivery do ::Subscriber sweep chat-[my chat_id]}
       }
     }
     my log "-- ending"
   }
 
-  Chat instproc logout {} {
-    my instvar array user_id
+  Chat instproc logout {{-user_id ""} {-msg ""}} {
+    set user_id [expr {$user_id ne "" ? $user_id : [my set user_id]}]
     ns_log Notice "--core-chat User $user_id logging out of chat"
-    my add_msg -get_new false [_ chat.has_left_the_room].
-    catch {
-      # do not try to clear nsvs, if they are not available
-      # this situation could occur after a server restart, after which the user tries to leave the room
-      ::xo::clusterwide nsv_unset $array-last-activity $user_id
-      ::xo::clusterwide nsv_unset $array-login $user_id
-      ::xo::clusterwide nsv_unset $array-color $user_id
+    if {[my set logout_messages_p]} {
+      if {$msg eq ""} {set msg [_ chat.has_left_the_room].}
+      my add_msg -get_new false $msg
     }
+    my instvar array
+    ::xo::clusterwide nsv_unset -nocomplain $array-login         $user_id
+    ::xo::clusterwide nsv_unset -nocomplain $array-color         $user_id
+    ::xo::clusterwide nsv_unset -nocomplain $array-last-activity $user_id
   }
 
   Chat instproc init_user_color {} {
@@ -178,7 +194,7 @@
       ::xo::clusterwide nsv_incr $array-color idx
     }
   }
-  
+
   Chat instproc get_users {} {
     set output ""
     foreach {user_id timestamp} [my active_user_list] {
@@ -187,10 +203,10 @@
         set userlink  [my user_link -user_id $user_id]
         append output "<TR><TD class='user'>$userlink</TD><TD class='timestamp'>$diff</TD></TR>\n"
       }
-    }  
+    }
     return $output
   }
-  
+
   Chat instproc user_active {user_id} {
     my instvar array
     # was the user already active?
@@ -200,15 +216,20 @@
 
   Chat instproc login {} {
     my log "--chat login"
-    my instvar user_id
-    if {![my user_active $user_id]} {
+    my instvar array user_id now
+    if {[my set login_messages_p] && ![my user_active $user_id]} {
       my add_msg -get_new false [_ xotcl-core.has_entered_the_room]
+    } elseif {![nsv_exists $array-login $user_id]} {
+      # give some proof of our presence to the chat system when we
+      # don't issue the login message
+      ::xo::clusterwide nsv_set $array-login $user_id [clock seconds]
+      ::xo::clusterwide nsv_set $array-last-activity $user_id $now
     }
     my encoder noencode
-    #my log "--c setting session_id [my set session_id]: [my set now]"
+    my log "--c setting session_id [my set session_id]: $now"
     return [my get_all]
   }
-  
+
   Chat instproc user_color { user_id } {
     my instvar array
     if { ![nsv_exists $array-color $user_id] } {
@@ -222,7 +243,7 @@
     acs_user::get -user_id $user_id -array user
     return [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}]
   }
-  
+
   Chat instproc user_link { -user_id -color } {
     if {$user_id > 0} {
       set name [my user_name $user_id]
@@ -235,17 +256,17 @@
       set creator "Nobody"
     } else {
       set creator "System"
-    }  
-    return [my encode $creator]  
+    }
+    return [my encode $creator]
   }
-  
+
   Chat instproc urlencode   {string} {ns_urlencode $string}
   Chat instproc noencode    {string} {set string}
   Chat instproc encode      {string} {my [my encoder] $string}
   Chat instproc json_encode {string} {
     string map [list \n \\n {"} {\"} ' {\'}] $string"
   }
-                
+
   Chat instproc json_encode_msg {msg} {
     set old [my encoder]
     my encoder noencode ;# just for user_link
@@ -277,15 +298,15 @@
    Chat instproc subscribe {-uid} {
      set user_id [expr {[info exists uid] ? $uid : [my set user_id]}]
      set color [my user_color $user_id]
-     bgdelivery subscribe chat-[my chat_id] "" [my mode] 
-     if {![my user_active $user_id]} {
-       my broadcast_msg [Message new -volatile -time [clock seconds] \
-                             -user_id $user_id -color $color \
-                             -msg [_ xotcl-core.has_entered_the_room] ]
+     bgdelivery subscribe chat-[my chat_id] "" [my mode]
+     if {[my set login_messages_p] && ![my user_active $user_id]} {
+       # my broadcast_msg [Message new -volatile -time [clock seconds] \
+       #                       -user_id $user_id -color $color \
+       #                       -msg [_ xotcl-core.has_entered_the_room] ]
      }
      #my get_all
    }
-                
+
    Chat instproc render {} {
      my orderby time
      set result "<div class='messages'>\n"
@@ -296,7 +317,7 @@
        set timelong  [clock format [$child time]]
        set timeshort [clock format [$child time] -format {[%H:%M:%S]}]
        set userlink  [my user_link -user_id $user_id -color $color]
-       
+
        append result "<p class='line'><span class='timestamp'>$timeshort</span> " \
                         "<span class='user'>$userlink</span> " \
                         "<span class='message'>[my encode $msg]</span></p>\n"
@@ -319,22 +340,22 @@
      }
      my log "-- ending"
    }
-                
+
    ChatClass method initialize_nsvs {} {
      # read the last_activity information at server start into a nsv array
      ::xo::dc foreach get_rooms {
-       select room_id, to_char(max(creation_date),'HH24:MI:SS YYYY-MM-DD') as last_activity 
+       select room_id, to_char(max(creation_date),'HH24:MI:SS YYYY-MM-DD') as last_activity
        from chat_msgs group by room_id
      } {
        ::xo::clusterwide nsv_set [self]-$room_id-seen last [clock scan $last_activity]
      }
    }
-                
+
    ChatClass method flush_messages {-chat_id:required} {
      set array "[self]-$chat_id"
-     ::xo::clusterwide nsv_unset $array
-     ::xo::clusterwide nsv_unset $array-seen
-     ::xo::clusterwide nsv_unset $array-last-activity
+     ::xo::clusterwide nsv_unset -nocomplain $array
+     ::xo::clusterwide nsv_unset -nocomplain $array-seen
+     ::xo::clusterwide nsv_unset -nocomplain $array-last-activity
    }
 
    ChatClass method init {} {