--- loncom/interface/lonannounce.pm 2002/08/09 20:15:16 1.4
+++ loncom/interface/lonannounce.pm 2002/08/21 17:18:08 1.6
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.4 2002/08/09 20:15:16 www Exp $
+# $Id: lonannounce.pm,v 1.6 2002/08/21 17:18:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -55,9 +55,16 @@ sub normalcell {
my $output='';
foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) {
if ($_) {
- my ($courseid,$msg)=split(/\@/,$_);
+ my ($courseid,$start,$end,@msg)=split(/\@/,$_);
+ my $msg=join('@',@msg);
my $fullmsg=$ENV{'course.'.$courseid.'.description'}.': '.$msg;
- $output.=''.
+ if ($courseid eq $ENV{'request.course.id'}) {
+ if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
+ $output.='';
+ }
+ }
+ $output.=''.
substr($msg,0,20).'...
';
}
}
@@ -79,7 +86,8 @@ sub showday {
foreach (keys %allcal) {
my ($course,$startdate,$enddate)=($_=~/^(\w+)\@(\d+)\_(\d+)$/);
if (($startdate<$nextday) && ($enddate>$tk)) {
- $outp.='___&&&___'.$course.'@'.$allcal{$_};
+ $outp.='___&&&___'.$course.'@'.$startdate.'@'.$enddate.'@'.
+ $allcal{$_};
}
}
return ($nextday,$nextmonth,&normalcell($th{'day'},$outp));
@@ -98,11 +106,6 @@ sub handler {
# ---------------------------------------------------------- Get month and year
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['month','year']);
-# ----------------------------------------------------- Summarize all calendars
- my %allcal=();
- foreach (&Apache::loncommon::findallcourses()) {
- %allcal=(%allcal,&readcalendar($_));
- }
# --------------------------------------------------- Decide what month to show
my $year=$todayhash{'year'};
if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; }
@@ -172,10 +175,8 @@ sub handler {
}
-