--- loncom/interface/lonannounce.pm	2003/05/21 19:15:41	1.10
+++ loncom/interface/lonannounce.pm	2003/07/10 10:27:04	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.10 2003/05/21 19:15:41 www Exp $
+# $Id: lonannounce.pm,v 1.16 2003/07/10 10:27:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,6 +32,10 @@ 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)=@_;
@@ -72,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.='<input type="checkbox" name="remove_'.$start.'_'.
 		   $end.'">';
+               $showedcheck{$start.'_'.$end}=1;
 	      }
 	    }
+            $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
+            $fullmsg=~s/&/\\&/g;
+            $output.='<a href="javascript:alert('."'$fullmsg'".')">'.
+	       substr($msg,0,20).'...</a><br />';
+       }
+    }
+    return '<td'.
+	((($day eq $todayhash{'day'}) &&
+          ($month eq $todayhash{'month'}) &&
+          ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':'').
+           '><b>'.$day.'</b><br>'.$output.'</td>';
+}
+
+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.='<a href="javascript:alert('."'$fullmsg'".')">'.
-	       substr($msg,0,20).'...</a><br>';
+	       substr($msg,0,40).'...</a><br />';
        }
     }
-    return '<td><b>'.$day.'</b><br>'.$output.'</td>';
+    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).':<br /><b>'.
+               $msg.'</b>';
+            $output.='<li>'.$fullmsg.'</li>';
+       }
+    }
+    return $output;
 }
 
 sub nextday {
@@ -99,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='';
@@ -111,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 '<br />'.&plaincell($outp);
+      } else {
+          return '<ul>'.&listcell($outp).'</ul>';
+      }
+   } else {
+       return '';
+   }
 }
 
 sub handler {
@@ -122,8 +179,10 @@ 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']);
@@ -214,11 +273,22 @@ ENDDOCUMENT
     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('<h1>'.('','January','February','March','April','May',
 		      'June','July','August','September','October',
-                      'November','December')[$month].' '.$year.'</h1>'.
+                      'November','December')[$month].' '.$year.'</h1>');
+# Reached the end of times, give up
+    if (($year<1970) || ($year>2037)) {
+	$r->print('<h3>No calendar available for this date.</h3>'.
+ '<a href="/adm/announcements?month='.$todayhash{'month'}.
+ '&year='.$todayhash{'year'}.'">Current Month</a></body></html>');
+	return OK;
+    }
+    $r->print(
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.
- '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a><p>'.
+ '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a>'.
+ '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
+ '&year='.$todayhash{'year'}.'">Current Month</a><p>'.
         '<table border="2" cols="7" rows="5"><tr><th>Sun</th><th>Mon</th>'.
         '<th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>');
 
@@ -230,7 +300,7 @@ ENDDOCUMENT
     $r->print('<tr>');
     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('</tr>');
@@ -238,7 +308,7 @@ ENDDOCUMENT
     for (my $k=0;$k<=3;$k++) {
         $r->print('<tr>');
         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);
         }
@@ -246,10 +316,16 @@ ENDDOCUMENT
     }
 # ------------------------------------------------------------------- End table
     $r->print('</table>');
+# ----------------------------------------------------------------- Check marks
+    %showedcheck=();
+    undef %showedcheck;
+# --------------------------------------------------------------- Remove button
     if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries"></form>'); }
     $r->print('<p>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.
- '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a><p>'.
+ '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a>'.
+ '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
+ '&year='.$todayhash{'year'}.'">Current Month</a></p>'.
  '</body></html>');
     return OK;
 }