--- loncom/interface/lonchatfetch.pm 2010/11/18 23:23:01 1.34.8.1 +++ loncom/interface/lonchatfetch.pm 2013/07/22 18:06:51 1.39 @@ -1,7 +1,7 @@ # The LearningOnline Network # Chat Fetching # -# $Id: lonchatfetch.pm,v 1.34.8.1 2010/11/18 23:23:01 raeburn Exp $ +# $Id: lonchatfetch.pm,v 1.39 2013/07/22 18:06:51 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -69,13 +69,6 @@ sub handler { return HTTP_NOT_ACCEPTABLE; } - my $loaderror=&Apache::lonnet::overloaderror($r); - if ($loaderror) { return $loaderror; } - $loaderror= - &Apache::lonnet::overloaderror($r, - $env{'course.'.$env{'request.course.id'}.'.home'}); - if ($loaderror) { return $loaderror; } - &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; @@ -128,10 +121,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 +162,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 +177,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,}; @@ -232,7 +237,7 @@ sub blockstatus { my ($openblock,$closeblock) = @{$setters{$course}{times}[$i]}; $openblock = &Apache::lonlocal::locallocaltime($openblock); $closeblock= &Apache::lonlocal::locallocaltime($closeblock); - $output .= &mt('Block for [_1] starts: [_2], ends [_3], set by: [_4]
',$courseinfo{'description'},$openblock,$closeblock,$fullname); + $output .= &mt('Block for [_1] starts: [_2], ends [_3], set by: [_4]',$courseinfo{'description'},$openblock,$closeblock,$fullname).'
'; } } }