[LON-CAPA-cvs] cvs: loncom /interface lonchatfetch.pm
raeburn
lon-capa-cvs@mail.lon-capa.org
Wed, 29 Nov 2006 19:45:55 -0000
raeburn Wed Nov 29 14:45:55 2006 EDT
Modified files:
/loncom/interface lonchatfetch.pm
Log:
Eliminate $_
Replace @ with : as separator between username and domain
Enable blocking of display of chat during communication blocks.
Index: loncom/interface/lonchatfetch.pm
diff -u loncom/interface/lonchatfetch.pm:1.31 loncom/interface/lonchatfetch.pm:1.32
--- loncom/interface/lonchatfetch.pm:1.31 Mon Jul 17 12:10:57 2006
+++ loncom/interface/lonchatfetch.pm Wed Nov 29 14:45:55 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Chat Fetching
#
-# $Id: lonchatfetch.pm,v 1.31 2006/07/17 16:10:57 raeburn Exp $
+# $Id: lonchatfetch.pm,v 1.32 2006/11/29 19:45:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,6 +34,7 @@
use Apache::loncommon;
use Apache::lonnet;
use Apache::longroup;
+use Apache::lonlocal;
use lib '/home/httpd/lib/perl/';
use LONCAPA;
@@ -89,8 +90,8 @@
$chome));
# Figure out what the last valid entry-id is
my ($lastid,$thentime,$idnum);
- foreach (@entries) {
- $_=~/^(\w+)/;
+ foreach my $entry (@entries) {
+ $entry =~/^(\w+)/;
if ($1 ne 'active_participant') {
$lastid=$1;
($thentime,$idnum)=split(/\_/,$lastid);
@@ -100,23 +101,24 @@
my $seeid = &get_seeid_status();
# -------------------------------------------------------- see which ones apply
my $include=0;
+ my $header;
my $newstuff='';
my $bottomid='';
unless ($env{'form.lastid'}) {
$include=1;
- $newstuff .=
+ $header =
&Apache::loncommon::start_page(undef,undef,
{'only_body' => 1,
'bgcolor' => '#FFFFFF',
'js_ready' => 1,});
}
my @participants=();
- foreach (@entries) {
- my ($id,$msg,$udom)=split(/\:/,&unescape($_));
+ foreach my $entry (@entries) {
+ my ($id,$msg,$udom)=split(/\:/,&unescape($entry));
if ($id eq 'active_participant') {
chomp($udom);
my $participant= &Apache::loncommon::nickname($msg,$udom);
- unless ($participant=~/\w/) { $participant=$msg.'@'.$udom; }
+ unless ($participant=~/\w/) { $participant=$msg.':'.$udom; }
$participants[$#participants+1]=$participant;
} elsif ($include) {
chomp($msg);
@@ -126,10 +128,10 @@
$contrib=&unescape($contrib);
&Apache::lonfeedback::newline_to_br(\$contrib);
($contrib,my $errors)=&Apache::lontexconvert::msgtexconverted($contrib);
- if ($errors) { $contrib.="[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.="<br />[TeX error message: $errors]";
+ $contrib.='<br />'.&mt('[TeX error message: [_1]',$errors);
}
$contrib=~s/\n/ /g;
$contrib=~s/\'/\&\#39\;/g;
@@ -140,14 +142,14 @@
if (($nick) && ($nick ne $sender)) {
$sender.=' '.$nick;
}
- unless ($sender) { $sender=$snum.'@'.$sdom; }
+ unless ($sender) { $sender=$snum.':'.$sdom; }
if ($anon) { $sender.=' [Anon]' };
} elsif (!$anon) {
$sender=&Apache::loncommon::nickname($snum,$sdom);
- unless ($sender) { $sender=$snum.'@'.$sdom; }
+ unless ($sender) { $sender=$snum.':'.$sdom; }
} else {
$sender=&Apache::loncommon::screenname($snum,$sdom);
- unless ($sender) { $sender="Anonymous"; }
+ unless ($sender) { $sender=&mt("Anonymous"); }
}
$sender=~s/\'/\&\#39\;/g;
my $color=$sender;
@@ -166,7 +168,7 @@
$contrib."</font><br />";
$bottomid='LC_'.$id;
} else {
- $_=~/^(\w+)/;
+ $entry=~/^(\w+)/;
if ($1 eq $env{'form.lastid'}) { $include=1; }
}
}
@@ -175,15 +177,21 @@
if (defined($group)) {
$refresh_cmd .= "&group=$group";
}
- my $start_page =
- &Apache::loncommon::start_page('Chat',undef,
- {'redirect' => [5,$refresh_cmd,1],
- 'only_body' => 1,});
+ my $headarg;
+ my ($blocked,$blocktext) = &blockstatus();
+ if ($blocked) {
+ $newstuff = $blocktext;
+ $headarg = {'only_body' => 1,};
+ } else {
+ $headarg = {'redirect' => [5,$refresh_cmd,1],
+ 'only_body' => 1,};
+ }
+ my $start_page = &Apache::loncommon::start_page('Chat',undef,$headarg);
my $end_page = &Apache::loncommon::end_page();
$r->print(<<ENDDOCUMENT);
$start_page
<script type="text/javascript">
-parent.chatout.document.writeln('$newstuff');
+parent.chatout.document.writeln('$header$newstuff');
parent.chatout.scroll(0,10000000);
</script>
$grouptitle
@@ -208,5 +216,28 @@
return $seeid;
}
+sub blockstatus {
+ my ($blocked,$output);
+ my %setters;
+ my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'chat');
+ if ($startblock && $endblock) {
+ $blocked = 1;
+ my $endblocktime = &Apache::lonlocal::locallocaltime($endblock);
+ $output .= &mt('Chat will be unavailable to you until [_1] because communication is blocked in one or more of your courses: <br/><br />',$endblocktime);
+ foreach my $course (keys(%setters)) {
+ my %courseinfo=&Apache::lonnet::coursedescription($course);
+ for (my $i=0; $i<@{$setters{$course}{staff}}; $i++) {
+ my ($uname,$udom) = @{$setters{$course}{staff}[$i]};
+ my $fullname = &Apache::loncommon::plainname($uname,$udom);
+ 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]<br />',$courseinfo{'description'},$openblock,$closeblock,$fullname);
+ }
+ }
+ }
+ return ($blocked,$output);
+}
+
1;
__END__