--- loncom/interface/lonannounce.pm	2003/06/18 15:02:20	1.13
+++ 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.13 2003/06/18 15:02:20 www Exp $
+# $Id: lonannounce.pm,v 1.16 2003/07/10 10:27:04 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,8 +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)=@_;
@@ -83,11 +85,15 @@ sub normalcell {
             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 />';
        }
@@ -108,6 +114,8 @@ sub plaincell {
             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,40).'...</a><br />';
        }
@@ -172,7 +180,9 @@ sub handler {
 # ---------------------------------------------------------- Get time right now
     my $today=time;
     %todayhash=&Apache::loncommon::timehash($today);
-
+# ----------------------------------------------------------------- Check marks
+    %showedcheck=();
+    undef %showedcheck;
 # ---------------------------------------------------------- Get month and year
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['month','year']);
@@ -263,8 +273,7 @@ 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); }
-    if (($year<1970) || ($year>2037)) {
-    }
+
     $r->print('<h1>'.('','January','February','March','April','May',
 		      'June','July','August','September','October',
                       'November','December')[$month].' '.$year.'</h1>');
@@ -307,6 +316,10 @@ 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> '.