Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v diff -u -r1.17 -r1.18 --- openacs-4/packages/xowiki/tcl/chat-procs.tcl 29 Jul 2013 08:56:44 -0000 1.17 +++ openacs-4/packages/xowiki/tcl/chat-procs.tcl 27 Oct 2014 16:42:04 -0000 1.18 @@ -1,9 +1,9 @@ ::xo::library doc { - XoWiki - chat procs + XoWiki - chat procs - @creation-date 2006-02-02 - @author Gustaf Neumann - @cvs-id $Id$ + @creation-date 2006-02-02 + @author Gustaf Neumann + @cvs-id $Id$ } namespace eval ::xowiki { ::xo::ChatClass create Chat -superclass ::xo::Chat @@ -25,8 +25,8 @@ # set creator "Nobody" # } # append result "$timeshort\ - # [my encode $creator]\ - # [my encode $msg]\n" + # [my encode $creator]\ + # [my encode $msg]\n" # } # return $result # } @@ -79,19 +79,19 @@ # Check, whether we have the tcllibthread and a sufficiently new # aolserver/naviserver supporting bgdelivery transfers. # - if {[info command ::thread::mutex] ne "" && + if {[info commands ::thread::mutex] ne "" && ![catch {ns_conn contentsentlength}]} { - # + # # scripted streaming should work everywhere - # + # set mode scripted-streaming if {![regexp msie|opera [string tolower [ns_set get [ns_conn headers] User-Agent]]]} { - # Explorer doesn't expose partial response until request state != 4, while Opera fires - # onreadystateevent only once. For this reason, for every broser except them, we could - # use the nice mode without the spinning load indicator. - # - set mode streaming - } + # Explorer doesn't expose partial response until request state != 4, while Opera fires + # onreadystateevent only once. For this reason, for every broser except them, we could + # use the nice mode without the spinning load indicator. + # + set mode streaming + } } my log "--chat mode $mode" } @@ -116,7 +116,7 @@ set subscribe_url ${path}ajax/chat?m=subscribe&$context } default { - error "mode $mode unknown, valid are: polling, streaming and scripted-streaming" + error "mode $mode unknown, valid are: polling, streaming and scripted-streaming" } } set send_url ${path}ajax/chat?m=add_msg&$context&msg= @@ -156,10 +156,10 @@ streaming { - ::xowiki::Chat create c1 -destroy_on_cleanup -chat_id $chat_id -session_id $session_id -mode $mode - set r [ns_urldecode [c1 get_all]] - regsub -all {<[/]?div[^>]*>} $r "" r - return "\ + ::xowiki::Chat create c1 -destroy_on_cleanup -chat_id $chat_id -session_id $session_id -mode $mode + set r [ns_urldecode [c1 get_all]] + regsub -all {<[/]?div[^>]*>} $r "" r + return "\