Index: openacs-4/packages/chat/tcl/test/chat-test-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/test/chat-test-procs.tcl,v diff -u -r1.1.2.4 -r1.1.2.5 --- openacs-4/packages/chat/tcl/test/chat-test-procs.tcl 13 Mar 2023 14:59:01 -0000 1.1.2.4 +++ openacs-4/packages/chat/tcl/test/chat-test-procs.tcl 29 Mar 2023 15:15:14 -0000 1.1.2.5 @@ -229,7 +229,6 @@ -cats {web smoke} \ -urls { /room-edit - /room-enter /room /chat } web_chat_room_create { Index: openacs-4/packages/chat/tcl/test/webtest-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/test/webtest-procs.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/chat/tcl/test/webtest-procs.tcl 13 Mar 2023 14:59:01 -0000 1.1.2.1 +++ openacs-4/packages/chat/tcl/test/webtest-procs.tcl 29 Mar 2023 15:15:14 -0000 1.1.2.2 @@ -73,17 +73,10 @@ set d $last_request - aa_log "Entering room via '$chat_page/room-enter?room_id=$room_id'" + aa_log "Entering room via '$chat_page/chat?room_id=$room_id'" set d [::acs::test::http \ -last_request $d \ - $chat_page/room-enter?room_id=$room_id] - acs::test::reply_has_status_code $d 302 - - set room_url [acs::test::get_url_from_location $d] - aa_log "Redirected to '$room_url'" - set d [::acs::test::http \ - -last_request $d \ - $room_url] + $chat_page/chat?room_id=$room_id] acs::test::reply_has_status_code $d 200 return $d Index: openacs-4/packages/chat/www/chat.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.tcl,v diff -u -r1.20.2.7 -r1.20.2.8 --- openacs-4/packages/chat/www/chat.tcl 8 Mar 2023 15:51:39 -0000 1.20.2.7 +++ openacs-4/packages/chat/www/chat.tcl 29 Mar 2023 15:15:14 -0000 1.20.2.8 @@ -10,41 +10,26 @@ room_id:object_type(chat_room) } -properties { context:onevalue - user_id:onevalue - user_name:onevalue - message:onevalue room_id:onevalue - room_name:onevalue - width:onevalue - height:onevalue - host:onevalue - port:onevalue moderator_p:onevalue - msgs:multirow } set r [::xo::db::Class get_instance_from_db -id $room_id] -set room_name [$r set pretty_name] -set doc(title) $room_name -set doc(type) {} +set doc(title) [$r set pretty_name] set context [list $doc(title)] -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 [$r set moderated_p] -if { $moderate_room_p == "t" } { - set moderator_p [permission::permission_p -object_id $room_id -privilege "chat_moderator"] -} else { - # This is an unmoderated room, therefore, everyone is a moderator. - set moderator_p "1" -} - -if { ($read_p == 0 && $write_p == 0) || ($ban_p == 1) } { - # Display unauthorize privilege page. +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 } Index: openacs-4/packages/chat/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.tcl,v diff -u -r1.18.2.8 -r1.18.2.9 --- openacs-4/packages/chat/www/index.tcl 12 Mar 2020 10:10:16 -0000 1.18.2.8 +++ openacs-4/packages/chat/www/index.tcl 29 Mar 2023 15:15:14 -0000 1.18.2.9 @@ -54,7 +54,7 @@ } if { $active_p } { - set room_url [export_vars -base "room-enter" {room_id}] + set room_url [export_vars -base "chat" {room_id}] } } Fisheye: Tag 1.13.2.4 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/room-enter.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/chat-portlet/www/chat-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet.tcl,v diff -u -r1.8.2.2 -r1.8.2.3 --- openacs-4/packages/chat-portlet/www/chat-portlet.tcl 9 Feb 2020 15:34:41 -0000 1.8.2.2 +++ openacs-4/packages/chat-portlet/www/chat-portlet.tcl 29 Mar 2023 15:15:14 -0000 1.8.2.3 @@ -50,7 +50,7 @@ set can_see_p 1 incr num_rooms } - set room_enter_url [export_vars -base "${base_url}room-enter" {room_id}] + set room_enter_url [export_vars -base "${base_url}chat" {room_id}] } template::list::create -name chat_rooms -multirow rooms \