--- loncom/interface/lonannounce.pm 2006/01/12 22:58:47 1.40
+++ loncom/interface/lonannounce.pm 2006/01/12 23:03:41 1.42
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.40 2006/01/12 22:58:47 albertel Exp $
+# $Id: lonannounce.pm,v 1.42 2006/01/12 23:03:41 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -74,9 +74,9 @@ sub readcalendar {
my $coursedom=$env{'course.'.$courseid.'.domain'};
my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum);
my %returnhash=();
- foreach (keys %thiscal) {
- unless (($_=~/^error\:/) || ($thiscal{$_}=~/^error\:/)) {
- $returnhash{$courseid.'@'.$_}=$thiscal{$_};
+ foreach my $item (keys(%thiscal)) {
+ unless (($item=~/^error\:/) || ($thiscal{$item}=~/^error\:/)) {
+ $returnhash{$courseid.'@'.$item}=$thiscal{$item};
}
}
if ($courseid eq $env{'request.course.id'}) {
@@ -146,8 +146,7 @@ sub normalcell {
foreach my $item (@items) {
if ($item) {
my $internalflag=0;
- my ($courseid,$start,$end,@msg)=split(/\@/,$item);
- my $msg=join('@',@msg);
+ my ($courseid,$start,$end,$msg)=split(/\@/,$item,4);
if ($msg=~/INTERNAL\:/) {
$msg=~s/INTERNAL\://gs;
$internalflag=1;
@@ -188,8 +187,7 @@ sub plaincell {
my @items=&order($text);
foreach my $item (@items) {
if ($item) {
- my ($courseid,$start,$end,@msg)=split(/\@/,$item);
- my $msg=join('@',@msg);
+ my ($courseid,$start,$end,$msg)=split(/\@/,$item,4);
my $fullmsg=&mt('Calendar Announcement for ').$env{'course.'.$courseid.'.description'}.
'\n'.&Apache::lonlocal::locallocaltime($start);
if ($start!=$end) {
@@ -213,8 +211,7 @@ sub listcell {
my @items=&order($text);
foreach my $item (@items) {
if ($item) {
- my ($courseid,$start,$end,@msg)=split(/\@/,$item);
- my $msg=join('@',@msg);
+ my ($courseid,$start,$end,$msg)=split(/\@/,$item,4);
$msg=~s/INTERNAL\://gs;
my $fullmsg=&Apache::lonlocal::locallocaltime($start);
if ($start!=$end) {
@@ -398,8 +395,8 @@ ENDDOCUMENT
# ------------------------------------------------------------ Process commands
if ($serverpost) {
if ($env{'form.serveraction'}) {
- foreach (keys %env) {
- if ($_=~/^form\.postto\_(\w+)/) {
+ foreach my $key (keys(%env)) {
+ if ($key=~/^form\.postto\_(\w+)/) {
$r->print(
'
Posting '.$1.': '.&Apache::lonnet::postannounce
($1,$env{'form.serverannnounce'}));
@@ -415,11 +412,11 @@ Post announcements to the system login a
Check machines:
SERVERANNOUNCE
# list servers
- foreach (sort keys %Apache::lonnet::hostname) {
- if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$_})) {
- $r->print ('
'.
- $_.' '.$Apache::lonnet::hostname{$_}.' '.
- ' '.
+ $host.' '.$Apache::lonnet::hostname{$host}.' '.
+ 'current');
}
}
@@ -456,8 +453,8 @@ SERVERANNOUNCE
# ---------------------------------------------------------------- Remove items
if ($env{'form.action'} eq 'del') {
my @delwhich=();
- foreach (keys %env) {
- if ($_=~/^form\.remove\_(.+)$/) {
+ foreach my $key (keys(%env)) {
+ if ($key=~/^form\.remove\_(.+)$/) {
push(@delwhich,$1);
}
}
@@ -472,8 +469,8 @@ SERVERANNOUNCE
}
# ----------------------------------------------------- Summarize all calendars
my %allcal=();
- foreach (&Apache::loncommon::findallcourses()) {
- %allcal=(%allcal,&readcalendar($_));
+ foreach my $course (&Apache::loncommon::findallcourses()) {
+ %allcal=(%allcal,&readcalendar($course));
}
# ------------------------------- Initialize table and forward backward buttons