--- loncom/interface/lonchatfetch.pm 2009/02/25 16:39:54 1.33 +++ loncom/interface/lonchatfetch.pm 2009/10/23 10:21:00 1.36 @@ -1,7 +1,7 @@ # The LearningOnline Network # Chat Fetching # -# $Id: lonchatfetch.pm,v 1.33 2009/02/25 16:39:54 hauer Exp $ +# $Id: lonchatfetch.pm,v 1.36 2009/10/23 10:21:00 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -128,10 +128,16 @@ sub handler { $contrib=&unescape($contrib); &Apache::lonfeedback::newline_to_br(\$contrib); ($contrib,my $errors)=&Apache::lontexconvert::msgtexconverted($contrib); - if ($errors) { $contrib.=&mt('[Message not fully displayed due to incorrect embedded TeX]'); } + if ($errors) { + $contrib.=' ' + .&mt('(Message not fully displayed due to incorrect embedded TeX.)') + .''; + } if ($errors && $snum eq $env{'user.name'} && $sdom eq $env{'user.domain'} ) { - $contrib.='
'.&mt('[TeX error message: [_1]',$errors); + $contrib.='
' + .&mt('TeX error message: [_1]',$errors) + .''; } $contrib=~s/\n/ /g; $contrib=~s/\'/\&\#39\;/g; @@ -163,9 +169,9 @@ sub handler { $color=substr($color,0,6); my $timestamp=localtime($msgtime); my ($mhour,$mmin,$msec)=($timestamp=~/(\d\d)\:(\d\d)\:(\d\d)/); - $newstuff.=''. + $newstuff.=''. $sender.' ('.$mhour.':'.$mmin.':'.$msec.'): '. - $contrib."
"; + $contrib."
"; $bottomid='LC_'.$id; } else { $entry=~/^(\w+)/; @@ -178,10 +184,16 @@ sub handler { $refresh_cmd .= "&group=$group"; } my $headarg; - my ($blocked,$blocktext) = &blockstatus(); + my ($blocked,$blocktext) = blockstatus(); if ($blocked) { $newstuff = $blocktext; $headarg = {'only_body' => 1,}; + + $r->print(< + parent.location.href="/adm/blockingstatus/?activity=chat" + +ENDSCRIPT } else { $headarg = {'redirect' => [5,$refresh_cmd,1], 'only_body' => 1,}; @@ -223,7 +235,7 @@ sub blockstatus { if ($startblock && $endblock) { $blocked = 1; my $endblocktime = &Apache::lonlocal::locallocaltime($endblock); - $output .= &mt('Chat Room will be unavailable to you until [_1] because communication is blocked in one or more of your courses:

',$endblocktime); + $output .= &mt('Chat Room will be unavailable to you until [_1] because communication is blocked in one or more of your courses:',$endblocktime).'

'; foreach my $course (keys(%setters)) { my %courseinfo=&Apache::lonnet::coursedescription($course); for (my $i=0; $i<@{$setters{$course}{staff}}; $i++) {