--- loncom/interface/lonannounce.pm 2003/05/21 16:26:46 1.9 +++ loncom/interface/lonannounce.pm 2003/09/02 21:15:59 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network # Announce # -# $Id: lonannounce.pm,v 1.9 2003/05/21 16:26:46 www Exp $ +# $Id: lonannounce.pm,v 1.18 2003/09/02 21:15:59 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,6 +32,30 @@ use strict; use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonhtmlcommon(); +use HTML::Entities(); + +my %todayhash; +my %showedcheck; + +sub editfield { + my ($r,$start,$end,$text)=@_; + # Deal with date forms + my $startdateform = &Apache::lonhtmlcommon::date_setter('anno', + 'startdate', + $start); + my $enddateform = &Apache::lonhtmlcommon::date_setter('anno', + 'enddate', + $end); + + $r->print(< + + +
Starting date:$startdateform
Ending date:$enddateform
+ +
+ENDFORM +} sub readcalendar { my $courseid=shift; @@ -52,24 +76,66 @@ sub emptycell { } sub normalcell { - my ($day,$text)=@_; + my ($day,$month,$year,$text)=@_; my $output=''; foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) { if ($_) { my ($courseid,$start,$end,@msg)=split(/\@/,$_); my $msg=join('@',@msg); - my $fullmsg=$ENV{'course.'.$courseid.'.description'}.': '.$msg; + my $fullmsg=$ENV{'course.'.$courseid.'.description'}. + ', '.localtime($start).' - '.localtime($end).': '.$msg; if ($courseid eq $ENV{'request.course.id'}) { - if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { + if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) + && (!$showedcheck{$start.'_'.$end})) { $output.=''; + $showedcheck{$start.'_'.$end}=1; } } + $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\''); + $fullmsg=~s/&/\\&/g; $output.=''. - substr($msg,0,20).'...
'; + substr($msg,0,20).'...
'; + } + } + return ''.$day.'
'.$output.''; +} + +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'}. + ', '.localtime($start).' - '.localtime($end).': '.$msg; + $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\''); + $fullmsg=~s/&/\\&/g; + $output.=''. + substr($msg,0,40).'...
'; + } + } + return $output; +} + +sub listcell { + my ($text)=@_; + my $output=''; + foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) { + if ($_) { + my ($courseid,$start,$end,@msg)=split(/\@/,$_); + my $msg=join('@',@msg); + my $fullmsg=localtime($start).' to '.localtime($end).':
'. + $msg.''; + $output.='
  • '.$fullmsg.'
    • '; } } - return ''.$day.'
    '.$output.''; + return $output; } sub nextday { @@ -79,7 +145,7 @@ sub nextday { } sub showday { - my ($tk,%allcal)=@_; + my ($tk,$mode,%allcal)=@_; my %th=&Apache::loncommon::timehash($tk); my ($nextday,$nextmonth)=&nextday(%th); my $outp=''; @@ -91,7 +157,18 @@ sub showday { $allcal{$_}; } } - return ($nextday,$nextmonth,&normalcell($th{'day'},$outp)); + unless ($mode) { + return ($nextday,$nextmonth,&normalcell( + $th{'day'},$th{'month'},$th{'year'},$outp)); + } elsif ($outp) { + if ($mode==1) { + return '
    '.&plaincell($outp); + } else { + return ''; + } + } else { + return ''; + } } sub handler { @@ -102,16 +179,22 @@ sub handler { # ---------------------------------------------------------- Get time right now my $today=time; - my %todayhash=&Apache::loncommon::timehash($today); - + %todayhash=&Apache::loncommon::timehash($today); +# ----------------------------------------------------------------- Check marks + %showedcheck=(); + undef %showedcheck; # ---------------------------------------------------------- Get month and year &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['month','year']); + ['month','year','pickdate']); # --------------------------------------------------- Decide what month to show my $year=$todayhash{'year'}; if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; } my $month=$todayhash{'month'}; if ($ENV{'form.month'}) { $month=$ENV{'form.month'}; } + +# ---------------------------------------------- See if we are in pickdate mode + my $pickdatemode=($ENV{'form.pickdate'} eq 'yes'); + # --------------------------------------------- Find out first day of the month my %firstday=&Apache::loncommon::timehash( @@ -140,13 +223,62 @@ sub handler { ENDDOCUMENT - $r->print(&Apache::loncommon::bodytag("Announcements and Calendar")); + if ($pickdatemode) { +# no big header in pickdate mode + $r->print(&Apache::loncommon::bodytag("Pick a Date",'','',1). + ''); + } else { + $r->print(&Apache::loncommon::bodytag("Announcements and Calendar")); + } # 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'}); } - +# does this user have privileges to post to servers? + my $serverpost=0; + if ($ENV{'request.role.domain'}) { + $serverpost=&Apache::lonnet::allowed('psa', + $ENV{'request.role.domain'}); + } else { + $serverpost=&Apache::lonnet::allowed('psa','/'); + } +# -------------------------------- BUT: do no fancy stuff when in pickdate mode + if ($pickdatemode) { + $serverpost=0; + $allowed=0; + } +# ------------------------------------------------------------ Process commands + if ($serverpost) { + if ($ENV{'form.serveraction'}) { + foreach (keys %ENV) { + if ($_=~/^form\.postto\_(\w+)/) { + $r->print( + '
    Posting '.$1.': '.&Apache::lonnet::postannounce + ($1,$ENV{'form.serverannnounce'})); + } + } + } + $r->print(< +

    Post Server Announcements

    +Post announcements to the system login and roles screen
    +(leave blank to delete announcement)
    +
    +Check machines:
    +SERVERANNOUNCE +# list servers + foreach (sort keys %Apache::lonnet::hostname) { + if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$_})) { + $r->print ('
    '. + $_.' '.$Apache::lonnet::hostname{$_}.' '. + 'current'); + } + } + $r->print( + '
    '); + } if ($allowed) { my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; @@ -182,24 +314,7 @@ ENDDOCUMENT $tomorrowhash{'day'}++; my $tomorrow=&Apache::loncommon::maketime(%tomorrowhash); - # Deal with date forms - my $startdateform = &Apache::lonhtmlcommon::date_setter('anno', - 'startdate', - $today); - my $enddateform = &Apache::lonhtmlcommon::date_setter('anno', - 'enddate', - $tomorrow); - # - - $r->print(< - - -
    Starting date:$startdateform
    Ending date:$enddateform
    - -
    -ENDFORM + &editfield($r,$today,$tomorrow,''); } # ----------------------------------------------------- Summarize all calendars my %allcal=(); @@ -211,11 +326,25 @@ ENDFORM my ($pm,$py,$fm,$fy)=($month-1,$year,$month+1,$year); if ($pm<1) { ($pm,$py)=(12,$year-1); } if ($fm>12){ ($fm,$fy)=(1,$year+1); } + $r->print('

    '.('','January','February','March','April','May', 'June','July','August','September','October', - 'November','December')[$month].' '.$year.'

    '. - 'Previous Month '. - 'Next Month

    '. + 'November','December')[$month].' '.$year.''); +# Reached the end of times, give up + if (($year<1970) || ($year>2037)) { + $r->print('

    No calendar available for this date.

    '. + 'Current Month'); + return OK; + } + $r->print( + 'Previous Month '. + 'Next Month'. + '   Current Month

    '. ''. ''); @@ -227,7 +356,7 @@ ENDFORM $r->print(''); for (my $i=0;$i<$weekday;$i++) { $r->print(&emptycell); } for (my $i=$weekday;$i<=6;$i++) { - ($tk,$nm,$outp)=&showday($tk,%allcal); + ($tk,$nm,$outp)=&showday($tk,0,%allcal); $r->print($outp); } $r->print(''); @@ -235,7 +364,7 @@ ENDFORM for (my $k=0;$k<=3;$k++) { $r->print(''); for (my $i=0;$i<=6;$i++) { - ($tk,$nm,$outp)=&showday($tk,%allcal); + ($tk,$nm,$outp)=&showday($tk,0,%allcal); if ($month!=$nm) { $outp=&emptycell; } $r->print($outp); } @@ -243,10 +372,20 @@ ENDFORM } # ------------------------------------------------------------------- End table $r->print('
    SunMonTueWedThuFriSat
    '); +# ----------------------------------------------------------------- Check marks + %showedcheck=(); + undef %showedcheck; +# --------------------------------------------------------------- Remove button if ($allowed) { $r->print(''); } $r->print('

    '. - 'Previous Month '. - 'Next Month

    '. + 'Previous Month '. + 'Next Month'. + '   Current Month

    '. + ($pickdatemode?'    ':''). ''); return OK; }