--- loncom/interface/lonparmset.pm	2005/03/18 15:17:36	1.189
+++ loncom/interface/lonparmset.pm	2005/04/07 06:56:23	1.190
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.189 2005/03/18 15:17:36 www Exp $
+# $Id: lonparmset.pm,v 1.190 2005/04/07 06:56:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,13 +115,13 @@ sub parmval {
     my $symbparm=$symbp{$id}.'.'.$what;
     my $mapparm=$mapp{$id}.'___(all).'.$what;
 
-    my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$what;
-    my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
-    my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;
-
-    my $courselevel=$ENV{'request.course.id'}.'.'.$what;
-    my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
-    my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
+    my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$what;
+    my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
+    my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;
+
+    my $courselevel=$env{'request.course.id'}.'.'.$what;
+    my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
+    my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
 
 
 
@@ -212,13 +212,13 @@ sub storeparm {
     my $symbparm=$symbp{$sresid}.'.'.$spnam;
     my $mapparm=$mapp{$sresid}.'___(all).'.$spnam;
     
-    my $seclevel=$ENV{'request.course.id'}.'.['.$csec.'].'.$spnam;
-    my $seclevelr=$ENV{'request.course.id'}.'.['.$csec.'].'.$symbparm;
-    my $seclevelm=$ENV{'request.course.id'}.'.['.$csec.'].'.$mapparm;
+    my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$spnam;
+    my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
+    my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;
     
-    my $courselevel=$ENV{'request.course.id'}.'.'.$spnam;
-    my $courselevelr=$ENV{'request.course.id'}.'.'.$symbparm;
-    my $courselevelm=$ENV{'request.course.id'}.'.'.$mapparm;
+    my $courselevel=$env{'request.course.id'}.'.'.$spnam;
+    my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
+    my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
     
     my $storeunder='';
     if (($snum==11) || ($snum==3)) { $storeunder=$courselevel; }
@@ -249,13 +249,13 @@ sub storeparm {
 	if ($delete) {
 	    $reply=&Apache::lonnet::del
 		('resourcedata',[keys(%storecontent)],
-		 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+		 $env{'course.'.$env{'request.course.id'}.'.domain'},
+		 $env{'course.'.$env{'request.course.id'}.'.num'});
 	} else {
 	    $reply=&Apache::lonnet::cput
 		('resourcedata',\%storecontent,
-		 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		 $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+		 $env{'course.'.$env{'request.course.id'}.'.domain'},
+		 $env{'course.'.$env{'request.course.id'}.'.num'});
 	}
     } else {
 # ------------------------------------------------------------------ Store User
@@ -367,9 +367,9 @@ sub plink {
     my $winvalue=$value;
     unless ($winvalue) {
 	if ($type=~/^date/) {
-            $winvalue=$ENV{'form.recent_'.$type};
+            $winvalue=$env{'form.recent_'.$type};
         } else {
-            $winvalue=$ENV{'form.recent_'.(split(/\_/,$type))[0]};
+            $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
         }
     }
     return 
@@ -478,8 +478,8 @@ ENDHEAD2
     my %sectionhash=();
     my $sections='';
     if (&Apache::loncommon::get_sections(
-                 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+                 $env{'course.'.$env{'request.course.id'}.'.domain'},
+                 $env{'course.'.$env{'request.course.id'}.'.num'},
 					 \%sectionhash)) {
         $sections=$lt{'sg'}.': <select name="csec">';
 	foreach ('',sort keys %sectionhash) {
@@ -788,7 +788,7 @@ sub assessparms {
     my $uhome;
     my $csec;
  
-    my $coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+    my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
 
     $alllevs{'Resource Level'}='full';
     $alllevs{'Map Level'}='map';
@@ -808,54 +808,54 @@ sub assessparms {
 
     my $message='';
 
-    $csec=$ENV{'form.csec'};
+    $csec=$env{'form.csec'};
 
-    if      ($udom=$ENV{'form.udom'}) {
-    } elsif ($udom=$ENV{'request.role.domain'}) {
-    } elsif ($udom=$ENV{'user.domain'}) {
+    if      ($udom=$env{'form.udom'}) {
+    } elsif ($udom=$env{'request.role.domain'}) {
+    } elsif ($udom=$env{'user.domain'}) {
     } else {
 	$udom=$r->dir_config('lonDefDomain');
     }
 
     my @pscat=&Apache::loncommon::get_env_multiple('form.pscat');
-    my $pschp=$ENV{'form.pschp'};
+    my $pschp=$env{'form.pschp'};
     my @psprt=&Apache::loncommon::get_env_multiple('form.psprt');
     if (!@psprt) { $psprt[0]='0'; }
-    my $showoptions=$ENV{'form.showoptions'};
+    my $showoptions=$env{'form.showoptions'};
 
     my $pssymb='';
     my $parmlev='';
     my $trimheader='';
-    my $prevvisit=$ENV{'form.prevvisit'};
+    my $prevvisit=$env{'form.prevvisit'};
  
-    unless ($ENV{'form.parmlev'}) {
+    unless ($env{'form.parmlev'}) {
         $parmlev = 'map';
     } else {
-        $parmlev = $ENV{'form.parmlev'};
+        $parmlev = $env{'form.parmlev'};
     }
 
 # ----------------------------------------------- Was this started from grades?
 
-    if (($ENV{'form.command'} eq 'set') && ($ENV{'form.url'})
-	&& (!$ENV{'form.dis'})) {
-	my $url=$ENV{'form.url'};
+    if (($env{'form.command'} eq 'set') && ($env{'form.url'})
+	&& (!$env{'form.dis'})) {
+	my $url=$env{'form.url'};
 	$url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
 	$pssymb=&Apache::lonnet::symbread($url);
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
         $trimheader='yes';
-    } elsif ($ENV{'form.symb'}) {
-	$pssymb=$ENV{'form.symb'};
+    } elsif ($env{'form.symb'}) {
+	$pssymb=$env{'form.symb'};
 	if (!@pscat) { @pscat=('all'); }
 	$pschp='';
         $parmlev = 'full';
         $trimheader='yes';
     } else {
-	$ENV{'form.url'}='';
+	$env{'form.url'}='';
     }
 
-    my $id=$ENV{'form.id'};
+    my $id=$env{'form.id'};
     if (($id) && ($udom)) {
 	$uname=(&Apache::lonnet::idget($udom,$id))[1];
 	if ($uname) {
@@ -866,7 +866,7 @@ sub assessparms {
 		&mt('at domain')." '$udom'</font>";
 	}
     } else {
-	$uname=$ENV{'form.uname'};
+	$uname=$env{'form.uname'};
     }
     unless ($udom) { $uname=''; }
     $uhome='';
@@ -879,13 +879,13 @@ sub assessparms {
 	    $uname='';
         } else {
 	    $csec=&Apache::lonnet::getsection($udom,$uname,
-					      $ENV{'request.course.id'});
+					      $env{'request.course.id'});
 	    if ($csec eq '-1') {
 		$message="<font color=red>".
 		    &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
 		    &mt("not in this course")."</font>";
 		$uname='';
-		$csec=$ENV{'form.csec'};
+		$csec=$env{'form.csec'};
 	    } else {
 		my %name=&Apache::lonnet::userenvironment($udom,$uname,
 		      ('firstname','middlename','lastname','generation','id'));
@@ -899,18 +899,18 @@ sub assessparms {
 
     unless ($csec) { $csec=''; }
 
-    my $fcat=$ENV{'form.fcat'};
+    my $fcat=$env{'form.fcat'};
     unless ($fcat) { $fcat=''; }
 
 # ------------------------------------------------------------------- Tie hashs
-    if (!(tie(%bighash,'GDBM_File',$ENV{'request.course.fn'}.'.db',
+    if (!(tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
 	      &GDBM_READER(),0640))) {
-	$r->print("Unable to access course data. (File $ENV{'request.course.fn'}.db not tieable)");
+	$r->print("Unable to access course data. (File $env{'request.course.fn'}.db not tieable)");
 	return ;
     }
     if (!(tie(%parmhash,'GDBM_File',
-	      $ENV{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640))) {
-	$r->print("Unable to access parameter data. (File $ENV{'request.course.fn'}_parms.db not tieable)");
+	      $env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640))) {
+	$r->print("Unable to access parameter data. (File $env{'request.course.fn'}_parms.db not tieable)");
 	return ;
     }
 
@@ -921,24 +921,24 @@ sub assessparms {
     $symbp{'0.0'} = '';
 
 # ---------------------------------------------------------- Anything to store?
-    if ($ENV{'form.pres_marker'}) {
-	$message.=&storeparm(split(/\&/,$ENV{'form.pres_marker'}),
-			     $ENV{'form.pres_value'},
-			     $ENV{'form.pres_type'},
+    if ($env{'form.pres_marker'}) {
+	$message.=&storeparm(split(/\&/,$env{'form.pres_marker'}),
+			     $env{'form.pres_value'},
+			     $env{'form.pres_type'},
                              $uname,$udom,$csec);
 # ---------------------------------------------------------------- Done storing
 	$message.='<h3>'.&mt('Changes can take up to 10 minutes before being active for all students.').&Apache::loncommon::help_open_topic('Caching').'</h3>';
     }
 # --------------------------------------------- Devalidate cache for this child
     &Apache::lonnet::devalidatecourseresdata(
-                 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-                 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'});
+                 $env{'course.'.$env{'request.course.id'}.'.num'},
+                 $env{'course.'.$env{'request.course.id'}.'.domain'});
     &Apache::lonnet::clear_EXT_cache_status();
 # -------------------------------------------------------------- Get coursedata
     %courseopt = &Apache::lonnet::dump
         ('resourcedata',
-         $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-         $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+         $env{'course.'.$env{'request.course.id'}.'.domain'},
+         $env{'course.'.$env{'request.course.id'}.'.num'});
 # --------------------------------------------------- Get userdata (if present)
     if ($uname) {
         %useropt=&Apache::lonnet::dump('resourcedata',$udom,$uname);
@@ -972,8 +972,8 @@ sub assessparms {
 	untie(%parmhash);
 	return '';
     }
-#    if ($ENV{'form.url'}) {
-#	$r->print('<input type="hidden" value="'.$ENV{'form.url'}.
+#    if ($env{'form.url'}) {
+#	$r->print('<input type="hidden" value="'.$env{'form.url'}.
 #		  '" name="url"><input type="hidden" name="command" value="set">');
 #    }
     $r->print('<input type="hidden" value="true" name="prevvisit">');
@@ -981,7 +981,7 @@ sub assessparms {
     foreach ('tolerance','date_default','date_start','date_end',
 	     'date_interval','int','float','string') {
 	$r->print('<input type="hidden" value="'.
-		  $ENV{'form.recent_'.$_}.'" name="recent_'.$_.'">');
+		  $env{'form.recent_'.$_}.'" name="recent_'.$_.'">');
     }
 
     $r->print('<h2>'.$message.'</h2><table>');
@@ -1147,8 +1147,8 @@ sub assessparms {
     if (($prevvisit) || ($pschp) || ($pssymb)) {
 # ----------------------------------------------------------------- Start Table
         my @catmarker=map { tr|.|_|; 'parameter_'.$_; } @pscat;
-        my $csuname=$ENV{'user.name'};
-        my $csudom=$ENV{'user.domain'};
+        my $csuname=$env{'user.name'};
+        my $csudom=$env{'user.domain'};
 
         if ($parmlev eq 'full' || $parmlev eq 'brief') {
            my $coursespan=$csec?8:5;
@@ -1509,17 +1509,17 @@ sub crsenv {
     my $setoutput='';
     my $bodytag=&Apache::loncommon::bodytag(
                              'Set Course Environment Parameters');
-    my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-    my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     #
     # Go through list of changes
-    foreach (keys %ENV) {
+    foreach (keys %env) {
         next if ($_!~/^form\.(.+)\_setparmval$/);
         my $name  = $1;
-        my $value = $ENV{'form.'.$name.'_value'};
+        my $value = $env{'form.'.$name.'_value'};
         if ($name eq 'newp') {
-            $name = $ENV{'form.newp_name'};
+            $name = $env{'form.newp_name'};
         }
         if ($name eq 'url') {
             $value=~s/^\/res\///;
@@ -1595,7 +1595,7 @@ sub crsenv {
     }
 # ------------------------- Re-init course environment entries for this session
 
-    &Apache::lonnet::coursedescription($ENV{'request.course.id'});
+    &Apache::lonnet::coursedescription($env{'request.course.id'});
 
 # -------------------------------------------------------- Get parameters again
 
@@ -1791,7 +1791,7 @@ sub crsenv {
     my $Set=&mt('Set');
     my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');
     my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<ENDENV);
+    $r->print(<<ENDenv);
 $html
 <head>
 <script type="text/javascript" language="Javascript" >
@@ -1811,7 +1811,7 @@ $output
 </form>
 </body>
 </html>    
-ENDENV
+ENDenv
 }
 ##################################################
 
@@ -1840,8 +1840,8 @@ sub overview {
     my $r=shift;
     my $bodytag=&Apache::loncommon::bodytag(
                              'Set/Modify Course Assessment Parameters');
-    my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-    my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDOVER);
 $html
@@ -1858,17 +1858,17 @@ ENDOVER
     undef %newdata;
     my @deldata=();
     undef @deldata;
-    foreach (keys %ENV) {
+    foreach (keys %env) {
 	if ($_=~/^form\.([a-z]+)\_(.+)$/) {
 	    my $cmd=$1;
 	    my $thiskey=$2;
 	    if ($cmd eq 'set') {
-		my $data=$ENV{$_};
+		my $data=$env{$_};
 		if ($olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
 	    } elsif ($cmd eq 'del') {
 		push (@deldata,$thiskey);
 	    } elsif ($cmd eq 'datepointer') {
-		my $data=&Apache::lonhtmlcommon::get_date_from_form($ENV{$_});
+		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
 		if (defined($data) and $olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
 	    }
 	}
@@ -1989,8 +1989,8 @@ Returns:
 sub change_clone {
     my ($clonelist,$oldcloner) = @_;
     my ($uname,$udom);
-    my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
-    my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $clone_crs = $cnum.':'.$cdom;
     
     if ($cnum && $cdom) {
@@ -2086,20 +2086,20 @@ sub handler {
 
 # ----------------------------------------------------- Needs to be in a course
 
-    if (($ENV{'request.course.id'}) && 
-	(&Apache::lonnet::allowed('opa',$ENV{'request.course.id'}) || 
-	 &Apache::lonnet::allowed('opa',$ENV{'request.course.id'}.'/'.
-				  $ENV{'request.course.sec'})
+    if (($env{'request.course.id'}) && 
+	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}) || 
+	 &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
+				  $env{'request.course.sec'})
 	 )) {
 
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
 
-	if (($ENV{'form.crsenv'}) || (!$ENV{'request.course.fn'})) {
+	if (($env{'form.crsenv'}) || (!$env{'request.course.fn'})) {
 # ---------------------------------------------- This is for course environment
 # -------------------------- also call if toplevel map coudl not be initialized
 	    &crsenv($r);
-	} elsif ($ENV{'form.overview'}) {
+	} elsif ($env{'form.overview'}) {
 # --------------------------------------------------------------- Overview mode
 	    &overview($r);
 	} else {
@@ -2108,7 +2108,7 @@ sub handler {
 	}
     } else {
 # ----------------------------- Not in a course, or not allowed to modify parms
-	$ENV{'user.error.msg'}=
+	$env{'user.error.msg'}=
 	    "/adm/parmset:opa:0:0:Cannot modify assessment parameters";
 	return HTTP_NOT_ACCEPTABLE;
     }