--- loncom/interface/lonannounce.pm 2006/04/22 16:35:31 1.50
+++ loncom/interface/lonannounce.pm 2006/05/12 15:53:10 1.53
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.50 2006/04/22 16:35:31 albertel Exp $
+# $Id: lonannounce.pm,v 1.53 2006/05/12 15:53:10 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -81,74 +81,76 @@ sub readcalendar {
}
}
- 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) {
- if ($resourcedata{$thiskey.'.type'}=~/^date/) {
- my ($course,$middle,$part,$name)=
- ($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/^\[(.*)\]\.//;
+ 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) {
+ if ($resourcedata{$thiskey.'.type'}=~/^date/) {
+ my ($course,$middle,$part,$name)=
+ ($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 eq '___(all)') {
+ if (!$can_see_hidden && !$navmap) {
+ next;
+ }
+ } elsif ($middle=~/^(.+)\_\_\_\(all\)$/) {
+ 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;
}
- $middle=~s/\.$//;
- my $realm=&mt('All Resources');
- if ($middle=~/^(.+)\_\_\_\(all\)$/) {
- 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);
+ if (!$can_see_hidden) {
+ my $res = $navmap->getBySymb($middle);
+ if ($res && $res->randomout()) { next; }
}
- my $datetype='';
- if ($name eq 'duedate') {
- $datetype=&mt('Due');
+ $realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle);
+ }
+ my $datetype='';
+ if ($name eq 'duedate') {
+ $datetype=&mt('Due');
# see if accidentally answerdate is before duedate
- my $answerkey=$thiskey;
- $answerkey=~s/duedate$/answerdate/;
- if ($resourcedata{$thiskey}>$resourcedata{$answerkey}) {
- $datetype='Due and Answer Available';
- }
+ my $answerkey=$thiskey;
+ $answerkey=~s/duedate$/answerdate/;
+ if ($resourcedata{$thiskey}>$resourcedata{$answerkey}) {
+ $datetype=&mt('Due and Answer Available');
}
- if ($name eq 'opendate') { $datetype=&mt('Opening'); }
- if ($name eq 'answerdate') {
+ }
+ if ($name eq 'opendate') { $datetype=&mt('Opening'); }
+ if ($name eq 'answerdate') {
# see if accidentally answerdate is before duedate
- my $duekey=$thiskey;
- $duekey=~s/answerdate$/duedate/;
- if ($resourcedata{$duekey}>$resourcedata{$thiskey}) {
+ my $duekey=$thiskey;
+ $duekey=~s/answerdate$/duedate/;
+ if ($resourcedata{$duekey}>$resourcedata{$thiskey}) {
# forget it
- next;
- }
- $datetype=&mt('Answer Available');
- }
- $returnhash{$courseid.'@'.$resourcedata{$thiskey}.'_'.
+ next;
+ }
+ $datetype=&mt('Answer Available');
+ }
+ $returnhash{$courseid.'@'.$resourcedata{$thiskey}.'_'.
$resourcedata{$thiskey}}=
'INTERNAL:'.$datetype.': '.$realm.' ('.$section.')';
- }
}
}
return %returnhash;
@@ -160,7 +162,7 @@ sub emptycell {
sub normalcell {
my ($day,$month,$year,$text)=@_;
- my $output='';
+ my $output;
my @items=&order($text);
foreach my $item (@items) {
if ($item) {
@@ -190,8 +192,9 @@ sub normalcell {
$fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
$fullmsg=~s/&/\\&/g;
my $short_msg = substr($msg,0,20).((length($msg) > 20)?'...':'');
+ if (defined($output)) { $output.='
'; }
$output.=''.
- $short_msg.'
';
+ $short_msg.'';
}
}
return ' 80)?'...':'');
+ if (defined($output)) { $output.='
'; }
$output.=''.
- substr($msg,0,80).'...
';
+ $short_msg.'';
}
}
return $output;
@@ -323,9 +328,51 @@ function dialin(day,month,year) {
ENDDIA
}
+# ----------------------------------------------------- Summarize all calendars
+sub get_all_calendars {
+ my %allcal=();
+ foreach my $course (sort(&Apache::loncommon::findallcourses())) {
+ %allcal=(%allcal,&readcalendar($course));
+ }
+ return %allcal;
+}
+
+sub output_ics_file {
+ my ($r)=@_;
+# RFC 2445 wants CRLF
+ my $crlf="\015\012";
+# Header
+ $r->print("BEGIN:VCALENDAR$crlf");
+ $r->print("VERSION:2.0$crlf");
+ $r->print("PRODID:-//LONCAPA//LONCAPA Calendar Output//EN$crlf");
+ my %allcal=&get_all_calendars();
+ foreach my $event (keys(%allcal)) {
+ my ($courseid,$startdate,$enddate)=($event=~/^(\w+)\@(\d+)\_(\d+)$/);
+ my $uid=$event;
+ $uid=~s/[\W\_]/-/gs;
+ $uid.='@loncapa';
+ my $summary=$allcal{$event};
+ $summary=~s/^INTERNAL\://;
+ $summary=~s/\s+/ /gs;
+ $summary=$env{'course.'.$courseid.'.description'}.': '.$summary;
+ $r->print("BEGIN:VEVENT$crlf");
+ $r->print("DTSTART:".&Apache::loncommon::utc_string($startdate).$crlf);
+ $r->print("DTEND:".&Apache::loncommon::utc_string($enddate).$crlf);
+ $r->print("SUMMARY:$summary$crlf");
+ $r->print("UID:$uid$crlf");
+ $r->print("END:VEVENT$crlf");
+ }
+# Footer
+ $r->print("END:VCALENDAR$crlf");
+}
sub handler {
my $r = shift;
+ if ($r->uri=~/\.(ics|ical)$/) {
+ &Apache::loncommon::content_type($r,'text/calendar');
+ &output_ics_file($r);
+ return OK;
+ }
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK if $r->header_only;
@@ -476,11 +523,7 @@ SERVERANNOUNCE
&editfield($r,$today,$tomorrow,'');
}
# ----------------------------------------------------- Summarize all calendars
- my %allcal=();
- foreach my $course (sort(&Apache::loncommon::findallcourses())) {
- %allcal=(%allcal,&readcalendar($course));
- }
-
+ my %allcal=&get_all_calendars();
# ------------------------------- Initialize table and forward backward buttons
my ($pm,$py,$fm,$fy)=($month-1,$year,$month+1,$year);
if ($pm<1) { ($pm,$py)=(12,$year-1); }
@@ -560,6 +603,7 @@ SERVERANNOUNCE
'&year='.$todayhash{'year'}.
($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').''.
($pickdatemode?'':'').&Apache::loncommon::end_page());
+ $r->print(''.&mt('Download your Calendar as iCalendar File').'');
return OK;
}
|