--- loncom/interface/lonparmset.pm	2004/07/19 17:57:25	1.169
+++ loncom/interface/lonparmset.pm	2005/06/05 01:37:26	1.209
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.169 2004/07/19 17:57:25 matthew Exp $
+# $Id: lonparmset.pm,v 1.209 2005/06/05 01:37:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,24 +62,16 @@ use GDBM_File;
 use Apache::lonhomework;
 use Apache::lonxml;
 use Apache::lonlocal;
+use Apache::lonnavmaps;
 
-my %courseopt;
-my %useropt;
+# --- Caches local to lonparmset
+
+my $parmhashid;
 my %parmhash;
+my $symbsid;
+my %symbs;
 
-my @ids;
-my %symbp;
-my %mapp;
-my %typep;
-my %keyp;
-
-my %maptitles;
-
-my $uname;
-my $udom;
-my $uhome;
-my $csec;
-my $coursename;
+# --- end local caches
 
 ##################################################
 ##################################################
@@ -96,10 +88,10 @@ Inputs:  $what - a parameter spec (inclu
 
 Returns:  A list, the first item is the index into the remaining list of items of parm valuse that is the active one, the list consists of parm values at the 11 possible levels
 
-11- resource default
-10- map default
-9 - General Course
-8 - Map or Folder level in course
+11 - General Course
+10 - Map or Folder level in course
+9- resource default
+8- map default
 7 - resource level in course
 6 - General for section
 5 - Map or Folder level for section
@@ -111,87 +103,258 @@ Returns:  A list, the first item is the
 =cut
 
 ##################################################
-##################################################
 sub parmval {
-    my ($what,$id,$def)=@_;
+    my ($what,$id,$def,$uname,$udom,$csec)=@_;
+    return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec);
+}
+
+sub parmval_by_symb {
+    my ($what,$symb,$def,$uname,$udom,$csec)=@_;
+# load caches
+
+    &cacheparmhash();
+
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $useropt=&Apache::lonnet::get_userresdata($uname,$udom);
+    my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+
+
     my $result='';
     my @outpar=();
 # ----------------------------------------------------- Cascading lookup scheme
+    my $map=(&Apache::lonnet::decode_symb($symb))[0];    
 
-    my $symbparm=$symbp{$id}.'.'.$what;
-    my $mapparm=$mapp{$id}.'___(all).'.$what;
+    my $symbparm=$symb.'.'.$what;
+    my $mapparm=$map.'___(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 $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 $courselevel=$env{'request.course.id'}.'.'.$what;
+    my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
+    my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
 
-# -------------------------------------------------------- first, check default
 
-    if (defined($def)) { $outpar[11]=$def; $result=11; }
 
-# ----------------------------------------------------- second, check map parms
+# --------------------------------------------------------- first, check course
 
-    my $thisparm=$parmhash{$symbparm};
-    if (defined($thisparm)) { $outpar[10]=$thisparm; $result=10; }
-
-# --------------------------------------------------------- third, check course
-
-    if (defined($courseopt{$courselevel})) {
-	$outpar[9]=$courseopt{$courselevel};
-	$result=9;
+    if (defined($$courseopt{$courselevel})) {
+	$outpar[11]=$$courseopt{$courselevel};
+	$result=11;
     }
 
-    if (defined($courseopt{$courselevelm})) {
-	$outpar[8]=$courseopt{$courselevelm};
-	$result=8;
+    if (defined($$courseopt{$courselevelm})) {
+	$outpar[10]=$$courseopt{$courselevelm};
+	$result=10;
     }
 
-    if (defined($courseopt{$courselevelr})) {
-	$outpar[7]=$courseopt{$courselevelr};
+# ------------------------------------------------------- second, check default
+
+    if (defined($def)) { $outpar[9]=$def; $result=9; }
+
+# ------------------------------------------------------ third, check map parms
+
+    my $thisparm=$parmhash{$symbparm};
+    if (defined($thisparm)) { $outpar[8]=$thisparm; $result=8; }
+
+    if (defined($$courseopt{$courselevelr})) {
+	$outpar[7]=$$courseopt{$courselevelr};
 	$result=7;
     }
 
+# ------------------------------------------------------ fourth, back to course
     if (defined($csec)) {
-        if (defined($courseopt{$seclevel})) {
-	    $outpar[6]=$courseopt{$seclevel};
+        if (defined($$courseopt{$seclevel})) {
+	    $outpar[6]=$$courseopt{$seclevel};
 	    $result=6;
 	}
-        if (defined($courseopt{$seclevelm})) {
-	    $outpar[5]=$courseopt{$seclevelm};
+        if (defined($$courseopt{$seclevelm})) {
+	    $outpar[5]=$$courseopt{$seclevelm};
 	    $result=5;
 	}
 
-        if (defined($courseopt{$seclevelr})) {
-	    $outpar[4]=$courseopt{$seclevelr};
+        if (defined($$courseopt{$seclevelr})) {
+	    $outpar[4]=$$courseopt{$seclevelr};
 	    $result=4;
 	}
     }
 
-# ---------------------------------------------------------- fourth, check user
+# ---------------------------------------------------------- fifth, check user
 
     if (defined($uname)) {
-	if (defined($useropt{$courselevel})) {
-	    $outpar[3]=$useropt{$courselevel};
+	if (defined($$useropt{$courselevel})) {
+	    $outpar[3]=$$useropt{$courselevel};
 	    $result=3;
 	}
 
-	if (defined($useropt{$courselevelm})) {
-	    $outpar[2]=$useropt{$courselevelm};
+	if (defined($$useropt{$courselevelm})) {
+	    $outpar[2]=$$useropt{$courselevelm};
 	    $result=2;
 	}
 
-	if (defined($useropt{$courselevelr})) {
-	    $outpar[1]=$useropt{$courselevelr};
+	if (defined($$useropt{$courselevelr})) {
+	    $outpar[1]=$$useropt{$courselevelr};
 	    $result=1;
 	}
     }
     return ($result,@outpar);
 }
 
+sub resetparmhash {
+    $parmhashid='';
+}
+
+sub cacheparmhash {
+    if ($parmhashid eq  $env{'request.course.fn'}) { return; }
+    my %parmhashfile;
+    if (tie(%parmhashfile,'GDBM_File',
+	      $env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
+	%parmhash=%parmhashfile;
+	untie %parmhashfile;
+	$parmhashid=$env{'request.course.fn'};
+    }
+}
+
+sub resetsymbcache {
+    $symbsid='';
+}
+
+sub symbcache {
+    my $id=shift;
+    if ($symbsid ne $env{'request.course.id'}) {
+	%symbs=();
+    }
+    unless ($symbs{$id}) {
+	my $navmap = Apache::lonnavmaps::navmap->new();
+	if ($id=~/\./) {
+	    my $resource=$navmap->getById($id);
+	    $symbs{$id}=$resource->symb();
+	} else {
+	    my $resource=$navmap->getByMapPc($id);
+	    $symbs{$id}=&Apache::lonnet::declutter($resource->src());
+	}
+	$symbsid=$env{'request.course.id'};
+    }
+    return $symbs{$id};
+}
+
+##################################################
+##################################################
+#
+# Store a parameter by ID
+#
+# Takes
+# - resource id
+# - name of parameter
+# - level
+# - new value
+# - new type
+# - username
+# - userdomain
+
+sub storeparm {
+    my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
+    &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
+}
+
+#
+# Store a parameter by symb
+#
+# Takes
+# - symb
+# - name of parameter
+# - level
+# - new value
+# - new type
+# - username
+# - userdomain
+
+sub storeparm_by_symb {
+# ---------------------------------------------------------- Get symb, map, etc
+    my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec)=@_;
+# ---------------------------------------------------------- Construct prefixes
+    $spnam=~s/\_([^\_]+)$/\.$1/;
+    my $map=(&Apache::lonnet::decode_symb($symb))[0];    
+    my $symbparm=$symb.'.'.$spnam;
+    my $mapparm=$map.'___(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
+#
+	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+# Expire sheets
+	&Apache::lonnet::expirespread('','','studentcalc');
+	if (($snum==7) || ($snum==4)) {
+	    &Apache::lonnet::expirespread('','','assesscalc',$symb);
+	} elsif (($snum==8) || ($snum==5)) {
+	    &Apache::lonnet::expirespread('','','assesscalc',$map);
+	} else {
+	    &Apache::lonnet::expirespread('','','assesscalc');
+	}
+# Store parameter
+	if ($delete) {
+	    $reply=&Apache::lonnet::del
+		('resourcedata',[keys(%storecontent)],$cdom,$cnum);
+	} else {
+	    $reply=&Apache::lonnet::cput
+		('resourcedata',\%storecontent,$cdom,$cnum);
+	}
+	&Apache::lonnet::devalidatecourseresdata($cnum,$cdom);
+    } else {
+# ------------------------------------------------------------------ Store User
+#
+# Expire sheets
+	&Apache::lonnet::expirespread($uname,$udom,'studentcalc');
+	if ($snum==1) {
+	    &Apache::lonnet::expirespread
+		($uname,$udom,'assesscalc',$symb);
+	} elsif ($snum==2) {
+	    &Apache::lonnet::expirespread
+		($uname,$udom,'assesscalc',$map);
+	} 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 '';
+}
+
 ##################################################
 ##################################################
 
@@ -272,45 +435,30 @@ 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 
 	'<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
 	    .$marker."','".$return."','".$call."'".');">'.
 		&valout($value,$type).'</a><a name="'.$marker.'"></a>';
 }
 
-
 sub startpage {
-    my ($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader)=@_;
+    my $r=shift;
 
     my $bodytag=&Apache::loncommon::bodytag('Set/Modify Course Parameters','',
                                             'onUnload="pclose()"');
-    my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
-        &Apache::loncommon::selectstudent_link('parmform','uname','udom');
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Table Mode Parameter Setting');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
-    my %lt=&Apache::lonlocal::texthash(
-		    'cep'   => "Course Environment Parameters",
-		    'scep'  => "Set Course Environment Parameters",
-		    'smcap' => "Set/Modify Course Assessment Parameter",
-		    'mcap'  => "Modify Course Assessment Parameters",
-		    'caphm' => "Course Assessment Parameter - Helper Mode",
-		    'capom' => "Course Assessment Parameters - Overview Mode",
-                    'captm' => "Course Assessments Parameters - Table Mode",
-		    'sg'    => "Section/Group",
-		    'fu'    => "For User",
-		    'oi'    => "or ID",
-		    'ad'    => "at Domain"
-				       );
-    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>
@@ -357,80 +505,40 @@ sub startpage {
 $selscript
 </head>
 $bodytag
-$overallhelp
-ENDHEAD
-
-    unless ($trimheader) {$r->print(<<ENDHEAD2);
-<form method="post" action="/adm/parmset" name="envform">
-<h4>$lt{'cep'}</h4>
-<input type="submit" name="crsenv" value="$lt{'scep'}" />
-</form>
-<hr />
-$assessparmhelp
-<form method="post" action="/adm/helper/parameter.helper" name="helpform">
-<h4>$lt{'caphm'}</h4>
-<input type="submit" value="$lt{'smcap'}" />
-</form>
-<hr />
-<form method="post" action="/adm/parmset" name="overview">
-<h4>$lt{'capom'}</h4>
-<input type="submit" name="overview" value="$lt{'mcap'}" />
-</form>
-<hr />
-ENDHEAD2
-}
-    $r->print(<<ENDHEAD3);
-<form method="post" action="/adm/parmset" name="parmform">
-<h4>$lt{'captm'}</h4>
-ENDHEAD3
-
-    if (!$have_assesments) {
-	$r->print('<font color="red">'.&mt('There are no assesment parameters in this course to set.').'</font><br />');	
-    } else {
-	$r->print(<<ENDHEAD);
-<b>
-$lt{'sg'}:
-<input type="text" value="$csec" size="6" name="csec">
-<br>
-$lt{'fu'} 
-<input type="text" value="$uname" size="12" name="uname">
-$lt{'oi'}
-<input type="text" value="$id" size="12" name="id"> 
-$lt{'ad'}
-$chooseopt
-</b>
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=settable" name="parmform">
 <input type="hidden" value='' name="pres_value">
 <input type="hidden" value='' name="pres_type">
 <input type="hidden" value='' name="pres_marker">
+<input type="hidden" value='1' name="prevvisit">
 ENDHEAD
-    }
 }
 
+
 sub print_row {
-    my ($r,$which,$part,$name,$rid,$default,$defaulttype,$display,$defbgone,
-	$defbgtwo,$parmlev)=@_;
+    my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
+	$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;
-    for (my $i=$#typeoutpar;$i>0;$i--) {
+    my $cascadetype=$$defaulttype{$which};
+    for (my $i=11;$i>0;$i--) {
 	 if ($typeoutpar[$i]) { 
             $cascadetype=$typeoutpar[$i];
 	} else {
             $typeoutpar[$i]=$cascadetype;
         }
     }
- 
     my $parm=$$display{$which};
 
-    if ($parmlev eq 'full' || $parmlev eq 'brief') {
+    if ($parmlev eq 'full') {
         $r->print('<td bgcolor='.$defbgtwo.' align="center">'
                   .$$part{$which}.'</td>');
     } else {    
@@ -450,7 +558,7 @@ sub print_row {
         } elsif ($csec) {
             &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
         } else {
-            &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
+            &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display); 
         }
     } elsif ($parmlev eq 'map') {
 
@@ -459,53 +567,36 @@ sub print_row {
         } elsif ($csec) {
             &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         } else {
-            &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
         }
     } else {
 
-        &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-
-        if ($parmlev eq 'brief') {
-
-           &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-
-           if ($csec) {
-               &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-           if ($uname) {
-               &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-        } else {
+        &print_td($r,11,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
 
-           &print_td($r,10,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,9,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,8,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           &print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,9,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,8,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	&print_td($r,7,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	
+	if ($csec) {
+	    &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	}
+	if ($uname) {
+	    &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	    &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+	}
 
-           if ($csec) {
-               &print_td($r,6,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,5,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,4,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-           if ($uname) {
-               &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-               &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-           }
-        } # end of $brief if/else
     } # end of $parmlev if/else
 
     $r->print('<td bgcolor=#CCCCFF align="center">'.
                   &valout($outpar[$result],$typeoutpar[$result]).'</td>');
 
-    if ($parmlev eq 'full' || $parmlev eq 'brief') {
+    if ($parmlev eq 'full') {
         my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
-                                        '.'.$$name{$which},$symbp{$rid});
-
-# this doesn't seem to work, and I don't think is correct
-#    my $sessionvaltype=&Apache::lonnet::EXT('resource.'.$$part{$which}.
-#                                      '.'.$$name{$which}.'.type',$symbp{$rid});
-# this seems to work
+                                        '.'.$$name{$which},$$symbp{$rid});
         my $sessionvaltype=$typeoutpar[$result];
         if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
         $r->print('<td bgcolor=#999999 align="center"><font color=#FFFFFF>'.
@@ -520,7 +611,7 @@ sub print_td {
     my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
     $r->print('<td bgcolor='.(($result==$which)?'"#AAFFAA"':$defbg).
               ' align="center">');
-    if ($which<10) {
+    if ($which<8 || $which > 9) {
 	$r->print(&plink($$typeoutpar[$which],
 			 $$display{$value},$$outpar[$which],
 			 $mprefix."$which",'parmform.pres','psub'));
@@ -530,6 +621,7 @@ sub print_td {
     $r->print('</td>'."\n");
 }
 
+
 =pod
 
 =item B<extractResourceInformation>: Given the course data hash, extractResourceInformation extracts lots of information about the course's resources into a variety of hashes.
@@ -542,7 +634,7 @@ Input: See list below:
 
 =item B<typep>: hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
 
-=item B<keyp>: hash, id->key list, will contain a comma seperated list of the meta-data keys available for the given id
+=item B<keyp>: hash, id->key list, will contain a comma separated list of the meta-data keys available for the given id
 
 =item B<allparms>: hash, name of parameter->display value (what is the display value?)
 
@@ -565,70 +657,215 @@ Input: See list below:
 =cut
 
 sub extractResourceInformation {
-    my $bighash = shift;
     my $ids = shift;
     my $typep = shift;
     my $keyp = shift;
     my $allparms = shift;
     my $allparts = shift;
-    my $allkeys = shift;
     my $allmaps = shift;
-    my $fcat = shift;
-    my $defp = shift;
     my $mapp = shift;
     my $symbp = shift;
     my $maptitles=shift;
+    my $uris=shift;
 
-    foreach (keys %$bighash) {
-	if ($_=~/^src\_(\d+)\.(\d+)$/) {
-	    my $mapid=$1;
-	    my $resid=$2;
-	    my $id=$mapid.'.'.$resid;
-	    my $srcf=$$bighash{$_};
-#	    if ($srcf=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-	    if (1) {
-		$$ids[$#$ids+1]=$id;
-		$$typep{$id}=$1;
-		$$keyp{$id}='';
-		foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
-		  if ($_=~/^parameter\_(.*)/) {
-                    my $key=$_;
-                    my $allkey=$1;
-                    $allkey=~s/\_/\./g;
-                    my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
-                    my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
-                    my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
-                    my $parmdis = $display;
-                    $parmdis =~ s|(\[Part.*$)||g;
-                    my $partkey = $part;
-                    $partkey =~ tr|_|.|;
-                    $$allparms{$name} = $parmdis;
-                    $$allparts{$part} = "[Part $part]";
-                    $$allkeys{$allkey}=$display;
-                    if ($allkey eq $fcat) {
-		        $$defp{$id}= &Apache::lonnet::metadata($srcf,$key);
-		    }
-		    if ($$keyp{$id}) {
-		        $$keyp{$id}.=','.$key;
-		    } else {
-		        $$keyp{$id}=$key;
-		    }
-		  }
+
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my @allres=$navmap->retrieveResources(undef,undef,1,undef,1);
+    foreach my $resource (@allres) {
+	my $id=$resource->id();
+        my ($mapid,$resid)=split(/\./,$id);
+	if ($mapid eq '0') { next; }
+	$$ids[$#$ids+1]=$id;
+	my $srcf=$resource->src();
+	$srcf=~/\.(\w+)$/;
+	$$typep{$id}=$1;
+	$$keyp{$id}='';
+        $$uris{$id}=$srcf;
+	foreach (split(/\,/,&Apache::lonnet::metadata($srcf,'allpossiblekeys'))) {
+	    if ($_=~/^parameter\_(.*)/) {
+		my $key=$_;
+# Hidden parameters
+		if (&Apache::lonnet::metadata($srcf,$key.'.hidden') eq 'parm') {
+		    next;
+		}
+		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
+		my $name=&Apache::lonnet::metadata($srcf,$key.'.name');
+		my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
+#
+# allparms is a hash of parameter names
+#
+		my $parmdis = $display;
+		$parmdis =~ s/\[Part.*$//g;
+                $$allparms{$name}=$parmdis;
+#
+# allparts is a hash of all parts
+#
+		$$allparts{$part} = "Part: $part";
+#
+# Remember all keys going with this resource
+#
+		if ($$keyp{$id}) {
+		    $$keyp{$id}.=','.$key;
+		} else {
+		    $$keyp{$id}=$key;
 		}
-		$$mapp{$id}=
-		    &Apache::lonnet::declutter($$bighash{'map_id_'.$mapid});
-                $$mapp{$mapid}=$$mapp{$id};
-		$$allmaps{$mapid}=$$mapp{$id};
-		$$maptitles{$mapid}=
- $$bighash{'title_'.$$bighash{'ids_'.&Apache::lonnet::clutter($$mapp{$id})}};
-		$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
-		$$symbp{$id}=$$mapp{$id}.
-			'___'.$resid.'___'.
-			    &Apache::lonnet::declutter($srcf);
-                $$symbp{$mapid}=$$mapp{$id}.'___(all)';
 	    }
 	}
+	$$mapp{$id}=
+	    &Apache::lonnet::declutter($resource->enclosing_map_src());
+	$$mapp{$mapid}=$$mapp{$id};
+	$$allmaps{$mapid}=$$mapp{$id};
+	if ($mapid eq '1') {
+	    $$maptitles{$mapid}='Main Course Documents';
+	} else {
+	    $$maptitles{$mapid}=&Apache::lonnet::gettitle(&Apache::lonnet::clutter($$mapp{$id}));
+	}
+	$$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
+	$$symbp{$id}=&Apache::lonnet::encode_symb($$mapp{$id},$resid,$srcf);
+	$$symbp{$mapid}=$$mapp{$id}.'___(all)';
+    }
+}
+
+
+##################################################
+##################################################
+
+sub parmmenu {
+    my ($r,$allparms,$pscat)=@_;
+    my $tempkey;
+    $r->print(<<ENDSCRIPT);
+<script type="text/javascript">
+    function checkall(value, checkName) {
+	for (i=0; i<document.forms.parmform.elements.length; i++) {
+            ele = document.forms.parmform.elements[i];
+            if (ele.name == checkName) {
+                document.forms.parmform.elements[i].checked=value;
+            }
+        }
+    }
+</script>
+ENDSCRIPT
+    $r->print();
+    $r->print("\n<table><tr>");
+    my $cnt=0;
+    foreach $tempkey (sort { $$allparms{$a} cmp $$allparms{$b} }
+                      keys %{$allparms} ) {
+	$r->print("\n<td><font size='-1'><input type='checkbox' name='pscat' ");
+	$r->print('value="'.$tempkey.'"');
+	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
+	    $r->print(' checked');
+	}
+	$r->print('>'.$$allparms{$tempkey}.'</font></td>');
+ 	$cnt++;
+        if ($cnt==3) {
+	    $r->print("</tr>\n<tr>");
+	    $cnt=0;
+	}
+    }
+    $r->print('
+</tr><tr><td>
+<input type="button" onclick="checkall(true, \'pscat\')" value="Select All" />
+</td><td></td><td>
+<input type="button" onclick="checkall(false, \'pscat\')" value="Unselect All" />
+</td>
+');
+    $r->print('</tr></table>');
+}
+
+sub partmenu {
+    my ($r,$allparts,$psprt)=@_;
+    $r->print('<select multiple name="psprt" size="5">');
+    $r->print('<option value="all"');
+    $r->print(' selected') unless (@{$psprt});
+    $r->print('>'.&mt('All Parts').'</option>');
+    my %temphash=();
+    foreach (@{$psprt}) { $temphash{$_}=1; }
+    foreach my $tempkey (sort keys %{$allparts}) {
+	unless ($tempkey =~ /\./) {
+	    $r->print('<option value="'.$tempkey.'"');
+	    if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
+		$r->print(' selected');
+	    }
+	    $r->print('>'.$$allparts{$tempkey}.'</option>');
+	}
+    }
+    $r->print('</select>');
+}
+
+sub usermenu {
+    my ($r,$uname,$id,$udom,$csec)=@_;
+    my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
+        &Apache::loncommon::selectstudent_link('parmform','uname','udom');
+    my $selscript=&Apache::loncommon::studentbrowser_javascript();
+    my %lt=&Apache::lonlocal::texthash(
+		    'sg'    => "Section/Group",
+		    'fu'    => "For User",
+		    'oi'    => "or ID",
+		    'ad'    => "at Domain"
+				       );
+    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(<<ENDMENU);
+<b>
+$sections
+<br />
+$lt{'fu'} 
+<input type="text" value="$uname" size="12" name="uname" />
+$lt{'oi'}
+<input type="text" value="$id" size="12" name="id" /> 
+$lt{'ad'}
+$chooseopt
+</b>
+ENDMENU
+}
+
+sub displaymenu {
+    my ($r,$allparms,$allparts,$pscat,$psprt)=@_;
+    $r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'.
+	     &mt('Select Parts to View').'</th></tr><tr><td>');  
+    &parmmenu($r,$allparms,$pscat);
+    $r->print('</td><td>');
+    &partmenu($r,$allparts,$psprt);
+    $r->print('</td></tr></table>');
+}
+
+sub mapmenu {
+    my ($r,$allmaps,$pschp,$maptitles)=@_;
+    $r->print(&mt('Select Enclosing Map or Folder').' ');
+    $r->print('<select name="pschp">');
+    $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
+    foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
+	$r->print('<option value="'.$_.'"');
+	if (($pschp eq $_)) { $r->print(' selected'); }
+	$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
+    }
+    $r->print("</select>");
+}
+
+sub levelmenu {
+    my ($r,$alllevs,$parmlev)=@_;
+    $r->print(&mt('Select Parameter Level').
+	      &Apache::loncommon::help_open_topic('Course_Parameter_Levels').' ');
+    $r->print('<select name="parmlev">');
+    foreach (reverse sort keys %{$alllevs}) {
+	$r->print('<option value="'.$$alllevs{$_}.'"');
+	if ($parmlev eq $$alllevs{$_}) {
+	    $r->print(' selected'); 
+	}
+	$r->print('>'.$_.'</option>');
     }
+    $r->print("</select>");
 }
 
 ##################################################
@@ -664,77 +901,83 @@ Variables used (guessed by Jeremy):
 sub assessparms {
 
     my $r=shift;
+
+    my @ids=();
+    my %symbp=();
+    my %mapp=();
+    my %typep=();
+    my %keyp=();
+    my %uris=();
+    my %maptitles=();
+
 # -------------------------------------------------------- Variable declaration
-    my %allkeys=();
+
     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';
 
     my %allparms;
     my %allparts;
 
-    my %defp;
-    %courseopt=();
-    %useropt=();
-    my %bighash=();
-
     @ids=();
     %symbp=();
     %typep=();
 
     my $message='';
 
-    $csec=$ENV{'form.csec'};
-    $udom=$ENV{'form.udom'};
-    unless ($udom) { $udom=$r->dir_config('lonDefDomain'); }
+    $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 $pssymb='';
     my $parmlev='';
-    my $trimheader='';
-    my $prevvisit=$ENV{'form.prevvisit'};
-
-#    unless ($parmlev==$ENV{'form.parmlev'}) {
-#        $parmlev = 'full';
-#    }
  
-    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) {
@@ -745,7 +988,7 @@ sub assessparms {
 		&mt('at domain')." '$udom'</font>";
 	}
     } else {
-	$uname=$ENV{'form.uname'};
+	$uname=$env{'form.uname'};
     }
     unless ($udom) { $uname=''; }
     $uhome='';
@@ -758,13 +1001,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'));
@@ -778,304 +1021,60 @@ sub assessparms {
 
     unless ($csec) { $csec=''; }
 
-    my $fcat=$ENV{'form.fcat'};
-    unless ($fcat) { $fcat=''; }
-
-# ------------------------------------------------------------------- Tie hashs
-    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)");
-	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)");
-	return ;
-    }
-
 # --------------------------------------------------------- Get all assessments
-    extractResourceInformation(\%bighash, \@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allkeys, \%allmaps, $fcat, \%defp, \%mapp, \%symbp,\%maptitles);
+    &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps, \%mapp, \%symbp,\%maptitles,\%uris);
 
     $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==9) || ($snum==3)) { $storeunder=$courselevel; }
-	if (($snum==8) || ($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'}) {
+        my @markers=split(/\&\&\&/,$env{'form.pres_marker'});
+        my @values=split(/\&\&\&/,$env{'form.pres_value'});
+        my @types=split(/\&\&\&/,$env{'form.pres_type'});
+	for (my $i=0;$i<=$#markers;$i++) {
+	    $message.=&storeparm(split(/\&/,$markers[$i]),
+				 $values[$i],
+				 $types[$i],
+				 $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();
-# -------------------------------------------------------------- Get coursedata
-    %courseopt = &Apache::lonnet::dump
-        ('resourcedata',
-         $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);
-    }
-
-# ------------------------------------------------------------------- Sort this
-
-    @ids=sort  {
-	if ($fcat eq '') {
-	    $a<=>$b;
-	} else {
-	    my ($result,@outpar)=&parmval($fcat,$a,$defp{$a});
-	    my $aparm=$outpar[$result];
-	    ($result,@outpar)=&parmval($fcat,$b,$defp{$b});
-	    my $bparm=$outpar[$result];
-	    1*$aparm<=>1*$bparm;
-	}
-    } @ids;
 #----------------------------------------------- if all selected, fill in array
-    if ($pscat[0] eq "all" || !@pscat) {@pscat = (keys %allparms);}
+    if ($pscat[0] eq "all") {@pscat = (keys %allparms);}
+    if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries') }; 
     if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
 # ------------------------------------------------------------------ Start page
 
-    my $have_assesments=1;
-    if (scalar(keys(%allkeys)) eq 0) { $have_assesments=0; }
-
-    &startpage($r,$id,$udom,$csec,$uname,$have_assesments,$trimheader);
-
-    if (!$have_assesments) {
-	untie(%bighash);
-	untie(%parmhash);
-	return '';
-    }
-#    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">');
+    &startpage($r);
 
     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>');
+    $r->print('<h2>'.$message.'</h2>');
                         
-    my $submitmessage = &mt('Update Section or Specific User');
     if (!$pssymb) {
-        $r->print('<tr><td>'.&mt('Select Parameter Level').
-       &Apache::loncommon::help_open_topic('Course_Parameter_Levels').
-		  '</td><td colspan="2">');
-        $r->print('<select name="parmlev">');
-        foreach (reverse sort keys %alllevs) {
-            $r->print('<option value="'.$alllevs{$_}.'"');
-            if ($parmlev eq $alllevs{$_}) {
-               $r->print(' selected'); 
-            }
-            $r->print('>'.$_.'</option>');
-        }
-        $r->print("</select></td>\n");
-
-        $r->print('</tr>');
+        $r->print('<table border="1"><tr><td>');
+        &levelmenu($r,\%alllevs,$parmlev);
 	if ($parmlev ne 'general') {
-	    $r->print('<tr><td>'.&mt('Select Enclosing Map or Folder').'</td>');
-	    $r->print('<td colspan="2"><select name="pschp">');
-	    $r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
-	    foreach (sort {$allmaps{$a} cmp $allmaps{$b}} keys %allmaps) {
-		$r->print('<option value="'.$_.'"');
-		if (($pschp eq $_)) { $r->print(' selected'); }
-		$r->print('>'.$maptitles{$_}.($allmaps{$_}!~/^uploaded/?'  ['.$allmaps{$_}.']':'').'</option>');
-	    }
-	    $r->print("</select></td></tr>\n");
+            $r->print('<td>');
+	    &mapmenu($r,\%allmaps,$pschp,\%maptitles);
+	    $r->print('</td>');
 	}
+        $r->print('</td></tr></table>');
+	&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt);
     } else {
         my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
-        $r->print("<tr><td>".&mt('Specific Resource')."</td><td>$resource</td>");
-        $r->print('<td><input type="submit" name="dis" value="'.$submitmessage.'"></td>');
-        $r->print('</tr>');
-        $r->print('<input type="hidden" value="'.$pssymb.'" name="symb">');
-    }
-
-    $r->print('<tr><td colspan="3"><hr /><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("<tr><td>Show: $showoptions</td></tr>");
-#    $r->print("<tr><td>pscat: @pscat</td></tr>");
-#    $r->print("<tr><td>psprt: @psprt</td></tr>");
-#    $r->print("<tr><td>fcat:  $fcat</td></tr>");
-
-    if ($showoptions eq 'show') {
-        my $tempkey;
-
-        $r->print('<tr><td colspan="3" align="center">'.&mt('Select Parameters to View').'</td></tr>');
-
-        $r->print('<tr><td colspan="2"><table>');
-        $r->print('<tr><td><input type="checkbox" name="pscat" value="all"');
-        $r->print(' checked') unless (@pscat);
-        $r->print('>'.&mt('All Parameters').'</td>');
-
-        my $cnt=0;
-        foreach $tempkey (sort { $allparms{$a} cmp $allparms{$b} }
-                      keys %allparms ) {
-            ++$cnt;
-            $r->print('</tr><tr>') unless ($cnt%2);
-            $r->print('<td><input type="checkbox" name="pscat" ');
-            $r->print('value="'.$tempkey.'"');
-            if ($pscat[0] eq "all" || grep $_ eq $tempkey, @pscat) {
-                $r->print(' checked');
-            }
-            $r->print('>'.$allparms{$tempkey}.'</td>');
-        }
-        $r->print('</tr></table>');
-
-#        $r->print('<tr><td>Select Parts</td><td>');
-        $r->print('<td><select multiple name="psprt" size="5">');
-        $r->print('<option value="all"');
-        $r->print(' selected') unless (@psprt);
-        $r->print('>'.&mt('All Parts').'</option>');
-        my %temphash=();
-        foreach (@psprt) { $temphash{$_}=1; }
-        foreach $tempkey (sort keys %allparts) {
-            unless ($tempkey =~ /\./) {
-                $r->print('<option value="'.$tempkey.'"');
-                if ($psprt[0] eq "all" ||  $temphash{$tempkey}) {
-                    $r->print(' selected');
-                }
-                $r->print('>'.$allparts{$tempkey}.'</option>');
-            }
-        }
-        $r->print('</select></td></tr><tr><td colspan="3"><hr /></td></tr>');
-
-        $r->print('<tr><td>'.&mt('Sort list by').'</td><td>');
-        $r->print('<select name="fcat">');
-        $r->print('<option value="">'.&mt('Enclosing Map or Folder').'</option>');
-        foreach (sort keys %allkeys) {
-            $r->print('<option value="'.$_.'"');
-            if ($fcat eq $_) { $r->print(' selected'); }
-            $r->print('>'.$allkeys{$_}.'</option>');
-        }
-        $r->print('</select></td>');
-
-        $r->print('</tr><tr><td colspan="3"><hr /></td></tr>');
-
-    } else { # hide options - include any necessary extras here
-
-        $r->print('<input type="hidden" name="fcat" value="'.$fcat.'">'."\n");
-
-        unless (@pscat) {
-          foreach (keys %allparms ) {
-            $r->print('<input type="hidden" name="pscat" value="'.$_.'">'."\n");
-          }
-        } else {
-          foreach (@pscat) {
-            $r->print('<input type="hidden" name="pscat" value="'.$_.'">'."\n");
-          }
-        }
-
-        unless (@psprt) {
-          foreach (keys %allparts ) {
-            $r->print('<input type="hidden" name="psprt" value="'.$_.'">'."\n");
-          }
-        } else {
-          foreach (@psprt) {
-            $r->print('<input type="hidden" name="psprt" value="'.$_.'">'."\n");
-          }
-        }
-
+        $r->print(&mt('Specific Resource').": ".$resource.
+                  '<input type="hidden" value="'.$pssymb.'" name="symb">');
     }
-    $r->print('</table><br />');
-    if (($prevvisit) || ($pschp) || ($pssymb)) {
-        $submitmessage = &mt("Update Course Assessment Parameter Display");
-    } else {
-        $submitmessage = &mt("Set/Modify Course Assessment Parameters");
-    }
-    $r->print('<input type="submit" name="dis" value="'.$submitmessage.'">');
-
-#    my @temp_psprt;
-#    foreach my $t (@psprt) {
-#	push(@temp_psprt, grep {eval (/^$t\./ || ($_ == $t))} (keys %allparts));
-#    }
+    &usermenu($r,$uname,$id,$udom,$csec);    
 
-#    @psprt = @temp_psprt;
+    $r->print('<br /><input type="submit" name="dis" value="'.&mt("Update Parameter Display").'" />');
 
     my @temp_pscat;
     map {
@@ -1085,13 +1084,13 @@ sub assessparms {
 
     @pscat = @temp_pscat;
 
-    if (($prevvisit) || ($pschp) || ($pssymb)) {
+    if (($env{'form.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') {
+        if ($parmlev eq 'full') {
            my $coursespan=$csec?8:5;
            $r->print('<p><table border=2>');
            $r->print('<tr><td colspan=5></td>');
@@ -1120,8 +1119,9 @@ sub assessparms {
            $r->print(<<ENDTABLETWO);
 <th rowspan=3>$lt{'pie'}</th>
 <th rowspan=3>$lt{'csv'}<br>($csuname $lt{'at'} $csudom)</th>
-</tr><tr><td colspan=5></td><th colspan=2>$lt{'rl'}</th>
-<th colspan=3>$lt{'ic'}</th>
+</tr><tr><td colspan=5></td><th colspan=2>$lt{'ic'}</th><th colspan=2>$lt{'rl'}</th>
+<th colspan=1>$lt{'ic'}</th>
+
 ENDTABLETWO
            if ($csec) {
                 $r->print("<th colspan=3>".
@@ -1130,8 +1130,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{'def'}</th><th>$lt{'femof'}</th>
-<th>$lt{'gen'}</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) {
@@ -1157,15 +1157,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=   ();
@@ -1174,7 +1174,7 @@ ENDTABLEHEADFOUR
                     my %display=();
                     my %type=   ();
                     my %default=();
-                    my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+                    my $uri=&Apache::lonnet::declutter($uris{$rid});
 
                     foreach (split(/\,/,$keyp{$rid})) {
                         my $tempkeyp = $_;
@@ -1192,8 +1192,7 @@ ENDTABLEHEADFOUR
                     my $totalparms=scalar keys %name;
                     if ($totalparms>0) {
                         my $firstrow=1;
-			my $title=$bighash{'title_'.$rid};
-			$title=~s/\&colon;/:/g;
+			my $title=&Apache::lonnet::gettitle($uri);
                         $r->print('<tr><td bgcolor='.$defbgone.
                              ' rowspan='.$totalparms.
                              '><tt><font size=-1>'.
@@ -1228,16 +1227,16 @@ ENDTABLEHEADFOUR
                                 undef $firstrow;
                             }
 
-                            &print_row($r,$_,\%part,\%name,$rid,\%default,
+                            &print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
-                                       $parmlev);
+                                       $parmlev,$uname,$udom,$csec);
                         }
                     }
                 }
             } # end foreach ids
 # -------------------------------------------------- End entry for one resource
             $r->print('</table>');
-        } # end of  brief/full
+        } # end of  full
 #--------------------------------------------------- Entry for parm level map
         if ($parmlev eq 'map') {
             my $defbgone = '"E0E099"';
@@ -1274,7 +1273,7 @@ ENDTABLEHEADFOUR
 #                  $r->print("$mapid:$map:   $rid <br /> \n");
 
                   if ($map eq $mapid) {
-                    my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+                    my $uri=&Apache::lonnet::declutter($uris{$rid});
 #                    $r->print("Keys: $keyp{$rid} <br />\n");
 
 #--------------------------------------------------------------------
@@ -1336,9 +1335,9 @@ ENDMAPONE
 
 	        foreach (sort keys %name) {
                     $r->print('<tr>');
-                    &print_row($r,$_,\%part,\%name,$mapid,\%default,
+                    &print_row($r,$_,\%part,\%name,\%symbp,$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>");
@@ -1362,7 +1361,7 @@ ENDMAPONE
             foreach (@ids) {
                 my $rid = $_;
         
-                my $uri=&Apache::lonnet::declutter($bighash{'src_'.$rid});
+                my $uri=&Apache::lonnet::declutter($uris{$rid});
 
 #--------------------------------------------------------------------
 # @catmarker contains list of all possible parameters including part #s
@@ -1414,16 +1413,14 @@ ENDMAPONE
 
 	    foreach (sort keys %name) {
                 $r->print('<tr>');
-                &print_row($r,$_,\%part,\%name,$mapid,\%default,
-                       \%type,\%display,$defbgone,$defbgtwo,$parmlev);
+                &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
+                       \%type,\%display,$defbgone,$defbgtwo,$parmlev,$uname,$udom,$csec);
 #                    $r->print("<tr><td>resource.$part{$_}.$name{$_},$symbp{$mapid}</td></tr>\n");
             }
             $r->print("</table></center>");
         } # end of $parmlev eq general
     }
     $r->print('</form></body></html>');
-    untie(%bighash);
-    untie(%parmhash);
 } # end sub assessparms
 
 
@@ -1450,17 +1447,19 @@ 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 $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,
+						    'Edit Course Environment');
+    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\///;
@@ -1500,13 +1499,34 @@ sub crsenv {
         if ($name =~ /^default_enrollment_(start|end)_date$/) {
             $value=&Apache::lonhtmlcommon::get_date_from_form($name.'_value');
         }
+        # Get existing cloners
+        my @oldcloner = ();
+        if ($name eq 'cloners') {
+            my %clonenames=&Apache::lonnet::dump('environment',$dom,$crs,'cloners');
+            if ($clonenames{'cloners'} =~ /,/) {
+                @oldcloner = split/,/,$clonenames{'cloners'};
+            } else {
+                $oldcloner[0] = $clonenames{'cloners'};
+            }
+        }
         #
         # Let the user know we made the changes
         if ($name && defined($value)) {
+            if ($name eq 'cloners') {
+                $value =~ s/^,//;
+                $value =~ s/,$//;
+            }
             my $put_result = &Apache::lonnet::put('environment',
                                                   {$name=>$value},$dom,$crs);
             if ($put_result eq 'ok') {
                 $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>'.$value.'</b>.<br />';
+                if ($name eq 'cloners') {
+                    &change_clone($value,\@oldcloner);
+                }
+                # Flush the course logs so course description is immediately updated
+                if ($name eq 'description' && defined($value)) {
+                    &Apache::lonnet::flushcourselogs();
+                }
             } else {
                 $setoutput.=&mt('Unable to set').' <b>'.$name.'</b> '.&mt('to').
 		    ' <b>'.$value.'</b> '.&mt('due to').' '.$put_result.'.<br />';
@@ -1515,7 +1535,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
 
@@ -1535,6 +1555,7 @@ sub crsenv {
              'courseid'       => '<b>'.&mt('Course ID or number').
                                  '</b><br />'.
                                  '('.&mt('internal').', '.&mt('optional').')',
+             'cloners'        => '<b>'.&mt('Users allowed to clone course').'</b><br /><tt>(user:domain,user:domain)</tt><br />'.&mt('Users with active Course Coordinator role in the course automatically have the right to clone it, and can be omitted from list.'),
              'grading'        => '<b>'.&mt('Grading').'</b><br />'.
                                  '<tt>"standard", "external", or "spreadsheet"</tt> '.&Apache::loncommon::help_open_topic('GradingOptions'),
              'default_xml_style' => '<b>'.&mt('Default XML Style File').'</b> '.
@@ -1592,6 +1613,9 @@ sub crsenv {
 	     'allow_limited_html_in_feedback'
 	         => '<b>'.&mt('Allow limited HTML in discussion posts').'</b><br />'.
 	            '('.&mt('Set value to "[_1]" to allow',"<tt>yes</tt>").')',
+             'allow_discussion_post_editing'
+                 => '<b>'.&mt('Allow users to edit/delete their own discussion posts').'</b><br />'.
+                    '('.&mt('Set value to "[_1]" to allow',"<tt>yes</tt>").')',
 	     'rndseed'
 	         => '<b>'.&mt('Randomization algorithm used').'</b> <br />'.
                     '<font color="red">'.&mt('Modifying this will make problems').' '.
@@ -1627,13 +1651,14 @@ sub crsenv {
 	     'tthoptions'
 	         => '<b>'.&mt('Default set of options to pass to tth/m when converting tex').'</b>'
              ); 
-        my @Display_Order = ('url','description','courseid','grading',
+        my @Display_Order = ('url','description','courseid','cloners','grading',
                              'default_xml_style','pageseparators',
                              'question.email','comment.email','policy.email',
                              'student_classlist_view',
                              'plc.roles.denied','plc.users.denied',
                              'pch.roles.denied','pch.users.denied',
                              'allow_limited_html_in_feedback',
+                             'allow_discussion_post_editing',
                              'languages',
 			     'nothideprivileged',
                              'rndseed',
@@ -1705,16 +1730,18 @@ 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
-<form method="post" action="/adm/parmset" name="envform">
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=crsenv" name="envform">
 $setoutput
 <p>
 <table border=2>
@@ -1725,10 +1752,11 @@ $output
 </form>
 </body>
 </html>    
-ENDENV
+ENDenv
 }
 ##################################################
-
+# Overview mode
+##################################################
 my $tableopen;
 
 sub tablestart {
@@ -1750,43 +1778,98 @@ sub tableend {
     }
 }
 
-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'};
-    $r->print(<<ENDOVER);
-<html>
-<head>
-<title>LON-CAPA Course Environment</title>
-</head>
-$bodytag
-<form method="post" action="/adm/parmset" name="overviewform">
-<input type="hidden" name="overview" value="1" />
-ENDOVER
+sub readdata {
+    my ($crs,$dom)=@_;
+# Read coursedata
+    my $resourcedata=&Apache::lonnet::get_courseresdata($crs,$dom);
+# Read userdata
+
+    my $classlist=&Apache::loncoursedata::get_classlist();
+    foreach (keys %$classlist) {
+        # the following undefs are for 'domain', and 'username' respectively.
+        if ($_=~/^(\w+)\:(\w+)$/) {
+	    my ($tuname,$tudom)=($1,$2);
+	    my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
+            foreach my $userkey (keys %{$useropt}) {
+		if ($userkey=~/^$env{'request.course.id'}/) {
+                    my $newkey=$userkey;
+		    $newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
+		    $$resourcedata{$newkey}=$$useropt{$userkey};
+		}
+	    }
+	}
+    }
+    return $resourcedata;
+}
+
+
 # Setting
-    my %olddata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+
+sub storedata {
+    my ($r,$crs,$dom)=@_;
+# Set userlevel immediately
+# Do an intermediate store of course level
+    my $olddata=&readdata($crs,$dom);
     my %newdata=();
     undef %newdata;
     my @deldata=();
     undef @deldata;
-    foreach (keys %ENV) {
+    foreach (keys %env) {
 	if ($_=~/^form\.([a-z]+)\_(.+)$/) {
 	    my $cmd=$1;
 	    my $thiskey=$2;
+	    my ($tuname,$tudom)=&extractuser($thiskey);
+	    my $tkey=$thiskey;
+            if ($tuname) {
+		$tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
+	    }
 	    if ($cmd eq 'set') {
-		my $data=$ENV{$_};
-		if ($olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+		my $data=$env{$_};
+		if ($$olddata{$thiskey} ne $data) { 
+		    if ($tuname) {
+			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data},$tudom,$tuname) eq 'ok') {
+			    $r->print('<br />'.&mt('Stored modified parameter for').' '.
+				      &Apache::loncommon::plainname($tuname,$tudom));
+			} else {
+			    $r->print('<h2><font color="red">'.
+				      &mt('Error storing parameters').'</font></h2>');
+			}
+			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		    } else {
+			$newdata{$thiskey}=$data;
+                    } 
+		}
 	    } elsif ($cmd eq 'del') {
-		push (@deldata,$thiskey);
+		if ($tuname) {
+		    if (&Apache::lonnet::del('resourcedata',[$tkey],$tudom,$tuname) eq 'ok') {
+			$r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+		    } else {
+			$r->print('<h2><font color="red">'.
+				  &mt('Error deleting parameters').'</font></h2>');
+		    }
+		    &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		} else {
+		    push (@deldata,$thiskey);
+		}
 	    } elsif ($cmd eq 'datepointer') {
-		my $data=&Apache::lonhtmlcommon::get_date_from_form($ENV{$_});
-		if (defined($data) and $olddata{$thiskey} ne $data) { $newdata{$thiskey}=$data; }
+		my $data=&Apache::lonhtmlcommon::get_date_from_form($env{$_});
+		if (defined($data) and $$olddata{$thiskey} ne $data) { 
+		    if ($tuname) {
+			if (&Apache::lonnet::put('resourcedata',{$tkey=>$data},$tudom,$tuname) eq 'ok') {
+			    $r->print('<br />'.&mt('Stored modified date for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+			} else {
+			    $r->print('<h2><font color="red">'.
+				      &mt('Error storing parameters').'</font></h2>');
+			}
+			&Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+		    } else {
+			$newdata{$thiskey}=$data; 
+		    }
+		}
 	    }
 	}
     }
-# Store
+# Store all course level
     my $delentries=$#deldata+1;
     my @newdatakeys=keys %newdata;
     my $putentries=$#newdatakeys+1;
@@ -1797,6 +1880,7 @@ ENDOVER
 	    $r->print('<h2><font color="red">'.
 		      &mt('Error deleting parameters').'</font></h2>');
 	}
+	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
     if ($putentries) {
 	if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
@@ -1805,30 +1889,47 @@ ENDOVER
 	    $r->print('<h2><font color="red">'.
 		      &mt('Error storing parameters').'</font></h2>');
 	}
+	&Apache::lonnet::devalidatecourseresdata($crs,$dom);
     }
-# Read and display
-    my %resourcedata=&Apache::lonnet::dump('resourcedata',$dom,$crs);
+}
+
+sub extractuser {
+    my $key=shift;
+    return ($key=~/^$env{'request.course.id'}.\[useropt\:(\w+)\:(\w+)\]\./);
+}
+
+sub listdata {
+    my ($r,$resourcedata,$listdata)=@_;
+# Start list output
+
     my $oldsection='';
     my $oldrealm='';
     my $oldpart='';
     my $pointer=0;
     $tableopen=0;
     my $foundkeys=0;
-    foreach my $thiskey (sort keys %resourcedata) {
-	if ($resourcedata{$thiskey.'.type'}) {
-	    my ($course,$middle,$part,$name)=
-		($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+    foreach my $thiskey (sort keys %{$listdata}) {
+	if ($$resourcedata{$thiskey.'.type'}) {
+	    my ($middle,$part,$name)=
+		($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
 	    my $section=&mt('All Students');
-	    if ($middle=~/^\[(.*)\]\./) {
-		$section=&mt('Group/Section').': '.$1;
-		$middle=~s/^\[(.*)\]\.//;
+	    if ($middle=~/^\[(.*)\]/) {
+		my $issection=$1;
+		if ($issection=~/^useropt\:(\w+)\:(\w+)/) {
+		    $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
+		} else {
+		    $section=&mt('Group/Section').': '.$issection;
+		}
+		$middle=~s/^\[(.*)\]//;
 	    }
-	    $middle=~s/\.$//;
+	    $middle=~s/\.+$//;
+	    $middle=~s/^\.+//;
 	    my $realm='<font color="red">'.&mt('All Resources').'</font>';
 	    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
-		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).'</font>';
+		$realm='<font color="green">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><font color="#aaaaaa" size="-2">('.$1.')</font></font>';
 	    } elsif ($middle) {
-		$realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).'</font>';
+		my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+		$realm='<font color="orange">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><font color="#aaaaaa" size="-2">('.$url.' in '.$map.' id: '.$id.')</font></font>';
 	    }
 	    if ($section ne $oldsection) {
 		$r->print(&tableend()."\n<hr /><h1>$section</h1>");
@@ -1852,28 +1953,256 @@ ENDOVER
 		      ':</b></td><td><input type="checkbox" name="del_'.
 		      $thiskey.'" /></td><td>');
 	    $foundkeys++;
-	    if ($resourcedata{$thiskey.'.type'}=~/^date/) {
+	    if ($$resourcedata{$thiskey.'.type'}=~/^date/) {
 		my $jskey='key_'.$pointer;
 		$pointer++;
 		$r->print(
 			  &Apache::lonhtmlcommon::date_setter('overviewform',
 							      $jskey,
-						      $resourcedata{$thiskey}).
+						      $$resourcedata{$thiskey}).
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'
 			  );
 	    } else {
 		$r->print(
 			  '<input type="text" name="set_'.$thiskey.'" value="'.
-			  $resourcedata{$thiskey}.'">');
+			  $$resourcedata{$thiskey}.'">');
 	    }
 	    $r->print('</td></tr>');
 	}
     }
-    
+    return $foundkeys;
+}
+
+sub newoverview {
+    my $r=shift;
+    my $bodytag=&Apache::loncommon::bodytag(
+                             'Set Course Assessment Parameters');
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print(<<ENDOVER);
+$html
+<head>
+<title>LON-CAPA Parameters</title>
+</head>
+$bodytag
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=newoverview" name="overviewform">
+ENDOVER
+   $r->print(&tableend().
+	     '<p><input type="submit" value="'.&mt('Submit').'" /></p></form></body></html>');
+}
+
+sub overview {
+    my $r=shift;
+    my $bodytag=&Apache::loncommon::bodytag(
+                             'Modify Course Assessment Parameters');
+    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(undef,'Overview');
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print(<<ENDOVER);
+$html
+<head>
+<title>LON-CAPA Parameters</title>
+</head>
+$bodytag
+$breadcrumbs
+<form method="post" action="/adm/parmset?action=setoverview" name="overviewform">
+ENDOVER
+# Store modified
+
+    &storedata($r,$crs,$dom);
+
+# Read modified data
+
+    my $resourcedata=&readdata($crs,$dom);
+
+# List data
+
+    my $foundkeys=&listdata($r,$resourcedata,$resourcedata);
+
     $r->print(&tableend().'<p>'.
-	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no course or section parameters.')).'</p></form></body></html>');
+	($foundkeys?'<input type="submit" value="'.&mt('Modify Parameters').'" />':&mt('There are no parameters.')).'</p></form></body></html>');
+}
+
+##################################################
+##################################################
+                                                                                            
+=pod
+                                                                                            
+=item change clone
+                                                                                            
+Modifies the list of courses a user can clone (stored
+in the user's environemnt.db file), called when a
+change is made to the list of users allowed to clone
+a course.
+                                                                                            
+Inputs: $action,$cloner
+where $action is add or drop, and $cloner is identity of 
+user for whom cloning ability is to be changed in course. 
+                                                                                            
+Returns: 
+
+=cut
+                                                                                            
+##################################################
+##################################################
+
+
+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 $clone_crs = $cnum.':'.$cdom;
+    
+    if ($cnum && $cdom) {
+        my @allowclone = ();
+        if ($clonelist =~ /,/) {
+            @allowclone = split/,/,$clonelist;
+        } else {
+            $allowclone[0] = $clonelist;
+        }
+        foreach my $currclone (@allowclone) {
+            if (!grep/^$currclone$/,@$oldcloner) {
+                ($uname,$udom) = split/:/,$currclone;
+                if ($uname && $udom) {
+                    unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                        my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                        if ($currclonecrs{'cloneable'} !~ /\Q$clone_crs\E/) {
+                            if ($currclonecrs{'cloneable'} eq '') {
+                                $currclonecrs{'cloneable'} = $clone_crs;
+                            } else {
+                                $currclonecrs{'cloneable'} .= ','.$clone_crs;
+                            }
+                            &Apache::lonnet::put('environment',\%currclonecrs,$udom,$uname);
+                        }
+                    }
+                }
+            }
+        }
+        foreach my $oldclone (@$oldcloner) {
+            if (!grep/^$oldclone$/,@allowclone) {
+                ($uname,$udom) = split/:/,$oldclone;
+                if ($uname && $udom) {
+                    unless (&Apache::lonnet::homeserver($uname,$udom) eq 'no_host') {
+                        my %currclonecrs = &Apache::lonnet::dump('environment',$udom,$uname,'cloneable');
+                        my %newclonecrs = ();
+                        if ($currclonecrs{'cloneable'} =~ /\Q$clone_crs\E/) {
+                            if ($currclonecrs{'cloneable'} =~ /,/) {
+                                my @currclonecrs = split/,/,$currclonecrs{'cloneable'};
+                                foreach (@currclonecrs) {
+                                    unless ($_ eq $clone_crs) {
+                                        $newclonecrs{'cloneable'} .= $_.',';
+                                    }
+                                }
+                                $newclonecrs{'cloneable'} =~ s/,$//;
+                            } else {
+                                $newclonecrs{'cloneable'} = '';
+                            }
+                            &Apache::lonnet::put('environment',\%newclonecrs,$udom,$uname);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+##################################################
+##################################################
+
+=pod
+
+=item * header
+
+Output html header for page
+
+=cut
+
+##################################################
+##################################################
+sub header {
+    my $html=&Apache::lonxml::xmlbegin();
+    my $bodytag=&Apache::loncommon::bodytag('Parameter Manager');
+    my $title = &mt('LON-CAPA Parameter Manager');
+    return(<<ENDHEAD);
+$html
+<head>
+<title>$title</title>
+</head>
+$bodytag
+ENDHEAD
+}
+##################################################
+##################################################
+sub print_main_menu {
+    my ($r,$parm_permission)=@_;
+    #
+    $r->print(<<ENDMAINFORMHEAD);
+<form method="post" enctype="multipart/form-data"
+      action="/adm/parmset" name="studentform">
+ENDMAINFORMHEAD
+#
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my @menu =
+        (
+          { text => 'Set Course Environment Parameters',
+	    action => 'crsenv',
+            permission => $parm_permission,
+            },
+          { text => 'Set/Modify Course Assessment Parameters - Helper Mode',
+            url => '/adm/helper/parameter.helper',
+            permission => $parm_permission,
+            },
+          { text => 'Modify Course Assessment Parameters - Overview Mode',
+            action => 'setoverview',
+            permission => $parm_permission,
+            },          
+	  { text => 'Set Course Assessment Parameters - Overview Mode',
+            action => 'newoverview',
+            permission => $parm_permission,
+            },
+          { text => 'Set/Modify Course Assessment Parameters - Table Mode',
+            action => 'settable',
+            permission => $parm_permission,
+            help => 'Cascading_Parameters',
+            },
+#          { text => 'Set Parameter Default Preferences',
+#            help => 'Course_View_Class_List',
+#            action => 'setdefaults',
+#            permission => $parm_permission,
+#            },
+          );
+    my $menu_html = '';
+    foreach my $menu_item (@menu) {
+        next if (! $menu_item->{'permission'});
+        $menu_html.='<p>';
+        $menu_html.='<font size="+1">';
+        if (exists($menu_item->{'url'})) {
+            $menu_html.=qq{<a href="$menu_item->{'url'}">};
+        } else {
+            $menu_html.=
+                qq{<a href="/adm/parmset?action=$menu_item->{'action'}">};
+        }
+        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+        if (exists($menu_item->{'help'})) {
+            $menu_html.=
+                &Apache::loncommon::help_open_topic($menu_item->{'help'});
+        }
+        $menu_html.='</p>'.$/;
+    }
+    $r->print($menu_html);
+    return;
 }
 
+
+
+
 ##################################################
 ##################################################
 
@@ -1884,7 +2213,6 @@ ENDOVER
 Main handler.  Calls &assessparms and &crsenv subroutines.
 
 =cut
-
 ##################################################
 ##################################################
     use Data::Dumper;
@@ -1896,49 +2224,74 @@ sub handler {
 	$r->send_http_header;
 	return OK;
     }
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+					    ['action','state',
+                                             'pres_marker',
+                                             'pres_value',
+                                             'pres_type',
+                                             'udom','uname']);
 
-# ----------------------------------------------------------- Clear out garbage
 
-    %courseopt=();
-    %useropt=();
-    %parmhash=();
-
-    @ids=();
-    %symbp=();
-    %mapp=();
-    %typep=();
-    %keyp=();
-
-    %maptitles=();
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/parmset",
+					    text=>"Parameter Manager",
+					    faq=>10,
+					    bug=>'Instructor Interface'});
 
 # ----------------------------------------------------- Needs to be in a course
+    my $parm_permission =
+	(&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'} &&  $parm_permission) {
 
-    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'})
-	 )) {
-
+        # Start Page
         &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'})) {
-# ---------------------------------------------- This is for course environment
-# -------------------------- also call if toplevel map coudl not be initialized
-	    &crsenv($r);
-	} elsif ($ENV{'form.overview'}) {
-# --------------------------------------------------------------- Overview mode
+
+        # id numbers can change on re-ordering of folders
+
+        &resetsymbcache();
+
+        #
+        # Main switch on form.action and form.state, as appropriate
+        #
+        # Check first if coming from someone else headed directly for
+        #  the table mode
+        if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
+	     && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+	    &assessparms($r);
+
+        } elsif (! exists($env{'form.action'})) {
+            $r->print(&header());
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
+							 'Parameter Manager'));
+            &print_main_menu($r,$parm_permission);
+        } elsif ($env{'form.action'} eq 'crsenv' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
+						    text=>"Course Environment"});
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
+						   'Edit Course Environment'));
+            &crsenv($r); 
+        } elsif ($env{'form.action'} eq 'setoverview' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+						    text=>"Overview Mode"});
 	    &overview($r);
-	} else {
-# --------------------------------------------------------- Bring up assessment
+        } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+						    text=>"Overview Mode"});
+	    &newoverview($r);
+        } elsif ($env{'form.action'} eq 'settable' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+						    text=>"Table Mode",
+						    help => 'Course_Setting_Parameters'});
 	    &assessparms($r);
-	}
+        }
+        
     } 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;
     }