+ @messages.person_name@: + +
+ +#chat.No_information_available#
+#chat.Transcript_name# | +@transcript_name@ | +
#chat.Description# | +@description@ | +
$userlink:" \ + "
\n" + } + return $result + } + + Chat proc login {-chat_id -package_id} { + auth::require_login + if {![info exists package_id]} {set package_id [ad_conn package_id] } + if {![info exists chat_id]} {set chat_id $package_id } + + set context id=$chat_id&s=[ad_conn session_id].[clock seconds] + set jspath packages/chat/www/ajax/chat.js + if { ![file exists [acs_root_dir]/$jspath] } { + return -code error "File [acs_root_dir]/$jspath does not exist" + } + set file [open [acs_root_dir]/$jspath]; set js [read $file]; close $file + set path [site_node::get_url_from_object_id -object_id $package_id] + set login_url ${path}ajax/chat?m=login&$context + set send_url ${path}ajax/chat?m=add_msg&$context&msg= + set users_url ${path}ajax/chat?m=get_users&$context + return "\ + + + " + } +} + Index: openacs-4/packages/chat/tcl/chat-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-init.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/chat/tcl/chat-init.tcl 20 Apr 2001 20:51:08 -0000 1.1 +++ openacs-4/packages/chat/tcl/chat-init.tcl 24 Jun 2006 14:23:41 -0000 1.2 @@ -11,71 +11,5 @@ nsv_set chat server_started 0 +ad_schedule_proc -thread t -schedule_proc ns_schedule_daily [list 0 5] chat_flush_rooms - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: openacs-4/packages/chat/tcl/chat-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-procs-oracle.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/chat/tcl/chat-procs-oracle.xql 14 Mar 2006 12:16:09 -0000 1.1 +++ openacs-4/packages/chat/tcl/chat-procs-oracle.xql 24 Jun 2006 14:23:41 -0000 1.2 @@ -121,7 +121,9 @@ description => :description, moderated_p => :moderated_p, active_p => :active_p, - archive_p => :archive_p + archive_p => :archive_p, + auto_flush_p => :auto_flush_p, + auto_transcript_p => :auto_transcript_p ); end; @@ -218,14 +220,10 @@ chat_transcript.edit( transcript_id => :transcript_id, pretty_name => :pretty_name, - contents => :empty_clob(), + contents => empty_clob(), description => :description); end; - - - - \ No newline at end of file Index: openacs-4/packages/chat/tcl/chat-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-procs-postgresql.xql,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/chat/tcl/chat-procs-postgresql.xql 14 Mar 2006 12:16:09 -0000 1.1 +++ openacs-4/packages/chat/tcl/chat-procs-postgresql.xql 24 Jun 2006 14:23:41 -0000 1.2 @@ -10,6 +10,8 @@ :moderated_p, :active_p, :archive_p, + :auto_flush_p, + :auto_transcript_p, :context_id, now(), :creation_user, @@ -119,10 +121,12 @@ perform chat_room__edit ( :room_id, :pretty_name, - :description, + :description, :moderated_p, :active_p, - :archive_p + :archive_p, + :auto_flush_p, + :auto_transcript_p ); return 0; end; @@ -217,7 +221,5 @@ - - 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 -N -r1.5 -r1.6 --- openacs-4/packages/chat/tcl/chat-procs.tcl 14 Mar 2006 12:16:09 -0000 1.5 +++ openacs-4/packages/chat/tcl/chat-procs.tcl 24 Jun 2006 14:23:41 -0000 1.6 @@ -9,7 +9,7 @@ ad_proc -private chat_start_server {} { Start Java chat server. } { - if [nsv_get chat server_started] { + if {[nsv_get chat server_started]} { return } ns_log notice "chat_start_server: Starting chat server" @@ -62,7 +62,7 @@ while { 1 } { # Wait until there is new message in queue. ns_mutex lock [nsv_get chat new_message] - if [nsv_exists chat html_message] { + if {[nsv_exists chat html_message]} { # Get message from queue. puts $w [nsv_get chat html_message] flush $w @@ -98,15 +98,33 @@ regexp " " \ + "+#chat.Log_off# +#chat.Transcript# +#chat.Hml# +
+ +@chat_frame;noquote@ + Index: openacs-4/packages/chat/www/ajax-chat-script.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/ajax-chat-script.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/chat/www/ajax-chat-script.tcl 24 Jun 2006 14:23:41 -0000 1.2 @@ -0,0 +1,12 @@ +ad_page_contract { + a tiny chat client + + @author Gustaf Neumann (gustaf.neumann@wu-wien.ac.at) + @creation-date Jan 31, 2006 + @cvs-id $Id: ajax-chat-script.tcl,v 1.2 2006/06/24 14:23:41 gustafn Exp $ +} -query { + msg:optional +} + +set chat_frame [ ::chat::Chat login -chat_id $room_id] + Index: openacs-4/packages/chat/www/chat-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat-oracle.xql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/chat/www/chat-oracle.xql 24 Jun 2006 14:23:41 -0000 1.2 @@ -0,0 +1,19 @@ + + +#chat.There_are_no_rooms_available# +
#chat.There_are_no_rooms_available#
+@rooms.pretty_name@ | -- [ HTML | java ] - | -
- | - @desc@ - | -
+ Index: openacs-4/packages/chat/www/room-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-delete.adp,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/chat/www/room-delete.adp 14 Mar 2006 12:16:09 -0000 1.5 +++ openacs-4/packages/chat/www/room-delete.adp 24 Jun 2006 14:23:42 -0000 1.6 @@ -12,7 +12,7 @@
Index: openacs-4/packages/chat/www/room-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/room-edit-2.tcl,v diff -u -N --- openacs-4/packages/chat/www/room-edit-2.tcl 14 Mar 2006 12:16:09 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,33 +0,0 @@ -#/www/chat/room-edit-2.tcl -ad_page_contract { - Update room information. - - @author David Dao (ddao@arsdigita.com) - @creation-date November 15, 2000 - @cvs-id $Id: room-edit-2.tcl,v 1.4 2006/03/14 12:16:09 emmar Exp $ -} { - room_id:notnull,integer - pretty_name:notnull,trim - {description:trim ""} - {moderated_p "f"} - {archive_p "f"} - {active_p "f"} -} - -ad_require_permission $room_id chat_room_edit - -ns_log notice "receive: moderated_p:$moderated_p archive_p:$archive_p active_p:$active_p" - - -if {[catch {chat_room_edit $room_id $pretty_name $description $moderated_p $active_p $archive_p} errmsg]} { - - ad_return_complaint 1 "[_ chat.Could_not_update_room]: $errmsg" -} - - -ad_returnredirect "room?room_id=$room_id" - - - - - Index: openacs-4/packages/chat/www/room-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-edit.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/chat/www/room-edit.adp 24 Jun 2006 14:23:42 -0000 1.2 @@ -0,0 +1,4 @@ +@description@- -
#chat.Room_name# | +@pretty_name@ | +
#chat.Description# | +@description@ | +
#chat.Active# | +@active_p@ | +
#chat.Archive# | +@archive_p@ | +
#chat.AutoFlush# | +@auto_flush_p@ | +
#chat.AutoTranscript# | +@auto_transcript_p@ | +
#chat.message_count# | +@message_count@ | +
(#chat.Edit#) +
#chat.No_information_available#.
#chat.Users_allow# -
(#chat.Ban_user#) -
#chat.Transcripts# -
#chat.Extreme_Actions# -
-
+
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 -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/transcript-delete.tcl 14 Mar 2006 12:16:09 -0000 1.3
+++ openacs-4/packages/chat/www/transcript-delete.tcl 24 Jun 2006 14:23:42 -0000 1.4
@@ -14,7 +14,7 @@
transcript_id:onevalue
}
-ad_require_permission $transcript_id chat_transcript_delete
+permission::require_permission -object_id $transcript_id -privilege chat_transcript_delete
set context_bar [list "[_ chat.Delete_transcript]"]
ad_return_template
Index: openacs-4/packages/chat/www/transcript-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-edit-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/transcript-edit-2.tcl 14 Mar 2006 12:16:09 -0000 1.3
+++ openacs-4/packages/chat/www/transcript-edit-2.tcl 24 Jun 2006 14:23:42 -0000 1.4
@@ -13,9 +13,8 @@
{description:trim ""}
}
-ad_require_permission $transcript_id chat_transcript_edit
+permission::require_permission -object_id $transcript_id -privilege chat_transcript_edit
-
if { [catch {chat_transcript_edit $transcript_id $transcript_name $description $contents} errmsg] } {
ad_return_complaint 1 "[_ chat.Could_not_update_transcript]: $errmsg"
}
Index: openacs-4/packages/chat/www/transcript-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-edit.adp,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/chat/www/transcript-edit.adp 24 Jun 2006 14:23:42 -0000 1.2
@@ -0,0 +1,4 @@
+