--- loncom/interface/lonparmset.pm	2005/02/05 06:21:57	1.182
+++ loncom/interface/lonparmset.pm	2005/05/06 19:00:31	1.192
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.182 2005/02/05 06:21:57 albertel Exp $
+# $Id: lonparmset.pm,v 1.192 2005/05/06 19:00:31 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,12 +75,6 @@ my %keyp;
 
 my %maptitles;
 
-my $uname;
-my $udom;
-my $uhome;
-my $csec;
-my $coursename;
-
 ##################################################
 ##################################################
 
@@ -113,7 +107,7 @@ Returns:  A list, the first item is the
 ##################################################
 ##################################################
 sub parmval {
-    my ($what,$id,$def)=@_;
+    my ($what,$id,$def,$uname,$udom,$csec)=@_;
     my $result='';
     my @outpar=();
 # ----------------------------------------------------- Cascading lookup scheme
@@ -121,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;
 
 
 
@@ -195,6 +189,105 @@ sub parmval {
     return ($result,@outpar);
 }
 
+
+##################################################
+##################################################
+#
+# Store a parameter
+#
+# Takes
+# - resource id
+# - name of parameter
+# - level
+# - new value
+# - new type
+# - username
+# - userdomain
+
+sub storeparm {
+    my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
+    $spnam=~s/\_([^\_]+)$/\.$1/;
+# ---------------------------------------------------------- Construct prefixes
+    
+    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 $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; }
+    if (($snum==10) || ($snum==2)) { $storeunder=$courselevelm; }
+    if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
+    if ($snum==6) { $storeunder=$seclevel; }
+    if ($snum==5) { $storeunder=$seclevelm; }
+    if ($snum==4) { $storeunder=$seclevelr; }
+    
+    my $delete;
+    if ($nval eq '') { $delete=1;}
+    my %storecontent = ($storeunder         => $nval,
+			$storeunder.'.type' => $ntype);
+    my $reply='';
+    if ($snum>3) {
+# ---------------------------------------------------------------- Store Course
+#
+# Expire sheets
+	&Apache::lonnet::expirespread('','','studentcalc');
+	if (($snum==7) || ($snum==4)) {
+	    &Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
+	} elsif (($snum==8) || ($snum==5)) {
+	    &Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
+	} else {
+	    &Apache::lonnet::expirespread('','','assesscalc');
+	}
+# Store parameter
+	if ($delete) {
+	    $reply=&Apache::lonnet::del
+		('resourcedata',[keys(%storecontent)],
+		 $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'});
+	}
+    } else {
+# ------------------------------------------------------------------ Store User
+#
+# Expire sheets
+	&Apache::lonnet::expirespread($uname,$udom,'studentcalc');
+	if ($snum==1) {
+	    &Apache::lonnet::expirespread
+		($uname,$udom,'assesscalc',$symbp{$sresid});
+	} elsif ($snum==2) {
+	    &Apache::lonnet::expirespread
+		($uname,$udom,'assesscalc',$mapp{$sresid});
+	} else {
+	    &Apache::lonnet::expirespread($uname,$udom,'assesscalc');
+	}
+# Store parameter
+	if ($delete) {
+	    $reply=&Apache::lonnet::del
+		('resourcedata',[keys(%storecontent)],$udom,$uname);
+	} else {
+	    $reply=&Apache::lonnet::cput
+		('resourcedata',\%storecontent,$udom,$uname);
+	}
+	&Apache::lonnet::devalidateuserresdata($uname,$udom);
+    }
+    
+    if ($reply=~/^error\:(.*)/) {
+	return "<font color=red>Write Error: $1</font>";
+    }
+    return '';
+}
+
 ##################################################
 ##################################################
 
@@ -275,9 +368,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 
@@ -312,8 +405,9 @@ sub startpage {
     my $overallhelp=
 	&Apache::loncommon::help_open_menu('','Setting Parameters','Course_Setting_Parameters','',10,'Instructor Interface');
     my $assessparmhelp=&Apache::loncommon::help_open_topic("Cascading_Parameters","Assessment Parameters");
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDHEAD);
-<html>
+$html
 <head>
 <title>LON-CAPA Course Parameters</title>
 <script>
@@ -381,8 +475,21 @@ $assessparmhelp
 </form>
 <hr />
 ENDHEAD2
-}
-    $r->print(<<ENDHEAD3);
+    }
+    my %sectionhash=();
+    my $sections='';
+    if (&Apache::loncommon::get_sections(
+                 $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) {
+	    $sections.='<option value="'.$_.'"'.
+		($_ eq $csec?'selected="selected"':'').'>'.$_.'</option>';
+        }
+        $sections.='</select>';
+     }
+     $r->print(<<ENDHEAD3);
 <form method="post" action="/adm/parmset" name="parmform">
 <h4>$lt{'captm'}</h4>
 ENDHEAD3
@@ -392,13 +499,12 @@ ENDHEAD3
     } else {
 	$r->print(<<ENDHEAD);
 <b>
-$lt{'sg'}:
-<input type="text" value="$csec" size="6" name="csec">
-<br>
+$sections
+<br />
 $lt{'fu'} 
-<input type="text" value="$uname" size="12" name="uname">
+<input type="text" value="$uname" size="12" name="uname" />
 $lt{'oi'}
-<input type="text" value="$id" size="12" name="id"> 
+<input type="text" value="$id" size="12" name="id" /> 
 $lt{'ad'}
 $chooseopt
 </b>
@@ -411,16 +517,16 @@ ENDHEAD
 
 sub print_row {
     my ($r,$which,$part,$name,$rid,$default,$defaulttype,$display,$defbgone,
-	$defbgtwo,$parmlev)=@_;
+	$defbgtwo,$parmlev,$uname,$udom,$csec)=@_;
 # get the values for the parameter in cascading order
 # empty levels will remain empty
     my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},
-				  $rid,$$default{$which});
+				  $rid,$$default{$which},$uname,$udom,$csec);
 # get the type for the parameters
 # problem: these may not be set for all levels
     my ($typeresult,@typeoutpar)=&parmval($$part{$which}.'.'.
                                           $$name{$which}.'.type',
-				  $rid,$$defaulttype{$which});
+				  $rid,$$defaulttype{$which},$uname,$udom,$csec);
 # cascade down manually
     my $cascadetype=$$defaulttype{$which};
     for (my $i=11;$i>0;$i--) {
@@ -607,7 +713,7 @@ sub extractResourceInformation {
                     my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
                     my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
                     my $parmdis = $display;
-                    $parmdis =~ s|(\[Part.*$)||g;
+                    $parmdis =~ s|(\[Part.*)$||g;
                     my $partkey = $part;
                     $partkey =~ tr|_|.|;
                     $$allparms{$name} = $parmdis;
@@ -678,8 +784,14 @@ sub assessparms {
     my %allmaps=();
     my %alllevs=();
 
+    my $uname;
+    my $udom;
+    my $uhome;
+    my $csec;
+ 
+    my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
+
     $alllevs{'Resource Level'}='full';
-#    $alllevs{'Resource Level [BRIEF]'}='brief';
     $alllevs{'Map Level'}='map';
     $alllevs{'Course Level'}='general';
 
@@ -697,57 +809,54 @@ sub assessparms {
 
     my $message='';
 
-    $csec=$ENV{'form.csec'};
-    if      ($udom=$ENV{'form.udom'}) {
-    } elsif ($udom=$ENV{'request.role.domain'}) {
-    } elsif ($udom=$ENV{'user.domain'}) {
+    $csec=$env{'form.csec'};
+
+    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'};
-
-#    unless ($parmlev==$ENV{'form.parmlev'}) {
-#        $parmlev = 'full';
-#    }
+    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) {
@@ -758,7 +867,7 @@ sub assessparms {
 		&mt('at domain')." '$udom'</font>";
 	}
     } else {
-	$uname=$ENV{'form.uname'};
+	$uname=$env{'form.uname'};
     }
     unless ($udom) { $uname=''; }
     $uhome='';
@@ -771,13 +880,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'));
@@ -791,121 +900,46 @@ 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 ;
     }
 
 # --------------------------------------------------------- Get all assessments
-    extractResourceInformation(\%bighash, \@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp,\%maptitles);
+    &extractResourceInformation(\%bighash, \@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp,\%maptitles);
 
     $mapp{'0.0'} = '';
     $symbp{'0.0'} = '';
 
 # ---------------------------------------------------------- Anything to store?
-    if ($ENV{'form.pres_marker'}) {
-	my ($sresid,$spnam,$snum)=split(/\&/,$ENV{'form.pres_marker'});
-	$spnam=~s/\_([^\_]+)$/\.$1/;
-# ---------------------------------------------------------- Construct prefixes
-
-	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 $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; }
-	if (($snum==10) || ($snum==2)) { $storeunder=$courselevelm; }
-	if (($snum==7) || ($snum==1)) { $storeunder=$courselevelr; }
-	if ($snum==6) { $storeunder=$seclevel; }
-	if ($snum==5) { $storeunder=$seclevelm; }
-	if ($snum==4) { $storeunder=$seclevelr; }
-	
-	my $delete;
-	if ($ENV{'form.pres_value'} eq '') { $delete=1;}
-        my %storecontent = ($storeunder         => $ENV{'form.pres_value'},
-                            $storeunder.'.type' => $ENV{'form.pres_type'});
-	my $reply='';
-	if ($snum>3) {
-# ---------------------------------------------------------------- Store Course
-#
-# Expire sheets
-	    &Apache::lonnet::expirespread('','','studentcalc');
-	    if (($snum==7) || ($snum==4)) {
-		&Apache::lonnet::expirespread('','','assesscalc',$symbp{$sresid});
-	    } elsif (($snum==8) || ($snum==5)) {
-		&Apache::lonnet::expirespread('','','assesscalc',$mapp{$sresid});
-	    } else {
-		&Apache::lonnet::expirespread('','','assesscalc');
-	    }
-# Store parameter
-	    if ($delete) {
-		$reply=&Apache::lonnet::del
-		    ('resourcedata',[keys(%storecontent)],
-		     $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'});
-	    }
-	} else {
-# ------------------------------------------------------------------ Store User
-#
-# Expire sheets
-	    &Apache::lonnet::expirespread($uname,$udom,'studentcalc');
-	    if ($snum==1) {
-		&Apache::lonnet::expirespread
-		    ($uname,$udom,'assesscalc',$symbp{$sresid});
-	    } elsif ($snum==2) {
-		&Apache::lonnet::expirespread
-		    ($uname,$udom,'assesscalc',$mapp{$sresid});
-	    } else {
-		&Apache::lonnet::expirespread($uname,$udom,'assesscalc');
-	    }
-# Store parameter
-	    if ($delete) {
-		$reply=&Apache::lonnet::del
-		    ('resourcedata',[keys(%storecontent)],$udom,$uname);
-	    } else {
-		$reply=&Apache::lonnet::cput
-		    ('resourcedata',\%storecontent,$udom,$uname);
-	    }
-	}
-
-	if ($reply=~/^error\:(.*)/) {
-	    $message.="<font color=red>Write Error: $1</font>";
-	}
+    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'});
-    &Apache::lonnet::clear_EXT_cache_status();
+                 $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);
@@ -917,9 +951,9 @@ sub assessparms {
 	if ($fcat eq '') {
 	    $a<=>$b;
 	} else {
-	    my ($result,@outpar)=&parmval($fcat,$a,$defp{$a});
+	    my ($result,@outpar)=&parmval($fcat,$a,$defp{$a},$uname,$udom,$csec);
 	    my $aparm=$outpar[$result];
-	    ($result,@outpar)=&parmval($fcat,$b,$defp{$b});
+	    ($result,@outpar)=&parmval($fcat,$b,$defp{$b},$uname,$udom,$csec);
 	    my $bparm=$outpar[$result];
 	    1*$aparm<=>1*$bparm;
 	}
@@ -939,8 +973,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">');
@@ -948,7 +982,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>');
@@ -988,9 +1022,9 @@ sub assessparms {
         $r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');
     }
 
-    $r->print('<tr><td colspan="3"><hr /><input type="checkbox"');
+    $r->print('<tr><td colspan="3"><hr /><label><input type="checkbox"');
     if ($showoptions eq 'show') {$r->print(" checked ");}
-    $r->print(' name="showoptions" value="show">'.&mt('Show More Options').'<hr /></td></tr>');
+    $r->print(' name="showoptions" value="show" />'.&mt('Show More Options').'</label><hr /></td></tr>');
 #    $r->print("<tr><td>Show: $showoptions</td></tr>");
 #    $r->print("<tr><td>pscat: @pscat</td></tr>");
 #    $r->print("<tr><td>psprt: @psprt</td></tr>");
@@ -1114,8 +1148,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;
@@ -1157,8 +1191,8 @@ ENDTABLETWO
            $r->print(<<ENDTABLEHEADFOUR);
 </tr><tr><th>$lt{'aut'}</th><th>$lt{'type'}</th>
 <th>$lt{'emof'}</th><th>$lt{'part'}</th><th>$lt{'pn'}</th>
-<th>$lt{'gen'}</th><th>$lt{'femof'}</th>
-<th>$lt{'def'}</th><th>$lt{'foremf'}</th><th>$lt{'fr'}</th>
+<th>$lt{'gen'}</th><th>$lt{'foremf'}</th>
+<th>$lt{'def'}</th><th>$lt{'femof'}</th><th>$lt{'fr'}</th>
 ENDTABLEHEADFOUR
 
            if ($csec) {
@@ -1184,15 +1218,15 @@ ENDTABLEHEADFOUR
 		    ||
 		    ($pssymb && $pssymb eq $symbp{$rid})) {
 # ------------------------------------------------------ Entry for one resource
-                    if ($defbgone eq '"E0E099"') {
-                        $defbgone='"E0E0DD"';
+                    if ($defbgone eq '"#E0E099"') {
+                        $defbgone='"#E0E0DD"';
                     } else {
-                        $defbgone='"E0E099"';
+                        $defbgone='"#E0E099"';
                     }
-                    if ($defbgtwo eq '"FFFF99"') {
-                        $defbgtwo='"FFFFDD"';
+                    if ($defbgtwo eq '"#FFFF99"') {
+                        $defbgtwo='"#FFFFDD"';
                     } else {
-                        $defbgtwo='"FFFF99"';
+                        $defbgtwo='"#FFFF99"';
                     }
                     my $thistitle='';
                     my %name=   ();
@@ -1256,7 +1290,7 @@ ENDTABLEHEADFOUR
 
                             &print_row($r,$_,\%part,\%name,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
-                                       $parmlev);
+                                       $parmlev,$uname,$udom,$csec);
                         }
                     }
                 }
@@ -1364,7 +1398,7 @@ ENDMAPONE
                     $r->print('<tr>');
                     &print_row($r,$_,\%part,\%name,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,
-                           $parmlev);
+                           $parmlev,$uname,$udom,$csec);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
                 }
                 $r->print("</table></center>");
@@ -1441,7 +1475,7 @@ ENDMAPONE
 	    foreach (sort keys %name) {
                 $r->print('<tr>');
                 &print_row($r,$_,\%part,\%name,$mapid,\%default,
-                       \%type,\%display,$defbgone,$defbgtwo,$parmlev);
+                       \%type,\%display,$defbgone,$defbgtwo,$parmlev,$uname,$udom,$csec);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
             }
             $r->print("</table></center>");
@@ -1476,17 +1510,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\///;
@@ -1562,7 +1596,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
 
@@ -1757,12 +1791,13 @@ sub crsenv {
     my $Value=&mt('Value');
     my $Set=&mt('Set');
     my $browse_js=&Apache::loncommon::browser_and_searcher_javascript('parmset');
-    $r->print(<<ENDENV);
-<html>
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print(<<ENDenv);
+$html
+<head>
 <script type="text/javascript" language="Javascript" >
 $browse_js
 </script>
-<head>
 <title>LON-CAPA Course Environment</title>
 </head>
 $bodytag
@@ -1777,7 +1812,7 @@ $output
 </form>
 </body>
 </html>    
-ENDENV
+ENDenv
 }
 ##################################################
 
@@ -1806,10 +1841,11 @@ 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>
+$html
 <head>
 <title>LON-CAPA Course Environment</title>
 </head>
@@ -1823,17 +1859,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; }
 	    }
 	}
@@ -1954,8 +1990,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) {
@@ -2051,22 +2087,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;
- 
-        $coursename=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
 
-	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 {
@@ -2075,7 +2109,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;
     }