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.16 -r1.17 --- openacs-4/packages/chat/www/chat.tcl 20 Jun 2016 08:37:04 -0000 1.16 +++ openacs-4/packages/chat/www/chat.tcl 7 Aug 2017 23:48:07 -0000 1.17 @@ -8,7 +8,7 @@ @cvs-id $Id$ } { room_id:naturalnum,notnull - {client "ajax"} + {client "ajax"} {message:html ""} } -properties { context:onevalue @@ -27,6 +27,7 @@ if { [catch {set room_name [chat_room_name $room_id]} errmsg] } { ad_return_complaint 1 "[_ chat.Room_not_found]" + ad_script_abort } set doc(title) $room_name @@ -36,9 +37,9 @@ auth::require_login set user_id [ad_conn user_id] -set read_p [permission::permission_p -object_id $room_id -privilege "chat_read"] +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"] +set ban_p [permission::permission_p -object_id $room_id -privilege "chat_ban"] set moderate_room_p [chat_room_moderate_p $room_id] if { $moderate_room_p == "t" } { @@ -57,11 +58,6 @@ # Get chat screen name. set user_name [chat_user_name $user_id] -# send message to the database -if { $message ne "" } { - chat_message_post $room_id $user_id $message $moderator_p -} - # Determine which template to use for html or ajax client switch $client { "html" { @@ -76,16 +72,6 @@ "ajax" { set template_use "ajax-chat-script" } - "java" { - set template_use "java-chat" - - # Get config paramater for applet. - set width [parameter::get -parameter AppletWidth -default 500] - set height [parameter::get -parameter AppletHeight -default 400] - - set host [ad_parameter ServerHost "" [ns_config "ns/server/[ns_info server]/module/nssock" Hostname]] - set port [parameter::get -parameter ServerPort -default 8200] - } } ad_return_template $template_use