Index: openacs-4/packages/chat/chat.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/chat.info,v diff -u -r1.22.2.25 -r1.22.2.26 --- openacs-4/packages/chat/chat.info 15 Jul 2022 13:35:12 -0000 1.22.2.25 +++ openacs-4/packages/chat/chat.info 29 Mar 2023 15:33:33 -0000 1.22.2.26 @@ -9,10 +9,10 @@ f t - + Peter Alberer Server based chat with an html and ajax client. - 2021-09-15 + 2023-03-29 OpenACS Adapted by Peter Alberer 2006/03/25 to allow java and ajax to coexist. @@ -22,7 +22,7 @@ 0 - + Index: openacs-4/packages/chat/tcl/apm-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/apm-callback-procs.tcl,v diff -u -r1.1.2.7 -r1.1.2.8 --- openacs-4/packages/chat/tcl/apm-callback-procs.tcl 19 Oct 2021 08:32:06 -0000 1.1.2.7 +++ openacs-4/packages/chat/tcl/apm-callback-procs.tcl 29 Mar 2023 15:33:33 -0000 1.1.2.8 @@ -49,6 +49,11 @@ ns_write "
$n_rows objects updated." ns_write "
Finished!" } + 6.0.0d17 7.0.0 { + ::xo::dc dml drop_moderated_column { + alter table chat_rooms drop column moderated_p + } + } } } Index: openacs-4/packages/chat/tcl/chat-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-procs.tcl,v diff -u -r1.24.2.9 -r1.24.2.10 --- openacs-4/packages/chat/tcl/chat-procs.tcl 25 Feb 2022 12:56:18 -0000 1.24.2.9 +++ openacs-4/packages/chat/tcl/chat-procs.tcl 29 Mar 2023 15:33:33 -0000 1.24.2.10 @@ -72,7 +72,6 @@ } { set r [::xo::db::chat_room new \ -description $description \ - -moderated_p $moderated_p \ -active_p $active_p \ -archive_p $archive_p \ -auto_flush_p $auto_flush_p \ @@ -122,7 +121,6 @@ foreach var { pretty_name description - moderated_p active_p archive_p auto_flush_p @@ -287,10 +285,12 @@ } { Return the moderate status of this chat room. + Note that the moderated_p flag is not part of the current + datamodel anymore. + @see ::xo::db::chat_room } { - set r [::xo::db::Class get_instance_from_db -id $room_id] - return [$r set moderated_p] + return false } ad_proc -deprecated -public chat_user_name { Index: openacs-4/packages/chat/tcl/xotcl-chat-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/xotcl-chat-procs.tcl,v diff -u -r1.1.2.19 -r1.1.2.20 --- openacs-4/packages/chat/tcl/xotcl-chat-procs.tcl 23 Feb 2023 12:46:20 -0000 1.1.2.19 +++ openacs-4/packages/chat/tcl/xotcl-chat-procs.tcl 29 Mar 2023 15:33:33 -0000 1.1.2.20 @@ -58,8 +58,6 @@ -sqltype varchar(100) -not_null true ::xo::db::Attribute create description \ -sqltype varchar(2000) - ::xo::db::Attribute create moderated_p \ - -datatype boolean -default false ::xo::db::Attribute create active_p \ -datatype boolean -default true ::xo::db::Attribute create archive_p \ 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.5 -r1.1.2.6 --- openacs-4/packages/chat/tcl/test/chat-test-procs.tcl 29 Mar 2023 15:15:14 -0000 1.1.2.5 +++ openacs-4/packages/chat/tcl/test/chat-test-procs.tcl 29 Mar 2023 15:33:33 -0000 1.1.2.6 @@ -49,7 +49,6 @@ set test_user_id [dict get $test_user user_id] set r [::xo::db::chat_room new \ - -moderated_p t \ -description {Test Chat Room} \ -active_p t \ -archive_p t \ 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.9 -r1.18.2.10 --- openacs-4/packages/chat/www/index.tcl 29 Mar 2023 15:15:14 -0000 1.18.2.9 +++ openacs-4/packages/chat/www/index.tcl 29 Mar 2023 15:33:33 -0000 1.18.2.10 @@ -34,7 +34,6 @@ select rm.room_id, rm.pretty_name, rm.description, - rm.moderated_p, rm.active_p, rm.archive_p from chat_rooms rm, 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.6 -r1.15.2.7 --- openacs-4/packages/chat/www/room-edit.tcl 15 Jul 2022 13:35:12 -0000 1.15.2.6 +++ openacs-4/packages/chat/www/room-edit.tcl 29 Mar 2023 15:33:33 -0000 1.15.2.7 @@ -22,9 +22,6 @@ ad_form -name "edit-room" -edit_buttons [list [list [_ chat.Update_room] next]] -has_edit 1 -form { {room_id:key} - {moderated_p:boolean(hidden) - {value "f"} - } {pretty_name:text(text) {label "#chat.Room_name#" } } @@ -82,7 +79,6 @@ } -new_data { if {[catch { set r [::xo::db::chat_room new \ - -moderated_p $moderated_p \ -description $description \ -active_p $active_p \ -archive_p $archive_p \ @@ -120,7 +116,6 @@ set r [::xo::db::Class get_instance_from_db -id $room_id] set pretty_name [$r set pretty_name] set description [$r set description] - set moderated_p [$r set moderated_p] set active_p [$r set active_p] set archive_p [$r set archive_p] set auto_flush_p [$r set auto_flush_p] @@ -138,7 +133,6 @@ foreach var { pretty_name description - moderated_p active_p archive_p auto_flush_p 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.5 -r1.11.2.6 --- openacs-4/packages/chat/www/room.tcl 15 Jul 2022 13:35:12 -0000 1.11.2.5 +++ openacs-4/packages/chat/www/room.tcl 29 Mar 2023 15:33:33 -0000 1.11.2.6 @@ -11,7 +11,6 @@ pretty_name:onevalue description:onevalue archive_p:onevalue - moderated_p:onevalue active_p:onevalue room_view_p:onevalue room_edit_p:onevalue @@ -54,7 +53,6 @@ set r [::xo::db::Class get_instance_from_db -id $room_id] set pretty_name [$r set pretty_name] set description [$r set description] -set moderated_p [$r set moderated_p] set active_p [$r set active_p] set archive_p [$r set archive_p] set auto_flush_p [$r set auto_flush_p] @@ -66,7 +64,6 @@ # prettify flags foreach property { - moderated_p active_p archive_p auto_flush_p Index: openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql,v diff -u -r1.2 -r1.2.6.1 --- openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql 9 Nov 2008 23:29:23 -0000 1.2 +++ openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql 29 Mar 2023 15:33:33 -0000 1.2.6.1 @@ -8,7 +8,6 @@ select rm.room_id, rm.pretty_name as pretty_name, rm.description as description, - rm.moderated_p, rm.active_p, rm.archive_p, acs_permission.permission_p(room_id, :user_id, 'chat_room_admin') as admin_p, @@ -30,7 +29,6 @@ select rm.room_id, rm.pretty_name as pretty_name, rm.description as description, - rm.moderated_p, rm.active_p, rm.archive_p, acs_permission.permission_p(room_id, :user_id, 'chat_room_admin') as admin_p, Index: openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql,v diff -u -r1.4 -r1.4.6.1 --- openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql 9 Nov 2008 23:29:23 -0000 1.4 +++ openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql 29 Mar 2023 15:33:33 -0000 1.4.6.1 @@ -8,7 +8,6 @@ select rm.room_id, rm.pretty_name as pretty_name, rm.description as description, - rm.moderated_p, rm.active_p, rm.archive_p, acs_permission__permission_p(room_id, :user_id, 'chat_room_admin') as admin_p, @@ -30,7 +29,6 @@ select rm.room_id, rm.pretty_name as pretty_name, rm.description as description, - rm.moderated_p, rm.active_p, rm.archive_p, acs_permission__permission_p(room_id, :user_id, 'chat_room_admin') as admin_p,