--- loncom/interface/lonannounce.pm	2003/05/21 19:15:41	1.10
+++ loncom/interface/lonannounce.pm	2003/09/17 19:45:39	1.20
@@ -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.20 2003/09/17 19:45:39 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,6 +32,11 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lonhtmlcommon();
+use Apache::lonlocal;
+use HTML::Entities();
+
+my %todayhash;
+my %showedcheck;
 
 sub editfield {
     my ($r,$start,$end,$text)=@_;
@@ -72,24 +77,67 @@ 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})
+	       && ($ENV{'form.pickdate'} ne 'yes')) {
                $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"':'').
+           '>'.&tfont('<b>'.&picklink($day,$day,$month,$year).'</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 +147,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 +159,55 @@ 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 tfont {
+    my $text=shift;
+    if ($ENV{'form.pickdate'} eq 'yes') {
+	return '<font size="1">'.$text.'</font>';
+    } else {
+	return $text;
+    }
+}
+
+sub picklink {
+    my ($text,$day,$month,$year)=@_;
+    if ($ENV{'form.pickdate'} eq 'yes') {
+	return '<a href="javascript:dialin('.$day.','.$month.','.$year.')">'.
+	    $text.'</a>';
+    } else {
+	return $text;
+    }
+}
+
+sub dialscript {
+    return (<<ENDDIA);
+<script language="Javascript">
+function dialin(day,month,year) {
+	opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_year.value=year;
+    var slct=opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_month;
+    var i;
+    for (i=0;i<slct.length;i++) {
+        if (slct.options[i].value==month) { slct.selectedIndex=i; }
+    }
+    opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_day.value=day;
+    opener.$ENV{'form.element'}\_checkday();
+    self.close();
+}
+</script>
+ENDDIA
 }
 
 sub handler {
@@ -122,16 +218,23 @@ 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','formname','element']);
 # --------------------------------------------------- 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');
+    my $pickinfo='&pickdate=yes&formname='.$ENV{'form.formname'}.
+	'&element='.$ENV{'form.element'};
 # --------------------------------------------- Find out first day of the month
 
     my %firstday=&Apache::loncommon::timehash(
@@ -160,13 +263,63 @@ sub handler {
 </script>
 </head>
 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).
+		  &dialscript().
+		  '<font size="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( 
+			'<br />Posting '.$1.': '.&Apache::lonnet::postannounce
+			($1,$ENV{'form.serverannnounce'}));
+		}
+	    }
+	}
+	$r->print(<<SERVERANNOUNCE);
+<form name="serveranno" method="post">
+<h3>Post Server Announcements</h3>
+Post announcements to the system login and roles screen<br />
+<i>(leave blank to delete announcement)</i><br />
+<textarea name="serverannnounce" cols="60" rows="5"></textarea><br />
+Check machines:<br />
+SERVERANNOUNCE
+# list servers
+    foreach (sort keys %Apache::lonnet::hostname) {
+	if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$_})) {
+	    $r->print ('<br /><input type="checkbox" name="postto_'.$_.'" /> '.
+		       $_.' <tt>'.$Apache::lonnet::hostname{$_}.'</tt> '.
+		       '<a href="http://'.$Apache::lonnet::hostname{$_}.
+		       '/announcement.txt" target="annowin">current</a>');
+	}
+    }
+    $r->print(
+  '<br /><input type="submit" name="serveraction" value="Post"></form><hr />');
+    }
     if ($allowed) {
         my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
         my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
@@ -214,13 +367,43 @@ 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>'.
- '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.
- '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next 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>');
+
+    $r->print('<h1>'.('',&mt('January'),&mt('February'),&mt('March'),
+		      &mt('April'),&mt('May'),
+		      &mt('June'),&mt('July'),&mt('August'),
+                      &mt('September'),&mt('October'),
+                      &mt('November'),&mt('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.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
+ '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
+ '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
+ '&year='.$todayhash{'year'}.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.
+        '<table border="2" cols="7" rows="5"><tr><th>'.
+&tfont(&mt('Sun'))
+.'</th><th>'.
+&tfont(&mt('Mon'))
+.'</th><th>'.
+&tfont(&mt('Tue'))
+.'</th><th>'.
+&tfont(&mt('Wed'))
+.'</th><th>'.
+&tfont(&mt('Thu'))
+.'</th><th>'.
+&tfont(&mt('Fri'))
+.'</th><th>'.
+&tfont(&mt('Sat'))
+.'</th></tr>');
 
     my $tk=&Apache::loncommon::maketime(%firstday);
     my $outp;
@@ -230,7 +413,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 +421,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 +429,20 @@ 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='.$pm.'&year='.$py.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
+ '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
+ '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
+ '&year='.$todayhash{'year'}.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.
+ ($pickdatemode?'</font>':'').
  '</body></html>');
     return OK;
 }