Index: openacs-4/packages/chat/chat.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/chat.info,v diff -u -r1.22.2.24 -r1.22.2.25 --- openacs-4/packages/chat/chat.info 25 Feb 2022 12:56:18 -0000 1.22.2.24 +++ openacs-4/packages/chat/chat.info 15 Jul 2022 13:35:12 -0000 1.22.2.25 @@ -9,7 +9,7 @@ f t - + Peter Alberer Server based chat with an html and ajax client. 2021-09-15 @@ -22,9 +22,9 @@ 0 - + - + Index: openacs-4/packages/chat/lib/current-messages.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/current-messages.tcl,v diff -u -r1.4.8.5 -r1.4.8.6 --- openacs-4/packages/chat/lib/current-messages.tcl 17 Mar 2020 14:06:38 -0000 1.4.8.5 +++ openacs-4/packages/chat/lib/current-messages.tcl 15 Jul 2022 13:35:12 -0000 1.4.8.6 @@ -1,7 +1,7 @@ ad_include_contract { This include displays currently persisted chat room messages } { - room_id:naturalnum + room_id:object_type(chat_room) } set r [::xo::db::Class get_instance_from_db -id $room_id] Index: openacs-4/packages/chat/lib/transcripts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcripts.tcl,v diff -u -r1.5.2.3 -r1.5.2.4 --- openacs-4/packages/chat/lib/transcripts.tcl 2 Jun 2021 12:23:31 -0000 1.5.2.3 +++ openacs-4/packages/chat/lib/transcripts.tcl 15 Jul 2022 13:35:12 -0000 1.5.2.4 @@ -1,7 +1,7 @@ ad_include_contract { This include is the UI to display and manage chat room transcripts } { - room_id:naturalnum + room_id:object_type(chat_room) } set transcript_create_p [permission::permission_p -object_id $room_id -privilege chat_transcript_create] Index: openacs-4/packages/chat/www/chat-transcript.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat-transcript.tcl,v diff -u -r1.6.2.2 -r1.6.2.3 --- openacs-4/packages/chat/www/chat-transcript.tcl 2 Mar 2019 17:51:10 -0000 1.6.2.2 +++ openacs-4/packages/chat/www/chat-transcript.tcl 15 Jul 2022 13:35:12 -0000 1.6.2.3 @@ -1,8 +1,10 @@ ad_page_contract { - mostra mensagens do chat arquivadas + + Display archived chat messages + } { - room_id:naturalnum,notnull - {transcript_id:naturalnum,optional 0} + room_id:object_type(chat_room) + {transcript_id:object_type(chat_transcript) 0} } set page_title "[_ chat.Transcript]" @@ -19,13 +21,8 @@ ad_script_abort } -if { [catch { - set r [::xo::db::Class get_instance_from_db -id $room_id] - set room_name [$r set pretty_name] -} errmsg] } { - ad_return_complaint 1 "[_ chat.Room_not_found]" - ad_script_abort -} +set r [::xo::db::Class get_instance_from_db -id $room_id] +set room_name [$r set pretty_name] template::head::add_style -style "#messages { border: 1px dotted black; 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.5 -r1.20.2.6 --- openacs-4/packages/chat/www/chat.tcl 5 Oct 2019 13:11:52 -0000 1.20.2.5 +++ openacs-4/packages/chat/www/chat.tcl 15 Jul 2022 13:35:12 -0000 1.20.2.6 @@ -7,7 +7,7 @@ @creation-date November 22, 2000 @cvs-id $Id$ } { - room_id:naturalnum,notnull + room_id:object_type(chat_room) } -properties { context:onevalue user_id:onevalue @@ -21,17 +21,9 @@ port:onevalue moderator_p:onevalue msgs:multirow -} -validate { - valid_room_id -requires room_id { - if { [catch { - set r [::xo::db::Class get_instance_from_db -id $room_id] - } errmsg] } { - ad_complain [_ chat.Room_not_found] - ad_log Warning "Chat room not found. Invalid room_id: $room_id" - } - } } +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) {} Index: openacs-4/packages/chat/www/message-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/message-delete-2.tcl,v diff -u -r1.9.2.2 -r1.9.2.3 --- openacs-4/packages/chat/www/message-delete-2.tcl 2 Mar 2019 17:51:10 -0000 1.9.2.2 +++ openacs-4/packages/chat/www/message-delete-2.tcl 15 Jul 2022 13:35:12 -0000 1.9.2.3 @@ -6,18 +6,13 @@ @creation-date January 18, 2001 @cvs-id $Id$ } { - room_id:naturalnum,notnull + room_id:object_type(chat_room) } permission::require_permission -object_id $room_id -privilege chat_room_delete -if { [catch { - set r [::xo::db::Class get_instance_from_db -id $room_id] - $r delete_messages -} errmsg] } { - ad_return_complaint 1 "[_ chat.Delete_messages_failed]: $errmsg" - ad_script_abort -} +set r [::xo::db::Class get_instance_from_db -id $room_id] +$r delete_messages ::chat::Chat flush_messages -chat_id $room_id Index: openacs-4/packages/chat/www/message-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/message-delete.tcl,v diff -u -r1.8.2.2 -r1.8.2.3 --- openacs-4/packages/chat/www/message-delete.tcl 2 Mar 2019 17:51:10 -0000 1.8.2.2 +++ openacs-4/packages/chat/www/message-delete.tcl 15 Jul 2022 13:35:12 -0000 1.8.2.3 @@ -6,7 +6,7 @@ @creation-date January 18, 2001 @cvs-id $Id$ } { - room_id:notnull,naturalnum + room_id:object_type(chat_room) } -properties { room_id:onevalue pretty_name:onevalue Index: openacs-4/packages/chat/www/room-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-delete-2.tcl,v diff -u -r1.8.2.3 -r1.8.2.4 --- openacs-4/packages/chat/www/room-delete-2.tcl 29 Dec 2021 17:12:54 -0000 1.8.2.3 +++ openacs-4/packages/chat/www/room-delete-2.tcl 15 Jul 2022 13:35:12 -0000 1.8.2.4 @@ -6,27 +6,13 @@ @creation-date November 16, 2000 @cvs-id $Id$ } { - room_id:naturalnum,notnull -} -validate { - id_is_a_room -requires room_id { - if {![::xo::dc 0or1row -prepare integer check_id { - select 1 from chat_rooms where room_id = :room_id - }]} { - ad_complain [_ chat.Room_not_found] - } - } + room_id:object_type(chat_room) } - permission::require_permission -object_id $room_id -privilege chat_room_delete -if { [catch { - set r [::xo::db::Class get_instance_from_db -id $room_id] - $r delete -} errmsg] } { - ad_return_complaint 1 "[_ chat.Delete_room_failed]: $errmsg" - ad_script_abort -} +set r [::xo::db::Class get_instance_from_db -id $room_id] +$r delete ad_returnredirect . Index: openacs-4/packages/chat/www/room-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-delete.tcl,v diff -u -r1.8.2.3 -r1.8.2.4 --- openacs-4/packages/chat/www/room-delete.tcl 29 Dec 2021 17:12:54 -0000 1.8.2.3 +++ openacs-4/packages/chat/www/room-delete.tcl 15 Jul 2022 13:35:12 -0000 1.8.2.4 @@ -6,19 +6,11 @@ @creation-date November 15, 2000 @cvs-id $Id$ } { - room_id:notnull,naturalnum + room_id:object_type(chat_room) } -properties { room_id:onevalue pretty_name:onevalue context_bar:onevalue -} -validate { - id_is_a_room -requires room_id { - if {![::xo::dc 0or1row -prepare integer check_id { - select 1 from chat_rooms where room_id = :room_id - }]} { - ad_complain [_ chat.Room_not_found] - } - } } permission::require_permission -object_id $room_id -privilege chat_room_delete Index: openacs-4/packages/chat/www/room-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-edit.tcl,v diff -u -r1.15.2.5 -r1.15.2.6 --- openacs-4/packages/chat/www/room-edit.tcl 2 Mar 2021 14:48:21 -0000 1.15.2.5 +++ openacs-4/packages/chat/www/room-edit.tcl 15 Jul 2022 13:35:12 -0000 1.15.2.6 @@ -5,7 +5,7 @@ @author Peter Alberer (peter@alberer.com) @creation-date March 26, 2006 } { - room_id:naturalnum,optional + room_id:object_id,optional } permission::require_permission -object_id [ad_conn package_id] -privilege chat_room_edit Index: openacs-4/packages/chat/www/room-enter.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/room-enter.tcl,v diff -u -r1.13.2.2 -r1.13.2.3 --- openacs-4/packages/chat/www/room-enter.tcl 20 Mar 2020 10:52:06 -0000 1.13.2.2 +++ openacs-4/packages/chat/www/room-enter.tcl 15 Jul 2022 13:35:12 -0000 1.13.2.3 @@ -1,13 +1,13 @@ #/chat/www/room-enter.tcl ad_page_contract { - Perform initialize before chat "Need to change this comment" + Perform initialization before starting a chat @author David Dao (ddao@arsdigita.com) @creation-date November 22, 2000 @cvs-id $Id$ } { - room_id:naturalnum,notnull + room_id:object_type(chat_room) } set user_id [ad_conn user_id] @@ -17,15 +17,9 @@ 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]" -if { [catch { - set r [::xo::db::Class get_instance_from_db -id $room_id] -} errmsg] } { - ad_return_error [_ chat.Room_not_found] [_ chat.Room_not_found] - ad_log Warning "Chat room not found. Invalid room_id: $room_id" - ad_script_abort -} +set r [::xo::db::Class get_instance_from_db -id $room_id] -set active [$r set active_p] +set active [$r set active_p] if { ($read_p == 0 && $write_p == 0) || ($ban_p == 1) || ($active == "f") } { #Display unauthorize privilege page. Index: openacs-4/packages/chat/www/room-exit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-exit.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/chat/www/room-exit.tcl 1 Oct 2018 12:17:00 -0000 1.10 +++ openacs-4/packages/chat/www/room-exit.tcl 15 Jul 2022 13:35:12 -0000 1.10.2.1 @@ -6,7 +6,7 @@ @creation-date November 25, 2000 @cvs-id $Id$ } { - room_id:naturalnum,notnull + room_id:object_type(chat_room) } set user_id [ad_conn user_id] Index: openacs-4/packages/chat/www/room.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.tcl,v diff -u -r1.11.2.4 -r1.11.2.5 --- openacs-4/packages/chat/www/room.tcl 2 Mar 2019 17:51:10 -0000 1.11.2.4 +++ openacs-4/packages/chat/www/room.tcl 15 Jul 2022 13:35:12 -0000 1.11.2.5 @@ -5,7 +5,7 @@ @creation-date November 15, 2000 @cvs-id $Id$ } { - room_id:naturalnum,notnull + room_id:object_type(chat_room) } -properties { context_bar:onevalue pretty_name:onevalue Index: openacs-4/packages/chat/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search.tcl,v diff -u -r1.2.2.1 -r1.2.2.2 --- openacs-4/packages/chat/www/search.tcl 14 Feb 2019 16:15:01 -0000 1.2.2.1 +++ openacs-4/packages/chat/www/search.tcl 15 Jul 2022 13:35:12 -0000 1.2.2.2 @@ -1,8 +1,8 @@ ad_page_contract { } { - type:notnull - room_id:naturalnum,notnull + type:notnull + room_id:object_type(chat_room) } set context [list "Users"] Index: openacs-4/packages/chat/www/toggle-active.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/toggle-active.tcl,v diff -u -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/chat/www/toggle-active.tcl 12 Mar 2020 10:10:17 -0000 1.1.2.1 +++ openacs-4/packages/chat/www/toggle-active.tcl 15 Jul 2022 13:35:12 -0000 1.1.2.2 @@ -3,7 +3,7 @@ Toggle chat room active state } { - room_id:naturalnum,optional + room_id:object_type(chat_room) {return_url:localurl .} } Index: openacs-4/packages/chat/www/transcript-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete-2.tcl,v diff -u -r1.6.2.2 -r1.6.2.3 --- openacs-4/packages/chat/www/transcript-delete-2.tcl 2 Mar 2019 17:51:10 -0000 1.6.2.2 +++ openacs-4/packages/chat/www/transcript-delete-2.tcl 15 Jul 2022 13:35:13 -0000 1.6.2.3 @@ -2,20 +2,14 @@ ad_page_contract { Delete chat transcript. } { - room_id:naturalnum,notnull - transcript_id:naturalnum,notnull - + room_id:object_type(chat_room) + transcript_id:object_type(chat_transcript) } permission::require_permission -object_id $transcript_id -privilege chat_transcript_delete -if { [catch { - set t [::xo::db::Class get_instance_from_db -id $transcript_id] - $t delete -} errmsg] } { - ad_return_complaint 1 "[_ chat.Delete_transcript_failed]: $errmsg" - ad_script_abort -} +set t [::xo::db::Class get_instance_from_db -id $transcript_id] +$t delete ad_returnredirect "room?room_id=$room_id" Index: openacs-4/packages/chat/www/transcript-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete.tcl,v diff -u -r1.8.2.2 -r1.8.2.3 --- openacs-4/packages/chat/www/transcript-delete.tcl 2 Mar 2019 17:51:10 -0000 1.8.2.2 +++ openacs-4/packages/chat/www/transcript-delete.tcl 15 Jul 2022 13:35:13 -0000 1.8.2.3 @@ -6,8 +6,8 @@ @creation-date November 28, 2000 @cvs-id $Id$ } { - room_id:naturalnum,notnull - transcript_id:naturalnum,notnull + room_id:object_type(chat_room) + transcript_id:object_type(chat_transcript) } -properties { context_bar:onevalue room_id:onevalue Index: openacs-4/packages/chat/www/transcript-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-edit.tcl,v diff -u -r1.12.2.3 -r1.12.2.4 --- openacs-4/packages/chat/www/transcript-edit.tcl 2 Jun 2021 12:23:31 -0000 1.12.2.3 +++ openacs-4/packages/chat/www/transcript-edit.tcl 15 Jul 2022 13:35:13 -0000 1.12.2.4 @@ -6,8 +6,8 @@ @creation-date November 28, 2000 @cvs-id $Id$ } { - transcript_id:naturalnum,notnull - room_id:naturalnum,notnull + room_id:object_type(chat_room) + transcript_id:object_type(chat_transcript) } permission::require_permission -object_id $transcript_id -privilege chat_transcript_edit Index: openacs-4/packages/chat/www/transcript-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-new.tcl,v diff -u -r1.8.2.4 -r1.8.2.5 --- openacs-4/packages/chat/www/transcript-new.tcl 12 May 2021 09:42:38 -0000 1.8.2.4 +++ openacs-4/packages/chat/www/transcript-new.tcl 15 Jul 2022 13:35:13 -0000 1.8.2.5 @@ -2,7 +2,7 @@ ad_page_contract { Display available all available chat messages. } { - room_id:naturalnum,notnull + room_id:object_type(chat_room) } -properties { context_bar:onevalue title:onevalue Index: openacs-4/packages/chat/www/user-ban-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-ban-2.tcl,v diff -u -r1.5.2.2 -r1.5.2.3 --- openacs-4/packages/chat/www/user-ban-2.tcl 31 Mar 2021 10:49:19 -0000 1.5.2.2 +++ openacs-4/packages/chat/www/user-ban-2.tcl 15 Jul 2022 13:35:13 -0000 1.5.2.3 @@ -7,8 +7,8 @@ @creation-date November 22, 2000 @cvs-id $Id$ } { - room_id:naturalnum,notnull - party_id:naturalnum,notnull + room_id:object_type(chat_room) + party_id:object_type(party) } permission::require_permission -object_id $room_id -privilege chat_user_ban Index: openacs-4/packages/chat/www/user-ban.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-ban.tcl,v diff -u -r1.6.2.3 -r1.6.2.4 --- openacs-4/packages/chat/www/user-ban.tcl 3 Sep 2019 12:03:21 -0000 1.6.2.3 +++ openacs-4/packages/chat/www/user-ban.tcl 15 Jul 2022 13:35:13 -0000 1.6.2.4 @@ -7,7 +7,7 @@ @creation-date November 22, 2000 @cvs-id $Id$ } { - room_id:naturalnum,notnull + room_id:object_type(chat_room) } -properties { context_bar:onevalue title:onevalue Index: openacs-4/packages/chat/www/user-unban-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-unban-2.tcl,v diff -u -r1.4.2.2 -r1.4.2.3 --- openacs-4/packages/chat/www/user-unban-2.tcl 31 Mar 2021 10:47:34 -0000 1.4.2.2 +++ openacs-4/packages/chat/www/user-unban-2.tcl 15 Jul 2022 13:35:13 -0000 1.4.2.3 @@ -7,8 +7,8 @@ @creation-date November 22, 2000 @cvs-id $Id$ } { - room_id:naturalnum,notnull - party_id:naturalnum,notnull + room_id:object_type(chat_room) + party_id:object_type(party) } permission::require_permission -object_id $room_id -privilege chat_user_unban Index: openacs-4/packages/chat/www/user-unban.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-unban.tcl,v diff -u -r1.7.2.2 -r1.7.2.3 --- openacs-4/packages/chat/www/user-unban.tcl 2 Mar 2019 17:51:10 -0000 1.7.2.2 +++ openacs-4/packages/chat/www/user-unban.tcl 15 Jul 2022 13:35:13 -0000 1.7.2.3 @@ -7,8 +7,8 @@ @creation-date November 22, 2000 @cvs-id $Id$ } { - room_id:naturalnum,notnull - party_id:naturalnum,notnull + room_id:object_type(chat_room) + party_id:object_type(party) } permission::require_permission -object_id $room_id -privilege chat_user_unban @@ -22,6 +22,6 @@ # Local variables: # mode: tcl -# tcl-indent-level: 2 +# tcl-indent-level: 4 # indent-tabs-mode: nil # End: