Index: openacs-4/packages/chat/www/room-enter.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-enter.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/chat/www/room-enter.tcl	14 Mar 2006 12:16:09 -0000	1.3
+++ openacs-4/packages/chat/www/room-enter.tcl	24 Jun 2006 14:23:42 -0000	1.4
@@ -10,24 +10,32 @@
     room_id:integer,notnull
     client:trim
 } 
-chat_start_server
+
 set user_id [ad_conn user_id]
 
-set read_p  [ad_permission_p $room_id "chat_read"]
-set write_p [ad_permission_p $room_id "chat_write"]
-set ban_p   [ad_permission_p $room_id "chat_ban"]
+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"]
+ns_log notice "--query ban $ban_p: permission::permission_p -object_id $room_id -privilege chat_ban -party_id [ad_conn user_id]"
 set active  [room_active_status $room_id]
 
-
-if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") || ($active == "f") } {
+if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") || ($active eq "f") } {
     #Display unauthorize privilege page.
     ad_returnredirect unauthorized
     ad_script_abort
 }
-if {$client == "html"} {
 
+set default_client [parameter::get -parameter "DefaultClient" -default "ajax"]
 
-    chat_message_post $room_id $user_id "[_ chat.has_entered_the_room]." "1"
+if {$default_client eq "java"} {
+	chat_start_server
 }
 
+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"
+    }
+}
+
 ad_returnredirect "chat?room_id=$room_id&client=$client"