--- loncom/interface/lonannounce.pm	2005/02/17 08:29:42	1.33
+++ loncom/interface/lonannounce.pm	2005/04/07 06:56:22	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.33 2005/02/17 08:29:42 albertel Exp $
+# $Id: lonannounce.pm,v 1.34 2005/04/07 06:56:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@ use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
+use Apache::lonnet;
 use HTML::Entities();
 
 my %todayhash;
@@ -61,8 +62,8 @@ ENDFORM
 
 sub readcalendar {
     my $courseid=shift;
-    my $coursenum=$ENV{'course.'.$courseid.'.num'};
-    my $coursedom=$ENV{'course.'.$courseid.'.domain'};
+    my $coursenum=$env{'course.'.$courseid.'.num'};
+    my $coursedom=$env{'course.'.$courseid.'.domain'};
     my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum);
     my %returnhash=();
     foreach (keys %thiscal) {
@@ -70,7 +71,7 @@ sub readcalendar {
 	   $returnhash{$courseid.'@'.$_}=$thiscal{$_};
         }
     }
-    if ($courseid eq $ENV{'request.course.id'}) {
+    if ($courseid eq $env{'request.course.id'}) {
 	my %resourcedata=
 	    &Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);
 	foreach my $thiskey (sort keys %resourcedata) {
@@ -81,11 +82,11 @@ sub readcalendar {
 		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 ($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; }
+		    if (!$env{'request.role.adv'} &&
+			!$env{'request.course.sec'}) { next; }
 		    $section=&mt('Group/Section').': '.$1;
 		    $middle=~s/^\[(.*)\]\.//;
 		}
@@ -142,16 +143,16 @@ sub normalcell {
 		$msg=~s/INTERNAL\://gs;
 		$internalflag=1;
 	    }
-            my $fullmsg=&mt('Calendar Announcement for ').$ENV{'course.'.$courseid.'.description'}.
+            my $fullmsg=&mt('Calendar Announcement for ').$env{'course.'.$courseid.'.description'}.
 		'\n'.&Apache::lonlocal::locallocaltime($start);
 	    if ($start!=$end) {
 		$fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end);
 	    }
 	    $fullmsg.=':\n'.$msg;
-            if ($courseid eq $ENV{'request.course.id'}) {
-              if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))
+            if ($courseid eq $env{'request.course.id'}) {
+              if ((&Apache::lonnet::allowed('srm',$env{'request.course.id'}))
                && (!$showedcheck{$start.'_'.$end})
-	       && ($ENV{'form.pickdate'} ne 'yes')
+	       && ($env{'form.pickdate'} ne 'yes')
 	       && (!$internalflag)) {
                $output.='<input type="checkbox" name="remove_'.$start.'_'.
 		   $end.'">';
@@ -179,7 +180,7 @@ sub plaincell {
         if ($_) {
 	    my ($courseid,$start,$end,@msg)=split(/\@/,$_);
             my $msg=join('@',@msg);
-            my $fullmsg=&mt('Calendar Announcement for ').$ENV{'course.'.$courseid.'.description'}.
+            my $fullmsg=&mt('Calendar Announcement for ').$env{'course.'.$courseid.'.description'}.
 		'\n'.&Apache::lonlocal::locallocaltime($start);
 	    if ($start!=$end) {
 		$fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end);
@@ -256,7 +257,7 @@ sub showday {
 
 sub tfont {
     my $text=shift;
-    if ($ENV{'form.pickdate'} eq 'yes') {
+    if ($env{'form.pickdate'} eq 'yes') {
 	return '<font size="1">'.$text.'</font>';
     } else {
 	return $text;
@@ -265,7 +266,7 @@ sub tfont {
 
 sub picklink {
     my ($text,$day,$month,$year)=@_;
-    if ($ENV{'form.pickdate'} eq 'yes') {
+    if ($env{'form.pickdate'} eq 'yes') {
 	return '<a href="javascript:dialin('.$day.','.$month.','.$year.')">'.
 	    $text.'</a>';
     } else {
@@ -277,14 +278,14 @@ 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;
+	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();
+    opener.document.$env{'form.formname'}.$env{'form.element'}\_day.value=day;
+    opener.$env{'form.element'}\_checkday();
     self.close();
 }
 </script>
@@ -308,14 +309,14 @@ sub handler {
                              ['month','year','pickdate','formname','element']);
 # --------------------------------------------------- Decide what month to show
     my $year=$todayhash{'year'};
-    if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; }
+    if ($env{'form.year'}) { $year=$env{'form.year'}; }
     my $month=$todayhash{'month'};
-    if ($ENV{'form.month'}) { $month=$ENV{'form.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'};
+    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(
@@ -354,14 +355,14 @@ ENDDOCUMENT
     }
 # 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'});
+    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'}) {
+    if ($env{'request.role.domain'}) {
 	$serverpost=&Apache::lonnet::allowed('psa',
-					     $ENV{'request.role.domain'});
+					     $env{'request.role.domain'});
     } else {
 	$serverpost=&Apache::lonnet::allowed('psa','/');
     }
@@ -372,12 +373,12 @@ ENDDOCUMENT
     }
 # ------------------------------------------------------------ Process commands
     if ($serverpost) {
-	if ($ENV{'form.serveraction'}) {
-	    foreach (keys %ENV) {
+	if ($env{'form.serveraction'}) {
+	    foreach (keys %env) {
 		if ($_=~/^form\.postto\_(\w+)/) {
 		    $r->print( 
 			'<br />Posting '.$1.': '.&Apache::lonnet::postannounce
-			($1,$ENV{'form.serverannnounce'}));
+			($1,$env{'form.serverannnounce'}));
 		}
 	    }
 	}
@@ -402,10 +403,10 @@ SERVERANNOUNCE
   '<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'};
+        my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
+        my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
 # ----------------------------------------------------- Store new submitted one
-        if ($ENV{'form.action'} eq 'new') {
+        if ($env{'form.action'} eq 'new') {
 	    my $startdate = 
 		&Apache::lonhtmlcommon::get_date_from_form('startdate');
 	    my $enddate   = 
@@ -419,12 +420,12 @@ SERVERANNOUNCE
             }
 	    &Apache::lonnet::put('calendar',{ 
 		$startdate.'_'.$enddate => 
-		    $ENV{'form.msg'} },$coursedom,$coursenum);
+		    $env{'form.msg'} },$coursedom,$coursenum);
         }
 # ---------------------------------------------------------------- Remove items
-        if ($ENV{'form.action'} eq 'del') {
+        if ($env{'form.action'} eq 'del') {
 	    my @delwhich=();
-            foreach (keys %ENV) {
+            foreach (keys %env) {
 		if ($_=~/^form\.remove\_(.+)$/) {
 		    push(@delwhich,$1);
                 }