--- loncom/interface/lonannounce.pm 2005/11/17 21:33:40 1.36 +++ loncom/interface/lonannounce.pm 2006/01/13 15:28:36 1.44 @@ -1,7 +1,7 @@ # The LearningOnline Network # Announce # -# $Id: lonannounce.pm,v 1.36 2005/11/17 21:33:40 www Exp $ +# $Id: lonannounce.pm,v 1.44 2006/01/13 15:28:36 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonhtmlcommon(); use Apache::lonlocal; +use Apache::lonnavmaps(); use Apache::lonrss(); use Apache::lonnet; use HTML::Entities(); @@ -53,7 +54,7 @@ sub editfield { my %lt=&Apache::lonlocal::texthash('post' => 'Post Announcement', 'start' => 'Starting date', 'end' => 'Ending date', - 'incrss' => 'Include in course newsfeed'); + 'incrss' => 'Include in course RSS newsfeed'); $r->print(<$lt{'end'}:$enddateform
- +
ENDFORM } @@ -74,12 +75,15 @@ 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'}) { + my $can_see_hidden = $env{'request.role.adv'}; + my $navmap = Apache::lonnavmaps::navmap->new(); my %resourcedata= &Apache::lonnet::dump('resourcedata',$coursedom,$coursenum); foreach my $thiskey (sort keys %resourcedata) { @@ -101,8 +105,17 @@ sub readcalendar { $middle=~s/\.$//; my $realm=&mt('All Resources'); if ($middle=~/^(.+)\_\_\_\(all\)$/) { - $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1); + my $map_url=$1; + if (!$can_see_hidden) { + my $res = $navmap->getResourceByUrl($map_url); + if ($res && $res->randomout()) { next; } + } + $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($map_url); } elsif ($middle) { + if (!$can_see_hidden) { + my $res = $navmap->getBySymb($middle); + if ($res && $res->randomout()) { next; } + } $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle); } my $datetype=''; @@ -142,11 +155,11 @@ sub emptycell { sub normalcell { my ($day,$month,$year,$text)=@_; my $output=''; - foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) { - if ($_) { + my @items=&order($text); + foreach my $item (@items) { + if ($item) { my $internalflag=0; - my ($courseid,$start,$end,@msg)=split(/\@/,$_); - my $msg=join('@',@msg); + my ($courseid,$start,$end,$msg)=split(/\@/,$item,4); if ($msg=~/INTERNAL\:/) { $msg=~s/INTERNAL\://gs; $internalflag=1; @@ -184,10 +197,10 @@ sub normalcell { sub plaincell { my ($text)=@_; my $output=''; - foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) { - if ($_) { - my ($courseid,$start,$end,@msg)=split(/\@/,$_); - my $msg=join('@',@msg); + my @items=&order($text); + foreach my $item (@items) { + if ($item) { + 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) { @@ -208,10 +221,10 @@ sub plaincell { sub listcell { my ($text)=@_; my $output=''; - foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) { - if ($_) { - my ($courseid,$start,$end,@msg)=split(/\@/,$_); - my $msg=join('@',@msg); + my @items=&order($text); + foreach my $item (@items) { + if ($item) { + my ($courseid,$start,$end,$msg)=split(/\@/,$item,4); $msg=~s/INTERNAL\://gs; my $fullmsg=&Apache::lonlocal::locallocaltime($start); if ($start!=$end) { @@ -226,6 +239,19 @@ sub listcell { return $output; } +sub order { + my ($text)=@_; + my @items = split(/___&&&___/,$text); + sort { + my (undef,$astart,$aend)=split(/\@/,$a); + my (undef,$bstart,$bend)=split(/\@/,$b); + if ($astart != $bstart) { + return $astart <=> $bstart; + } + return $aend <=> $bend; + } @items; +} + sub nextday { my %th=@_; $th{'day'}++; @@ -242,11 +268,11 @@ sub showday { $tk-=$oneday; $nextday+=$oneday; } - foreach (keys %allcal) { - my ($course,$startdate,$enddate)=($_=~/^(\w+)\@(\d+)\_(\d+)$/); - if (($startdate<$nextday) && ($enddate>$tk)) { + foreach my $item (keys(%allcal)) { + my ($course,$startdate,$enddate)=($item=~/^(\w+)\@(\d+)\_(\d+)$/); + if (($startdate<$nextday) && ($enddate>=$tk)) { $outp.='___&&&___'.$course.'@'.$startdate.'@'.$enddate.'@'. - $allcal{$_}; + $allcal{$item}; } } unless ($mode) { @@ -382,8 +408,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'})); @@ -399,11 +425,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'); } } @@ -440,8 +466,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); } } @@ -456,8 +482,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