--- loncom/interface/lonparmset.pm	2015/08/16 20:45:41	1.552
+++ loncom/interface/lonparmset.pm	2016/03/15 14:25:26	1.558
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.552 2015/08/16 20:45:41 raeburn Exp $
+# $Id: lonparmset.pm,v 1.558 2016/03/15 14:25:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,21 +54,25 @@ Inputs:  $what - a parameter spec (inclu
          $id   - a bighash Id number
          $def  - the resource's default value   'stupid emacs
 
-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 14 possible levels
+Returns:  A list, the first item is the index into the remaining list of items of parm values that is the active one, the list consists of parm values at the 18 possible levels
 
-14- General Course
-13- Map or Folder level in course
-12- resource default
-11- map default
-10- resource level in course
-9 - General for section
-8 - Map or Folder level for section
-7 - resource level in section
-6 - General for group
-5 - Map or Folder level for group
-4 - resource level in group
-3 - General for specific student
-2 - Map or Folder level for specific student
+18 - General Course
+17 - Map or Folder level in course (recursive) 
+16 - Map or Folder level in course (non-recursive)
+15 - resource default
+14 - map default
+13 - resource level in course
+12 - General for section
+11 - Map or Folder level for section (recursive)
+10 - Map or Folder level for section (non-recursive)
+9 - resource level in section
+8 - General for group
+7 - Map or Folder level for group (recursive)
+6 - Map or Folder level for group (non-recursive)
+5 - resource level in group
+4 - General for specific student
+3 - Map or Folder level for specific student (recursive)
+2 - Map or Folder level for specific student (non-recursive)
 1 - resource level for specific student
 
 =item parmval_by_symb()
@@ -369,84 +373,106 @@ sub parmval_by_symb {
     $map = &Apache::lonnet::deversion($map);
 
     my $symbparm=$symb.'.'.$what;
+    my $recurseparm=$map.'___(rec).'.$what; 
     my $mapparm=$map.'___(all).'.$what;
 
     my $grplevel=$env{'request.course.id'}.'.['.$cgroup.'].'.$what;
     my $grplevelr=$env{'request.course.id'}.'.['.$cgroup.'].'.$symbparm;
+    my $grpleveli=$env{'request.course.id'}.'.['.$cgroup.'].'.$recurseparm;
     my $grplevelm=$env{'request.course.id'}.'.['.$cgroup.'].'.$mapparm;
 
     my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$what;
     my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
+    my $secleveli=$env{'request.course.id'}.'.['.$csec.'].'.$recurseparm;
     my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;
 
     my $courselevel=$env{'request.course.id'}.'.'.$what;
     my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
+    my $courseleveli=$env{'request.course.id'}.'.'.$recurseparm;
     my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
 
 
 # --------------------------------------------------------- first, check course
 
     if (defined($$courseopt{$courselevel})) {
-    $outpar[14]=$$courseopt{$courselevel};
-    $result=14;
+        $outpar[18]=$$courseopt{$courselevel};
+        $result=18;
+    }
+
+    if (defined($$courseopt{$courseleveli})) {
+        $outpar[17]=$$courseopt{$courseleveli};
+        $result=17;
     }
 
     if (defined($$courseopt{$courselevelm})) {
-    $outpar[13]=$$courseopt{$courselevelm};
-    $result=13;
+        $outpar[16]=$$courseopt{$courselevelm};
+        $result=16;
     }
 
 # ------------------------------------------------------- second, check default
 
-    if (defined($def)) { $outpar[12]=$def; $result=12; }
+    if (defined($def)) { $outpar[15]=$def; $result=15; }
 
 # ------------------------------------------------------ third, check map parms
 
+    
     my $thisparm=&parmhash($symbparm);
-    if (defined($thisparm)) { $outpar[11]=$thisparm; $result=11; }
+    if (defined($thisparm)) { $outpar[14]=$thisparm; $result=14; }
 
     if (defined($$courseopt{$courselevelr})) {
-    $outpar[10]=$$courseopt{$courselevelr};
-    $result=10;
+        $outpar[13]=$$courseopt{$courselevelr};
+        $result=13;
     }
 
 # ------------------------------------------------------ fourth, back to course
     if ($csec ne '') {
         if (defined($$courseopt{$seclevel})) {
-        $outpar[9]=$$courseopt{$seclevel};
-        $result=9;
-    }
+            $outpar[12]=$$courseopt{$seclevel};
+            $result=12;
+        }
+        if (defined($$courseopt{$secleveli})) {
+            $outpar[11]=$$courseopt{$secleveli};
+            $result=11;
+        }
         if (defined($$courseopt{$seclevelm})) {
-        $outpar[8]=$$courseopt{$seclevelm};
-        $result=8;
-    }
-
+            $outpar[10]=$$courseopt{$seclevelm};
+            $result=10;
+        }
         if (defined($$courseopt{$seclevelr})) {
-        $outpar[7]=$$courseopt{$seclevelr};
-        $result=7;
-    }
+            $outpar[9]=$$courseopt{$seclevelr};
+            $result=9;
+        }
     }
 # ------------------------------------------------------ fifth, check course group
     if ($cgroup ne '') {
         if (defined($$courseopt{$grplevel})) {
-            $outpar[6]=$$courseopt{$grplevel};
-            $result=6;
+            $outpar[8]=$$courseopt{$grplevel};
+            $result=8;
+        }
+        if (defined($$courseopt{$grpleveli})) {
+            $outpar[7]=$$courseopt{$grpleveli};
+            $result=7;
         }
         if (defined($$courseopt{$grplevelm})) {
-            $outpar[5]=$$courseopt{$grplevelm};
-            $result=5;
+            $outpar[6]=$$courseopt{$grplevelm};
+            $result=6;
         }
         if (defined($$courseopt{$grplevelr})) {
-            $outpar[4]=$$courseopt{$grplevelr};
-            $result=4;
+            $outpar[5]=$$courseopt{$grplevelr};
+            $result=5;
         }
     }
 
-# ---------------------------------------------------------- fifth, check user
+# ---------------------------------------------------------- sixth, check user
 
     if ($uname ne '') {
     if (defined($$useropt{$courselevel})) {
-        $outpar[3]=$$useropt{$courselevel};
+        $outpar[4]=$$useropt{$courselevel};
+        $result=4;
+    }
+
+    if (defined($$useropt{$courseleveli})) {
+        $outpar[3]=$$useropt{$courseleveli};
         $result=3;
     }
 
@@ -686,30 +712,37 @@ sub storeparm_by_symb_inner {
     $map = &Apache::lonnet::deversion($map);
 
     my $symbparm=$symb.'.'.$spnam;
+    my $recurseparm=$map.'___(rec).'.$spnam;
     my $mapparm=$map.'___(all).'.$spnam;
 
     my $grplevel=$env{'request.course.id'}.'.['.$cgroup.'].'.$spnam;
     my $grplevelr=$env{'request.course.id'}.'.['.$cgroup.'].'.$symbparm;
+    my $grpleveli=$env{'request.course.id'}.'.['.$cgroup.'].'.$recurseparm;
     my $grplevelm=$env{'request.course.id'}.'.['.$cgroup.'].'.$mapparm;
 
     my $seclevel=$env{'request.course.id'}.'.['.$csec.'].'.$spnam;
     my $seclevelr=$env{'request.course.id'}.'.['.$csec.'].'.$symbparm;
+    my $secleveli=$env{'request.course.id'}.'.['.$csec.'].'.$recurseparm;
     my $seclevelm=$env{'request.course.id'}.'.['.$csec.'].'.$mapparm;
 
     my $courselevel=$env{'request.course.id'}.'.'.$spnam;
     my $courselevelr=$env{'request.course.id'}.'.'.$symbparm;
+    my $courseleveli=$env{'request.course.id'}.'.'.$recurseparm;
     my $courselevelm=$env{'request.course.id'}.'.'.$mapparm;
 
     my $storeunder='';
-    if (($snum==14) || ($snum==3)) { $storeunder=$courselevel; }
-    if (($snum==13) || ($snum==2)) { $storeunder=$courselevelm; }
-    if (($snum==10) || ($snum==1)) { $storeunder=$courselevelr; }
-    if ($snum==9) { $storeunder=$seclevel; }
-    if ($snum==8) { $storeunder=$seclevelm; }
-    if ($snum==7) { $storeunder=$seclevelr; }
-    if ($snum==6) { $storeunder=$grplevel; }
-    if ($snum==5) { $storeunder=$grplevelm; }
-    if ($snum==4) { $storeunder=$grplevelr; }
+    if (($snum==18) || ($snum==4)) { $storeunder=$courselevel; }
+    if (($snum==17) || ($snum==3)) { $storeunder=$courseleveli; } 
+    if (($snum==16) || ($snum==2)) { $storeunder=$courselevelm; }
+    if (($snum==13) || ($snum==1)) { $storeunder=$courselevelr; }
+    if ($snum==12) { $storeunder=$seclevel; }
+    if ($snum==11) { $storeunder=$secleveli; }
+    if ($snum==10) { $storeunder=$seclevelm; }
+    if ($snum==9) { $storeunder=$seclevelr; }
+    if ($snum==8) { $storeunder=$grplevel; }
+    if ($snum==7) { $storeunder=$grpleveli; }
+    if ($snum==6) { $storeunder=$grplevelm; }
+    if ($snum==5) { $storeunder=$grplevelr; }
 
 
     my $delete;
@@ -717,16 +750,16 @@ sub storeparm_by_symb_inner {
     my %storecontent = ($storeunder         => $nval,
             $storeunder.'.type' => $ntype);
     my $reply='';
-    if ($snum>3) {
+    if ($snum>4) {
 # ---------------------------------------------------------------- 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==10) || ($snum==7) || ($snum==4)) {
+    if (($snum==13) || ($snum==9) || ($snum==5)) {
         &Apache::lonnet::expirespread('','','assesscalc',$symb);
-    } elsif (($snum==11) || ($snum==8) || ($snum==5)) {
+    } elsif (($snum==14) || ($snum==10) || ($snum==6)) {
         &Apache::lonnet::expirespread('','','assesscalc',$map);
     } else {
         &Apache::lonnet::expirespread('','','assesscalc');
@@ -777,7 +810,7 @@ sub storeparm_by_symb_inner {
 
 
 sub valout {
-    my ($value,$type,$editable)=@_;
+    my ($value,$type,$name,$editable)=@_;
     my $result = '';
     # Values of zero are valid.
     if (! $value && $value ne '0') {
@@ -791,7 +824,8 @@ sub valout {
         }
     } else {
         if ($type eq 'date_interval') {
-            my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+            my ($totalsecs,$donebutton,$proctor,$secretkey) = split(/_/,$value);
+            my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
             my @timer;
             $year=$year-70;
             $mday--;
@@ -824,6 +858,13 @@ sub valout {
                 push(@timer,&mt('[quant,_1,sec]',0));
             }
             $result.=join(", ",@timer);
+            if ($donebutton eq 'done') {
+                if ($secretkey) {
+                    $result .= ' '.&mt('+ "done" with proctor key: [_1]',$secretkey);  
+                } else {
+                    $result .= ' '.&mt('+ "done"');
+                }  
+            }
         } elsif (&isdateparm($type)) {
             $result = &Apache::lonlocal::locallocaltime($value).
         &date_sanity_info($value);
@@ -850,7 +891,7 @@ sub plink {
     my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
     my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
     unless (defined($winvalue)) { $winvalue=$val; }
-    my $valout = &valout($value,$type,1);
+    my $valout = &valout($value,$type,$parmname,1);
     my $unencmarker = $marker;
     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
               \$hour, \$min, \$sec) {
@@ -1088,6 +1129,31 @@ sub ipacc_boxes_js  {
 END
 }
 
+sub done_proctor_js {
+    return <<"END";
+function toggleSecret(form,radio,key) {
+    var radios = form[radio+key];
+    if (radios.length) {
+        for (var i=0; i<radios.length; i++) {
+            if (radios[i].checked) {
+                if (radios[i].value == '_done_proctor') {
+                    if (document.getElementById('done_'+key+'_proctorkey')) {
+                        document.getElementById('done_'+key+'_proctorkey').type='text';
+                    }
+                } else {
+                    if (document.getElementById('done_'+key+'_proctorkey')) {
+                        document.getElementById('done_'+key+'_proctorkey').type='hidden';
+                        document.getElementById('done_'+key+'_proctorkey').value='';
+                    }
+                }
+            }
+        }
+    }
+}
+END
+
+}
+
 sub startpage {
     my ($r,$psymb,$crstype) = @_;
 
@@ -1138,10 +1204,11 @@ ENDHEAD
 
 sub print_row {
     my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
-    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups)=@_;
+    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp)=@_;
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+
 # get the values for the parameter in cascading order
 # empty levels will remain empty
     my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},
@@ -1153,7 +1220,7 @@ sub print_row {
          $$defaulttype{$which},$uname,$udom,$csec,$cgroup,$courseopt);
 # cascade down manually
     my $cascadetype=$$defaulttype{$which};
-    for (my $i=14;$i>0;$i--) {
+    for (my $i=18;$i>0;$i--) {
      if ($typeoutpar[$i]) {
             $cascadetype=$typeoutpar[$i];
     } else {
@@ -1177,29 +1244,32 @@ sub print_row {
     my $thismarker=$which;
     $thismarker=~s/^parameter\_//;
     my $mprefix=$rid.'&'.$thismarker.'&';
-    my $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
+    my $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$thismarker);
     my ($othergrp,$grp_parm,$controlgrp);
 
     if ($parmlev eq 'general') {
         if ($uname) {
-            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } elsif ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         } elsif ($csec) {
-            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } else {
-            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         }
     } elsif ($parmlev eq 'map') {
-
         if ($uname) {
-            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display); 
         } elsif ($cgroup) {
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,7,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         } elsif ($csec) {
-            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,11,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } else {
-            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,17,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         }
     } else {
         if ($uname) {
@@ -1208,7 +1278,7 @@ sub print_row {
                 ($coursereply,$othergrp,$grp_parm,$controlgrp) =
                     &print_usergroups($r,$$part{$which}.'.'.$$name{$which},
                        $rid,$cgroup,$defbgone,$usersgroups,$result,$courseopt);
-                if ($coursereply && $result > 3) {
+                if ($coursereply && $result > 4) {
                     if (defined($controlgrp)) {
                         if ($cgroup ne $controlgrp) {
                             $effective_parm = $grp_parm;
@@ -1219,28 +1289,32 @@ sub print_row {
             }
         }
 
-        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,17,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,15,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,14,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
-        &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
-        &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
-        &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
 
         if ($csec) {
+            &print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,11,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
             &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
-            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
-            &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         }
 
         if ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
-            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,7,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         }
 
         if ($uname) {
             if ($othergrp) {
                 $r->print($othergrp);
             }
+            &print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
             &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
             &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
             &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
@@ -1255,7 +1329,7 @@ sub print_row {
         my $sessionvaltype=$typeoutpar[$result];
         if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
         $r->print('<td style="background-color:#999999;" align="center"><font color="#FFFFFF">'.
-                  &valout($sessionval,$sessionvaltype).'&nbsp;'.
+                  &valout($sessionval,$sessionvaltype,$$name{$which}).'&nbsp;'.
                   '</font></td>');
     }
     $r->print('</tr>');
@@ -1263,16 +1337,20 @@ sub print_row {
 }
 
 sub print_td {
-    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
+    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp)=@_;
     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
               ';" align="center">');
     my $nolink = 0;
-    if ($which == 11 || $which == 12) {
+    if ($which == 14 || $which == 15) {
         $nolink = 1;
-    } elsif (($env{'request.course.sec'} ne '') && ($which > 9)) {
+    } elsif (($env{'request.course.sec'} ne '') && ($which > 12)) {
         $nolink = 1;
+    } elsif ($which == 5 || $which ==  6 || $which == 7 || $which == 8) {
+        if ($noeditgrp) {
+            $nolink = 1;
+        }
     } elsif ($mprefix =~ /availablestudent\&$/) {
-        if ($which > 3) {
+        if ($which > 4) {
             $nolink = 1;
         }
     } elsif ($mprefix =~ /examcode\&$/) {
@@ -1281,7 +1359,7 @@ sub print_td {
         }
     }
     if ($nolink) {
-        $r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
+        $r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));
     } else {
         $r->print(&plink($$typeoutpar[$which],
                          $$display{$value},$$outpar[$which],
@@ -1297,18 +1375,19 @@ sub print_usergroups {
     my $symb = &symbcache($rid);
     my $symbparm=$symb.'.'.$what;
     my $map=(&Apache::lonnet::decode_symb($symb))[0];
+    my $recurseparm=$map.'___(rec).'.$what; 
     my $mapparm=$map.'___(all).'.$what;
     my ($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype) =
-          &parm_control_group($courseid,$usersgroups,$symbparm,$mapparm,$what,
-                                                                   $courseopt);
+          &parm_control_group($courseid,$usersgroups,$symbparm,$mapparm,
+                              $recurseparm,$what,$courseopt);
     my $bgcolor = $defbg;
     my $grp_parm;
     if (($coursereply) && ($cgroup ne $resultgroup)) {
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
-            $grp_parm = &valout($coursereply,$resulttype);
+            $grp_parm = &valout($coursereply,$resulttype,$what);
         }
-        $grp_parm = &valout($coursereply,$resulttype);
+        $grp_parm = &valout($coursereply,$resulttype,$what);
         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
         if ($resultgroup && $resultlevel) {
             $output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm;
@@ -1323,11 +1402,11 @@ sub print_usergroups {
 }
 
 sub parm_control_group {
-    my ($courseid,$usersgroups,$symbparm,$mapparm,$what,$courseopt) = @_;
+    my ($courseid,$usersgroups,$symbparm,$mapparm,$recurseparm,$what,$courseopt) = @_;
     my ($coursereply,$resultitem,$resultgroup,$resultlevel,$resulttype);
     my $grpfound = 0;
-    my @levels = ($symbparm,$mapparm,$what);
-    my @levelnames = ('resource','map/folder','general');
+    my @levels = ($symbparm,$mapparm,$recurseparm,$what);
+    my @levelnames = ('resource','map/folder','recursive','general');
     foreach my $group (@{$usersgroups}) {
         if ($grpfound) { last; }
         for (my $i=0; $i<@levels; $i++) {
@@ -1437,7 +1516,9 @@ sub extractResourceInformation {
                 $$maptitles{$mapid}=&Apache::lonnet::gettitle($$mapp{$id});
             }
             $$maptitles{$$mapp{$id}}=$$maptitles{$mapid};
-            $$symbp{$mapid}=$$mapp{$id}.'___(all)';
+            $$symbp{$mapid}=$$mapp{$id}.'___(all)';  # Added in rev. 1.57, but seems not to be used.
+                                                     # Lines 1038 and 1114 which use $symbp{$mapid}
+                                                     # are commented out in rev. 1.57
         } else {
             $$mapp{$id} = $$mapp{$mapid};
         }
@@ -1756,7 +1837,7 @@ sub partmenu {
 }
 
 sub usermenu {
-    my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups)=@_;
+    my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups,$pssymb)=@_;
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
         &Apache::loncommon::selectstudent_link('parmform','uname','udom');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
@@ -1765,7 +1846,12 @@ sub usermenu {
     my %sectionhash = &Apache::loncommon::get_sections();
 
     my $groups;
-    my %grouphash = &Apache::longroup::coursegroups();
+    my %grouphash;
+    if (($pssymb) || &Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+        %grouphash = &Apache::longroup::coursegroups();
+    } elsif ($env{'request.course.groups'} ne '') {
+        map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
+    }
 
     my $g_s_header='';
     my $g_s_footer='';
@@ -1809,7 +1895,7 @@ function group_or_section(caller) {
 // ]]>
 </script>
 |;
-    } elsif ($currsec eq '') {
+    } else {
         $sections .= qq|
 <script type="text/javascript">
 // <![CDATA[
@@ -1849,6 +1935,8 @@ function group_or_section(caller) {
         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section')));
         $r->print($sections.$groups);
         $r->print(&Apache::lonhtmlcommon::row_closure());
+    } else {
+        $r->print($sections); 
     }
 
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('User')));
@@ -2048,9 +2136,9 @@ sub levelmenu {
 
 
 sub sectionmenu {
-    my ($r,$selectedsections)=@_;
+    my ($selectedsections)=@_;
     my %sectionhash = &Apache::loncommon::get_sections();
-    return if (!%sectionhash);
+    return '' if (!%sectionhash);
 
     my (@possibles,$disabled);
     if ($env{'request.course.sec'} ne '') {
@@ -2060,40 +2148,40 @@ sub sectionmenu {
     } else {
         @possibles = ('all',sort(keys(%sectionhash)));
     }
-    $r->print('<select name="Section" multiple="multiple" size="8"'.$disabled.'>');
+    my $output = '<select name="Section" multiple="multiple" size="8"'.$disabled.'>';
     foreach my $s (@possibles) {
-        $r->print('    <option value="'.$s.'"');
-        foreach my $sec (@{$selectedsections}) {
-            if ($s eq $sec) {
-                $r->print(' selected="selected"');
-                last;
-            }
+        $output .= '    <option value="'.$s.'"';
+        if ((@{$selectedsections}) && (grep(/^\Q$s\E$/,@{$selectedsections}))) {  
+            $output .= ' selected="selected"';
         }
-        $r->print('>'.$s."</option>\n");
+        $output .= '>'."$s</option>\n";
     }
-    $r->print("</select>\n");
+    $output .= "</select>\n";
+    return $output;
 }
 
 sub groupmenu {
-    my ($r,$selectedgroups)=@_;
-    my %grouphash = &Apache::longroup::coursegroups();
-    return if (!%grouphash);
+    my ($selectedgroups)=@_;
+    my %grouphash;
+    if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+        %grouphash = &Apache::longroup::coursegroups();
+    } elsif ($env{'request.course.groups'} ne '') {
+         map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
+    }
+    return '' if (!%grouphash);
 
-    $r->print('<select name="Group" multiple="multiple" size="8">');
+    my $output = '<select name="Group" multiple="multiple" size="8">';
     foreach my $group (sort(keys(%grouphash))) {
-        $r->print('    <option value="'.$group.'"');
-        foreach my $grp (@{$selectedgroups}) {
-            if ($group eq $grp) {
-                $r->print(' selected="selected"');
-                last;
-            }
+        $output .= '    <option value="'.$group.'"';
+        if ((@{$selectedgroups}) && (grep(/^\Q$group\E$/,\@{$selectedgroups}))) {
+            $output .=  ' selected="selected"';
         }
-        $r->print('>'.$group."</option>\n");
+        $output .= '>'."$group</option>\n";
     }
-    $r->print("</select>\n");
+    $output .= "</select>\n";
+    return $output;
 }
 
-
 sub keysplit {
     my $keyp=shift;
     return (split(/\,/,$keyp));
@@ -2217,7 +2305,17 @@ sub assessparms {
         $csec = $env{'request.course.sec'};    
     }
 
+# Check group privs.
     $cgroup=$env{'form.cgroup'};
+    my $noeditgrp; 
+    if ($cgroup ne '') {
+        unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+            if (($env{'request.course.groups'} eq '') || 
+                (!grep(/^\Q$cgroup\E$/,split(/,/,$env{'request.course.groups'})))) {
+                $noeditgrp = 1;
+            }
+        }
+    }
 
     if      ($udom=$env{'form.udom'}) {
     } elsif ($udom=$env{'request.role.domain'}) {
@@ -2265,7 +2363,7 @@ sub assessparms {
 
     my $id=$env{'form.id'};
     if (($id) && ($udom)) {
-        $uname=(&Apache::lonnet::idget($udom,$id))[1];
+        $uname=(&Apache::lonnet::idget($udom,[$id],'ids'))[1];
         if ($uname) {
             $id='';
         } else {
@@ -2342,11 +2440,17 @@ sub assessparms {
         my $totalstored = 0;
         my $now = time;
         for (my $i=0;$i<=$#markers;$i++) {
-            my ($needsrelease,$needsnewer,$name);
-            if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(7|8|9)$/)) {
+            my ($needsrelease,$needsnewer,$name,$namematch);
+            if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(9|10|11|12)$/)) {
                 next if ($csec ne $env{'request.course.sec'});
             }
-            if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
+            if ($markers[$i] =~ /\&(8|7|6|5)$/) {
+                next if ($noeditgrp);
+            }
+            if ($markers[$i] =~ /\&(17|11|7|3)$/) {
+                $namematch = 'maplevelrecurse';
+            }
+            if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3|4)$/) {
                 my (@ok_slots,@fail_slots,@del_slots);
                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
                 my ($level,@all) =
@@ -2376,7 +2480,7 @@ sub assessparms {
                         }
                     }
                 }
-            } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote|examcode|printstartdate|printenddate|acc)\&\d+$/) {
+            } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote|examcode|printstartdate|printenddate|acc|interval)\&\d+$/) {
                 $name = $1;
                 my $val = $values[$i];
                 my $valmatch = '';
@@ -2413,21 +2517,61 @@ sub assessparms {
                             }
                         }
                     }
+                } elsif ($name eq 'interval') {
+                    my $intervaltype = &get_intervaltype($name);
+                    my $intervalmatch = &standard_interval_matches($intervaltype);
+                    if (ref($intervalmatch) eq 'ARRAY') {
+                        foreach my $item (@{$intervalmatch}) {
+                            if (ref($item) eq 'ARRAY') {
+                                my ($regexpname,$pattern) = @{$item};
+                                if ($pattern ne '') {
+                                    if ($val =~ /$pattern/) {
+                                        $valmatch = $regexpname;
+                                        $val = '';
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
                 $needsrelease =
-                    $Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch"};
+                    $Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch:"};
                 if ($needsrelease) {
                     unless ($got_chostname) {
                         ($chostname,$cmajor,$cminor) = &parameter_release_vars();
                         $got_chostname = 1;
                     } 
-                    $needsnewer = &parameter_releasecheck($name,$val,$valmatch,
+                    $needsnewer = &parameter_releasecheck($name,$val,$valmatch,undef,
                                                           $needsrelease,
                                                           $cmajor,$cminor);
                 }
             }
             if ($needsnewer) {
-                $message .= &oldversion_warning($name,$values[$i],$chostname,$cmajor,
+                undef($namematch);
+            } else {
+                my $currneeded;
+                if ($needsrelease) {
+                    $currneeded = $needsrelease;
+                }
+                if ($namematch) {
+                    $needsrelease =
+                        $Apache::lonnet::needsrelease{"parameter::::$namematch"};
+                    if (($needsrelease) && (($currneeded eq '') || ($needsrelease < $currneeded))) {
+                        unless ($got_chostname) {
+                            ($chostname,$cmajor,$cminor) = &parameter_release_vars();
+                            $got_chostname = 1;
+                        }
+                        $needsnewer = &parameter_releasecheck(undef,undef,undef,$namematch,
+                                                              $needsrelease,
+                                                              $cmajor,$cminor);
+                    } else {
+                        undef($namematch);
+                    }
+                }
+            }
+            if ($needsnewer) {
+                $message .= &oldversion_warning($name,$namematch,$values[$i],$chostname,$cmajor,
                                                 $cminor,$needsrelease);
             } else {
                 $message.=&storeparm(split(/\&/,$markers[$i]),
@@ -2509,7 +2653,7 @@ ENDPARMSELSCRIPT
         # Step 3
         $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
-        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
 
@@ -2541,7 +2685,7 @@ ENDPARMSELSCRIPT
                   '<br />');
         $r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)')));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
-        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
         $r->print('<p>'
@@ -2576,10 +2720,10 @@ ENDPARMSELSCRIPT
 #
 # This produces the cascading table output of parameters
 #
-               my $coursespan=$csec?8:5;
-               my $userspan=3;
+               my $coursespan=$csec?10:6;
+               my $userspan=4;
                if ($cgroup ne '') {
-                  $coursespan += 3;
+                  $coursespan += 4;
                }
 
                $r->print(&Apache::loncommon::start_data_table());
@@ -2609,43 +2753,44 @@ ENDPARMSELSCRIPT
                 'femof'  => 'from Enclosing Map or Folder',
                 'gen'    => 'general',
                 'foremf' => 'for Enclosing Map or Folder',
+                'formfr' => 'for Map or Folder (recursive)',
                 'fr'     => 'for Resource'
             );
                $r->print(<<ENDTABLETWO);
 <th rowspan="3">$lt{'pie'}</th>
 <th rowspan="3">$lt{'csv'}<br />($csuname:$csudom)</th>
-</tr><tr><td colspan="5"></td><th colspan="2">$lt{'ic'}</th><th colspan="2">$lt{'rl'}</th>
+</tr><tr><td colspan="5"></td><th colspan="3">$lt{'ic'}</th><th colspan="2">$lt{'rl'}</th>
 <th colspan="1">$lt{'ic'}</th>
 
 ENDTABLETWO
                if ($csec) {
-                   $r->print('<th colspan="3">'.
+                   $r->print('<th colspan="4">'.
                   &mt("in Section")." $csec</th>");
                }
                if ($cgroup) {
-                $r->print('<th colspan="3">'.
+                $r->print('<th colspan="4">'.
                 &mt("in Group")." $cgroup</th>");
                }
                $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{'foremf'}</th>
+<th>$lt{'gen'}</th><th>$lt{'formfr'}</th><th>$lt{'foremf'}</th>
 <th>$lt{'def'}</th><th>$lt{'femof'}</th><th>$lt{'fr'}</th>
 ENDTABLEHEADFOUR
 
                if ($csec) {
-                   $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
+                   $r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'formfr'}.'</th><th>'.$lt{'foremf'}.'</th><th>'.$lt{'fr'}.'</th>');
                }
 
                if ($cgroup) {
-                $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
+                   $r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'formfr'}.'</th><th>'.&mt('foremf').'</th><th>'.$lt{'fr'}.'</th>');
                }
 
                if ($uname) {
-                if (@usersgroups > 1) {
-                    $r->print('<th>'.&mt('Control by other group?').'</th>');
+                    if (@usersgroups > 1) {
+                        $r->print('<th>'.&mt('Control by other group?').'</th>');
                    }
-                   $r->print('<th>'.&mt('general').'</th><th>'.&mt('for Enclosing Map or Folder').'</th><th>'.&mt('for Resource').'</th>');
+                   $r->print('<th>'.$lt{'gen'}.'</th><th>'.$lt{'formfr'}.'</th><th>'.$lt{'foremf'}.'</th><th>'.$lt{'fr'}.'</th>');
                }
 
                $r->print('</tr>');
@@ -2753,7 +2898,7 @@ ENDTABLEHEADFOUR
                             &print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
                                        $defbgthree,$parmlev,$uname,$udom,$csec,
-                                                            $cgroup,\@usersgroups);
+                                       $cgroup,\@usersgroups,$noeditgrp);
                         }
                     }
                 }
@@ -2866,7 +3011,8 @@ ENDTABLEHEADFOUR
                 $r->print('<p>'.&Apache::loncommon::start_data_table()
                          .&Apache::loncommon::start_data_table_header_row()
                          .'<th>'.&mt('Parameter Name').'</th>'
-                         .'<th>'.&mt('Default Value').'</th>'
+                         .'<th>'.&mt('Recursive Value').'</th>'
+                         .'<th>'.&mt('Non-Recursive Value').'</th>'
                          .'<th>'.&mt('Parameter in Effect').'</th>'
                          .&Apache::loncommon::end_data_table_header_row()
                 );
@@ -2875,7 +3021,7 @@ ENDTABLEHEADFOUR
                     $r->print(&Apache::loncommon::start_data_table_row());
                     &print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                           $parmlev,$uname,$udom,$csec,$cgroup);
+                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
                 }
                 $r->print(&Apache::loncommon::end_data_table().'</p>'
                          .'</div>'
@@ -2965,7 +3111,7 @@ ENDMAPONE
                 $r->print(&Apache::loncommon::start_data_table_row());
                 &print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
                        \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                                   $parmlev,$uname,$udom,$csec,$cgroup);
+                                   $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
             }
             $r->print(&Apache::loncommon::end_data_table()
                      .'</p>'
@@ -3061,7 +3207,7 @@ sub storedata {
         $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
         }
         if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
-        my ($data, $typeof, $text, $name, $valchk, $valmatch);
+        my ($data, $typeof, $text, $name, $valchk, $valmatch, $namematch);
         if ($cmd eq 'set') {
             $data=$env{$key};
             $valmatch = '';
@@ -3120,27 +3266,73 @@ sub storedata {
             }
         } elsif ($cmd eq 'dateinterval') {
             $data=&get_date_interval_from_form($thiskey);
+            if ($thiskey =~ /\.interval$/) {
+                $name = 'interval';
+                my $intervaltype = &get_intervaltype($name);
+                my $intervalmatch = &standard_interval_matches($intervaltype);
+                if (ref($intervalmatch) eq 'ARRAY') {
+                    foreach my $item (@{$intervalmatch}) {
+                        if (ref($item) eq 'ARRAY') {
+                            my ($regexpname,$pattern) = @{$item};
+                            if ($pattern ne '') {
+                                if ($data =~ /$pattern/) {
+                                    $valmatch = $regexpname;
+                                    $valchk = '';
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified date for');
         }
-        if ($name ne '') {
+        if ($thiskey =~ m{\.(?:sequence|page)___\(rec\)}) {
+            $namematch = 'maplevelrecurse';
+        }
+        if (($name ne '') || ($namematch ne '')) {
             my ($needsrelease,$needsnewer);
-            $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch"};
-            if ($needsrelease) {
-                unless ($got_chostname) {
-                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
-                    $got_chostname = 1;
+            if ($name ne '') {
+                $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch:"};
+                if ($needsrelease) {
+                    unless ($got_chostname) {
+                        ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                        $got_chostname = 1;
+                    }
+                    $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,undef,
+                                                          $needsrelease,
+                                                          $cmajor,$cminor);
                 }
-                $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,
-                                                      $needsrelease,
-                                                      $cmajor,$cminor);
+            }
+            if ($namematch ne '') {
                 if ($needsnewer) {
-                    $r->print('<br />'.&oldversion_warning($name,$data,
-                                                           $chostname,$cmajor,
-                                                           $cminor,$needsrelease));
-                    next;
+                    undef($namematch);
+                } else {
+                    my $currneeded;
+                    if ($needsrelease) {
+                        $currneeded = $needsrelease;
+                    }
+                    $needsrelease =
+                        $Apache::lonnet::needsrelease{"parameter::::$namematch"};
+                    if (($needsrelease) && (($currneeded eq '') || ($needsrelease < $currneeded))) {
+                        unless ($got_chostname) {
+                            ($chostname,$cmajor,$cminor) = &parameter_release_vars();
+                            $got_chostname = 1;
+                        }
+                        $needsnewer = &parameter_releasecheck(undef,$valchk,$valmatch,$namematch,
+                                                              $needsrelease,$cmajor,$cminor);
+                    } else {
+                        undef($namematch);
+                    }
                 }
             }
+            if ($needsnewer) {
+                $r->print('<br />'.&oldversion_warning($name,$namematch,$data,
+                                                       $chostname,$cmajor,
+                                                       $cminor,$needsrelease));
+                next;
+            }
         }
         if (defined($data) and $$olddata{$thiskey} ne $data) {
             if ($tuname) {
@@ -3244,7 +3436,11 @@ sub listdata {
     my ($secidx,%grouphash);
     if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
         $secidx = &Apache::loncoursedata::CL_SECTION();
-        %grouphash = &Apache::longroup::coursegroups();
+        if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+            %grouphash = &Apache::longroup::coursegroups();
+        } elsif ($env{'request.course.groups'} ne '') {
+            map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
+        }
     }
 
     foreach my $thiskey (sort {
@@ -3329,8 +3525,14 @@ sub listdata {
         $middle=~s/\.+$//;
         $middle=~s/^\.+//;
         my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
-        if ($middle=~/^(.+)\_\_\_\(all\)$/) {
-        $realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</span></span>';
+        if ($middle=~/^(.+)\_\_\_\((all|rec)\)$/) {
+            my $mapurl = $1;
+            my $maplevel = $2;
+            my $leveltitle = &mt('Folder/Map');
+            if ($maplevel eq 'rec') {
+                $leveltitle = &mt('Recursive');
+            }
+            $realm='<span class="LC_parm_scope_folder">'.$leveltitle.': '.&Apache::lonnet::gettitle($mapurl).' <br /><span class="LC_parm_folder">('.$mapurl.')</span></span>';
         } elsif ($middle) {
         my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
         $realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
@@ -3398,7 +3600,7 @@ sub listdata {
                 );
             }
         } elsif ($thistype eq 'date_interval') {
-            $r->print(&date_interval_selector($thiskey,
+            $r->print(&date_interval_selector($thiskey,$name,
                       $$resourcedata{$thiskey},$readonly));
         } elsif ($thistype =~ m/^string/) {
             $r->print(&string_selector($thistype,$thiskey,
@@ -3416,30 +3618,6 @@ sub listdata {
     return $foundkeys;
 }
 
-
-sub date_interval_selector {
-    my ($thiskey, $showval, $readonly) = @_;
-    my $result;
-    foreach my $which (['days', 86400, 31],
-               ['hours', 3600, 23],
-               ['minutes', 60, 59],
-               ['seconds',  1, 59]) {
-    my ($name, $factor, $max) = @{ $which };
-    my $amount = int($showval/$factor);
-    $showval  %= $factor;
-    my %select = ((map {$_ => $_} (0..$max)),
-              'select_form_order' => [0..$max]);
-    $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
-                           \%select,'',$readonly);
-    $result .= ' '.&mt($name);
-    }
-    unless ($readonly) {
-        $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
-    }
-    return $result;
-
-}
-
 sub get_date_interval_from_form {
     my ($key) = @_;
     my $seconds = 0;
@@ -3452,6 +3630,12 @@ sub get_date_interval_from_form {
         $seconds += $env{'form.'.$name.'_'.$key} * $factor;
     }
     }
+    if (($key =~ /\.interval$/) && (($env{'form.done_'.$key} eq '_done') || ($env{'form.done_'.$key} eq '_done_proctor'))) {
+        $seconds .= $env{'form.done_'.$key};
+        if ($env{'form.done_'.$key.'_proctorkey'}) {
+            $seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'};
+        }
+    }
     return $seconds;
 }
 
@@ -3635,7 +3819,7 @@ sub string_selector {
                     ($chostname,$cmajor,$cminor)=&parameter_release_vars();
                     $got_chostname = 1;
                 }
-                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,undef,
                                                        $needsrelease,$cmajor,$cminor);
                 if ($needsnewer) {
                     if ($parmmatch ne '') {
@@ -3747,8 +3931,155 @@ sub string_selector {
     return $result;
 }
 
+my %intervals =
+    (
+     'date_interval'
+             => [[ 'done', 'Yes' ],
+                 [ 'done_proctor', 'Yes, with proctor key'],                  
+                 [ '', 'No' ]],
+    );
+
+my %intervalmatches = (
+         'date_interval'
+              => [['done','\d+_done$'],
+                  ['done_proctor','\d+_done_proctor_']],
+    );
+
+my %intervaltypes = (
+                      interval => 'date_interval',
+    );
+
+sub standard_interval_matches {
+    my ($interval_type) = @_;
+    if (ref($intervalmatches{$interval_type}) eq 'ARRAY') {
+        return $intervalmatches{$interval_type};
+    }
+    return;
+}
+
+sub get_intervaltype {
+    my ($name) = @_;
+    if (exists($intervaltypes{$name})) {
+        return $intervaltypes{$name};
+    }
+    return;
+}
+
+sub standard_interval_options {
+    my ($interval_type) = @_;
+    if (ref($intervals{$interval_type}) eq 'ARRAY') {
+        return $intervals{$interval_type};
+    }
+    return;
+}
+
+sub date_interval_selector {
+    my ($thiskey, $name, $showval, $readonly) = @_;
+    my ($result,%skipval);
+    if ($name eq 'interval') {
+        my $intervaltype = &get_intervaltype($name);
+        my ($got_chostname,$chostname,$cmajor,$cminor);
+        foreach my $possibilities (@{ $intervals{$intervaltype} }) {
+            next unless (ref($possibilities) eq 'ARRAY');
+            my ($parmval, $description) = @{ $possibilities };
+            my $parmmatch;
+            if (ref($intervalmatches{$intervaltype}) eq 'ARRAY') {
+                foreach my $item (@{$intervalmatches{$intervaltype}}) {
+                    if (ref($item) eq 'ARRAY') {
+                        if ($parmval eq $item->[0]) {
+                            $parmmatch = $parmval;
+                            $parmval = '';
+                            last;
+                        }
+                    }
+                }
+            }
+            my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval:$parmmatch"};
+            if ($needsrelease) {
+                unless ($got_chostname) {
+                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                    $got_chostname = 1;
+                }
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,undef,
+                                                       $needsrelease,$cmajor,$cminor);
+                if ($needsnewer) {
+                    if ($parmmatch ne '') {
+                        $skipval{$parmmatch} = 1;
+                    } elsif ($parmval ne '') {
+                        $skipval{$parmval} = 1;
+                    }
+                }
+            }
+        }
+    }
+
+    my $currval = $showval;
+    foreach my $which (['days', 86400, 31],
+               ['hours', 3600, 23],
+               ['minutes', 60, 59],
+               ['seconds',  1, 59]) {
+    my ($name, $factor, $max) = @{ $which };
+    my $amount = int($showval/$factor);
+    $showval  %= $factor;
+    my %select = ((map {$_ => $_} (0..$max)),
+              'select_form_order' => [0..$max]);
+    $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
+                           \%select,'',$readonly);
+    $result .= ' '.&mt($name);
+    }
+    if ($name eq 'interval') {
+        unless ($skipval{'done'}) {
+            my $checkedon = '';
+            my $checkedproc = '';
+            my $currproctorkey = '';
+            my $currprocdisplay = 'hidden';
+            my $checkedoff = ' checked="checked"';
+            if ($currval =~ /^(\d+)_done$/) {
+                $checkedon = ' checked="checked"';
+                $checkedoff = '';
+            } elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
+                $currproctorkey = $1;
+                $checkedproc = ' checked="checked"';
+                $checkedoff = '';
+                $currprocdisplay = 'text';
+            }
+            my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
+            $result .= '<br /><span class="LC_nobreak">'.&mt('Include "done" button').
+                       '<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.' />'.
+                       &mt('No').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.$onclick.' />'.
+                       &mt('Yes').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" value="_done_proctor" name="done_'.$thiskey.'"'.$checkedproc.$onclick.' />'.
+                       &mt('Yes, with proctor key').'</label>'.
+                       '<input type="'.$currprocdisplay.'" id="done_'.$thiskey.'_proctorkey" '.
+                       'name="done_'.$thiskey.'_proctorkey" value="'.$currproctorkey.'" /></span>';
+        }
+    }
+    unless ($readonly) {
+        $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
+    }
+    return $result;
+}
+
 sub oldversion_warning {
-    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
+    my ($name,$namematch,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
+    my $standard_name = &standard_parameter_names($name);
+    if ($namematch) {
+        my $level = &standard_parameter_levels($namematch);
+        my $msg = '';
+        if ($level) {
+            $msg = &mt('[_1] was [_2]not[_3] set at the level of: [_4].',
+                       $standard_name,'<b>','</b>','"'.$level.'"');
+        } else {
+            $msg = &mt('[_1] was [_2]not[_3] set.',
+                      $standard_name,'<b>','</b>');
+        }
+        return '<p class="LC_warning">'.$msg.'<br />'.
+               &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
+                   $cmajor.'.'.$cminor,$chostname,
+                   $needsrelease).
+                   '</p>';
+    }
     my $desc;
     my $stringtype = &get_stringtype($name);
     if ($stringtype ne '') {
@@ -3793,14 +4124,13 @@ sub oldversion_warning {
             }
         }
     }
-    my $standard_name = &standard_parameter_names($name);
     return '<p class="LC_warning">'.
-           &mt('[_1] was [_2]not[_3] set to [_4].',
-               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
-           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
-           $cmajor.'.'.$cminor,$chostname,
-           $needsrelease).
-           '</p>';
+       &mt('[_1] was [_2]not[_3] set to [_4].',
+           $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
+       &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
+       $cmajor.'.'.$cminor,$chostname,
+       $needsrelease).
+       '</p>';
 }
 
 }
@@ -3861,6 +4191,7 @@ sub newoverview {
             &toggleparmtextbox_js()."\n".
             &validateparms_js()."\n".
             &ipacc_boxes_js()."\n".
+            &done_proctor_js()."\n".
 '// ]]>
 </script>
 ';
@@ -3950,16 +4281,26 @@ ENDOVER
     &displaymenu($r,\%allparms,\@pscat,\%keyorder);
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
+    my $sectionselector = &sectionmenu(\@selected_sections);
+    my $groupselector = &groupmenu(\@selected_groups);
     $r->print('<table>'.
-              '<tr><th>'.&mt('Parts').'</th><th>'.&mt('Section(s)').
-              '</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');
+              '<tr><th>'.&mt('Parts').'</th>');
+    if ($sectionselector) {
+        $r->print('<th>'.&mt('Section(s)').'</th>');
+    }
+    if ($groupselector) {
+        $r->print('<th>'.&mt('Group(s)').'</th>');
+    }
+    $r->print('</tr><tr><td>');
     &partmenu($r,\%allparts,\@psprt);
-    $r->print('</td><td>');
-    &sectionmenu($r,\@selected_sections);
-    $r->print('</td><td>');
-    &groupmenu($r,\@selected_groups);
-    $r->print('</td></tr></table>');
-    #$r->print('</td></tr></table>');
+    $r->print('</td>');
+    if ($sectionselector) { 
+        $r->print('<td>'.$sectionselector.'</td>');
+    }
+    if ($groupselector) {
+        $r->print('<td>'.$groupselector.'</td>');
+    }
+    $r->print('</tr></table>');
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print('</div></div>');
@@ -4022,6 +4363,9 @@ sub secgroup_lister {
                     my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
                     $$listdata{$newparmkey}=1;
                     $$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
+                    $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(rec).'.$part.'.'.$cat;
+                    $$listdata{$newparmkey}=1;
+                    $$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
                 }
             } else {
 # resource-level parameter
@@ -4047,6 +4391,7 @@ sub overview {
              &toggleparmtextbox_js()."\n".
              &validateparms_js()."\n".
              &ipacc_boxes_js()."\n".
+             &done_proctor_js()."\n".
              '// ]]>'."\n".
              '</script>'."\n";
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
@@ -4886,9 +5231,15 @@ sub components {
     }
     my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
     my $realmdescription=&mt('all resources');
-    if ($middle=~/^(.+)\_\_\_\(all\)$/) {
-    $realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <span class="LC_parm_folder"><br />('.$1.')</span></span>';
-     $realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);
+    if ($middle=~/^(.+)\_\_\_\((all|rec)\)$/) {
+        my $mapurl = $1;
+        my $maplevel = $2;
+        my $leveltitle = &mt('Folder/Map');
+        if ($maplevel eq 'rec') {
+            $leveltitle = &mt('Recursive');
+        }
+    $realm='<span class="LC_parm_scope_folder">'.$leveltitle.': '.&Apache::lonnet::gettitle($mapurl).' <span class="LC_parm_folder"><br />('.$mapurl.')</span></span>';
+     $realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($mapurl);
    } elsif ($middle) {
     my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
     $realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
@@ -4943,6 +5294,20 @@ sub standard_parameter_types {
     return;
 }
 
+sub standard_parameter_levels {
+    my ($name)=@_;
+    my %levels = (
+                    'resourcelevel'   => 'a single resource',
+                    'maplevel'        => 'the enclosing map/folder', 
+                    'maplevelrecurse' => 'the enclosing map/folder (recursive into sub-folders)',
+                    'courselevel'     => 'the general (course) level',
+                 );
+    if ($levels{$name}) {
+        return $levels{$name};
+    }
+    return;
+}
+
 sub parm_change_log {
     my ($r)=@_;
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -5238,16 +5603,20 @@ sub parameter_release_vars {
 }
 
 sub parameter_releasecheck {
-    my ($name,$value,$valmatch,$needsrelease,$cmajor,$cminor) = @_;
+    my ($name,$value,$valmatch,$namematch,$needsrelease,$cmajor,$cminor) = @_;
     my $needsnewer;
     my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
     if (($cmajor < $needsmajor) || 
         ($cmajor == $needsmajor && $cminor < $needsminor)) {
         $needsnewer = 1;
-    } elsif ($valmatch) {
-        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch});
-    } elsif ($value) { 
-        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.':'});
+    } elsif ($name) {
+        if ($valmatch) {
+            &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch.':'});
+        } elsif ($value) { 
+            &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.'::'});
+        }
+    } elsif ($namematch) {
+        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter::::'.$namematch});
     }
     return $needsnewer;
 }