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.9 -r1.10 --- openacs-4/packages/chat/www/chat.tcl 7 Jun 2007 09:14:25 -0000 1.9 +++ openacs-4/packages/chat/www/chat.tcl 21 Jun 2007 11:06:29 -0000 1.10 @@ -29,21 +29,58 @@ ad_return_complaint 1 "[_ chat.Room_not_found]" } + set user_id [ad_conn user_id] + set return_url [ad_return_url] + db_1row room_info { + select room.comm_name + from chat_rooms as room + where room.room_id = :room_id + } + set folder_id "$comm_name's Public Files" + db_1row room_info { + select count(acs.object_id) as count + from acs_objects as acs + where acs.title = :folder_id + } + if { $count > 0 } { + db_1row room_info { + select acs.object_id as id + from acs_objects as acs + where acs.title = :folder_id + } + set folder_id $id + } else { + acs_user::get -user_id $user_id -array user + set name [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}] + set folder_id "$name's Shared Files" + + #$folder_id + db_1row room_info { + select fs.folder_id as id + from fs_folders as fs + where fs.name = :folder_id + } + set folder_id $id + } + + + set context_bar $room_name auth::require_login set user_id [ad_conn user_id] 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 moderate_room_p [chat_room_moderate_p $room_id] +#set moderate_room_p [chat_room_moderate_p $room_id] -if { $moderate_room_p eq "t" } { - set moderator_p [permission::permission_p -object_id $room_id -privilege "chat_moderator"] -} else { - # This is an unmoderate room, therefore everyone is a moderator. - set moderator_p "1" -} +#if { $moderate_room_p eq "t" } { +# set moderator_p [permission::permission_p -object_id $room_id -privilege "chat_moderator"] +#} else { +# # This is an unmoderate room, therefore everyone is a moderator. +# set moderator_p "1" +#} + if { ($read_p == "0" && $write_p == "0") || ($ban_p == "1") } { db_1row room_info { select cr.private as private @@ -79,7 +116,7 @@ } } "ajax" { - set template_use "ajax-chat-script" + set template_use "ajax-chat-script" } "java" { set template_use "java-chat"