--- loncom/interface/lonannounce.pm 2004/08/17 15:38:58 1.30 +++ loncom/interface/lonannounce.pm 2006/03/21 20:45:35 1.47 @@ -1,7 +1,7 @@ # The LearningOnline Network # Announce # -# $Id: lonannounce.pm,v 1.30 2004/08/17 15:38:58 www Exp $ +# $Id: lonannounce.pm,v 1.47 2006/03/21 20:45:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,9 @@ 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(); my %todayhash; @@ -48,29 +51,39 @@ sub editfield { 'enddate', $end); my $help=&Apache::loncommon::help_open_menu('','Calendar Add Announcement','Calendar_Add_Announcement','',274,'Communication Tools'); + my %lt=&Apache::lonlocal::texthash('post' => 'Post Announcement', + 'start' => 'Starting date', + 'end' => 'Ending date', + 'incrss' => 'Include in course RSS newsfeed'); + $r->print(< - - -
Starting date:$startdateform
Ending date:$enddateform
+ + +
$lt{'start'}:$startdateform
$lt{'end'}:$enddateform
-
+
+ +
ENDFORM } sub readcalendar { my $courseid=shift; - my $coursenum=$ENV{'course.'.$courseid.'.num'}; - my $coursedom=$ENV{'course.'.$courseid.'.domain'}; + my $coursenum=$env{'course.'.$courseid.'.num'}; + 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'}) { + + 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) { @@ -79,14 +92,36 @@ sub readcalendar { ($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/); my $section=&mt('All Students'); if ($middle=~/^\[(.*)\]\./) { + my $sec=$1; + # if we have a section don't show ones that aren't ours + if ($env{'request.course.sec'} && + $env{'request.course.sec'} ne $sec) { next; } + # if a student without a section don't show any section ones + if (!$env{'request.role.adv'} && + !$env{'request.course.sec'}) { next; } $section=&mt('Group/Section').': '.$1; $middle=~s/^\[(.*)\]\.//; } $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 && !$navmap) { + next; + } + 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 && !$navmap) { + next; + } + if (!$can_see_hidden) { + my $res = $navmap->getBySymb($middle); + if ($res && $res->randomout()) { next; } + } $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle); } my $datetype=''; @@ -126,31 +161,32 @@ 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; } - my $fullmsg=$ENV{'course.'.$courseid.'.description'}. - ', '.&Apache::lonlocal::locallocaltime($start); + my $fullmsg=&mt('Calendar Announcement for ').$env{'course.'.$courseid.'.description'}. + '\n'.&Apache::lonlocal::locallocaltime($start); if ($start!=$end) { $fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end); } - $fullmsg.=': '.$msg; - if ($courseid eq $ENV{'request.course.id'}) { - if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) + $fullmsg.=':\n'.$msg; + if ($courseid eq $env{'request.course.id'}) { + if ((&Apache::lonnet::allowed('srm',$env{'request.course.id'})) && (!$showedcheck{$start.'_'.$end}) - && ($ENV{'form.pickdate'} ne 'yes') + && ($env{'form.pickdate'} ne 'yes') && (!$internalflag)) { $output.=''; $showedcheck{$start.'_'.$end}=1; } } + $fullmsg=~s/[\n\r]/\\n/gs; $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\''); $fullmsg=~s/&/\\&/g; $output.=''. @@ -167,21 +203,22 @@ sub normalcell { sub plaincell { my ($text)=@_; my $output=''; - foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) { - if ($_) { - my ($courseid,$start,$end,@msg)=split(/\@/,$_); - my $msg=join('@',@msg); - my $fullmsg=$ENV{'course.'.$courseid.'.description'}. - ', '.&Apache::lonlocal::locallocaltime($start); + 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) { $fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end); } $msg=~s/INTERNAL\://gs; - $fullmsg.=': '.$msg; + $fullmsg.=':\n'.$msg; + $fullmsg=~s/[\n\r]/\\n/gs; $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\''); $fullmsg=~s/&/\\&/g; $output.=''. - substr($msg,0,40).'...
'; + substr($msg,0,80).'...
'; } } return $output; @@ -190,10 +227,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) { @@ -208,6 +245,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'}++; @@ -224,11 +274,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) { @@ -247,7 +297,7 @@ sub showday { sub tfont { my $text=shift; - if ($ENV{'form.pickdate'} eq 'yes') { + if ($env{'form.pickdate'} eq 'yes') { return ''.$text.''; } else { return $text; @@ -256,7 +306,7 @@ sub tfont { sub picklink { my ($text,$day,$month,$year)=@_; - if ($ENV{'form.pickdate'} eq 'yes') { + if ($env{'form.pickdate'} eq 'yes') { return ''. $text.''; } else { @@ -268,14 +318,14 @@ sub dialscript { return (< function dialin(day,month,year) { - opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_year.value=year; - var slct=opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_month; + opener.document.$env{'form.formname'}.$env{'form.element'}\_year.value=year; + var slct=opener.document.$env{'form.formname'}.$env{'form.element'}\_month; var i; for (i=0;i @@ -299,14 +349,14 @@ sub handler { ['month','year','pickdate','formname','element']); # --------------------------------------------------- Decide what month to show my $year=$todayhash{'year'}; - if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; } + if ($env{'form.year'}) { $year=$env{'form.year'}; } my $month=$todayhash{'month'}; - if ($ENV{'form.month'}) { $month=$ENV{'form.month'}; } + if ($env{'form.month'}) { $month=$env{'form.month'}; } # ---------------------------------------------- See if we are in pickdate mode - my $pickdatemode=($ENV{'form.pickdate'} eq 'yes'); - my $pickinfo='&pickdate=yes&formname='.$ENV{'form.formname'}. - '&element='.$ENV{'form.element'}; + my $pickdatemode=($env{'form.pickdate'} eq 'yes'); + my $pickinfo='&pickdate=yes&formname='.$env{'form.formname'}. + '&element='.$env{'form.element'}; # --------------------------------------------- Find out first day of the month my %firstday=&Apache::loncommon::timehash( @@ -316,12 +366,9 @@ sub handler { 'dlsav' => -1 )); my $weekday=$firstday{'weekday'}; # ------------------------------------------------------------ Print the screen - - $r->print(< - -The LearningOnline Network with CAPA - - ENDDOCUMENT + if ($pickdatemode) { # no big header in pickdate mode - $r->print(&Apache::loncommon::bodytag("Pick a Date",'','',1). + $r->print(&Apache::loncommon::start_page("Pick a Date",$js, + {'only_body' => 1,}). &dialscript(). ''); } else { - $r->print(&Apache::loncommon::bodytag("Announcements and Calendar")); + $r->print(&Apache::loncommon::start_page("Announcements and Calendar", + $js)); } # does this user have privileges to post, etc? my $allowed=0; - if ($ENV{'request.course.id'}) { - $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}); + if ($env{'request.course.id'}) { + $allowed=&Apache::lonnet::allowed('srm',$env{'request.course.id'}); } # does this user have privileges to post to servers? my $serverpost=0; - if ($ENV{'request.role.domain'}) { + if ($env{'request.role.domain'}) { $serverpost=&Apache::lonnet::allowed('psa', - $ENV{'request.role.domain'}); + $env{'request.role.domain'}); } else { $serverpost=&Apache::lonnet::allowed('psa','/'); } @@ -363,12 +412,12 @@ ENDDOCUMENT } # ------------------------------------------------------------ Process commands if ($serverpost) { - if ($ENV{'form.serveraction'}) { - foreach (keys %ENV) { - if ($_=~/^form\.postto\_(\w+)/) { + if ($env{'form.serveraction'}) { + foreach my $key (keys(%env)) { + if ($key=~/^form\.postto\_(\w+)/) { $r->print( '
Posting '.$1.': '.&Apache::lonnet::postannounce - ($1,$ENV{'form.serverannnounce'})); + ($1,$env{'form.serverannnounce'})); } } } @@ -381,11 +430,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'); } } @@ -393,10 +442,10 @@ SERVERANNOUNCE '
'); } if ($allowed) { - my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; - my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; + my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'}; + my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'}; # ----------------------------------------------------- Store new submitted one - if ($ENV{'form.action'} eq 'new') { + if ($env{'form.action'} eq 'new') { my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate'); my $enddate = @@ -410,13 +459,20 @@ SERVERANNOUNCE } &Apache::lonnet::put('calendar',{ $startdate.'_'.$enddate => - $ENV{'form.msg'} },$coursedom,$coursenum); + $env{'form.msg'} },$coursedom,$coursenum); + if ($env{'form.rsspost'}) { + &Apache::lonrss::addentry($coursenum,$coursedom,'Course_Announcements', + &mt('Event from [_1] to [_2]', + &Apache::lonlocal::locallocaltime($startdate), + &Apache::lonlocal::locallocaltime($enddate)), + $env{'form.msg'},'/adm/announcements','public'); + } } # ---------------------------------------------------------------- Remove items - if ($ENV{'form.action'} eq 'del') { + 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); } } @@ -431,8 +487,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 @@ -450,7 +506,8 @@ SERVERANNOUNCE if (($year<1970) || ($year>2037)) { $r->print('

No calendar available for this date.

'. 'Current Month'); + '&year='.$todayhash{'year'}.'">Current Month'. + &Apache::loncommon::end_page()); return OK; } $r->print( @@ -515,8 +572,7 @@ SERVERANNOUNCE '   '.&mt('Current Month').'

'. - ($pickdatemode?'':''). - ''); + ($pickdatemode?'':'').&Apache::loncommon::end_page()); return OK; }