Index: openacs-4/packages/chat/lib/chat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/Attic/chat.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/chat/lib/chat.adp	3 Nov 2023 15:13:29 -0000	1.1.2.1
@@ -0,0 +1,5 @@
+<property name="focus">ichat_form.msg</property>
+
+<div id="xowiki-chat-container">
+  @chat_frame;noquote@
+</div>
Index: openacs-4/packages/chat/lib/chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/Attic/chat.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/chat/lib/chat.tcl	3 Nov 2023 15:13:29 -0000	1.1.2.1
@@ -0,0 +1,37 @@
+ad_include_contract {
+
+    This include renders a chat room on a page.
+
+    It assumes the including page to provide a master, as this is
+    needed to provide the javascript machinery needed to run the chat.
+
+} {
+    room_id:object_type(chat_room),notnull
+}
+
+set r [::xo::db::Class get_instance_from_db -id $room_id]
+
+set room_name [$r set pretty_name]
+
+set read_p  [permission::permission_p -object_id $room_id -privilege "chat_read"]
+set write_p [permission::permission_p -object_id $room_id -privilege "chat_write"]
+set ban_p   [permission::permission_p -object_id $room_id -privilege "chat_ban"]
+
+if { (!$read_p && !$write_p) || $ban_p || ![$r set active_p] } {
+    #
+    # You won't be able to chat if:
+    # - you cannot read nor write in the room
+    # - you were banned
+    # - the chat is not active
+    #
+    ad_returnredirect unauthorized
+    ad_script_abort
+}
+
+set chat_frame [::chat::Chat login -chat_id $room_id]
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
Index: openacs-4/packages/chat/www/chat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.adp,v
diff -u -N -r1.2.2.4 -r1.2.2.5
--- openacs-4/packages/chat/www/chat.adp	3 Apr 2020 07:07:29 -0000	1.2.2.4
+++ openacs-4/packages/chat/www/chat.adp	3 Nov 2023 15:13:29 -0000	1.2.2.5
@@ -1,7 +1,6 @@
 <master>
 <property name="context">@context;literal@</property>
 <property name="&doc">doc</property>
-<property name="focus">ichat_form.msg</property>
 
 <h1>@doc.title@</h1>
 
@@ -12,7 +11,4 @@
     <a href="room-exit?room_id=@room_id@" class="button" title="#chat.exit_msg#">#chat.Log_off#</a> 
     <a href="chat-transcript?room_id=@room_id@" class="button" title="#chat.transcription_msg#">#chat.Transcript#</a>
 </p>
-
-<div id="xowiki-chat-container">
-    @chat_frame;noquote@
-</div>
+<include src="/packages/chat/lib/chat" room_id="@room_id;literal@">
Index: openacs-4/packages/chat/www/chat.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.tcl,v
diff -u -N -r1.20.2.9 -r1.20.2.10
--- openacs-4/packages/chat/www/chat.tcl	17 May 2023 09:09:21 -0000	1.20.2.9
+++ openacs-4/packages/chat/www/chat.tcl	3 Nov 2023 15:13:29 -0000	1.20.2.10
@@ -19,23 +19,6 @@
 set doc(title) [$r set pretty_name]
 set context [list $doc(title)]
 
-set read_p  [permission::permission_p -object_id $room_id -privilege "chat_read"]
-set write_p [permission::permission_p -object_id $room_id -privilege "chat_write"]
-set ban_p   [permission::permission_p -object_id $room_id -privilege "chat_ban"]
-
-if { (!$read_p && !$write_p) || $ban_p || ![$r set active_p] } {
-    #
-    # You won't be able to chat if:
-    # - you cannot read nor write in the room
-    # - you were banned
-    # - the chat is not active
-    #
-    ad_returnredirect unauthorized
-    ad_script_abort
-}
-
-set chat_frame [::chat::Chat login -chat_id $room_id]
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4