loncom/interface/lonparmset.pm - diff

Return to lonparmset.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonparmset.pm between versions 1.551 and 1.563

-version 1.551, 2015/05/10 01:02:35
+version 1.563, 2016/07/19 21:55:12
  Line 36  lonparmset - Handler to set parameters f
  =head1 SYNOPSIS
  lonparmset provides an interface to setting course parameters.
+ It contains all the code for the "Content and Problem Settings" UI, except
+ for the helpers parameter.helper and resettimes.helper, and lonhelper.pm,
+ and lonblockingmenu.pm.
  =head1 DESCRIPTION
- Line 54  Inputs:  $what - a parameter spec (inclu
+ Line 58  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
 - General Course
-- Map or Folder level in course
+- Map or Folder level in course (recursive)
-- resource default
+- Map or Folder level in course (non-recursive)
-- map default
+- resource default
-- resource level in course
+- map default
-- General for section
+- resource level in course
-- Map or Folder level for section
+- General for section
-- resource level in section
+- Map or Folder level for section (recursive)
-- General for group
+- Map or Folder level for section (non-recursive)
-- Map or Folder level for group
+- resource level in section
-- resource level in group
+- General for group
-- General for specific student
+- Map or Folder level for group (recursive)
-- Map or Folder level for specific student
+- Map or Folder level for group (non-recursive)
+- resource level in group
+- General for specific student
+- Map or Folder level for specific student (recursive)
+- Map or Folder level for specific student (non-recursive)
 - resource level for specific student
  =item parmval_by_symb()
- Line 323  use HTML::Entities;
+ Line 331  use HTML::Entities;
  use LONCAPA qw(:DEFAULT :match);
+ ##################################################
+ # CONTENT AND PROBLEM SETTINGS HTML PAGE HEADER/FOOTER
+ ##################################################
+ # Page header
+ #
+ # @param {Apache2::RequestRec} $r - Apache request object
+ # @param {string} $mode - selected tab, 'parmset' for course and problem settings, or 'coursepref' for course settings
+ # @param {string} $crstype - course type ('Community' for community settings)
  sub startSettingsScreen {
      my ($r,$mode,$crstype)=@_;
- Line 341  sub startSettingsScreen {
+ Line 358  sub startSettingsScreen {
      $r->print('<div class="LC_Box" style="clear:both;margin:0;" id="parameditor"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
  }
+ # Page footer
  sub endSettingsScreen {
     my ($r)=@_;
     $r->print('</div></div></div>');
- Line 348  sub endSettingsScreen {
+ Line 366  sub endSettingsScreen {
+ ##################################################
+ # (mostly) TABLE MODE
+ # (parmval is also used for the log of parameter changes)
+ ##################################################
+ # Calls parmval_by_symb, getting the symb from $id (the big hash resource id) with &symbcache.
+ #
+ # @param {string} $what - part info and parameter name separated by a dot, e.g. '0.weight'
+ # @param {string} $id - big hash resource id
+ # @param {string} $def - the resource's default value for this parameter
+ # @param {string} $uname - user name
+ # @param {string} $udom - user domain
+ # @param {string} $csec - section name
+ # @param {string} $cgroup - group name
+ # @param {hash reference} $courseopt - course parameters hash (result of lonnet::get_courseresdata, dump of course's resourcedata.db)
+ # @returns {Array}
  sub parmval {
      my ($what,$id,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
      return &parmval_by_symb($what,&symbcache($id),$def,$uname,$udom,$csec,
                                                             $cgroup,$courseopt);
  }
+ # Returns an array containing
+ # - the most specific level that is defined for that parameter (integer)
+ # - an array with the level as index and the parameter value as value (when defined)
+ #   (level 1 is the most specific and will have precedence)
+ #
+ # @param {string} $what - part info and parameter name separated by a dot, e.g. '0.weight'
+ # @param {string} $symb - resource symb
+ # @param {string} $def - the resource's default value for this parameter
+ # @param {string} $uname - user name
+ # @param {string} $udom - user domain
+ # @param {string} $csec - section name
+ # @param {string} $cgroup - group name
+ # @param {hash reference} $courseopt - course parameters hash (result of lonnet::get_courseresdata, dump of course's resourcedata.db)
+ # @returns {Array}
  sub parmval_by_symb {
      my ($what,$symb,$def,$uname,$udom,$csec,$cgroup,$courseopt)=@_;
      my $useropt;
      if ($uname ne '' && $udom ne '') {
-     $useropt = &Apache::lonnet::get_userresdata($uname,$udom);
+         $useropt = &Apache::lonnet::get_userresdata($uname,$udom);
      }
      my $result='';
- Line 367  sub parmval_by_symb {
+ Line 415  sub parmval_by_symb {
  # ----------------------------------------------------- Cascading lookup scheme
      my $map=(&Apache::lonnet::decode_symb($symb))[0];
      $map = &Apache::lonnet::deversion($map);
+     # NOTE: some of that code looks redondant with code in lonnavmaps::parmval_real,
+     # any change should be reflected there.
      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
+ # 18 - General Course
      if (defined($$courseopt{$courselevel})) {
-     $outpar[14]=$$courseopt{$courselevel};
+         $outpar[18]=$$courseopt{$courselevel};
-     $result=14;
+         $result=18;
      }
+ # 17 - Map or Folder level in course (recursive)
+     if (defined($$courseopt{$courseleveli})) {
+         $outpar[17]=$$courseopt{$courseleveli};
+         $result=17;
+     }
+ # 16 - Map or Folder level in course (non-recursive)
      if (defined($$courseopt{$courselevelm})) {
-     $outpar[13]=$$courseopt{$courselevelm};
+         $outpar[16]=$$courseopt{$courselevelm};
-     $result=13;
+         $result=16;
      }
  # ------------------------------------------------------- second, check default
-     if (defined($def)) { $outpar[12]=$def; $result=12; }
+ # 15 - resource default
+     if (defined($def)) { $outpar[15]=$def; $result=15; }
  # ------------------------------------------------------ third, check map parms
+ # 14 - map default
      my $thisparm=&parmhash($symbparm);
-     if (defined($thisparm)) { $outpar[11]=$thisparm; $result=11; }
+     if (defined($thisparm)) { $outpar[14]=$thisparm; $result=14; }
+ # 13 - resource level in course
      if (defined($$courseopt{$courselevelr})) {
-     $outpar[10]=$$courseopt{$courselevelr};
+         $outpar[13]=$$courseopt{$courselevelr};
-     $result=10;
+         $result=13;
      }
  # ------------------------------------------------------ fourth, back to course
      if ($csec ne '') {
+ # 12 - General for section
          if (defined($$courseopt{$seclevel})) {
-         $outpar[9]=$$courseopt{$seclevel};
+             $outpar[12]=$$courseopt{$seclevel};
-         $result=9;
+             $result=12;
-     }
+         }
+ # 11 - Map or Folder level for section (recursive)
+         if (defined($$courseopt{$secleveli})) {
+             $outpar[11]=$$courseopt{$secleveli};
+             $result=11;
+         }
+ # 10 - Map or Folder level for section (non-recursive)
          if (defined($$courseopt{$seclevelm})) {
-         $outpar[8]=$$courseopt{$seclevelm};
+             $outpar[10]=$$courseopt{$seclevelm};
-         $result=8;
+             $result=10;
-     }
+         }
+ # 9 - resource level in section
          if (defined($$courseopt{$seclevelr})) {
-         $outpar[7]=$$courseopt{$seclevelr};
+             $outpar[9]=$$courseopt{$seclevelr};
-         $result=7;
+             $result=9;
-     }
+         }
      }
  # ------------------------------------------------------ fifth, check course group
      if ($cgroup ne '') {
+ # 8 - General for group
          if (defined($$courseopt{$grplevel})) {
-             $outpar[6]=$$courseopt{$grplevel};
+             $outpar[8]=$$courseopt{$grplevel};
-             $result=6;
+             $result=8;
+         }
+ # 7 - Map or Folder level for group (recursive)
+         if (defined($$courseopt{$grpleveli})) {
+             $outpar[7]=$$courseopt{$grpleveli};
+             $result=7;
          }
+ # 6 - Map or Folder level for group (non-recursive)
          if (defined($$courseopt{$grplevelm})) {
-             $outpar[5]=$$courseopt{$grplevelm};
+             $outpar[6]=$$courseopt{$grplevelm};
-             $result=5;
+             $result=6;
          }
+ # 5 - resource level in group
          if (defined($$courseopt{$grplevelr})) {
-             $outpar[4]=$$courseopt{$grplevelr};
+             $outpar[5]=$$courseopt{$grplevelr};
-             $result=4;
+             $result=5;
          }
      }
- # ---------------------------------------------------------- fifth, check user
+ # ---------------------------------------------------------- sixth, check user
      if ($uname ne '') {
-     if (defined($$useropt{$courselevel})) {
+ # 4 - General for specific student
-         $outpar[3]=$$useropt{$courselevel};
+         if (defined($$useropt{$courselevel})) {
-         $result=3;
+             $outpar[4]=$$useropt{$courselevel};
-     }
+             $result=4;
+         }
-     if (defined($$useropt{$courselevelm})) {
-         $outpar[2]=$$useropt{$courselevelm};
-         $result=2;
-     }
-     if (defined($$useropt{$courselevelr})) {
+ # 3 - Map or Folder level for specific student (recursive)
-         $outpar[1]=$$useropt{$courselevelr};
+         if (defined($$useropt{$courseleveli})) {
-         $result=1;
+             $outpar[3]=$$useropt{$courseleveli};
-     }
+             $result=3;
+         }
+ # 2 - Map or Folder level for specific student (non-recursive)
+         if (defined($$useropt{$courselevelm})) {
+             $outpar[2]=$$useropt{$courselevelm};
+             $result=2;
+         }
+ # 1 - resource level for specific student
+         if (defined($$useropt{$courselevelr})) {
+             $outpar[1]=$$useropt{$courselevelr};
+             $result=1;
+         }
      }
      return ($result,@outpar);
  }
- Line 468  sub parmval_by_symb {
+ Line 559  sub parmval_by_symb {
  # --- Caches local to lonparmset
+ # Reset lonparmset caches (called at the beginning and end of the handler).
  sub reset_caches {
      &resetparmhash();
      &resetsymbcache();
      &resetrulescache();
  }
+ # cache for map parameters, stored temporarily in $env{'request.course.fn'}_parms.db
+ # (these parameters come from param elements in .sequence files created with the advanced RAT)
  {
-     my $parmhashid;
+     my $parmhashid; # course identifier, to initialize the cache only once for a course
-     my %parmhash;
+     my %parmhash; # the parameter cache
+     # reset map parameter hash
      sub resetparmhash {
-     undef($parmhashid);
+         undef($parmhashid);
-     undef(%parmhash);
+         undef(%parmhash);
      }
+     # dump the _parms.db database into %parmhash
      sub cacheparmhash {
-     if ($parmhashid eq  $env{'request.course.fn'}) { return; }
+         if ($parmhashid eq  $env{'request.course.fn'}) { return; }
-     my %parmhashfile;
+         my %parmhashfile;
-     if (tie(%parmhashfile,'GDBM_File',
+         if (tie(%parmhashfile,'GDBM_File',
-         $env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
+             $env{'request.course.fn'}.'_parms.db',&GDBM_READER(),0640)) {
-         %parmhash=%parmhashfile;
+             %parmhash=%parmhashfile;
-         untie(%parmhashfile);
+             untie(%parmhashfile);
-         $parmhashid=$env{'request.course.fn'};
+             $parmhashid=$env{'request.course.fn'};
-     }
+         }
      }
+     # returns a parameter value for an identifier symb.parts.parameter, using the map parameter cache
      sub parmhash {
-     my ($id) = @_;
+         my ($id) = @_;
-     &cacheparmhash();
+         &cacheparmhash();
-     return $parmhash{$id};
+         return $parmhash{$id};
      }
-  }
+ }
+ # cache big hash id -> symb, using lonnavmaps to find association
  {
-     my $symbsid;
+     my $symbsid; # course identifier, to initialize the cache only once for a course
-     my %symbs;
+     my %symbs; # hash id->symb
+     # reset the id->symb cache
      sub resetsymbcache {
-     undef($symbsid);
+         undef($symbsid);
-     undef(%symbs);
+         undef(%symbs);
      }
+     # returns the symb corresponding to a big hash id (using lonnavmaps and a cache)
      sub symbcache {
-     my $id=shift;
+         my $id=shift;
-     if ($symbsid ne $env{'request.course.id'}) {
+         if ($symbsid ne $env{'request.course.id'}) {
-         undef(%symbs);
+             undef(%symbs);
-     }
+         }
-     if (!$symbs{$id}) {
+         if (!$symbs{$id}) {
-         my $navmap = Apache::lonnavmaps::navmap->new();
+             my $navmap = Apache::lonnavmaps::navmap->new();
-         if ($id=~/\./) {
+             if ($id=~/\./) {
-         my $resource=$navmap->getById($id);
+                 my $resource=$navmap->getById($id);
-         $symbs{$id}=$resource->symb();
+                 $symbs{$id}=$resource->symb();
-         } else {
+             } else {
-         my $resource=$navmap->getByMapPc($id);
+                 my $resource=$navmap->getByMapPc($id);
-         $symbs{$id}=&Apache::lonnet::declutter($resource->src());
+                 $symbs{$id}=&Apache::lonnet::declutter($resource->src());
+             }
+             $symbsid=$env{'request.course.id'};
          }
-         $symbsid=$env{'request.course.id'};
+         return $symbs{$id};
-     }
-     return $symbs{$id};
      }
-  }
+ }
+ # cache for parameter default actions (stored in parmdefactions.db)
  {
-     my $rulesid;
+     my $rulesid; # course identifier, to initialize the cache only once for a course
-     my %rules;
+     my %rules; # parameter default actions hash
      sub resetrulescache {
-     undef($rulesid);
+         undef($rulesid);
-     undef(%rules);
+         undef(%rules);
      }
+     # returns the value for a given key in the parameter default action hash
      sub rulescache {
-     my $id=shift;
+         my $id=shift;
-     if ($rulesid ne $env{'request.course.id'}
+         if ($rulesid ne $env{'request.course.id'}
-         && !defined($rules{$id})) {
+             && !defined($rules{$id})) {
-         my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+             my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-         my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+             my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-         %rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
+             %rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
-         $rulesid=$env{'request.course.id'};
+             $rulesid=$env{'request.course.id'};
-     }
+         }
-     return $rules{$id};
+         return $rules{$id};
      }
  }
+ # Returns the values of the parameter type default action
+ # "default value when manually setting".
+ # If none is defined, ('','','','','') is returned.
+ #
+ # @param {string} $type - parameter type
+ # @returns {Array<string>} - (hours, min, sec, value)
  sub preset_defaults {
      my $type=shift;
      if (&rulescache($type.'_action') eq 'default') {
- # yes, there is something
+         # yes, there is something
-     return (&rulescache($type.'_hours'),
+         return (&rulescache($type.'_hours'),
-         &rulescache($type.'_min'),
+             &rulescache($type.'_min'),
-         &rulescache($type.'_sec'),
+             &rulescache($type.'_sec'),
-         &rulescache($type.'_value'));
+             &rulescache($type.'_value'));
      } else {
- # nothing there or something else
+         # nothing there or something else
-     return ('','','','','');
+         return ('','','','','');
      }
  }
+ # Checks that a date is after enrollment start date and before
+ # enrollment end date.
+ # Returns HTML with a warning if it is not, or the empty string otherwise.
+ # This is used by both overview and table modes.
+ #
+ # @param {integer} $checkdate - the date to check.
+ # @returns {string} - HTML possibly containing a localized warning message.
  sub date_sanity_info {
     my $checkdate=shift;
     unless ($checkdate) { return ''; }
- Line 602  sub date_sanity_info {
+ Line 714  sub date_sanity_info {
  #      }
     return $result;
  }
- ##################################################
- ##################################################
- #
- # Store a parameter by ID
- #
- # Takes
- # - resource id
- # - name of parameter
- # - level
- # - new value
- # - new type
- # - username
- # - userdomain
+ # Store a parameter value and type by ID, also triggering more parameter changes based on parameter default actions.
+ #
+ # @param {string} $sresid - resource big hash id
+ # @param {string} $spnam - part info and parameter name separated by a dot, e.g. '0.weight'
+ # @param {integer} $snum - level
+ # @param {string} $nval - new value
+ # @param {string} $ntype - new type
+ # @param {string} $uname - username
+ # @param {string} $udom - userdomain
+ # @param {string} $csec - section name
+ # @param {string} $cgroup - group name
  sub storeparm {
      my ($sresid,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
      &storeparm_by_symb(&symbcache($sresid),$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,'',$cgroup);
  }
- my %recstack;
+ my %recstack; # hash parameter name -> 1 when a parameter was used before in a recursive call to storeparm_by_symb
+ # Store a parameter value and type by symb, also triggering more parameter changes based on parameter default actions.
+ # Uses storeparm_by_symb_inner to actually store the parameter, ignoring any returned error.
+ #
+ # @param {string} $symb - resource symb
+ # @param {string} $spnam - part info and parameter name separated by a dot, e.g. '0.weight'
+ # @param {integer} $snum - level
+ # @param {string} $nval - new value
+ # @param {string} $ntype - new type
+ # @param {string} $uname - username
+ # @param {string} $udom - userdomain
+ # @param {string} $csec - section name
+ # @param {boolean} $recflag - should be true for recursive calls to storeparm_by_symb, false otherwise
+ # @param {string} $cgroup - group name
  sub storeparm_by_symb {
      my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$recflag,$cgroup)=@_;
      unless ($recflag) {
- # first time call
+         # first time call
-     %recstack=();
+         %recstack=();
-     $recflag=1;
+         $recflag=1;
      }
- # store parameter
+     # store parameter
      &storeparm_by_symb_inner
      ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup);
- # don't do anything if parameter was reset
+     # don't do anything if parameter was reset
      unless ($nval) { return; }
      my ($prefix,$parm)=($spnam=~/^(.*[\_\.])([^\_\.]+)$/);
- # remember that this was set
+     # remember that this was set
      $recstack{$parm}=1;
- # what does this trigger?
+     # what does this trigger?
      foreach my $triggered (split(/\:/,&rulescache($parm.'_triggers'))) {
- # don't backfire
+         # don't backfire
-        unless ((!$triggered) || ($recstack{$triggered})) {
+         unless ((!$triggered) || ($recstack{$triggered})) {
-        my $action=&rulescache($triggered.'_action');
+             my $action=&rulescache($triggered.'_action');
-        my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
+             my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
- # set triggered parameter on same level
+             # set triggered parameter on same level
-        my $newspnam=$prefix.$triggered;
+             my $newspnam=$prefix.$triggered;
-        my $newvalue='';
+             my $newvalue='';
-        my $active=1;
+             my $active=1;
-        if ($action=~/^when\_setting/) {
+             if ($action=~/^when\_setting/) {
- # are there restrictions?
+             # are there restrictions?
-            if (&rulescache($triggered.'_triggervalue')=~/\w/) {
+                 if (&rulescache($triggered.'_triggervalue')=~/\w/) {
-            $active=0;
+                     $active=0;
-            foreach my $possiblevalue (split(/\s*\,\s*/,&rulescache($triggered.'_triggervalue'))) {
+                     foreach my $possiblevalue (split(/\s*\,
-                if (lc($possiblevalue) eq lc($nval)) { $active=1; }
+                             \s*/,&rulescache($triggered.'_triggervalue'))) {
-            }
+                         if (lc($possiblevalue) eq lc($nval)) { $active=1; }
-            }
+                     }
-            $newvalue=&rulescache($triggered.'_value');
+                 }
-        } else {
+                 $newvalue=&rulescache($triggered.'_value');
-            my $totalsecs=((&rulescache($triggered.'_days')*24+&rulescache($triggered.'_hours'))*60+&rulescache($triggered.'_min'))*60+&rulescache($triggered.'_sec');
+             } else {
-            if ($action=~/^later\_than/) {
+                 my $totalsecs=((&rulescache($triggered.'_days')*24+&rulescache($triggered.'_hours'))*60+&rulescache($triggered.'_min'))*60+&rulescache($triggered.'_sec');
-            $newvalue=$nval+$totalsecs;
+                 if ($action=~/^later\_than/) {
-            } else {
+                     $newvalue=$nval+$totalsecs;
-            $newvalue=$nval-$totalsecs;
+                 } else {
-            }
+                     $newvalue=$nval-$totalsecs;
-        }
+                 }
-        if ($active) {
+             }
-            &storeparm_by_symb($symb,$newspnam,$snum,$newvalue,&rulescache($triggered.'_type'),
+             if ($active) {
-                    $uname,$udom,$csec,$recflag,$cgroup);
+                 &storeparm_by_symb($symb,$newspnam,$snum,$newvalue,&rulescache($triggered.'_type'),
-        }
+                         $uname,$udom,$csec,$recflag,$cgroup);
-        }
+             }
+         }
      }
      return '';
  }
+ # Adds all given arguments to the course parameter log.
+ # @returns {string} - the answer to the lonnet query.
  sub log_parmset {
      return &Apache::lonnet::write_log('course','parameterlog',@_);
  }
+ # Store a parameter value and type by symb, without using the parameter default actions.
+ # Expire related sheets.
+ #
+ # @param {string} $symb - resource symb
+ # @param {string} $spnam - part info and parameter name separated by a dot, e.g. '0.weight'
+ # @param {integer} $snum - level
+ # @param {string} $nval - new value
+ # @param {string} $ntype - new type
+ # @param {string} $uname - username
+ # @param {string} $udom - userdomain
+ # @param {string} $csec - section name
+ # @param {string} $cgroup - group name
+ # @returns {string} - HTML code with an error message if the parameter could not be stored.
  sub storeparm_by_symb_inner {
  # ---------------------------------------------------------- Get symb, map, etc
      my ($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec,$cgroup)=@_;
- Line 686  sub storeparm_by_symb_inner {
+ Line 827  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==18) || ($snum==4)) { $storeunder=$courselevel; }
-     if (($snum==13) || ($snum==2)) { $storeunder=$courselevelm; }
+     if (($snum==17) || ($snum==3)) { $storeunder=$courseleveli; }
-     if (($snum==10) || ($snum==1)) { $storeunder=$courselevelr; }
+     if (($snum==16) || ($snum==2)) { $storeunder=$courselevelm; }
-     if ($snum==9) { $storeunder=$seclevel; }
+     if (($snum==13) || ($snum==1)) { $storeunder=$courselevelr; }
-     if ($snum==8) { $storeunder=$seclevelm; }
+     if ($snum==12) { $storeunder=$seclevel; }
-     if ($snum==7) { $storeunder=$seclevelr; }
+     if ($snum==11) { $storeunder=$secleveli; }
-     if ($snum==6) { $storeunder=$grplevel; }
+     if ($snum==10) { $storeunder=$seclevelm; }
-     if ($snum==5) { $storeunder=$grplevelm; }
+     if ($snum==9) { $storeunder=$seclevelr; }
-     if ($snum==4) { $storeunder=$grplevelr; }
+     if ($snum==8) { $storeunder=$grplevel; }
+     if ($snum==7) { $storeunder=$grpleveli; }
+     if ($snum==6) { $storeunder=$grplevelm; }
+     if ($snum==5) { $storeunder=$grplevelr; }
      my $delete;
- Line 717  sub storeparm_by_symb_inner {
+ Line 865  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 $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- # Expire sheets
+         # Expire sheets
-     &Apache::lonnet::expirespread('','','studentcalc');
+         &Apache::lonnet::expirespread('','','studentcalc');
-     if (($snum==10) || ($snum==7) || ($snum==4)) {
+         if (($snum==13) || ($snum==9) || ($snum==5)) {
-         &Apache::lonnet::expirespread('','','assesscalc',$symb);
+             &Apache::lonnet::expirespread('','','assesscalc',$symb);
-     } elsif (($snum==11) || ($snum==8) || ($snum==5)) {
+         } elsif (($snum==14) || ($snum==10) || ($snum==6)) {
-         &Apache::lonnet::expirespread('','','assesscalc',$map);
+             &Apache::lonnet::expirespread('','','assesscalc',$map);
-     } else {
+         } else {
-         &Apache::lonnet::expirespread('','','assesscalc');
+             &Apache::lonnet::expirespread('','','assesscalc');
-     }
+         }
- # Store parameter
+         # Store parameter
-     if ($delete) {
+         if ($delete) {
-         $reply=&Apache::lonnet::del
+             $reply=&Apache::lonnet::del
-         ('resourcedata',[keys(%storecontent)],$cdom,$cnum);
+             ('resourcedata',[keys(%storecontent)],$cdom,$cnum);
-             &log_parmset(\%storecontent,1);
+                 &log_parmset(\%storecontent,1);
-     } else {
+         } else {
-         $reply=&Apache::lonnet::cput
+             $reply=&Apache::lonnet::cput
-         ('resourcedata',\%storecontent,$cdom,$cnum);
+             ('resourcedata',\%storecontent,$cdom,$cnum);
-         &log_parmset(\%storecontent);
+             &log_parmset(\%storecontent);
-     }
+         }
-     &Apache::lonnet::devalidatecourseresdata($cnum,$cdom);
+         &Apache::lonnet::devalidatecourseresdata($cnum,$cdom);
      } else {
  # ------------------------------------------------------------------ Store User
  #
- # Expire sheets
+         # Expire sheets
-     &Apache::lonnet::expirespread($uname,$udom,'studentcalc');
+         &Apache::lonnet::expirespread($uname,$udom,'studentcalc');
-     if ($snum==1) {
+         if ($snum==1) {
-         &Apache::lonnet::expirespread
+             &Apache::lonnet::expirespread
-         ($uname,$udom,'assesscalc',$symb);
+             ($uname,$udom,'assesscalc',$symb);
-     } elsif ($snum==2) {
+         } elsif ($snum==2) {
-         &Apache::lonnet::expirespread
+             &Apache::lonnet::expirespread
-         ($uname,$udom,'assesscalc',$map);
+             ($uname,$udom,'assesscalc',$map);
-     } else {
+         } else {
-         &Apache::lonnet::expirespread($uname,$udom,'assesscalc');
+             &Apache::lonnet::expirespread($uname,$udom,'assesscalc');
-     }
+         }
- # Store parameter
+         # Store parameter
-     if ($delete) {
+         if ($delete) {
-         $reply=&Apache::lonnet::del
+             $reply=&Apache::lonnet::del
-         ('resourcedata',[keys(%storecontent)],$udom,$uname);
+             ('resourcedata',[keys(%storecontent)],$udom,$uname);
-         &log_parmset(\%storecontent,1,$uname,$udom);
+             &log_parmset(\%storecontent,1,$uname,$udom);
-     } else {
+         } else {
-         $reply=&Apache::lonnet::cput
+             $reply=&Apache::lonnet::cput
-         ('resourcedata',\%storecontent,$udom,$uname);
+             ('resourcedata',\%storecontent,$udom,$uname);
-         &log_parmset(\%storecontent,0,$uname,$udom);
+             &log_parmset(\%storecontent,0,$uname,$udom);
-     }
+         }
-     &Apache::lonnet::devalidateuserresdata($uname,$udom);
+         &Apache::lonnet::devalidateuserresdata($uname,$udom);
      }
      if ($reply=~/^error\:(.*)/) {
-     return "<span class=\"LC_error\">Write Error: $1</span>";
+         return "<span class=\"LC_error\">Write Error: $1</span>";
      }
      return '';
  }
+ # Returns HTML with the value of the given parameter,
+ # using a readable format for dates, and
+ # a warning if there is a problem with a date.
+ # Used by table mode.
+ # Returns HTML for the editmap.png image if no value is defined and $editable is true.
+ #
+ # @param {string} $value - the parameter value
+ # @param {string} $type - the parameter type
+ # @param {string} $name - the parameter name (unused)
+ # @param {boolean} $editable - Set to true to get an icon when no value is defined.
  sub valout {
-     my ($value,$type,$editable)=@_;
+     my ($value,$type,$name,$editable)=@_;
      my $result = '';
      # Values of zero are valid.
      if (! $value && $value ne '0') {
- Line 791  sub valout {
+ Line 950  sub valout {
          }
      } else {
          if ($type eq 'date_interval') {
-             my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+             my ($totalsecs,$donesuffix) = split(/_/,$value,2);
+             my ($usesdone,$donebuttontext,$proctor,$secretkey);
+             if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) {
+                 $donebuttontext = $1;
+                 (undef,$proctor,$secretkey) = split(/_/,$2);
+                 $usesdone = 'done';
+             } elsif ($donesuffix =~ /^done(|_.+)$/) {
+                 $donebuttontext = &mt('Done');
+                 ($usesdone,$proctor,$secretkey) = split(/_/,$donesuffix);
+             }
+             my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
              my @timer;
              $year=$year-70;
              $mday--;
- Line 824  sub valout {
+ Line 993  sub valout {
                  push(@timer,&mt('[quant,_1,sec]',0));
              }
              $result.=join(", ",@timer);
+             if ($usesdone eq 'done') {
+                 if ($secretkey) {
+                     $result .= ' '.&mt('+ "[_1]" with proctor key: [_2]',$donebuttontext,$secretkey);
+                 } else {
+                     $result .= ' + "'.$donebuttontext.'"';
+                 }
+             }
          } elsif (&isdateparm($type)) {
              $result = &Apache::lonlocal::locallocaltime($value).
-         &date_sanity_info($value);
+                 &date_sanity_info($value);
          } else {
              $result = $value;
              $result=~s/\,/\, /gs;
-         $result = &HTML::Entities::encode($result,'"<>&');
+             $result = &HTML::Entities::encode($result,'"<>&');
          }
      }
      return $result;
  }
+ # Returns HTML containing a link on a parameter value, for table mode.
+ # The link uses the javascript function 'pjump'.
+ #
+ # @param {string} $type - parameter type
+ # @param {string} $dis - dialog title for editing the parameter value and type
+ # @param {string} $value - parameter value
+ # @param {string} $marker - identifier for the parameter, "resource id&part_parameter name&level", will be passed as pres_marker when the user submits a change.
+ # @param {string} $return - prefix for the name of the form and field names that will be used to submit the form ('parmform.pres')
+ # @param {string} $call - javascript function to call to submit the form ('psub')
  sub plink {
      my ($type,$dis,$value,$marker,$return,$call)=@_;
      my $winvalue=$value;
      unless ($winvalue) {
-     if (&isdateparm($type)) {
+         if (&isdateparm($type)) {
              $winvalue=$env{'form.recent_'.$type};
          } else {
              $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
- Line 850  sub plink {
+ Line 1035  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) {
-     $$item = &HTML::Entities::encode($$item,'"<>&');
+         $$item = &HTML::Entities::encode($$item,'"<>&');
-     $$item =~ s/\'/\\\'/g;
+         $$item =~ s/\'/\\\'/g;
      }
      return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.
      '<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
- Line 863  sub plink {
+ Line 1048  sub plink {
          $valout.'</a></td></tr></table>';
  }
+ # Javascript for table mode.
  sub page_js {
      my $selscript=&Apache::loncommon::studentbrowser_javascript();
- Line 879  sub page_js {
+ Line 1065  sub page_js {
              document.parmform.action+='#'+document.parmform.pres_marker.value;
              var typedef=new Array();
              typedef=document.parmform.pres_type.value.split('_');
-            if (document.parmform.pres_type.value!='') {
+             if (document.parmform.pres_type.value!='') {
-             if (typedef[0]=='date') {
+                 if (typedef[0]=='date') {
-                 eval('document.parmform.recent_'+
+                     eval('document.parmform.recent_'+
-                      document.parmform.pres_type.value+
+                         document.parmform.pres_type.value+
-              '.value=document.parmform.pres_value.value;');
+                         '.value=document.parmform.pres_value.value;');
-             } else {
+                 } else {
-                 eval('document.parmform.recent_'+typedef[0]+
+                     eval('document.parmform.recent_'+typedef[0]+
-              '.value=document.parmform.pres_value.value;');
+                         '.value=document.parmform.pres_value.value;');
+                 }
              }
-        }
              document.parmform.submit();
          } else {
              document.parmform.pres_value.value='';
- Line 912  ENDJS
+ Line 1098  ENDJS
  }
+ # Javascript to show or hide the map selection (function showHide_courseContent),
+ # for table and overview modes.
  sub showhide_js {
      return <<"COURSECONTENTSCRIPT";
- Line 932  function showHide_courseContent() {
+ Line 1120  function showHide_courseContent() {
  COURSECONTENTSCRIPT
  }
+ # Javascript functions showHideLenient and toggleParmTextbox, for overview mode
  sub toggleparmtextbox_js {
      return <<"ENDSCRIPT";
- Line 991  function toggleParmTextbox(form,key) {
+ Line 1180  function toggleParmTextbox(form,key) {
  ENDSCRIPT
  }
+ # Javascript function validateParms, for overview mode
  sub validateparms_js {
      return <<'ENDSCRIPT';
- Line 1064  function validateParms() {
+ Line 1254  function validateParms() {
  ENDSCRIPT
  }
+ # Javascript initialization, for overview mode
  sub ipacc_boxes_js  {
      my $remove = &mt('Remove');
      return <<"END";
- Line 1088  sub ipacc_boxes_js  {
+ Line 1279  sub ipacc_boxes_js  {
  END
  }
+ # Javascript function toggleSecret, for overview mode.
+ 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
+ }
+ # Prints HTML page start for table mode.
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {string} $psymb - resource symb
+ # @param {string} $crstype - course type (Community / Course / Placement Test)
  sub startpage {
      my ($r,$psymb,$crstype) = @_;
- Line 1098  sub startpage {
+ Line 1319  sub startpage {
          $loaditems{'onload'} = "showHide_courseContent(); group_or_section('cgroup'); resize_scrollbox('mapmenuscroll','1','1');";
      }
-     if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
+     if ((($env{'form.command'} eq 'set') && ($env{'form.url'}) &&
-          && (!$env{'form.dis'})) || ($env{'form.symb'})) {
+             (!$env{'form.dis'})) || ($env{'form.symb'})) {
-     &Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
+         &Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
-         text=>"Problem Parameters"});
+             text=>"Problem Parameters"});
      } else {
-     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+         &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
-        text=>"Table Mode",
+             text=>"Table Mode",
-        help => 'Course_Setting_Parameters'});
+             help => 'Course_Setting_Parameters'});
      }
      my $js = &page_js().'
  <script type="text/javascript">
- Line 1136  ENDHEAD
+ Line 1357  ENDHEAD
  }
+ # Prints a row for table mode (except for the tr start).
+ # Every time a hash reference is passed, a single entry is used, so print_row
+ # could just use these values, but why make it simple when it can be complicated ?
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {string} $which - parameter key ('parameter_'.part.'_'.name)
+ # @param {hash reference} $part - parameter key -> parameter part (can be problem part.'_'.response id for response parameters)
+ # @param {hash reference} $name - parameter key -> parameter name
+ # @param {hash reference} $symbp - resource id -> symb
+ # @param {string} $rid - resource id
+ # @param {hash reference} $default - parameter key -> resource parameter default value
+ # @param {hash reference} $defaulttype - parameter key -> resource parameter default type
+ # @param {hash reference} $display - parameter key -> full title for the parameter
+ # @param {string} $defbgone - user level and other levels background color
+ # @param {string} $defbgtwo - section level background color, also used for part number
+ # @param {string} $defbgthree - group level background color
+ # @param {string} $parmlev - parameter level (Resource:'full', Map:'map', Course:'general')
+ # @param {string} $uname - user name
+ # @param {string} $udom - user domain
+ # @param {string} $csec - section name
+ # @param {string} $cgroup - group name
+ # @param {array reference} $usersgroups - list of groups the user belongs to, if any
+ # @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters
  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
+     # 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},$uname,$udom,$csec,$cgroup,$courseopt);
- # get the type for the parameters
+     # get the type for the parameters
- # problem: these may not be set for all levels
+     # problem: these may not be set for all levels
      my ($typeresult,@typeoutpar)=&parmval($$part{$which}.'.'.
                                            $$name{$which}.'.type',$rid,
           $$defaulttype{$which},$uname,$udom,$csec,$cgroup,$courseopt);
- # cascade down manually
+     # cascade down manually
      my $cascadetype=$$defaulttype{$which};
-     for (my $i=14;$i>0;$i--) {
+     for (my $i=18;$i>0;$i--) {
-      if ($typeoutpar[$i]) {
+         if ($typeoutpar[$i]) {
              $cascadetype=$typeoutpar[$i];
-     } else {
+         } else {
              $typeoutpar[$i]=$cascadetype;
          }
      }
- Line 1170  sub print_row {
+ Line 1415  sub print_row {
      }
      my $automatic=&rulescache(($which=~/\_([^\_]+)$/)[0].'_triggers');
      if ($automatic) {
-     $parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
+         $parm.='<span class="LC_warning"><br />'.&mt('Automatically sets').' '.join(', ',split(/\:/,$automatic)).'</span>';
      }
      $r->print('<td>'.$parm.'</td>');
      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) {
- Line 1208  sub print_row {
+ Line 1456  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;
- Line 1219  sub print_row {
+ Line 1467  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,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
-             &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,4,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+             &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);
- Line 1253  sub print_row {
+ Line 1505  sub print_row {
          my $sessionval=&Apache::lonnet::EXT('resource.'.$$part{$which}.
                                          '.'.$$name{$which},$$symbp{$rid});
          my $sessionvaltype=$typeoutpar[$result];
-         if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
+         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>');
      $r->print("\n");
  }
+ # Prints a cell for table mode.
+ #
+ # FIXME: some of these parameter names are uninspired ($which and $value)
+ # Also, it would make more sense to pass the display for this cell rather
+ # than the full display hash and the key to use.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {integer} $which - level
+ # @param {string} $defbg - cell background color
+ # @param {integer} $result - the most specific level that is defined for that parameter
+ # @param {array reference} $outpar - array level -> parameter value (when defined)
+ # @param {string} $mprefix - resource id.'&'.part.'_'.parameter name.'&'
+ # @param {string} $value - parameter key ('parameter_'.part.'_'.name)
+ # @param {array reference} $typeoutpar - array level -> parameter type (when defined)
+ # @param {hash reference} $display - parameter key -> full title for the parameter
+ # @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters
  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 > 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\&$/) {
- Line 1279  sub print_td {
+ Line 1555  sub print_td {
          }
      }
      if ($nolink) {
-         $r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
+         $r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));
+ # FIXME: probably a good thing that mprefix is not used in valout, because it does not look like a parameter name !
      } else {
          $r->print(&plink($$typeoutpar[$which],
                           $$display{$value},$$outpar[$which],
- Line 1288  sub print_td {
+ Line 1565  sub print_td {
      $r->print('</td>'."\n");
  }
+ # FIXME: Despite the name, this does not print anything, the $r parameter is unused.
+ # Returns HTML and other info for the cell added when a user is selected
+ # and that user is in several groups. This is the cell with the title "Control by other group".
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request (unused)
+ # @param {string} $what - parameter part.'.'.parameter name
+ # @param {string} $rid - resource id
+ # @param {string} $cgroup - group name
+ # @param {string} $defbg - cell background color
+ # @param {array reference} $usersgroups - list of groups the user belongs to, if any
+ # @param {integer} $result - level
+ # @param {hash reference} $courseopt - course parameters hash (result of lonnet::get_courseresdata, dump of course's resourcedata.db)
+ # @returns {Array} - array (parameter value for the other group, HTML for the cell, HTML with the value, name of the other group)
  sub print_usergroups {
      my ($r,$what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
      my $courseid = $env{'request.course.id'};
- Line 1295  sub print_usergroups {
+ Line 1585  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,
+           &parm_control_group($courseid,$usersgroups,$symbparm,$mapparm,
-                                                                    $courseopt);
+                               $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;
- Line 1320  sub print_usergroups {
+ Line 1611  sub print_usergroups {
      return ($coursereply,$output,$grp_parm,$resultgroup);
  }
+ # Looks for a group with a defined parameter for given user and parameter.
+ # Used by print_usergroups.
+ #
+ # @param {string} $courseid - the course id
+ # @param {array reference} $usersgroups - list of groups the user belongs to, if any
+ # @param {string} $symbparm - end of the course parameter hash key for the group resource level
+ # @param {string} $mapparm - end of the course parameter hash key for the group map/folder level
+ # @param {string} $recurseparm - end of the course parameter hash key for the group recursive level
+ # @param {string} $what - parameter part.'.'.parameter name
+ # @param {hash reference} $courseopt - course parameters hash
+ # @returns {Array} - (parameter value for the group, course parameter hash key for the parameter, name of the group, level name, parameter type)
  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 @levels = ($symbparm,$mapparm,$recurseparm,$what);
-     my @levelnames = ('resource','map/folder','general');
+     my @levelnames = ('resource','map/folder','recursive','general');
      foreach my $group (@{$usersgroups}) {
          if ($grpfound) { last; }
          for (my $i=0; $i<@levels; $i++) {
- Line 1346  sub parm_control_group {
+ Line 1648  sub parm_control_group {
+ # Extracts lots of information about all of the the course's resources into a variety of hashes, using lonnavmaps and lonnet::metadata.
+ # All the parameters are references and are filled by the sub.
+ #
+ # @param {array reference} $ids - resource ids
+ # @param {hash reference} $typep - hash resource id (from big hash) -> resource type (file extension)
+ # @param {hash reference} $keyp - hash resource id -> comma-separated list of parameter keys from lonnet::metadata
+ # @param {hash reference} $allparms - hash parameter name -> parameter title
+ # @param {hash reference} $allparts - hash parameter part -> part title (a parameter part can be problem part.'_'.response id for response parameters)
+ # @param {hash reference} $allmaps - hash map id (from big hash) -> map src
+ # @param {hash reference} $mapp - hash resource id -> enclosing map src
+ # @param {hash reference} $symbp - hash map id or resource id -> map src.'___(all)' for a map or resource symb for a resource
+ # @param {hash reference} $maptitles - hash map id or src -> map title (this should really be two separate hashes)
+ # @param {hash reference} $uris - hash resource id -> resource src
+ # @param {hash reference} $keyorder - hash parameter key -> appearance rank for this parameter when looking through every resource and every parameter, starting at 100 (integer)
+ # @param {hash reference} $defkeytype - hash parameter name -> parameter type
  sub extractResourceInformation {
      my $ids = shift;
      my $typep = shift;
- Line 1435  sub extractResourceInformation {
+ Line 1752  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};
          }
- Line 1444  sub extractResourceInformation {
+ Line 1763  sub extractResourceInformation {
  }
+ # Tells if a parameter type is a date.
+ #
+ # @param {string} type - parameter type
+ # @returns{boolean} - true if it is a date
  sub isdateparm {
      my $type=shift;
      return (($type=~/^date/) && (!($type eq 'date_interval')));
  }
+ # Prints the HTML and Javascript to select parameters, with various shortcuts.
+ # FIXME: remove unused parameters
  #
- # parmmenu displays a list of the selected parameters.
+ # @param {Apache2::RequestRec} $r - the Apache request (unused)
- # It also offers a link to show/hide the complete parameter list
+ # @param {hash reference} $allparms - hash parameter name -> parameter title
- # from which you can select all desired parameters.
+ # @param {array reference} $pscat - list of selected parameter names (unused)
- #
+ # @param {hash reference} $keyorder - hash parameter key -> appearance rank (unused)
  sub parmmenu {
      my ($r,$allparms,$pscat,$keyorder)=@_;
      my $tempkey;
- Line 1470  sub parmmenu {
+ Line 1794  sub parmmenu {
              displayOverview = "none"
          }
-     for (i=0; i<document.forms.parmform.elements.length; i++) {
+         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;
- Line 1479  sub parmmenu {
+ Line 1803  sub parmmenu {
      }
      function checkthis(thisvalue, checkName) {
+         for (i=0; i<document.forms.parmform.elements.length; i++) {
-     for (i=0; i<document.forms.parmform.elements.length; i++) {
              ele = document.forms.parmform.elements[i];
              if (ele.name == checkName) {
-         if (ele.value == thisvalue) {
+                 if (ele.value == thisvalue) {
-             document.forms.parmform.elements[i].checked=true;
+                     document.forms.parmform.elements[i].checked=true;
-         }
+                 }
              }
          }
      }
      function checkdates() {
-     checkthis('duedate','pscat');
+         checkthis('duedate','pscat');
-      checkthis('opendate','pscat');
+         checkthis('opendate','pscat');
-     checkthis('answerdate','pscat');
+         checkthis('answerdate','pscat');
      }
      function checkdisset() {
-      checkthis('discussend','pscat');
+         checkthis('discussend','pscat');
-      checkthis('discusshide','pscat');
+         checkthis('discusshide','pscat');
-      checkthis('discussvote','pscat');
+         checkthis('discussvote','pscat');
      }
      function checkcontdates() {
-     checkthis('contentopen','pscat');
+         checkthis('contentopen','pscat');
-      checkthis('contentclose','pscat');
+         checkthis('contentclose','pscat');
      }
      function checkvisi() {
-     checkthis('hiddenresource','pscat');
+         checkthis('hiddenresource','pscat');
-      checkthis('encrypturl','pscat');
+         checkthis('encrypturl','pscat');
-     checkthis('problemstatus','pscat');
+         checkthis('problemstatus','pscat');
-     checkthis('contentopen','pscat');
+         checkthis('contentopen','pscat');
-     checkthis('opendate','pscat');
+         checkthis('opendate','pscat');
      }
      function checkparts() {
-     checkthis('hiddenparts','pscat');
+         checkthis('hiddenparts','pscat');
-     checkthis('display','pscat');
+         checkthis('display','pscat');
-     checkthis('ordered','pscat');
+         checkthis('ordered','pscat');
      }
      function checkstandard() {
          checkall(false,'pscat');
-     checkdates();
+         checkdates();
-     checkthis('weight','pscat');
+         checkthis('weight','pscat');
-     checkthis('maxtries','pscat');
+         checkthis('maxtries','pscat');
-     checkthis('type','pscat');
+         checkthis('type','pscat');
-     checkthis('problemstatus','pscat');
+         checkthis('problemstatus','pscat');
      }
  // ]]>
- Line 1539  ENDSCRIPT
+ Line 1861  ENDSCRIPT
      &shortCuts($r,$allparms,$pscat,$keyorder);
      $r->print('<hr />');
  }
- # return a hash
+ # Returns parameter categories.
+ #
+ # @returns {hash} - category name -> title in English
  sub categories {
      return ('time_settings' => 'Time Settings',
      'grading' => 'Grading',
- Line 1553  sub categories {
+ Line 1878  sub categories {
      'misc' => 'Miscellaneous' );
  }
- # return a hash. Like a look-up table
+ # Returns the category for each parameter.
+ #
+ # @returns {hash} - parameter name -> category name
  sub lookUpTableParameter {
      return (
- Line 1564  sub lookUpTableParameter {
+ Line 1891  sub lookUpTableParameter {
          'contentopen' => 'time_settings',
          'contentclose' => 'time_settings',
          'discussend' => 'time_settings',
- 	'printstartdate' => 'time_settings',
+         'printstartdate' => 'time_settings',
- 	'printenddate' => 'time_settings',
+         'printenddate' => 'time_settings',
          'weight' => 'grading',
          'handgrade' => 'grading',
          'maxtries' => 'tries',
- Line 1604  sub lookUpTableParameter {
+ Line 1931  sub lookUpTableParameter {
      );
  }
+ # Adds the given parameter name to an array of arrays listing all parameters for each category.
+ #
+ # @param {string} $name - parameter name
+ # @param {array reference} $catList - array reference category name -> array reference of parameter names
  sub whatIsMyCategory {
      my $name = shift;
      my $catList = shift;
- Line 1627  sub whatIsMyCategory {
+ Line 1958  sub whatIsMyCategory {
      }
  }
+ # Sorts parameter names based on appearance order.
+ #
+ # @param {array reference} name - array reference of parameter names
+ # @param {hash reference} $keyorder - hash parameter key -> appearance rank
+ # @returns {Array} - array of parameter names
  sub keysindisplayorderCategory {
      my ($name,$keyorder)=@_;
      return sort {
- Line 1634  sub keysindisplayorderCategory {
+ Line 1970  sub keysindisplayorderCategory {
      } ( @{$name});
  }
+ # Returns a hash category name -> order, starting at 1 (integer)
+ #
+ # @returns {hash}
  sub category_order {
      return (
          'time_settings' => 1,
- Line 1650  sub category_order {
+ Line 1989  sub category_order {
  }
+ # Prints HTML to let the user select parameters, from a list of all parameters organized by category.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {hash reference} $allparms - hash parameter name -> parameter title
+ # @param {array reference} $pscat - list of selected parameter names
+ # @param {hash reference} $keyorder - hash parameter key -> appearance rank
  sub parmboxes {
      my ($r,$allparms,$pscat,$keyorder)=@_;
      my %categories = &categories();
- Line 1691  sub parmboxes {
+ Line 2036  sub parmboxes {
      }
      $r->print("\n");
  }
+ # Prints HTML with shortcuts to select groups of parameters in one click, or deselect all.
+ # FIXME: remove unused parameters
  #
- # This function offers some links on the parameter section to get with one click a group a parameters
+ # @param {Apache2::RequestRec} $r - the Apache request
- #
+ # @param {hash reference} $allparms - hash parameter name -> parameter title (unused)
+ # @param {array reference} $pscat - list of selected parameter names (unused)
+ # @param {hash reference} $keyorder - hash parameter key -> appearance rank (unused)
  sub shortCuts {
      my ($r,$allparms,$pscat,$keyorder)=@_;
- Line 1726  sub shortCuts {
+ Line 2076  sub shortCuts {
      );
  }
+ # Prints HTML to select parts to view (except for the title).
+ # Used by table and overview modes.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {hash reference} $allparts - hash parameter part -> part title
+ # @param {array reference} $psprt - list of selected parameter parts
  sub partmenu {
      my ($r,$allparts,$psprt)=@_;
      my $selsize = 1+scalar(keys(%{$allparts}));
- Line 1735  sub partmenu {
+ Line 2091  sub partmenu {
      $r->print('<select multiple="multiple" name="psprt" size="'.$selsize.'">');
      $r->print('<option value="all"');
-     $r->print(' selected="selected"') unless (@{$psprt});
+     $r->print(' selected="selected"') unless (@{$psprt}); # useless, the array is never empty
      $r->print('>'.&mt('All Parts').'</option>');
      my %temphash=();
      foreach (@{$psprt}) { $temphash{$_}=1; }
      foreach my $tempkey (sort {
-     if ($a==$b) { return ($a cmp $b) } else { return ($a <=> $b); }
+                 if ($a==$b) { return ($a cmp $b) } else { return ($a <=> $b); }
-     } keys(%{$allparts})) {
+             } keys(%{$allparts})) {
-     unless ($tempkey =~ /\./) {
+         unless ($tempkey =~ /\./) {
-         $r->print('<option value="'.$tempkey.'"');
+             $r->print('<option value="'.$tempkey.'"');
-         if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
+             if ($$psprt[0] eq "all" ||  $temphash{$tempkey}) {
-         $r->print(' selected="selected"');
+                 $r->print(' selected="selected"');
+             }
+             $r->print('>'.$$allparts{$tempkey}.'</option>');
          }
-         $r->print('>'.$$allparts{$tempkey}.'</option>');
-     }
      }
      $r->print('</select>');
  }
+ # Prints HTML to select a user and/or a group.
+ # Used by table mode.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {string} $uname - selected user name
+ # @param {string} $id - selected Student/Employee ID
+ # @param {string} $udom - selected user domain
+ # @param {string} $csec - selected section name
+ # @param {string} $cgroup - selected group name
+ # @param {string} $parmlev - parameter level (Resource:'full', Map:'map', Course:'general')
+ # @param {array reference} $usersgroups - list of groups the user belongs to, if any
+ # @param {string} $pssymb - resource symb (when a single resource is selected)
  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();
- Line 1763  sub usermenu {
+ Line 2131  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='';
-     if (%sectionhash) {
+     my $currsec = $env{'request.course.sec'};
+     if ($currsec) {
+         $sections=&mt('Section:').' '.$currsec;
+         if (%grouphash) {
+             $sections .= ';'.('&nbsp;' x2);
+         }
+     } elsif (%sectionhash && $currsec eq '') {
          $sections=&mt('Section:').' <select name="csec"';
          if (%grouphash && $parmlev ne 'full') {
              $sections .= qq| onchange="group_or_section('csec')" |;
- Line 1782  sub usermenu {
+ Line 2161  sub usermenu {
          $sections.='</select>';
      }
-     if (%sectionhash && %grouphash && $parmlev ne 'full') {
+     if (%sectionhash && %grouphash && $parmlev ne 'full' && $currsec eq '') {
          $sections .= '&nbsp;'.&mt('or').'&nbsp;';
          $sections .= qq|
  <script type="text/javascript">
- Line 1815  function group_or_section(caller) {
+ Line 2194  function group_or_section(caller) {
      if (%grouphash) {
          $groups=&mt('Group:').' <select name="cgroup"';
-         if (%sectionhash && $env{'form.action'} eq 'settable') {
+         if (%sectionhash && $env{'form.action'} eq 'settable' && $currsec eq '') {
              $groups .= qq| onchange="group_or_section('cgroup')" |;
          }
          $groups .= '>';
- Line 1841  function group_or_section(caller) {
+ Line 2220  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')));
- Line 1850  function group_or_section(caller) {
+ Line 2231  function group_or_section(caller) {
                   ,$chooseopt));
  }
+ # Prints HTML to select parameters from a list of all parameters.
+ # Uses parmmenu and parmboxes.
+ # Used by table and overview modes.
  #
- # This function shows on table Mode the available Parameters for the selected Resources
+ # @param {Apache2::RequestRec} $r - the Apache request
- #
+ # @param {hash reference} $allparms - hash parameter name -> parameter title
+ # @param {array reference} $pscat - list of selected parameter names
+ # @param {array reference} $psprt - list of selected parameter parts (unused)
+ # @param {hash reference} $keyorder - hash parameter key -> appearance rank
+ # @param {string} [$divid] - name used to give an id to the HTML element for the scroll box
  sub displaymenu {
      my ($r,$allparms,$pscat,$psprt,$keyorder,$divid)=@_;
      $r->print(&Apache::lonhtmlcommon::start_pick_box());
      $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
-     &parmmenu($r,$allparms,$pscat,$keyorder);
+     &parmmenu($r,$allparms,$pscat,$keyorder); # only $allparms is used by parmmenu
      $r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
      &parmboxes($r,$allparms,$pscat,$keyorder);
      $r->print(&Apache::loncommon::end_scrollbox());
- Line 1869  sub displaymenu {
+ Line 2257  sub displaymenu {
  }
+ # Prints HTML to select a map.
+ # Used by table mode and overview mode.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {hash reference} $allmaps - hash map id -> map src
+ # @param {string} $pschp - selected map id, or 'all'
+ # @param {hash reference} $maptitles - hash map id or src -> map title
+ # @param {hash reference} $symbp - hash map id or resource id -> map src.'___(all)' for a map or resource symb for a resource
  sub mapmenu {
      my ($r,$allmaps,$pschp,$maptitles,$symbp)=@_;
      my %allmaps_inverted = reverse %$allmaps;
- Line 2020  sub mapmenu {
+ Line 2416  sub mapmenu {
      }
  }
- # Build up the select Box to choose if your parameter specification should work for the resource, map/folder or the course level
+ # Prints HTML to select the parameter level (resource, map/folder or course).
- # The value of default selection in the select box is set by the value that is given by the argument in $parmlev.
+ # Used by table and overview modes.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {hash reference} $alllevs - all parameter levels, hash English title -> value
+ # @param {string} $parmlev - selected level value (full|map|general), or ''
  sub levelmenu {
      my ($r,$alllevs,$parmlev)=@_;
- Line 2039  sub levelmenu {
+ Line 2439  sub levelmenu {
  }
+ # Returns HTML to select a section (with a select HTML element).
+ # Used by overview mode.
+ #
+ # @param {array reference} $selectedsections - list of selected section ids
+ # @returns {string}
  sub sectionmenu {
-     my ($r,$selectedsections)=@_;
+     my ($selectedsections)=@_;
      my %sectionhash = &Apache::loncommon::get_sections();
-     return if (!%sectionhash);
+     return '' if (!%sectionhash);
-     $r->print('<select name="Section" multiple="multiple" size="8">');
+     my (@possibles,$disabled);
-     foreach my $s ('all',sort(keys(%sectionhash))) {
+     if ($env{'request.course.sec'} ne '') {
-         $r->print('    <option value="'.$s.'"');
+         @possibles = ($env{'request.course.sec'});
-         foreach my $sec (@{$selectedsections}) {
+         $selectedsections = [$env{'request.course.sec'}];
-             if ($s eq $sec) {
+         $disabled = ' disabled="disabled"';
-                 $r->print(' selected="selected"');
+     } else {
-                 last;
+         @possibles = ('all',sort(keys(%sectionhash)));
-             }
+     }
+     my $output = '<select name="Section" multiple="multiple" size="8"'.$disabled.'>';
+     foreach my $s (@possibles) {
+         $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;
  }
+ # Returns HTML to select a group (with a select HTML element).
+ # Used by overview mode.
+ #
+ # @param {array reference} $selectedgroups - list of selected group names
+ # @returns {string}
  sub groupmenu {
-     my ($r,$selectedgroups)=@_;
+     my ($selectedgroups)=@_;
-     my %grouphash = &Apache::longroup::coursegroups();
+     my %grouphash;
-     return if (!%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.'"');
+         $output .= '    <option value="'.$group.'"';
-         foreach my $grp (@{$selectedgroups}) {
+         if ((@{$selectedgroups}) && (grep(/^\Q$group\E$/,\@{$selectedgroups}))) {
-             if ($group eq $grp) {
+             $output .=  ' selected="selected"';
-                 $r->print(' selected="selected"');
-                 last;
-             }
          }
-         $r->print('>'.$group."</option>\n");
+         $output .= '>'."$group</option>\n";
      }
-     $r->print("</select>\n");
+     $output .= "</select>\n";
+     return $output;
  }
+ # Returns an array with the given parameter split by comma.
+ # Used by assessparms (table mode).
+ #
+ # @param {string} $keyp - the string to split
+ # @returns {Array<string>}
  sub keysplit {
      my $keyp=shift;
      return (split(/\,/,$keyp));
  }
+ # Returns the keys in $name, sorted using $keyorder.
+ # Parameters are sorted by key, which means they are sorted by part first, then by name.
+ # Used by assessparms (table mode) for resource level.
+ #
+ # @param {hash reference} $name - parameter key -> parameter name
+ # @param {hash reference} $keyorder - hash parameter key -> appearance rank
+ # @returns {Array<string>}
  sub keysinorder {
      my ($name,$keyorder)=@_;
      return sort {
-     $$keyorder{$a} <=> $$keyorder{$b};
+         $$keyorder{$a} <=> $$keyorder{$b};
      } (keys(%{$name}));
  }
+ # Returns the keys in $name, sorted using $keyorder to sort parameters by name first, then by part.
+ # Used by assessparms (table mode) for map and general levels.
+ #
+ # @param {hash reference} $name - parameter key -> parameter name
+ # @param {hash reference} $keyorder - hash parameter key -> appearance rank
+ # @returns {Array<string>}
  sub keysinorder_bytype {
      my ($name,$keyorder)=@_;
      return sort {
-     my $ta=(split('_',$a))[-1];
+         my $ta=(split('_',$a))[-1]; # parameter name
-     my $tb=(split('_',$b))[-1];
+         my $tb=(split('_',$b))[-1];
-     if ($$keyorder{'parameter_0_'.$ta} == $$keyorder{'parameter_0_'.$tb}) {
+         if ($$keyorder{'parameter_0_'.$ta} == $$keyorder{'parameter_0_'.$tb}) {
-         return ($a cmp $b);
+             return ($a cmp $b);
-     }
+         }
-     $$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
+         $$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
      } (keys(%{$name}));
  }
+ # Returns the keys in $name, sorted using $keyorder to sort parameters by name.
+ # Used by defaultsetter (parameter settings default actions).
+ #
+ # @param {hash reference} $name - hash parameter name -> parameter title
+ # @param {hash reference} $keyorder - hash parameter key -> appearance rank
+ # @returns {Array<string>}
  sub keysindisplayorder {
      my ($name,$keyorder)=@_;
      return sort {
-     $$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b};
+         $$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b};
      } (keys(%{$name}));
  }
+ # Prints HTML with a choice to sort results by realm or student first.
+ # Used by overview mode.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {string} $sortorder - realmstudent|studentrealm
  sub sortmenu {
      my ($r,$sortorder)=@_;
      $r->print('<br /><label><input type="radio" name="sortorder" value="realmstudent"');
- Line 2124  sub sortmenu {
+ Line 2571  sub sortmenu {
            '</label>');
  }
+ # Returns a hash parameter key -> order (integer) giving the order for some parameters.
+ #
+ # @returns {hash}
  sub standardkeyorder {
      return ('parameter_0_opendate' => 1,
          'parameter_0_duedate' => 2,
- Line 2146  sub standardkeyorder {
+ Line 2596  sub standardkeyorder {
          'parameter_0_discussend' => 19,
          'parameter_0_discusshide' => 20,
          'parameter_0_discussvote' => 21,
- 	'parameter_0_printstartdate'  =>  22,
+         'parameter_0_printstartdate'  =>  22,
- 	'parameter_0_printenddate' =>  23);
+         'parameter_0_printenddate' =>  23);
  }
+ # Table mode UI.
+ # If nothing is selected, prints HTML forms to select resources, parts, parameters, user, group and section.
+ # Otherwise, prints the parameter table, with a link to change the selection unless a single resource is selected.
+ #
+ # Parameters used from the request:
+ # action - handler action (see handler), usermenu is checking for value 'settable'
+ # cgroup - selected group
+ # command - 'set': direct access to table mode for a resource
+ # csec - selected section
+ # dis - set when the "Update Display" button was used, used only to discard command 'set'
+ # hideparmsel - can be 'hidden' to hide the parameter selection div initially and display the "Change Parameter Selection" link instead (which displays the div)
+ # id - student/employee ID
+ # parmlev - selected level (full|map|general)
+ # part - selected part (unused ?)
+ # pres_marker - &&&-separated parameter identifiers, "resource id&part_parameter name&level"
+ # pres_type - &&&-separated parameter types
+ # pres_value - &&&-separated parameter values
+ # prevvisit - '1' if the user has submitted the form before
+ # pscat (multiple values) - selected parameter names
+ # pschp - selected map id, or 'all'
+ # psprt (multiple values) - list of selected parameter parts
+ # filter - part of or whole parameter name, to be filtered out when parameters are displayed (unused ?)
+ # recent_* (* = parameter type) - recent values entered by the user for parameter types
+ # symb - resource symb (when a single resource is selected)
+ # udom - selected user domain
+ # uname - selected user name
+ # url - used only with command 'set', the resource url
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub assessparms {
      my $r=shift;
  # -------------------------------------------------------- Variable declaration
-     my @ids=();
+     my @ids=(); # resource ids
-     my %symbp=();
+     my %symbp=(); # hash map id or resource id -> map src.'___(all)' for a map or resource symb for a resource
-     my %mapp=();
+     my %mapp=(); # hash resource id -> enclosing map src
-     my %typep=();
+     my %typep=(); # hash resource id (from big hash) -> resource type (file extension)
-     my %keyp=();
+     my %keyp=(); # hash resource id -> comma-separated list of parameter keys
-     my %uris=();
+     my %uris=(); # hash resource id -> resource src
-     my %maptitles=();
+     my %maptitles=(); # hash map id or src -> map title
-     my %allmaps=();
+     my %allmaps=(); # hash map id (from big hash) -> map src
-     my %alllevs=();
+     my %alllevs=(); # hash English level title -> value
-     my $uname;
+     my $uname; # selected user name
-     my $udom;
+     my $udom; # selected user domain
-     my $uhome;
+     my $uhome; # server with the user's files, or 'no_host'
-     my $csec;
+     my $csec; # selected section name
-     my $cgroup;
+     my $cgroup; # selected group name
-     my @usersgroups = ();
+     my @usersgroups = (); # list of the user groups
      my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
- Line 2181  sub assessparms {
+ Line 2659  sub assessparms {
      $alllevs{'Map/Folder Level'}='map';
      $alllevs{'Course Level'}='general';
-     my %allparms;
+     my %allparms; # hash parameter name -> parameter title
-     my %allparts;
+     my %allparts; # hash parameter part -> part title
  # ------------------------------------------------------------------------------
  #
- Line 2197  sub assessparms {
+ Line 2675  sub assessparms {
      my $message='';
      $csec=$env{'form.csec'};
+     if ($env{'request.course.sec'} ne '') {
+         $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'}) {
- Line 2226  sub assessparms {
+ Line 2718  sub assessparms {
  # ----------------------------------------------- Was this started from grades?
-     if (($env{'form.command'} eq 'set') && ($env{'form.url'})
+     if (($env{'form.command'} eq 'set') && ($env{'form.url'}) &&
-     && (!$env{'form.dis'})) {
+             (!$env{'form.dis'})) {
          my $url=$env{'form.url'};
          $url=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
          $pssymb=&Apache::lonnet::symbread($url);
- Line 2245  sub assessparms {
+ Line 2737  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 {
- Line 2322  sub assessparms {
+ Line 2814  sub assessparms {
          my $totalstored = 0;
          my $now = time;
          for (my $i=0;$i<=$#markers;$i++) {
-             my ($needsrelease,$needsnewer,$name);
+             my ($needsrelease,$needsnewer,$name,$namematch);
-             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
+             if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(9|10|11|12)$/)) {
+                 next if ($csec ne $env{'request.course.sec'});
+             }
+             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) =
- Line 2353  sub assessparms {
+ Line 2854  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 = '';
- Line 2390  sub assessparms {
+ Line 2891  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]),
- Line 2423  sub assessparms {
+ Line 2964  sub assessparms {
          }
      }
  #----------------------------------------------- if all selected, fill in array
-     if ($pscat[0] eq "all") {@pscat = (keys(%allparms));}
+     if ($pscat[0] eq "all") {
-     if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus') };
+         @pscat = (keys(%allparms));
-     if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys(%allparts));}
+     }
+     if (!@pscat) {
+         @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus')
+     };
+     if ($psprt[0] eq "all" || !@psprt) {
+         @psprt = (keys(%allparts));
+     }
  # ------------------------------------------------------------------ Start page
      my $crstype = &Apache::loncommon::course_type();
      &startpage($r,$pssymb,$crstype);
      foreach my $item ('tolerance','date_default','date_start','date_end',
-         'date_interval','int','float','string') {
+             'date_interval','int','float','string') {
          $r->print('<input type="hidden" value="'.
-           &HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
+             &HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
-           '" name="recent_'.$item.'" />');
+             '" name="recent_'.$item.'" />');
      }
      # ----- Start Parameter Selection
- Line 2445  sub assessparms {
+ Line 2992  sub assessparms {
  <script type="text/javascript">
  // <![CDATA[
  function parmsel_show() {
-   document.getElementById('parmsel').style.display = "";
+     document.getElementById('parmsel').style.display = "";
-   document.getElementById('parmsellink').style.display = "none";
+     document.getElementById('parmsellink').style.display = "none";
  }
  // ]]>
  </script>
  ENDPARMSELSCRIPT
      if (!$pssymb) {
+         # No single resource selected, print forms to select things (hidden after first selection)
          my $parmselhiddenstyle=' style="display:none"';
          if($env{'form.hideparmsel'} eq 'hidden') {
             $r->print('<div id="parmsel"'.$parmselhiddenstyle.'>');
- Line 2486  ENDPARMSELSCRIPT
+ Line 3034  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());
- Line 2518  ENDPARMSELSCRIPT
+ Line 3066  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>'
- Line 2553  ENDPARMSELSCRIPT
+ Line 3101  ENDPARMSELSCRIPT
  #
  # This produces the cascading table output of parameters
  #
-                my $coursespan=$csec?8:5;
+             my $coursespan=$csec?10:6;
-                my $userspan=3;
+             my $userspan=4;
-                if ($cgroup ne '') {
+             if ($cgroup ne '') {
-                   $coursespan += 3;
+                 $coursespan += 4;
-                }
+             }
-                $r->print(&Apache::loncommon::start_data_table());
+             $r->print(&Apache::loncommon::start_data_table());
- #
+             #
- # This produces the headers
+             # This produces the headers
- #
+             #
-                $r->print('<tr><td colspan="5"></td>');
+             $r->print('<tr><td colspan="5"></td>');
-                $r->print('<th colspan="'.($coursespan).'">'.&mt('Any User').'</th>');
+             $r->print('<th colspan="'.($coursespan).'">'.&mt('Any User').'</th>');
-                if ($uname) {
+             if ($uname) {
                  if (@usersgroups > 1) {
-                        $userspan ++;
+                     $userspan ++;
-                    }
+                 }
-                    $r->print('<th colspan="'.$userspan.'" rowspan="2">');
+                 $r->print('<th colspan="'.$userspan.'" rowspan="2">');
-                    $r->print(&mt('User [_1] at Domain [_2]',"'".$uname."'","'".$udom."'").'</th>');
+                 $r->print(&mt('User [_1] at Domain [_2]',"'".$uname."'","'".$udom."'").'</th>');
-                }
+             }
-                my %lt=&Apache::lonlocal::texthash(
+             my %lt=&Apache::lonlocal::texthash(
                  'pie'    => "Parameter in Effect",
                  'csv'    => "Current Session Value",
                  'rl'     => "Resource Level",
- Line 2586  ENDPARMSELSCRIPT
+ Line 3134  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);
+             $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) {
+             if ($csec) {
-                    $r->print('<th colspan="3">'.
+                 $r->print('<th colspan="4">'.
-                   &mt("in Section")." $csec</th>");
+                 &mt("in Section")." $csec</th>");
-                }
+             }
-                if ($cgroup) {
+             if ($cgroup) {
-                 $r->print('<th colspan="3">'.
+                 $r->print('<th colspan="4">'.
                  &mt("in Group")." $cgroup</th>");
-                }
+             }
-                $r->print(<<ENDTABLEHEADFOUR);
+             $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) {
+             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>');
-                }
-                if ($uname) {
+             if ($cgroup) {
+                 $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>');
-                    }
+                 }
-                    $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>');
+             $r->print('</tr>');
  #
  # Done with the headers
  #
-                my $defbgone='';
+             my $defbgone='';
-                my $defbgtwo='';
+             my $defbgtwo='';
-                my $defbgthree = '';
+             my $defbgthree = '';
-                foreach my $rid (@ids) {
+             foreach my $rid (@ids) {
                  my ($inmapid)=($rid=~/\.(\d+)$/);
                  if ((!$pssymb &&
-                  (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})))
+                         (($pschp eq 'all') || ($allmaps{$pschp} eq $mapp{$rid})))
-                 ||
+                         ||
-                 ($pssymb && $pssymb eq $symbp{$rid})) {
+                         ($pssymb && $pssymb eq $symbp{$rid})) {
  # ------------------------------------------------------ Entry for one resource
                      if ($defbgone eq '#E0E099') {
                          $defbgone='#E0E0DD';
- Line 2670  ENDTABLEHEADFOUR
+ Line 3219  ENDTABLEHEADFOUR
                      my $filter=$env{'form.filter'};
                      foreach my $tempkeyp (&keysplit($keyp{$rid})) {
                          if (grep $_ eq $tempkeyp, @catmarker) {
-                           my $parmname=&Apache::lonnet::metadata($uri,$tempkeyp.'.name');
+                             my $parmname=&Apache::lonnet::metadata($uri,$tempkeyp.'.name');
- # We may only want certain parameters listed
+     # We may only want certain parameters listed
-                           if ($filter) {
+                             if ($filter) {
-                              unless ($filter=~/\Q$parmname\E/) { next; }
+                                 unless ($filter=~/\Q$parmname\E/) { next; }
-                           }
+                             }
-                           $name{$tempkeyp}=$parmname;
+                             $name{$tempkeyp}=$parmname;
-                           $part{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.part');
+                             $part{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.part');
-                           my $parmdis=&Apache::lonnet::metadata($uri,$tempkeyp.'.display');
+                             my $parmdis=&Apache::lonnet::metadata($uri,$tempkeyp.'.display');
-                           if ($allparms{$name{$tempkeyp}} ne '') {
+                             if ($allparms{$name{$tempkeyp}} ne '') {
-                               my $identifier;
+                                 my $identifier;
-                               if ($parmdis =~ /(\s*\[Part.*)$/) {
+                                 if ($parmdis =~ /(\s*\[Part.*)$/) {
-                                   $identifier = $1;
+                                     $identifier = $1;
-                               }
+                                 }
-                               $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
+                                 $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
-                           } else {
+                             } else {
-                               $display{$tempkeyp} = $parmdis;
+                                 $display{$tempkeyp} = $parmdis;
-                           }
+                             }
-                           unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
+                             unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
-                           $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
+                             $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
-                           $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp);
+                             $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp);
-                           $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.type');
+                             $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.type');
-                           $thistitle=&Apache::lonnet::metadata($uri,$tempkeyp.'.title');
+                             $thistitle=&Apache::lonnet::metadata($uri,$tempkeyp.'.title');
                          }
                      }
                      my $totalparms=scalar(keys(%name));
                      if ($totalparms>0) {
-                            my $firstrow=1;
+                         my $firstrow=1;
                          my $title=&Apache::lonnet::gettitle($symbp{$rid});
                          $r->print('<tr><td style="background-color:'.$defbgone.';"'.
                               ' rowspan='.$totalparms.
- Line 2730  ENDTABLEHEADFOUR
+ Line 3279  ENDTABLEHEADFOUR
                              &print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,
                                         \%type,\%display,$defbgone,$defbgtwo,
                                         $defbgthree,$parmlev,$uname,$udom,$csec,
-                                                             $cgroup,\@usersgroups);
+                                        $cgroup,\@usersgroups,$noeditgrp);
                          }
                      }
                  }
- Line 2754  ENDTABLEHEADFOUR
+ Line 3303  ENDTABLEHEADFOUR
  #-------------------------------------------- for each map, gather information
              my $mapid;
-                foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys(%maplist)) {
+             foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys(%maplist)) {
                  my $maptitle = $maplist{$mapid};
  #-----------------------  loop through ids and get all parameter types for map
- Line 2774  ENDTABLEHEADFOUR
+ Line 3323  ENDTABLEHEADFOUR
  #                  $r->print("$mapid:$map:   $rid <br /> \n");
-                      if ($map eq $mapid) {
+                     if ($map eq $mapid) {
                          my $uri=&Apache::lonnet::declutter($uris{$rid});
  #                    $r->print("Keys: $keyp{$rid} <br />\n");
- Line 2809  ENDTABLEHEADFOUR
+ Line 3358  ENDTABLEHEADFOUR
                                  $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
                                }
                          } # end loop through keys
-                       }
+                     }
                  } # end loop through ids
  #---------------------------------------------------- print header information
- Line 2843  ENDTABLEHEADFOUR
+ Line 3392  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()
                  );
- Line 2852  ENDTABLEHEADFOUR
+ Line 3402  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>'
- Line 2908  ENDTABLEHEADFOUR
+ Line 3458  ENDTABLEHEADFOUR
                          $display{$tempkeyp} =~ s/_\w+_/_0_/;
                          $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp);
                          $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.type');
-                       }
+                     }
                  } # end loop through keys
              } # end loop through ids
- Line 2942  ENDMAPONE
+ Line 3492  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>'
- Line 2955  ENDMAPONE
+ Line 3505  ENDMAPONE
      $r->print(&Apache::loncommon::end_page());
  } # end sub assessparms
  ##################################################
- # Overview mode
+ # OVERVIEW MODE
  ##################################################
- my $tableopen;
+ my $tableopen; # boolean, true if HTML table is already opened
+ # Returns HTML with the HTML table start tag and header, unless the table is already opened.
+ # @param {boolean} $readonly - true if values cannot be edited (otherwise more columns are added)
+ # @returns {string}
  sub tablestart {
+     my ($readonly) = @_;
      if ($tableopen) {
-     return '';
+         return '';
      } else {
-     $tableopen=1;
+         $tableopen=1;
-     return &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th><th>'.
+         my $output = &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th>';
-         &mt('Delete').'</th><th>'.&mt('Set to ...').'</th></tr>';
+         if ($readonly) {
+             $output .= '<th>'.&mt('Current value').'</th>';
+         } else {
+             $output .= '<th>'.&mt('Delete').'</th><th>'.&mt('Set to ...').'</th>';
+         }
+         $output .= '</tr>';
+         return $output;
      }
  }
+ # Returns HTML with the HTML table end tag, unless the table is not opened.
+ # @returns {string}
  sub tableend {
      if ($tableopen) {
-     $tableopen=0;
+         $tableopen=0;
-     return &Apache::loncommon::end_data_table();
+         return &Apache::loncommon::end_data_table();
      } else {
-     return'';
+         return'';
      }
  }
+ # Reads course and user information.
+ # If the context is looking for a scalar, returns the course parameters hash (result of lonnet::get_courseresdata, dump of course's resourcedata.db) with added student data from lonnet::get_userresdata (which reads the user's resourcedata.db).
+ # The key for student data is modified with '[useropt:'.username.':'.userdomain.'].'.
+ # If the context is looking for a list, returns a list with the scalar data and the class list.
+ # @param {string} $crs - course number
+ # @param {string} $dom - course domain
+ # @returns {hash reference|Array}
  sub readdata {
      my ($crs,$dom)=@_;
  # Read coursedata
- Line 2999  sub readdata {
+ Line 3571  sub readdata {
              }
          }
      }
-     return $resourcedata;
+     if (wantarray) {
+         return ($resourcedata,$classlist);
+     } else {
+         return $resourcedata;
+     }
  }
- # Setting
+ # Stores parameter data, using form parameters directly.
+ #
+ # Uses the following form parameters. The variable part in the names is a resourcedata key (except for a modification for user data).
+ # set_* (except settext, setipallow, setipdeny) - set a parameter value
+ # del_* - remove a parameter
+ # datepointer_* - set a date parameter (value is key_* refering to a set of other form parameters)
+ # dateinterval_* - set a date interval parameter (value refers to more form parameters)
+ # key_* - date values
+ # days_* - for date intervals
+ # hours_* - for date intervals
+ # minutes_* - for date intervals
+ # seconds_* - for date intervals
+ # done_* - for date intervals
+ # typeof_* - parameter type
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {string} $crs - course number
+ # @param {string} $dom - course domain
  sub storedata {
      my ($r,$crs,$dom)=@_;
  # Set userlevel immediately
- Line 3016  sub storedata {
+ Line 3608  sub storedata {
      undef @deldata;
      my ($got_chostname,$chostname,$cmajor,$cminor);
      my $now = time;
      foreach my $key (keys(%env)) {
-     if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
+         if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
-         my $cmd=$1;
+             my $cmd=$1;
-         my $thiskey=$2;
+             my $thiskey=$2;
-         next if ($cmd eq 'settext' || $cmd eq 'setipallow' || $cmd eq 'setipdeny');
+             next if ($cmd eq 'settext' || $cmd eq 'setipallow' || $cmd eq 'setipdeny');
-         my ($tuname,$tudom)=&extractuser($thiskey);
+             my ($tuname,$tudom)=&extractuser($thiskey);
-         my $tkey=$thiskey;
+             my $tkey=$thiskey;
              if ($tuname) {
-         $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
+                 $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
-         }
+             }
-         if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
+             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') {
+                 if ($cmd eq 'set') {
-             $data=$env{$key};
+                     $data=$env{$key};
-             $valmatch = '';
+                     $valmatch = '';
-             $valchk = $data;
+                     $valchk = $data;
-             $typeof=$env{'form.typeof_'.$thiskey};
+                     $typeof=$env{'form.typeof_'.$thiskey};
-             $text = &mt('Saved modified parameter for');
+                     $text = &mt('Saved modified parameter for');
-             if ($typeof eq 'string_questiontype') {
+                     if ($typeof eq 'string_questiontype') {
-                 $name = 'type';
+                         $name = 'type';
-             } elsif ($typeof eq 'string_lenient') {
+                     } elsif ($typeof eq 'string_lenient') {
-                 $name = 'lenient';
+                         $name = 'lenient';
-                 my $stringmatch = &standard_string_matches($typeof);
+                         my $stringmatch = &standard_string_matches($typeof);
-                 if (ref($stringmatch) eq 'ARRAY') {
+                         if (ref($stringmatch) eq 'ARRAY') {
-                     foreach my $item (@{$stringmatch}) {
+                             foreach my $item (@{$stringmatch}) {
-                         if (ref($item) eq 'ARRAY') {
+                                 if (ref($item) eq 'ARRAY') {
-                             my ($regexpname,$pattern) = @{$item};
+                                     my ($regexpname,$pattern) = @{$item};
-                             if ($pattern ne '') {
+                                     if ($pattern ne '') {
-                                 if ($data =~ /$pattern/) {
+                                         if ($data =~ /$pattern/) {
-                                     $valmatch = $regexpname;
+                                             $valmatch = $regexpname;
-                                     $valchk = '';
+                                             $valchk = '';
-                                     last;
+                                             last;
+                                         }
+                                     }
+                                 }
+                             }
+                         }
+                     } elsif ($typeof eq 'string_discussvote') {
+                         $name = 'discussvote';
+                     } elsif ($typeof eq 'string_examcode') {
+                         $name = 'examcode';
+                         if (&Apache::lonnet::validCODE($data)) {
+                             $valchk = 'valid';
+                         }
+                     } elsif ($typeof eq 'string_yesno') {
+                         if ($thiskey =~ /\.retrypartial$/) {
+                             $name = 'retrypartial';
+                         }
+                     }
+                 } elsif ($cmd eq 'datepointer') {
+                     $data=&Apache::lonhtmlcommon::get_date_from_form($env{$key});
+                     $typeof=$env{'form.typeof_'.$thiskey};
+                     $text = &mt('Saved modified date for');
+                     if ($typeof eq 'date_start') {
+                         if ($thiskey =~ /\.printstartdate$/) {
+                             $name = 'printstartdate';
+                             if (($data) && ($data > $now)) {
+                                 $valchk = 'future';
+                             }
+                         }
+                     } elsif ($typeof eq 'date_end') {
+                         if ($thiskey =~ /\.printenddate$/) {
+                             $name = 'printenddate';
+                             if (($data) && ($data < $now)) {
+                                 $valchk = 'past';
+                             }
+                         }
+                     }
+                 } 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 ($thiskey =~ m{\.(?:sequence|page)___\(rec\)}) {
+                     $namematch = 'maplevelrecurse';
                  }
-             } elsif ($typeof eq 'string_discussvote') {
+                 if (($name ne '') || ($namematch ne '')) {
-                 $name = 'discussvote';
+                     my ($needsrelease,$needsnewer);
-             } elsif ($typeof eq 'string_examcode') {
+                     if ($name ne '') {
-                 $name = 'examcode';
+                         $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch:"};
-                 if (&Apache::lonnet::validCODE($data)) {
+                         if ($needsrelease) {
-                     $valchk = 'valid';
+                             unless ($got_chostname) {
-                 }
+                                 ($chostname,$cmajor,$cminor)=&parameter_release_vars();
-             } elsif ($typeof eq 'string_yesno') {
+                                 $got_chostname = 1;
-                 if ($thiskey =~ /\.retrypartial$/) {
+                             }
-                     $name = 'retrypartial';
+                             $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,undef,
-                 }
+                                                                 $needsrelease,
-             }
+                                                                 $cmajor,$cminor);
-         } elsif ($cmd eq 'datepointer') {
+                         }
-             $data=&Apache::lonhtmlcommon::get_date_from_form($env{$key});
+                     }
-             $typeof=$env{'form.typeof_'.$thiskey};
+                     if ($namematch ne '') {
-             $text = &mt('Saved modified date for');
+                         if ($needsnewer) {
-             if ($typeof eq 'date_start') {
+                             undef($namematch);
-                 if ($thiskey =~ /\.printstartdate$/) {
+                         } else {
-                     $name = 'printstartdate';
+                             my $currneeded;
-                     if (($data) && ($data > $now)) {
+                             if ($needsrelease) {
-                         $valchk = 'future';
+                                 $currneeded = $needsrelease;
-                     }
+                             }
-                 }
+                             $needsrelease =
-             } elsif ($typeof eq 'date_end') {
+                                 $Apache::lonnet::needsrelease{"parameter::::$namematch"};
-                 if ($thiskey =~ /\.printenddate$/) {
+                             if (($needsrelease) &&
-                     $name = 'printenddate';
+                                     (($currneeded eq '') || ($needsrelease < $currneeded))) {
-                     if (($data) && ($data < $now)) {
+                                 unless ($got_chostname) {
-                         $valchk = 'past';
+                                     ($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) {
-         } elsif ($cmd eq 'dateinterval') {
+                     if ($tuname) {
-             $data=&get_date_interval_from_form($thiskey);
+                         if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
-             $typeof=$env{'form.typeof_'.$thiskey};
+                                             $tkey.'.type' => $typeof},
-             $text = &mt('Saved modified date for');
+                                     $tudom,$tuname) eq 'ok') {
-         }
+                             &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
-         if ($name ne '') {
+                             $r->print('<br />'.$text.' '.
-             my ($needsrelease,$needsnewer);
+                                 &Apache::loncommon::plainname($tuname,$tudom));
-             $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch"};
+                         } else {
-             if ($needsrelease) {
+                             $r->print('<div class="LC_error">'.
-                 unless ($got_chostname) {
+                                 &mt('Error saving parameters').'</div>');
-                     ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                         }
-                     $got_chostname = 1;
+                         &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+                     } else {
+                         $newdata{$thiskey}=$data;
+                         $newdata{$thiskey.'.type'}=$typeof;
+                     }
                  }
-                 $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,
+             } elsif ($cmd eq 'del') {
-                                                       $needsrelease,
+                 if ($tuname) {
-                                                       $cmajor,$cminor);
+                     if (&Apache::lonnet::del('resourcedata',[$tkey],$tudom,$tuname) eq 'ok') {
-                 if ($needsnewer) {
+                             &log_parmset({$tkey=>''},1,$tuname,$tudom);
-                     $r->print('<br />'.&oldversion_warning($name,$data,
+                         $r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
-                                                            $chostname,$cmajor,
+                     } else {
-                                                            $cminor,$needsrelease));
+                         $r->print('<div class="LC_error">'.
-                     next;
+                             &mt('Error deleting parameters').'</div>');
+                     }
+                     &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
+                 } else {
+                     push (@deldata,$thiskey,$thiskey.'.type');
                  }
              }
          }
-         if (defined($data) and $$olddata{$thiskey} ne $data) {
-             if ($tuname) {
-             if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
-                                  $tkey.'.type' => $typeof},
-                          $tudom,$tuname) eq 'ok') {
-                 &log_parmset({$tkey=>$data,$tkey.'.type' => $typeof},0,$tuname,$tudom);
-                 $r->print('<br />'.$text.' '.
-                       &Apache::loncommon::plainname($tuname,$tudom));
-             } else {
-                 $r->print('<div class="LC_error">'.
-                       &mt('Error saving parameters').'</div>');
-             }
-             &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
-             } else {
-             $newdata{$thiskey}=$data;
-              $newdata{$thiskey.'.type'}=$typeof;
-                    }
-         }
-         } elsif ($cmd eq 'del') {
-         if ($tuname) {
-             if (&Apache::lonnet::del('resourcedata',[$tkey],$tudom,$tuname) eq 'ok') {
-                 &log_parmset({$tkey=>''},1,$tuname,$tudom);
-             $r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
-             } else {
-             $r->print('<div class="LC_error">'.
-                   &mt('Error deleting parameters').'</div>');
-             }
-             &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
-         } else {
-             push (@deldata,$thiskey,$thiskey.'.type');
-         }
-         }
-     }
      }
  # Store all course level
      my $delentries=$#deldata+1;
      my @newdatakeys=keys(%newdata);
      my $putentries=$#newdatakeys+1;
      if ($delentries) {
-     if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
+         if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
-         my %loghash=map { $_ => '' } @deldata;
+             my %loghash=map { $_ => '' } @deldata;
-         &log_parmset(\%loghash,1);
+             &log_parmset(\%loghash,1);
-         $r->print('<h2>'.&mt('Deleted [quant,_1,parameter]',$delentries/2).'</h2>');
+             $r->print('<h2>'.&mt('Deleted [quant,_1,parameter]',$delentries/2).'</h2>');
-     } else {
+         } else {
-         $r->print('<div class="LC_error">'.
+             $r->print('<div class="LC_error">'.
-               &mt('Error deleting parameters').'</div>');
+                 &mt('Error deleting parameters').'</div>');
-     }
+         }
-     &Apache::lonnet::devalidatecourseresdata($crs,$dom);
+         &Apache::lonnet::devalidatecourseresdata($crs,$dom);
      }
      if ($putentries) {
-     if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
+         if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
-                 &log_parmset(\%newdata,0);
+                     &log_parmset(\%newdata,0);
-         $r->print('<h3>'.&mt('Saved [quant,_1,parameter]',$putentries/2).'</h3>');
+             $r->print('<h3>'.&mt('Saved [quant,_1,parameter]',$putentries/2).'</h3>');
-     } else {
+         } else {
-         $r->print('<div class="LC_error">'.
+             $r->print('<div class="LC_error">'.
-               &mt('Error saving parameters').'</div>');
+                 &mt('Error saving parameters').'</div>');
-     }
+         }
-     &Apache::lonnet::devalidatecourseresdata($crs,$dom);
+         &Apache::lonnet::devalidatecourseresdata($crs,$dom);
      }
  }
+ # Returns the username and domain from a key created in readdata from a resourcedata key.
+ #
+ # @param {string} $key - the key
+ # @returns {Array}
  sub extractuser {
      my $key=shift;
      return ($key=~/^$env{'request.course.id'}.\[useropt\:($match_username)\:($match_domain)\]\./);
  }
+ # Parses a parameter key and returns the components.
+ #
+ # @param {string} $key -
+ # @param {hash reference} $listdata -
+ # @return {Array} - (student, resource, part, parameter)
  sub parse_listdata_key {
      my ($key,$listdata) = @_;
      # split into student/section affected, and
- Line 3182  sub parse_listdata_key {
+ Line 3830  sub parse_listdata_key {
      ($key=~/^\Q$env{'request.course.id'}\E\.\[([^\.]+)\]\.(.+)$/);
      # if course wide student would be undefined
      if (!defined($student)) {
-     ($realm)=($key=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
+         ($realm)=($key=~/^\Q$env{'request.course.id'}\E\.(.+)$/);
      }
      # strip off the .type if it's not the Question type parameter
      if ($realm=~/\.type$/ && !exists($listdata->{$key.'.type'})) {
-     $realm=~s/\.type//;
+         $realm=~s/\.type//;
      }
      # split into resource+part and parameter name
      my ($res,    $parm) = ($realm=~/^(.*)\.(.*)$/);
- Line 3194  sub parse_listdata_key {
+ Line 3842  sub parse_listdata_key {
      return ($student,$res,$part,$parm);
  }
+ # Prints HTML with forms for the given parameter data in overview mode (newoverview or overview).
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {hash reference} $resourcedata - parameter data returned by readdata
+ # @param {hash reference} $listdata - data created in secgroup_lister, course id.[section id].part.name -> 1 or course id.[section id].part.name.type -> parameter type
+ # @param {string} $sortorder - realmstudent|studentrealm
+ # @param {string} $caller - name of the calling sub (overview|newoverview)
+ # @param {hash reference} $classlist - from loncoursedata::get_classlist
+ # @returns{integer} - number of $listdata parameters processed
  sub listdata {
-     my ($r,$resourcedata,$listdata,$sortorder)=@_;
+     my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist)=@_;
  # Start list output
      my $oldsection='';
- Line 3206  sub listdata {
+ Line 3864  sub listdata {
      my $foundkeys=0;
      my %keyorder=&standardkeyorder();
+     my ($secidx,%grouphash);
+     if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
+         $secidx = &Apache::loncoursedata::CL_SECTION();
+         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 {
-     my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
+         my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
-     my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
+         my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
-     # get the numerical order for the param
+         # get the numerical order for the param
-     $aparm=$keyorder{'parameter_0_'.$aparm};
+         $aparm=$keyorder{'parameter_0_'.$aparm};
-     $bparm=$keyorder{'parameter_0_'.$bparm};
+         $bparm=$keyorder{'parameter_0_'.$bparm};
-     my $result=0;
+         my $result=0;
-     if ($sortorder eq 'realmstudent') {
+         if ($sortorder eq 'realmstudent') {
              if ($ares     ne $bres    ) {
-         $result = ($ares     cmp $bres);
+                 $result = ($ares     cmp $bres);
              } elsif ($astudent ne $bstudent) {
-         $result = ($astudent cmp $bstudent);
+                 $result = ($astudent cmp $bstudent);
-         } elsif ($apart    ne $bpart   ) {
+             } elsif ($apart    ne $bpart   ) {
-         $result = ($apart    cmp $bpart);
+                 $result = ($apart    cmp $bpart);
-         }
+             }
-     } else {
+         } else {
-         if      ($astudent ne $bstudent) {
+             if      ($astudent ne $bstudent) {
-         $result = ($astudent cmp $bstudent);
+                 $result = ($astudent cmp $bstudent);
-         } elsif ($ares     ne $bres    ) {
+             } elsif ($ares     ne $bres    ) {
-         $result = ($ares     cmp $bres);
+                 $result = ($ares     cmp $bres);
-         } elsif ($apart    ne $bpart   ) {
+             } elsif ($apart    ne $bpart   ) {
-         $result = ($apart    cmp $bpart);
+                 $result = ($apart    cmp $bpart);
+             }
          }
-     }
-     if (!$result) {
+         if (!$result) {
              if (defined($aparm) && defined($bparm)) {
-         $result = ($aparm <=> $bparm);
+                 $result = ($aparm <=> $bparm);
              } elsif (defined($aparm)) {
-         $result = -1;
+                 $result = -1;
              } elsif (defined($bparm)) {
-         $result = 1;
+                 $result = 1;
+             }
          }
-     }
-     $result;
+         $result;
-     } keys(%{$listdata})) {
+     } keys(%{$listdata})) { # foreach my $thiskey
-     if ($$listdata{$thiskey.'.type'}) {
+         my $readonly;
+         if ($$listdata{$thiskey.'.type'}) {
              my $thistype=$$listdata{$thiskey.'.type'};
              if ($$resourcedata{$thiskey.'.type'}) {
-         $thistype=$$resourcedata{$thiskey.'.type'};
+                 $thistype=$$resourcedata{$thiskey.'.type'};
-         }
+             }
-         my ($middle,$part,$name)=
+             my ($middle,$part,$name)=
-         ($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+                 ($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
-         my $section=&mt('All Students');
+             my $section=&mt('All Students');
-         if ($middle=~/^\[(.*)\]/) {
+             if ($middle=~/^\[(.*)\]/) {
-         my $issection=$1;
+                 my $issection=$1;
-         if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
+                 if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
-             $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
+                     my ($stuname,$studom) = ($1,$2);
-         } else {
+                     if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
-             $section=&mt('Group/Section').': '.$issection;
+                         if (ref($classlist) eq 'HASH') {
-         }
+                             if (ref($classlist->{$stuname.':'.$studom}) eq 'ARRAY') {
-         $middle=~s/^\[(.*)\]//;
+                                 next unless ($classlist->{$stuname.':'.$studom}->[$secidx] eq $env{'request.course.sec'});
-         }
+                             }
-         $middle=~s/\.+$//;
+                         }
-         $middle=~s/^\.+//;
+                     }
-         my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
+                     $section=&mt('User').": ".&Apache::loncommon::plainname($stuname,$studom);
-         if ($middle=~/^(.+)\_\_\_\(all\)$/) {
+                 } else {
-         $realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</span></span>';
+                     if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
-         } elsif ($middle) {
+                         if (exists($grouphash{$issection})) {
-         my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+                             $section=&mt('Group').': '.$issection;
-         $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>';
+                         } elsif ($issection eq $env{'request.course.sec'}) {
-         }
+                             $section = &mt('Section').': '.$issection;
-         if ($sortorder eq 'realmstudent') {
+                         } else {
-         if ($realm ne $oldrealm) {
+                             next;
-             $r->print(&tableend()."\n<hr /><h1>$realm</h1>");
+                         }
-             $oldrealm=$realm;
+                     } else {
-             $oldsection='';
+                         $section=&mt('Group/Section').': '.$issection;
-         }
+                     }
-         if ($section ne $oldsection) {
+                 }
-             $r->print(&tableend()."\n<h2>$section</h2>");
+                 $middle=~s/^\[(.*)\]//;
-             $oldsection=$section;
+             } elsif (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
-             $oldpart='';
+                 $readonly = 1;
-         }
+             }
-         } else {
+             $middle=~s/\.+$//;
-         if ($section ne $oldsection) {
+             $middle=~s/^\.+//;
-             $r->print(&tableend()."\n<hr /><h1>$section</h1>");
+             my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
-             $oldsection=$section;
+             if ($middle=~/^(.+)\_\_\_\((all|rec)\)$/) {
-             $oldrealm='';
+                 my $mapurl = $1;
-         }
+                 my $maplevel = $2;
-         if ($realm ne $oldrealm) {
+                 my $leveltitle = &mt('Folder/Map');
-             $r->print(&tableend()."\n<h2>$realm</h2>");
+                 if ($maplevel eq 'rec') {
-             $oldrealm=$realm;
+                     $leveltitle = &mt('Recursive');
-             $oldpart='';
+                 }
-         }
+                 $realm='<span class="LC_parm_scope_folder">'.$leveltitle.': '.&Apache::lonnet::gettitle($mapurl).' <br /><span class="LC_parm_folder">('.$mapurl.')</span></span>';
-         }
+             } elsif ($middle) {
-         if ($part ne $oldpart) {
+                 my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
-         $r->print(&tableend().
+                 $realm='<span class="LC_parm_scope_resource">'.&mt('Resource').
-               "\n".'<span class="LC_parm_part">'.&mt('Part').": $part</span>");
+                     ': '.&Apache::lonnet::gettitle($middle).
-         $oldpart=$part;
+                     ' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.
-         }
+                     $id.')</span></span>';
- #
+             }
- # Ready to print
+             if ($sortorder eq 'realmstudent') {
- #
+                 if ($realm ne $oldrealm) {
+                     $r->print(&tableend()."\n<hr /><h1>$realm</h1>");
+                     $oldrealm=$realm;
+                     $oldsection='';
+                 }
+                 if ($section ne $oldsection) {
+                     $r->print(&tableend()."\n<h2>$section</h2>");
+                     $oldsection=$section;
+                     $oldpart='';
+                 }
+             } else {
+                 if ($section ne $oldsection) {
+                     $r->print(&tableend()."\n<hr /><h1>$section</h1>");
+                     $oldsection=$section;
+                     $oldrealm='';
+                 }
+                 if ($realm ne $oldrealm) {
+                     $r->print(&tableend()."\n<h2>$realm</h2>");
+                     $oldrealm=$realm;
+                     $oldpart='';
+                 }
+             }
+             if ($part ne $oldpart) {
+                 $r->print(&tableend().
+                     "\n".'<span class="LC_parm_part">'.&mt('Part').": $part</span>");
+                 $oldpart=$part;
+             }
+     #
+     # Ready to print
+     #
              my $parmitem = &standard_parameter_names($name);
-         $r->print(&tablestart().
+             $r->print(&tablestart($readonly).
-               &Apache::loncommon::start_data_table_row().
+                 &Apache::loncommon::start_data_table_row().
-               '<td><b>'.&mt($parmitem).
+                 '<td><b>'.&mt($parmitem).
-               '</b></td><td><input type="checkbox" name="del_'.
+                 '</b></td>');
-               $thiskey.'" /></td><td>');
+             unless ($readonly) {
-         $foundkeys++;
+                 $r->print('<td><input type="checkbox" name="del_'.
-         if (&isdateparm($thistype)) {
+                         $thiskey.'" /></td>');
-         my $jskey='key_'.$pointer;
+             }
-         $pointer++;
+             $r->print('<td>');
-         $r->print(
+             $foundkeys++;
-               &Apache::lonhtmlcommon::date_setter('parmform',
+             if (&isdateparm($thistype)) {
-                                   $jskey,
+                 my $jskey='key_'.$pointer;
-                               $$resourcedata{$thiskey},
+                 my $state;
-                                   '',1,'','').
+                 $pointer++;
- '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
+                 if ($readonly) {
- (($$resourcedata{$thiskey}!=0)?'<span class="LC_nobreak"><a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
+                     $state = 'disabled';
- &mt('Shift all dates based on this date').'</a></span>':'').
+                 }
- &date_sanity_info($$resourcedata{$thiskey})
+                 $r->print(
-               );
+                     &Apache::lonhtmlcommon::date_setter('parmform',
-         } elsif ($thistype eq 'date_interval') {
+                                                         $jskey,
-         $r->print(&date_interval_selector($thiskey,
+                                                         $$resourcedata{$thiskey},
-                           $$resourcedata{$thiskey}));
+                                                         '',1,$state));
-         } elsif ($thistype =~ m/^string/) {
+                 unless  ($readonly) {
-         $r->print(&string_selector($thistype,$thiskey,
+                     $r->print(
-                        $$resourcedata{$thiskey},$name));
+     '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
-         } else {
+     (($$resourcedata{$thiskey}!=0)?'<span class="LC_nobreak"><a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
-         $r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
+     &mt('Shift all dates based on this date').'</a></span>':'').
+     &date_sanity_info($$resourcedata{$thiskey})
+                     );
+                 }
+             } elsif ($thistype eq 'date_interval') {
+                 $r->print(&date_interval_selector($thiskey,$name,
+                         $$resourcedata{$thiskey},$readonly));
+             } elsif ($thistype =~ m/^string/) {
+                 $r->print(&string_selector($thistype,$thiskey,
+                         $$resourcedata{$thiskey},$name,$readonly));
+             } else {
+                 $r->print(&default_selector($thiskey,$$resourcedata{$thiskey},$readonly));
+             }
+             unless ($readonly) {
+                 $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
+                         $thistype.'" />');
+             }
+             $r->print('</td>'.&Apache::loncommon::end_data_table_row());
          }
-         $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
-               $thistype.'" />');
-         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
-     }
      }
      return $foundkeys;
  }
+ # Returns a string representing the interval, directly using form data matching the given key.
- sub date_interval_selector {
+ # The returned string may also include information related to proctored exams.
-     my ($thiskey, $showval) = @_;
+ # Format: seconds['_done'[':'done button title':']['_proctor'['_'proctor key]]]
-     my $result;
+ #
-     foreach my $which (['days', 86400, 31],
+ # @param {string} $key - suffix for form fields related to the interval
-                ['hours', 3600, 23],
+ # @returns {string}
-                ['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);
-     $result .= ' '.&mt($name);
-     }
-     $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
-     return $result;
- }
  sub get_date_interval_from_form {
      my ($key) = @_;
      my $seconds = 0;
- Line 3370  sub get_date_interval_from_form {
+ Line 4066  sub get_date_interval_from_form {
                 ['hours', 3600],
                 ['minutes', 60],
                 ['seconds',  1]) {
-     my ($name, $factor) = @{ $which };
+         my ($name, $factor) = @{ $which };
-     if (defined($env{'form.'.$name.'_'.$key})) {
+         if (defined($env{'form.'.$name.'_'.$key})) {
-         $seconds += $env{'form.'.$name.'_'.$key} * $factor;
+             $seconds += $env{'form.'.$name.'_'.$key} * $factor;
+         }
      }
+     if (($key =~ /\.interval$/) &&
+             (($env{'form.done_'.$key} eq '_done') || ($env{'form.done_'.$key} eq '_done_proctor'))) {
+         if ($env{'form.done_'.$key.'_buttontext'}) {
+             $env{'form.done_'.$key.'_buttontext'} =~ s/\://g;
+             $seconds .= '_done:'.$env{'form.done_'.$key.'_buttontext'}.':';
+             if ($env{'form.done_'.$key} eq '_done_proctor') {
+                 $seconds .= '_proctor';
+             }
+         } else {
+             $seconds .= $env{'form.done_'.$key};
+         }
+         if (($env{'form.done_'.$key} eq '_done_proctor') &&
+                 ($env{'form.done_'.$key.'_proctorkey'})) {
+             $seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'};
+         }
      }
      return $seconds;
  }
+ # Returns HTML to enter a text value for a parameter.
+ #
+ # @param {string} $thiskey - parameter key
+ # @param {string} $showval - the current value
+ # @param {boolean} $readonly - true if the field should not be made editable
+ # @returns {string}
  sub default_selector {
-     my ($thiskey, $showval) = @_;
+     my ($thiskey, $showval, $readonly) = @_;
-     return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
+     my $disabled;
+     if ($readonly) {
+         $disabled = ' disabled="disabled"';
+     }
+     return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'"'.$disabled.' />';
  }
+ # Returns HTML to enter allow/deny rules related to IP addresses.
+ #
+ # @param {string} $thiskey - parameter key
+ # @param {string} $showval - the current value
+ # @param {boolean} $readonly - true if the fields should not be made editable
+ # @returns {string}
  sub string_ip_selector {
-     my ($thiskey, $showval) = @_;
+     my ($thiskey, $showval, $readonly) = @_;
      my %access = (
                     allow => [],
                     deny  => [],
- Line 3411  sub string_ip_selector {
+ Line 4139  sub string_ip_selector {
      if (!@{$access{'deny'}}) {
          @{$access{'deny'}} = ('');
      }
+     my ($disabled,$addmore);
+     if ($disabled) {
+         $disabled=' disabled="disabled"';
+     } else {
+         $addmore = "\n".'<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>';
+     }
      my $output = '<input type="hidden" name="set_'.$thiskey.'" />
  <table><tr><th>'.&mt('Allow from').'</th><th>'.&mt('Deny from').'</th></tr><tr>';
      foreach my $acctype ('allow','deny') {
- Line 3420  sub string_ip_selector {
+ Line 4154  sub string_ip_selector {
    <div class="LC_string_ipacc_inner">'."\n";
          my $num = 0;
          foreach my $curr (@{$access{$acctype}}) {
-             $output .= '<div><input type="text" name="setip'.$acctype.'_'.$thiskey.'" value="'.$curr.'" />';
+             $output .= '<div><input type="text" name="setip'.$acctype.'_'.$thiskey.'" value="'.$curr.'"'.$disabled.' />';
              if ($num > 0) {
                  $output .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>';
              }
- Line 3428  sub string_ip_selector {
+ Line 4162  sub string_ip_selector {
              $num ++;
          }
          $output .= '
-   </div>
+   </div>'.$addmore.'
- <button class="LC_add_ipacc_button">'.&mt('Add more').'</button>
  </div>
  </td>';
     }
- Line 3439  sub string_ip_selector {
+ Line 4172  sub string_ip_selector {
      return $output;
  }
- {
+ { # block using some constants related to parameter types (overview mode)
  my %strings =
      (
       'string_yesno'
               => [[ 'yes', 'Yes' ],
-          [ 'no', 'No' ]],
+                  [ 'no', 'No' ]],
       'string_problemstatus'
               => [[ 'yes', 'Yes' ],
           [ 'answer', 'Yes, and show correct answer if they exceed the maximum number of tries.' ],
- Line 3490  my %stringtypes = (
+ Line 4225  my %stringtypes = (
                      acc          => 'string_ip',
                    );
+ # Returns the possible values and titles for a given string type, or undef if there are none.
+ # Used by courseprefs.
+ #
+ # @param {string} $string_type - a parameter type for strings
+ # @returns {array reference} - 2D array, containing values and English titles
  sub standard_string_options {
      my ($string_type) = @_;
      if (ref($strings{$string_type}) eq 'ARRAY') {
- Line 3498  sub standard_string_options {
+ Line 4238  sub standard_string_options {
      return;
  }
+ # Returns regular expressions to match kinds of string types, or undef if there are none.
+ #
+ # @param {string} $string_type - a parameter type for strings
+ # @returns {array reference}  - 2D array, containing regular expression names and regular expressions
  sub standard_string_matches {
      my ($string_type) = @_;
      if (ref($stringmatches{$string_type}) eq 'ARRAY') {
- Line 3506  sub standard_string_matches {
+ Line 4250  sub standard_string_matches {
      return;
  }
+ # Returns a parameter type for a given parameter with a string type, or undef if not known.
+ #
+ # @param {string} $name - parameter name
+ # @returns {string}
  sub get_stringtype {
      my ($name) = @_;
      if (exists($stringtypes{$name})) {
- Line 3514  sub get_stringtype {
+ Line 4262  sub get_stringtype {
      return;
  }
+ # Returns HTML to edit a string parameter.
+ #
+ # @param {string} $thistype - parameter type
+ # @param {string} $thiskey - parameter key
+ # @param {string} $showval - parameter current value
+ # @param {string} $name - parameter name
+ # @param {boolean} $readonly - true if the values should not be made editable
+ # @returns {string}
  sub string_selector {
-     my ($thistype, $thiskey, $showval, $name) = @_;
+     my ($thistype, $thiskey, $showval, $name, $readonly) = @_;
      if (!exists($strings{$thistype})) {
-         return &default_selector($thiskey,$showval);
+         return &default_selector($thiskey,$showval,$readonly);
      }
      my %skiptype;
      if (($thistype eq 'string_questiontype') ||
-         ($thistype eq 'string_lenient') ||
+             ($thistype eq 'string_lenient') ||
-         ($thistype eq 'string_discussvote') ||
+             ($thistype eq 'string_discussvote') ||
-         ($thistype eq 'string_ip') ||
+             ($thistype eq 'string_ip') ||
-         ($name eq 'retrypartial')) {
+             ($name eq 'retrypartial')) {
          my ($got_chostname,$chostname,$cmajor,$cminor);
          foreach my $possibilities (@{ $strings{$thistype} }) {
              next unless (ref($possibilities) eq 'ARRAY');
- Line 3549  sub string_selector {
+ Line 4305  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 '') {
- Line 3563  sub string_selector {
+ Line 4319  sub string_selector {
      }
      if ($thistype eq 'string_ip') {
-         return &string_ip_selector($thiskey,$showval);
+         return &string_ip_selector($thiskey,$showval,$readonly);
      }
-     my $result;
+     my ($result,$disabled);
+     if ($readonly) {
+         $disabled = ' disabled="disabled"';
+     }
      my $numinrow = 3;
      if ($thistype eq 'string_problemstatus') {
          $numinrow = 2;
- Line 3631  sub string_selector {
+ Line 4391  sub string_selector {
                      foreach my $reltype ('corrchkd','corrunchkd','incorrchkd','incorrunchkd') {
                          $add .= '<tr><td>&nbsp;</td><td>'.$relatives{$reltype}.'</td>'."\n".
                                  '<td><input type="text" name="settext_'.$thiskey.'"'.
-                                 ' value="'.$textval{$reltype}.'" size="3" />'.
+                                 ' value="'.$textval{$reltype}.'" size="3"'.$disabled.' />'.
                                  '</td></tr>';
                      }
                      $add .= '</table></div>'."\n";
- Line 3642  sub string_selector {
+ Line 4402  sub string_selector {
              $result .= '<td class="LC_left_item"'.$colspan.'>'.
                         '<span class="LC_nobreak"><label>'.
                         '<input type="radio" name="set_'.$thiskey.
-                        '" value="'.$name.'"'.$onchange.$css_class;
+                        '" value="'.$name.'"'.$onchange.$css_class.$disabled;
              if ($showval eq $name) {
                  $result .= ' checked="checked"';
              }
- Line 3657  sub string_selector {
+ Line 4417  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',
+     );
+ # Returns regular expressions to match kinds of interval type, or undef if there are none.
+ #
+ # @param {string} $interval_type - a parameter type for intervals
+ # @returns {array reference}  - 2D array, containing regular expression names and regular expressions
+ sub standard_interval_matches {
+     my ($interval_type) = @_;
+     if (ref($intervalmatches{$interval_type}) eq 'ARRAY') {
+         return $intervalmatches{$interval_type};
+     }
+     return;
+ }
+ # Returns a parameter type for a given parameter with an interval type, or undef if not known.
+ #
+ # @param {string} $name - parameter name
+ # @returns {string}
+ sub get_intervaltype {
+     my ($name) = @_;
+     if (exists($intervaltypes{$name})) {
+         return $intervaltypes{$name};
+     }
+     return;
+ }
+ # Returns the possible values and titles for a given interval type, or undef if there are none.
+ # Used by courseprefs.
+ #
+ # @param {string} $interval_type - a parameter type for intervals
+ # @returns {array reference} - 2D array, containing values and English titles
+ sub standard_interval_options {
+     my ($interval_type) = @_;
+     if (ref($intervals{$interval_type}) eq 'ARRAY') {
+         return $intervals{$interval_type};
+     }
+     return;
+ }
+ # Returns HTML to edit a date interval parameter.
+ #
+ # @param {string} $thiskey - parameter key
+ # @param {string} $name - parameter name
+ # @param {string} $showval - parameter current value
+ # @param {boolean} $readonly - true if the values should not be made editable
+ # @returns {string}
+ 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 $currdonetext = &mt('Done');
+             my $checkedoff = ' checked="checked"';
+             if ($currval =~ /^(?:\d+)_done$/) {
+                 $checkedon = ' checked="checked"';
+                 $checkedoff = '';
+             } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) {
+                 $currdonetext = $1;
+                 $checkedon = ' checked="checked"';
+                 $checkedoff = '';
+             } elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
+                 $currproctorkey = $1;
+                 $checkedproc = ' checked="checked"';
+                 $checkedoff = '';
+                 $currprocdisplay = 'text';
+             } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:_proctor_(.+)$/) {
+                 $currdonetext = $1;
+                 $currproctorkey = $2;
+                 $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="'.&HTML::Entities::encode($currproctorkey,'"<>&').'" /></span><br />'.
+                        '<span class="LC_nobreak">'.&mt('Button text').': '.
+                        '<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'" /></span>';
+         }
+     }
+     unless ($readonly) {
+         $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
+     }
+     return $result;
+ }
+ # Returns HTML with a warning if a parameter requires a more recent version of LON-CAPA.
+ #
+ # @param {string} $name - parameter name
+ # @param {string} $namematch - parameter level name (recognized: resourcelevel|maplevel|maplevelrecurse|courselevel)
+ # @param {string} $value - parameter value
+ # @param {string} $chostname - course server name
+ # @param {integer} $cmajor - major version number
+ # @param {integer} $cminor - minor version number
+ # @param {string} $needsrelease - release version needed (major.minor)
+ # @returns {string}
  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 '') {
- Line 3703  sub oldversion_warning {
+ Line 4653  sub oldversion_warning {
              }
          }
      }
-     my $standard_name = &standard_parameter_names($name);
      return '<p class="LC_warning">'.
-            &mt('[_1] was [_2]not[_3] set to [_4].',
+        &mt('[_1] was [_2]not[_3] set to [_4].',
-                $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
+            $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
-            &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
+        &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
-            $cmajor.'.'.$cminor,$chostname,
+        $cmajor.'.'.$cminor,$chostname,
-            $needsrelease).
+        $needsrelease).
-            '</p>';
+        '</p>';
  }
- }
+ } # end of block using some constants related to parameter types
- #
- # Shift all start and end dates by $shift
- #
+ # Shifts all start and end dates in the current course by $shift.
+ #
+ # @param {integer} $shift - time to shift, in seconds
+ # @returns {string} - error name or 'ok'
  sub dateshift {
      my ($shift)=@_;
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 3750  sub dateshift {
+ Line 4701  sub dateshift {
      return $reply;
  }
+ # Overview mode UI to edit course parameters.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub newoverview {
      my ($r) = @_;
- Line 3771  sub newoverview {
+ Line 4725  sub newoverview {
              &toggleparmtextbox_js()."\n".
              &validateparms_js()."\n".
              &ipacc_boxes_js()."\n".
+             &done_proctor_js()."\n".
  '// ]]>
  </script>
  ';
- Line 3818  ENDOVER
+ Line 4773  ENDOVER
              @selected_sections = ('all');
          }
      }
+     if ($env{'request.course.sec'} ne '') {
+         @selected_sections = ($env{'request.course.sec'});
+     }
      my @selected_groups =
          &Apache::loncommon::get_env_multiple('form.Group');
- Line 3854  ENDOVER
+ Line 4812  ENDOVER
      $r->print('<div class="LC_Box">');
      $r->print('<div>');
-     &displaymenu($r,\%allparms,\@pscat,\%keyorder);
+     &displaymenu($r,\%allparms,\@pscat,\%keyorder); # FIXME: wrong parameters, could make keysindisplayorderCategory crash because $keyorder is undefined
      $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)').
+               '<tr><th>'.&mt('Parts').'</th>');
-               '</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');
+     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>');
+     $r->print('</td>');
-     &sectionmenu($r,\@selected_sections);
+     if ($sectionselector) {
-     $r->print('</td><td>');
+         $r->print('<td>'.$sectionselector.'</td>');
-     &groupmenu($r,\@selected_groups);
+     }
-     $r->print('</td></tr></table>');
+     if ($groupselector) {
-     #$r->print('</td></tr></table>');
+         $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>');
- Line 3900  ENDOVER
+ Line 4868  ENDOVER
  # List data
-         &listdata($r,$resourcedata,$listdata,$sortorder);
+         &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview');
      }
      $r->print(&tableend().
           ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
- Line 3909  ENDOVER
+ Line 4877  ENDOVER
      $r->print(&Apache::loncommon::end_page());
  }
+ # Fills $listdata with parameter information.
+ # Keys use the format course id.[section id].part.name and course id.[section id].part.name.type.
+ # The non-type value is always 1.
+ #
+ # @param {string} $cat - parameter name
+ # @param {string} $pschp - selected map id, or 'all'
+ # @param {string} $parmlev - selected level value (full|map|general), or ''
+ # @param {hash reference} $listdata - the parameter data that will be modified
+ # @param {array reference} $psprt - selected parts
+ # @param {array reference} $selections - selected sections
+ # @param {hash reference} $defkeytype - hash parameter name -> parameter type
+ # @param {hash reference} $allmaps - hash map id -> map src
+ # @param {array reference} $ids - resource ids
+ # @param {hash reference} $symbp - hash map id or resource id -> map src.'___(all)' for a map or resource symb for a resource
  sub secgroup_lister {
      my ($cat,$pschp,$parmlev,$listdata,$psprt,$selections,$defkeytype,$allmaps,$ids,$symbp) = @_;
      foreach my $item (@{$selections}) {
- Line 3929  sub secgroup_lister {
+ Line 4911  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
- Line 3944  sub secgroup_lister {
+ Line 4929  sub secgroup_lister {
      }
  }
+ # UI to edit parameter settings starting with a list of all existing parameters.
+ # (called by setoverview action)
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub overview {
      my ($r) = @_;
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 3954  sub overview {
+ Line 4943  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',
- Line 3974  sub overview {
+ Line 4964  sub overview {
  # Read modified data
-     my $resourcedata=&readdata($crs,$dom);
+     my ($resourcedata,$classlist)=&readdata($crs,$dom);
      my $sortorder=$env{'form.sortorder'};
- Line 3983  sub overview {
+ Line 4973  sub overview {
  # List data
-     my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
+     my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder,'overview',$classlist);
      $r->print(&tableend().'<p>'.
      ($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':'<span class="LC_info">'.&mt('There are no parameters.').'</span>').'</p></form>'.
            &Apache::loncommon::end_page());
  }
+ # Unused sub.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub clean_parameters {
      my ($r) = @_;
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 4024  ENDOVER
+ Line 5017  ENDOVER
            '<th>'.&mt('Parameter').'</th>'.
            '</tr>');
      foreach my $thiskey (sort(keys(%{$resourcedata}))) {
-     next if (!exists($resourcedata->{$thiskey.'.type'})
+         next if (!exists($resourcedata->{$thiskey.'.type'})
-          && $thiskey=~/\.type$/);
+             && $thiskey=~/\.type$/);
-     my %data = &parse_key($thiskey);
+         my %data = &parse_key($thiskey);
-     if (1) { #exists($data{'realm_exists'})
+         if (1) { #exists($data{'realm_exists'})
-         #&& !$data{'realm_exists'}) {
+             #&& !$data{'realm_exists'}) {
-         $r->print(&Apache::loncommon::start_data_table_row().
+             $r->print(&Apache::loncommon::start_data_table_row().
-               '<tr>'.
+                 '<tr>'.
-               '<td><input type="checkbox" name="del_'.$thiskey.'" /></td>'              );
+                 '<td><input type="checkbox" name="del_'.$thiskey.'" /></td>'              );
-         $r->print('<td>');
+             $r->print('<td>');
-         my $display_value = $resourcedata->{$thiskey};
+             my $display_value = $resourcedata->{$thiskey};
-         if (&isdateparm($resourcedata->{$thiskey.'.type'})) {
+             if (&isdateparm($resourcedata->{$thiskey.'.type'})) {
-         $display_value =
+             $display_value =
-             &Apache::lonlocal::locallocaltime($display_value);
+                 &Apache::lonlocal::locallocaltime($display_value);
-         }
+             }
              my $parmitem = &standard_parameter_names($data{'parameter_name'});
              $parmitem = &mt($parmitem);
-         $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
+             $r->print(&mt('Parameter: "[_1]" with value: "[_2]"',
-               $parmitem,$resourcedata->{$thiskey}));
+                 $parmitem,$resourcedata->{$thiskey}));
-         $r->print('<br />');
+             $r->print('<br />');
-         if ($data{'scope_type'} eq 'all') {
+             if ($data{'scope_type'} eq 'all') {
-         $r->print(&mt('All users'));
+                 $r->print(&mt('All users'));
-         } elsif ($data{'scope_type'} eq 'user') {
+             } elsif ($data{'scope_type'} eq 'user') {
-         $r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
+                 $r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
-         } elsif ($data{'scope_type'} eq 'section') {
+             } elsif ($data{'scope_type'} eq 'section') {
-         $r->print(&mt('Section: [_1]',$data{'scope'}));
+                 $r->print(&mt('Section: [_1]',$data{'scope'}));
-         } elsif ($data{'scope_type'} eq 'group') {
+             } elsif ($data{'scope_type'} eq 'group') {
-         $r->print(&mt('Group: [_1]',$data{'scope'}));
+                 $r->print(&mt('Group: [_1]',$data{'scope'}));
-         }
+             }
-         $r->print('<br />');
+             $r->print('<br />');
-         if ($data{'realm_type'} eq 'all') {
+             if ($data{'realm_type'} eq 'all') {
-         $r->print(&mt('All Resources'));
+                 $r->print(&mt('All Resources'));
-         } elsif ($data{'realm_type'} eq 'folder') {
+             } elsif ($data{'realm_type'} eq 'folder') {
-         $r->print(&mt('Folder: [_1]'),$data{'realm'});
+                 $r->print(&mt('Folder: [_1]'),$data{'realm'});
-         } elsif ($data{'realm_type'} eq 'symb') {
+             } elsif ($data{'realm_type'} eq 'symb') {
-         my ($map,$resid,$url) =
+             my ($map,$resid,$url) =
-             &Apache::lonnet::decode_symb($data{'realm'});
+                 &Apache::lonnet::decode_symb($data{'realm'});
-         $r->print(&mt('Resource: [_1]with ID: [_2]in folder [_3]',
+             $r->print(&mt('Resource: [_1]with ID: [_2]in folder [_3]',
-                       $url.' <br />&nbsp;&nbsp;&nbsp;',
+                         $url.' <br />&nbsp;&nbsp;&nbsp;',
-                       $resid.' <br />&nbsp;&nbsp;&nbsp;',$map));
+                         $resid.' <br />&nbsp;&nbsp;&nbsp;',$map));
-         }
+             }
-         $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
+             $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
-         $r->print('</td></tr>');
+             $r->print('</td></tr>');
-     }
+         }
      }
      $r->print(&Apache::loncommon::end_data_table().'<p>'.
            '<input type="submit" value="'.&mt('Delete Selected').'" />'.
- Line 4077  ENDOVER
+ Line 5070  ENDOVER
      $r->print(&Apache::loncommon::end_page());
  }
+ # UI to shift all dates (called by dateshift1 action).
+ # Used by overview mode.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub date_shift_one {
      my ($r) = @_;
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 4105  sub date_shift_one {
+ Line 5102  sub date_shift_one {
      $r->print(&Apache::loncommon::end_page());
  }
+ # UI to shift all dates (second form).
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub date_shift_two {
      my ($r) = @_;
      my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 4132  sub date_shift_two {
+ Line 5132  sub date_shift_two {
      $r->print(&Apache::loncommon::end_page());
  }
+ # Returns the different components of a resourcedata key.
+ # Keys: scope_type, scope, realm_type, realm, realm_title,
+ #       realm_exists, parameter_part, parameter_name.
+ # Was used by clean_parameters (which is unused).
+ #
+ # @param {string} $key - the parameter key
+ # @returns {hash}
  sub parse_key {
      my ($key) = @_;
      my %data;
- Line 4139  sub parse_key {
+ Line 5146  sub parse_key {
      ($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
      $data{'scope_type'} = 'all';
      if ($middle=~/^\[(.*)\]/) {
-            $data{'scope'} = $1;
+         $data{'scope'} = $1;
-     if ($data{'scope'}=~/^useropt\:($match_username)\:($match_domain)/) {
+         if ($data{'scope'}=~/^useropt\:($match_username)\:($match_domain)/) {
-         $data{'scope_type'} = 'user';
+             $data{'scope_type'} = 'user';
-         $data{'scope'} = [$1,$2];
+             $data{'scope'} = [$1,$2];
-     } else {
+         } else {
-         #FIXME check for group scope
+             #FIXME check for group scope
-         $data{'scope_type'} = 'section';
+             $data{'scope_type'} = 'section';
-     }
+         }
-     $middle=~s/^\[(.*)\]//;
+         $middle=~s/^\[(.*)\]//;
      }
      $middle=~s/\.+$//;
      $middle=~s/^\.+//;
      $data{'realm_type'}='all';
      if ($middle=~/^(.+)\_\_\_\(all\)$/) {
-     $data{'realm'} = $1;
+         $data{'realm'} = $1;
-     $data{'realm_type'} = 'folder';
+         $data{'realm_type'} = 'folder';
-     $data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
+         $data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
-     ($data{'realm_exists'}) = &Apache::lonnet::is_on_map($data{'realm'});
+         ($data{'realm_exists'}) = &Apache::lonnet::is_on_map($data{'realm'});
      } elsif ($middle) {
-     $data{'realm'} = $middle;
+         $data{'realm'} = $middle;
-     $data{'realm_type'} = 'symb';
+         $data{'realm_type'} = 'symb';
-     $data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
+         $data{'realm_title'} = &Apache::lonnet::gettitle($data{'realm'});
-     my ($map,$resid,$url) = &Apache::lonnet::decode_symb($data{'realm'});
+         my ($map,$resid,$url) = &Apache::lonnet::decode_symb($data{'realm'});
-     $data{'realm_exists'} = &Apache::lonnet::symbverify($data{'realm'},$url);
+         $data{'realm_exists'} = &Apache::lonnet::symbverify($data{'realm'},$url);
      }
      $data{'parameter_part'} = $part;
- Line 4172  sub parse_key {
+ Line 5179  sub parse_key {
  }
+ # Calls loncommon::start_page with the "Settings" title.
  sub header {
      return &Apache::loncommon::start_page('Settings');
  }
+ ##################################################
+ # MAIN MENU
+ ##################################################
+ # Content and problem settings main menu.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {boolean} $parm_permission - true if the user has permission to edit the current course or section
  sub print_main_menu {
      my ($r,$parm_permission)=@_;
      #
- Line 4277  ENDMAINFORMHEAD
+ Line 5293  ENDMAINFORMHEAD
+ ##################################################
+ # PORTFOLIO METADATA
+ ##################################################
+ # Prints HTML to edit an item of portfolio metadata. The HTML contains several td elements (no tr).
+ # It looks like field titles are not localized.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
+ # @param {string} $field_name - metadata field name
+ # @param {string} $field_text - metadata field title, in English unless manually added
+ # @param {boolean} $added_flag - true if the field was manually added
  sub output_row {
      my ($r, $field_name, $field_text, $added_flag) = @_;
      my $output;
- Line 4298  sub output_row {
+ Line 5325  sub output_row {
          $output .= '<td><strong>'.$field_text.':</strong></td>';
          $output .= &Apache::loncommon::end_data_table_row();
          foreach my $opt (@options) {
-         my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+             my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
-         $output .= &Apache::loncommon::continue_data_table_row();
+             $output .= &Apache::loncommon::continue_data_table_row();
-         $output .= '<td>'.('&nbsp;' x 5).'<label>
+             $output .= '<td>'.('&nbsp;' x 5).'<label>
-                    <input type="checkbox" name="'.
+                     <input type="checkbox" name="'.
-                    $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+                     $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
-                    &mt($opt->[1]).'</label></td>';
+                     &mt($opt->[1]).'</label></td>';
-         $output .= &Apache::loncommon::end_data_table_row();
+             $output .= &Apache::loncommon::end_data_table_row();
-     }
+         }
          $output .= &Apache::loncommon::continue_data_table_row();
          $output .= '<td>'.('&nbsp;' x 10).'<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /></td>';
          $output .= &Apache::loncommon::end_data_table_row();
- Line 4318  sub output_row {
+ Line 5345  sub output_row {
              $multiple_checked = ' checked="checked"';
              $single_checked = '';
          }
-     $output .= &Apache::loncommon::continue_data_table_row();
+         $output .= &Apache::loncommon::continue_data_table_row();
-     $output .= '<td>'.('&nbsp;' x 10).'
+         $output .= '<td>'.('&nbsp;' x 10).'
-                 <input type="radio" name="'.$field_name.'_onlyone" value="multiple"'.$multiple_checked .' />
+                     <input type="radio" name="'.$field_name.'_onlyone" value="multiple"'.$multiple_checked .' />
-                 '.&mt('Student may select multiple choices from list').'</td>';
+                     '.&mt('Student may select multiple choices from list').'</td>';
-     $output .= &Apache::loncommon::end_data_table_row();
+         $output .= &Apache::loncommon::end_data_table_row();
-     $output .= &Apache::loncommon::continue_data_table_row();
+         $output .= &Apache::loncommon::continue_data_table_row();
-     $output .= '<td>'.('&nbsp;' x 10).'
+         $output .= '<td>'.('&nbsp;' x 10).'
-                 <input type="radio" name="'.$field_name.'_onlyone"  value="single"'.$single_checked.' />
+                     <input type="radio" name="'.$field_name.'_onlyone"  value="single"'.$single_checked.' />
-                 '.&mt('Student may select only one choice from list').'</td>';
+                     '.&mt('Student may select only one choice from list').'</td>';
-     $output .= &Apache::loncommon::end_data_table_row();
+         $output .= &Apache::loncommon::end_data_table_row();
      }
      return ($output);
  }
+ # UI to order portfolio metadata fields.
+ # Currently useless because addmetafield does not work.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub order_meta_fields {
      my ($r)=@_;
      my $idx = 1;
- Line 4341  sub order_meta_fields {
+ Line 5371  sub order_meta_fields {
      my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
      my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};;
      $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
-     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+     &Apache::lonhtmlcommon::add_breadcrumb(
+         {href=>'/adm/parmset?action=addmetadata',
          text=>"Add Metadata Field"});
-     &Apache::lonhtmlcommon::add_breadcrumb
+     &Apache::lonhtmlcommon::add_breadcrumb(
-             ({href=>"/adm/parmset?action=setrestrictmeta",
+         {href=>"/adm/parmset?action=setrestrictmeta",
-               text=>"Restrict Metadata"},
+         text=>"Restrict Metadata"},
-              {text=>"Order Metadata"});
+         {text=>"Order Metadata"});
      $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
      &startSettingsScreen($r,'parmset',$crstype);
      if ($env{'form.storeorder'}) {
- Line 4358  sub order_meta_fields {
+ Line 5389  sub order_meta_fields {
          if ($newpos > $currentpos) {
          # moving stuff up
              for ($i=0;$i<$currentpos;$i++) {
-             $neworder[$i]=$oldorder[$i];
+                 $neworder[$i]=$oldorder[$i];
              }
              for ($i=$currentpos;$i<$newpos;$i++) {
-             $neworder[$i]=$oldorder[$i+1];
+                 $neworder[$i]=$oldorder[$i+1];
              }
              $neworder[$newpos]=$oldorder[$currentpos];
              for ($i=$newpos+1;$i<=$#oldorder;$i++) {
-             $neworder[$i]=$oldorder[$i];
+                 $neworder[$i]=$oldorder[$i];
              }
          } else {
          # moving stuff down
- Line 4380  sub order_meta_fields {
+ Line 5411  sub order_meta_fields {
                  $neworder[$i]=$oldorder[$i];
              }
          }
-     my $ordered_fields = join ",", @neworder;
+         my $ordered_fields = join ",", @neworder;
          my $put_result = &Apache::lonnet::put('environment',
-                            {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
+                         {'metadata.addedorder'=>$ordered_fields},$dom,$crs);
-     &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields});
+         &Apache::lonnet::appenv({'course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields});
      }
      my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
      my $ordered_fields;
- Line 4423  sub order_meta_fields {
+ Line 5454  sub order_meta_fields {
  }
+ # Returns HTML with a Continue button redirecting to the initial portfolio metadata screen.
+ # @returns {string}
  sub continue {
      my $output;
      $output .= '<form action="" method="post">';
- Line 4432  sub continue {
+ Line 5465  sub continue {
  }
+ # UI to add a metadata field.
+ # Currenly does not work because of an HTML error (the field is not visible).
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub addmetafield {
      my ($r)=@_;
      &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
- Line 4476  sub addmetafield {
+ Line 5513  sub addmetafield {
              $r->print('<input type="submit" name="undelete" value="Undelete" />');
              $r->print('</form>');
          }
-         $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
+         $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"'); # FIXME: HTML error, input will not be displayed !
          $r->print('<input type="text" name="fieldname" /><br />');
          $r->print('<input type="submit" value="Add Metadata Field" />');
      }
- Line 4486  sub addmetafield {
+ Line 5523  sub addmetafield {
+ # Display or save portfolio metadata.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub setrestrictmeta {
      my ($r)=@_;
      my $next_meta;
- Line 4526  sub setrestrictmeta {
+ Line 5566  sub setrestrictmeta {
                          $options.='deleted,';
                      }
                      my $name = $save_field;
-                      $put_result = &Apache::lonnet::put('environment',
+                     $put_result = &Apache::lonnet::put('environment',
-                                                   {'metadata.'.$meta_field.'.options'=>$options,
+                         {'metadata.'.$meta_field.'.options'=>$options,
-                                                    'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+                         'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
-                                                    },$dom,$crs);
+                         },$dom,$crs);
                  }
              }
          }
- Line 4545  sub setrestrictmeta {
+ Line 5585  sub setrestrictmeta {
      foreach my $field (sort(keys(%metadata_fields))) {
          if ($field ne 'courserestricted') {
              $row_alt = $row_alt ? 0 : 1;
-         $output.= &output_row($r, $field, $metadata_fields{$field});
+             $output.= &output_row($r, $field, $metadata_fields{$field});
-     }
+         }
      }
      my $buttons = (<<ENDButtons);
          <input type="submit" name="restrictmeta" value="Save" />
- Line 4561  ENDButtons
+ Line 5601  ENDButtons
      my $added_flag = 1;
      foreach my $field (sort(keys(%$added_metadata_fields))) {
          $row_alt = $row_alt ? 0 : 1;
-         $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
+         $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt); # FIXME: wrong parameters
      }
      $output .= &Apache::loncommon::end_data_table();
      $r->print(<<ENDenv);
- Line 4576  ENDenv
+ Line 5616  ENDenv
  }
+ # Returns metadata fields that have been manually added.
+ #
+ # @param {string} $cid - course id
+ # @returns {hash reference} - hash field name -> field title (not localized)
  sub get_added_meta_fieldnames {
      my ($cid) = @_;
      my %fields;
- Line 4591  sub get_added_meta_fieldnames {
+ Line 5634  sub get_added_meta_fieldnames {
  }
+ # Returns metadata fields that have been manually added and deleted.
+ #
+ # @param {string} $cid - course id
+ # @returns {hash reference} - hash field name -> field title (not localized)
  sub get_deleted_meta_fieldnames {
      my ($cid) = @_;
      my %fields;
- Line 4606  sub get_deleted_meta_fieldnames {
+ Line 5652  sub get_deleted_meta_fieldnames {
      }
      return \%fields;
  }
+ ##################################################
+ # PARAMETER SETTINGS DEFAULT ACTIONS
+ ##################################################
+ # UI to change parameter setting default actions
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub defaultsetter {
      my ($r) = @_;
- Line 4638  sub defaultsetter {
+ Line 5693  sub defaultsetter {
                  \%mapp, \%symbp,\%maptitles,\%uris,
                  \%keyorder,\%defkeytype);
      if ($env{'form.storerules'}) {
-     my %newrules=();
+         my %newrules=();
-     my @delrules=();
+         my @delrules=();
-     my %triggers=();
+         my %triggers=();
-     foreach my $key (keys(%env)) {
+         foreach my $key (keys(%env)) {
              if ($key=~/^form\.(\w+)\_action$/) {
-         my $tempkey=$1;
+                 my $tempkey=$1;
-         my $action=$env{$key};
+                 my $action=$env{$key};
                  if ($action) {
-             $newrules{$tempkey.'_action'}=$action;
+                     $newrules{$tempkey.'_action'}=$action;
-             if ($action ne 'default') {
+                     if ($action ne 'default') {
-             my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
+                         my ($whichaction,$whichparm)=($action=~/^(.*\_)([^\_]+)$/);
-             $triggers{$whichparm}.=$tempkey.':';
+                         $triggers{$whichparm}.=$tempkey.':';
-             }
+                     }
-             $newrules{$tempkey.'_type'}=$defkeytype{$tempkey};
+                     $newrules{$tempkey.'_type'}=$defkeytype{$tempkey};
-             if (&isdateparm($defkeytype{$tempkey})) {
+                     if (&isdateparm($defkeytype{$tempkey})) {
-             $newrules{$tempkey.'_days'}=$env{'form.'.$tempkey.'_days'};
+                         $newrules{$tempkey.'_days'}=$env{'form.'.$tempkey.'_days'};
-             $newrules{$tempkey.'_hours'}=$env{'form.'.$tempkey.'_hours'};
+                         $newrules{$tempkey.'_hours'}=$env{'form.'.$tempkey.'_hours'};
-             $newrules{$tempkey.'_min'}=$env{'form.'.$tempkey.'_min'};
+                         $newrules{$tempkey.'_min'}=$env{'form.'.$tempkey.'_min'};
-             $newrules{$tempkey.'_sec'}=$env{'form.'.$tempkey.'_sec'};
+                         $newrules{$tempkey.'_sec'}=$env{'form.'.$tempkey.'_sec'};
-             } else {
+                     } else {
-             $newrules{$tempkey.'_value'}=$env{'form.'.$tempkey.'_value'};
+                         $newrules{$tempkey.'_value'}=$env{'form.'.$tempkey.'_value'};
-             $newrules{$tempkey.'_triggervalue'}=$env{'form.'.$tempkey.'_triggervalue'};
+                         $newrules{$tempkey.'_triggervalue'}=$env{'form.'.$tempkey.'_triggervalue'};
+                     }
+                 } else {
+                     push(@delrules,$tempkey.'_action');
+                     push(@delrules,$tempkey.'_type');
+                     push(@delrules,$tempkey.'_hours');
+                     push(@delrules,$tempkey.'_min');
+                     push(@delrules,$tempkey.'_sec');
+                     push(@delrules,$tempkey.'_value');
+                 }
              }
-         } else {
-             push(@delrules,$tempkey.'_action');
-             push(@delrules,$tempkey.'_type');
-             push(@delrules,$tempkey.'_hours');
-             push(@delrules,$tempkey.'_min');
-             push(@delrules,$tempkey.'_sec');
-             push(@delrules,$tempkey.'_value');
          }
+         foreach my $key (keys(%allparms)) {
+             $newrules{$key.'_triggers'}=$triggers{$key};
          }
-     }
+         &Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);
-     foreach my $key (keys(%allparms)) {
+         &Apache::lonnet::del('parmdefactions',\@delrules,$cdom,$cnum);
-         $newrules{$key.'_triggers'}=$triggers{$key};
+         &resetrulescache();
-     }
-     &Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);
-     &Apache::lonnet::del('parmdefactions',\@delrules,$cdom,$cnum);
-     &resetrulescache();
      }
      my %lt=&Apache::lonlocal::texthash('days' => 'Days',
                         'hours' => 'Hours',
- Line 4689  sub defaultsetter {
+ Line 5744  sub defaultsetter {
      my @dateoptions=('','default');
      my @datedisplay=('',&mt('Default value when manually setting'));
      foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {
-     unless ($tempkey) { next; }
+         unless ($tempkey) { next; }
-     push @standardoptions,'when_setting_'.$tempkey;
+         push @standardoptions,'when_setting_'.$tempkey;
-     push @standarddisplay,&mt('Automatically set when setting ').$tempkey;
+         push @standarddisplay,&mt('Automatically set when setting ').$tempkey;
-     if (&isdateparm($defkeytype{$tempkey})) {
+         if (&isdateparm($defkeytype{$tempkey})) {
-         push @dateoptions,'later_than_'.$tempkey;
+             push @dateoptions,'later_than_'.$tempkey;
-         push @datedisplay,&mt('Automatically set later than ').$tempkey;
+             push @datedisplay,&mt('Automatically set later than ').$tempkey;
-         push @dateoptions,'earlier_than_'.$tempkey;
+             push @dateoptions,'earlier_than_'.$tempkey;
-         push @datedisplay,&mt('Automatically set earlier than ').$tempkey;
+             push @datedisplay,&mt('Automatically set earlier than ').$tempkey;
-     }
+         }
      }
- $r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
+     $r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
-       &mt('Automatic setting rules apply to table mode interfaces only.'));
+         &mt('Automatic setting rules apply to table mode interfaces only.'));
      $r->print("\n".&Apache::loncommon::start_data_table().
            &Apache::loncommon::start_data_table_header_row().
            "<th>".&mt('Rule for parameter').'</th><th>'.
            &mt('Action').'</th><th>'.&mt('Value').'</th>'.
            &Apache::loncommon::end_data_table_header_row());
      foreach my $tempkey (&keysindisplayorder(\%allparms,\%keyorder)) {
-     unless ($tempkey) { next; }
+         unless ($tempkey) { next; }
-     $r->print("\n".&Apache::loncommon::start_data_table_row().
+         $r->print("\n".&Apache::loncommon::start_data_table_row().
-           "<td>".$allparms{$tempkey}."\n<br />(".$tempkey.')</td><td>');
+             "<td>".$allparms{$tempkey}."\n<br />(".$tempkey.')</td><td>');
-     my $action=&rulescache($tempkey.'_action');
+         my $action=&rulescache($tempkey.'_action');
-     $r->print('<select name="'.$tempkey.'_action">');
+         $r->print('<select name="'.$tempkey.'_action">');
-     if (&isdateparm($defkeytype{$tempkey})) {
+         if (&isdateparm($defkeytype{$tempkey})) {
-         for (my $i=0;$i<=$#dateoptions;$i++) {
+             for (my $i=0;$i<=$#dateoptions;$i++) {
-         if ($dateoptions[$i]=~/\_$tempkey$/) { next; }
+             if ($dateoptions[$i]=~/\_$tempkey$/) { next; }
-         $r->print("\n<option value='$dateoptions[$i]'".
+             $r->print("\n<option value='$dateoptions[$i]'".
-               ($dateoptions[$i] eq $action?' selected="selected"':'').
+                 ($dateoptions[$i] eq $action?' selected="selected"':'').
-               ">$datedisplay[$i]</option>");
+                 ">$datedisplay[$i]</option>");
+             }
+         } else {
+             for (my $i=0;$i<=$#standardoptions;$i++) {
+             if ($standardoptions[$i]=~/\_$tempkey$/) { next; }
+             $r->print("\n<option value='$standardoptions[$i]'".
+                 ($standardoptions[$i] eq $action?' selected="selected"':'').
+                 ">$standarddisplay[$i]</option>");
+             }
          }
-     } else {
+         $r->print('</select>');
-         for (my $i=0;$i<=$#standardoptions;$i++) {
+         unless (&isdateparm($defkeytype{$tempkey})) {
-         if ($standardoptions[$i]=~/\_$tempkey$/) { next; }
+             $r->print("\n<br />".&mt('Triggering value(s) of other parameter (optional, comma-separated):').
-         $r->print("\n<option value='$standardoptions[$i]'".
+                 '<input type="text" size="20" name="'.$tempkey.'_triggervalue" value="'.&rulescache($tempkey.'_triggervalue').'" />');
-               ($standardoptions[$i] eq $action?' selected="selected"':'').
-               ">$standarddisplay[$i]</option>");
          }
-     }
+         $r->print("\n</td><td>\n");
-     $r->print('</select>');
-     unless (&isdateparm($defkeytype{$tempkey})) {
-         $r->print("\n<br />".&mt('Triggering value(s) of other parameter (optional, comma-separated):').
-               '<input type="text" size="20" name="'.$tempkey.'_triggervalue" value="'.&rulescache($tempkey.'_triggervalue').'" />');
-     }
-     $r->print("\n</td><td>\n");
          if (&isdateparm($defkeytype{$tempkey})) {
-         my $days=&rulescache($tempkey.'_days');
+             my $days=&rulescache($tempkey.'_days');
-         my $hours=&rulescache($tempkey.'_hours');
+             my $hours=&rulescache($tempkey.'_hours');
-         my $min=&rulescache($tempkey.'_min');
+             my $min=&rulescache($tempkey.'_min');
-         my $sec=&rulescache($tempkey.'_sec');
+             my $sec=&rulescache($tempkey.'_sec');
-         $r->print(<<ENDINPUTDATE);
+             $r->print(<<ENDINPUTDATE);
- <input name="$tempkey\_days" type="text" size="4" value="$days" />$lt{'days'}<br />
+     <input name="$tempkey\_days" type="text" size="4" value="$days" />$lt{'days'}<br />
- <input name="$tempkey\_hours" type="text" size="4" value="$hours" />$lt{'hours'}<br />
+     <input name="$tempkey\_hours" type="text" size="4" value="$hours" />$lt{'hours'}<br />
- <input name="$tempkey\_min" type="text" size="4" value="$min" />$lt{'min'}<br />
+     <input name="$tempkey\_min" type="text" size="4" value="$min" />$lt{'min'}<br />
- <input name="$tempkey\_sec" type="text" size="4" value="$sec" />$lt{'sec'}
+     <input name="$tempkey\_sec" type="text" size="4" value="$sec" />$lt{'sec'}
- ENDINPUTDATE
+     ENDINPUTDATE
-     } elsif ($defkeytype{$tempkey} eq 'string_yesno') {
+         } elsif ($defkeytype{$tempkey} eq 'string_yesno') {
-             my $yeschecked='';
+                 my $yeschecked='';
-             my $nochecked='';
+                 my $nochecked='';
-             if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked=' checked="checked"'; }
+                 if (&rulescache($tempkey.'_value') eq 'yes') { $yeschecked=' checked="checked"'; }
-             if (&rulescache($tempkey.'_value') eq 'no') { $nochecked=' checked="checked"'; }
+                 if (&rulescache($tempkey.'_value') eq 'no') { $nochecked=' checked="checked"'; }
-         $r->print(<<ENDYESNO);
+             $r->print(<<ENDYESNO);
- <label><input type="radio" name="$tempkey\_value" value="yes"$yeschecked /> $lt{'yes'}</label><br />
+     <label><input type="radio" name="$tempkey\_value" value="yes"$yeschecked /> $lt{'yes'}</label><br />
- <label><input type="radio" name="$tempkey\_value" value="no"$nochecked /> $lt{'no'}</label>
+     <label><input type="radio" name="$tempkey\_value" value="no"$nochecked /> $lt{'no'}</label>
- ENDYESNO
+     ENDYESNO
          } else {
-         $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');
+             $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');
-     }
+         }
          $r->print('</td>'.&Apache::loncommon::end_data_table_row());
      }
      $r->print(&Apache::loncommon::end_data_table().
- Line 4768  ENDYESNO
+ Line 5823  ENDYESNO
      return;
  }
+ ##################################################
+ # PARAMETER CHANGES LOG
+ ##################################################
+ # Returns some info for a parameter log entry.
+ # Returned entries:
+ # $realm - HTML title for the parameter level and resource
+ # $section - parameter section
+ # $name - parameter name
+ # $part - parameter part
+ # $what - $part.'.'.$name
+ # $middle - resource symb ?
+ # $uname - user name (same as given)
+ # $udom - user domain (same as given)
+ # $issection - section or group name
+ # $realmdescription - title for the parameter level and resource (without using HTML)
+ #
+ # FIXME: remove unused fields.
+ #
+ # @param {string} $key - parameter log key
+ # @param {string} $uname - user name
+ # @param {string} $udom - user domain
+ # @param {string} $exeuser - unused
+ # @param {string} $exedomain - unused
+ # @param {boolean} $typeflag - .type log entry
+ # @returns {Array}
  sub components {
      my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
      if ($typeflag) {
-     $key=~s/\.type$//;
+         $key=~s/\.type$//;
      }
      my ($middle,$part,$name)=
-     ($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+         ($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
      my $issection;
      my $section=&mt('All Students');
      if ($middle=~/^\[(.*)\]/) {
-     $issection=$1;
+         $issection=$1;
-     $section=&mt('Group/Section').': '.$issection;
+         $section=&mt('Group/Section').': '.$issection;
-     $middle=~s/^\[(.*)\]//;
+         $middle=~s/^\[(.*)\]//;
      }
      $middle=~s/\.+$//;
      $middle=~s/^\.+//;
      if ($uname) {
-     $section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);
+         $section=&mt('User').": ".&Apache::loncommon::plainname($uname,$udom);
-     $issection='';
+         $issection='';
      }
      my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
      my $realmdescription=&mt('all resources');
-     if ($middle=~/^(.+)\_\_\_\(all\)$/) {
+     if ($middle=~/^(.+)\_\_\_\((all|rec)\)$/) {
-     $realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <span class="LC_parm_folder"><br />('.$1.')</span></span>';
+         my $mapurl = $1;
-      $realmdescription=&mt('folder').' '.&Apache::lonnet::gettitle($1);
+         my $maplevel = $2;
-    } elsif ($middle) {
+         my $leveltitle = &mt('Folder/Map');
-     my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+         if ($maplevel eq 'rec') {
-     $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>';
+             $leveltitle = &mt('Recursive');
-     $realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
+         }
+         $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>';
+         $realmdescription=&mt('resource').' '.&Apache::lonnet::gettitle($middle);
      }
      my $what=$part.'.'.$name;
      return ($realm,$section,$name,$part,
          $what,$middle,$uname,$udom,$issection,$realmdescription);
  }
- my %standard_parms;
+ my %standard_parms; # hash parameter name -> parameter title (not localized)
- my %standard_parms_types;
+ my %standard_parms_types; # hash parameter name -> parameter type
+ # Reads parameter info from packages.tab into %standard_parms.
  sub load_parameter_names {
      open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
      while (my $configline=<$config>) {
-     if ($configline !~ /\S/ || $configline=~/^\#/) { next; }
+         if ($configline !~ /\S/ || $configline=~/^\#/) { next; }
-     chomp($configline);
+         chomp($configline);
-     my ($short,$plain)=split(/:/,$configline);
+         my ($short,$plain)=split(/:/,$configline);
-     my (undef,$name,$type)=split(/\&/,$short,3);
+         my (undef,$name,$type)=split(/\&/,$short,3);
-     if ($type eq 'display') {
+         if ($type eq 'display') {
-         $standard_parms{$name} = $plain;
+             $standard_parms{$name} = $plain;
          } elsif ($type eq 'type') {
-             $standard_parms_types{$name} = $plain;
+                 $standard_parms_types{$name} = $plain;
          }
      }
      close($config);
- Line 4827  sub load_parameter_names {
+ Line 5919  sub load_parameter_names {
      $standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
  }
+ # Returns a parameter title for standard parameters, the name for others.
+ #
+ # @param {string} $name - parameter name
+ # @returns {string}
  sub standard_parameter_names {
      my ($name)=@_;
      if (!%standard_parms) {
-     &load_parameter_names();
+         &load_parameter_names();
      }
      if ($standard_parms{$name}) {
-     return $standard_parms{$name};
+         return $standard_parms{$name};
      } else {
-     return $name;
+         return $name;
      }
  }
+ # Returns a parameter type for standard parameters, undef for others.
+ #
+ # @param {string} $name - parameter name
+ # @returns {string}
  sub standard_parameter_types {
      my ($name)=@_;
      if (!%standard_parms_types) {
- Line 4850  sub standard_parameter_types {
+ Line 5950  sub standard_parameter_types {
      return;
  }
+ # Returns a parameter level title (not localized) from the parameter level name.
+ #
+ # @param {string} $name - parameter level name (recognized: resourcelevel|maplevel|maplevelrecurse|courselevel)
+ # @returns {string}
+ 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;
+ }
+ # Display log for parameter changes, blog postings, user notification changes.
+ #
+ # @param {Apache2::RequestRec} $r - the Apache request
  sub parm_change_log {
      my ($r)=@_;
      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 4891  sub parm_change_log {
+ Line 6012  sub parm_change_log {
      my $shown=0;
      my $folder='';
      if ($env{'form.displayfilter'} eq 'currentfolder') {
-     my $last='';
+         my $last='';
-     if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
+         if (tie(my %hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
-         &GDBM_READER(),0640)) {
+                 &GDBM_READER(),0640)) {
-         $last=$hash{'last_known'};
+             $last=$hash{'last_known'};
-         untie(%hash);
+             untie(%hash);
-     }
+         }
-     if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
+         if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
      }
-     foreach my $id (sort
+     foreach my $id (sort {
-             {
+                 if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
-             if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
+                     return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
-                 return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
+                 }
-             }
+                 my $aid = (split('00000',$a))[-1];
-             my $aid = (split('00000',$a))[-1];
+                 my $bid = (split('00000',$b))[-1];
-             my $bid = (split('00000',$b))[-1];
+                 return $bid<=>$aid;
-             return $bid<=>$aid;
              } (keys(%parmlog))) {
          my @changes=keys(%{$parmlog{$id}{'logentry'}});
-     my $count = 0;
+         my $count = 0;
-     my $time =
+         my $time =
-         &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
+             &Apache::lonlocal::locallocaltime($parmlog{$id}{'exe_time'});
-     my $plainname =
+         my $plainname =
-         &Apache::loncommon::plainname($parmlog{$id}{'exe_uname'},
+             &Apache::loncommon::plainname($parmlog{$id}{'exe_uname'},
-                       $parmlog{$id}{'exe_udom'});
+                         $parmlog{$id}{'exe_udom'});
-     my $about_me_link =
+         my $about_me_link =
-         &Apache::loncommon::aboutmewrapper($plainname,
+             &Apache::loncommon::aboutmewrapper($plainname,
-                            $parmlog{$id}{'exe_uname'},
+                             $parmlog{$id}{'exe_uname'},
-                            $parmlog{$id}{'exe_udom'});
+                             $parmlog{$id}{'exe_udom'});
-     my $send_msg_link='';
+         my $send_msg_link='';
-     if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
+         if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
-          || ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
+             || ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
-         $send_msg_link ='<br />'.
+             $send_msg_link ='<br />'.
-         &Apache::loncommon::messagewrapper(&mt('Send message'),
+             &Apache::loncommon::messagewrapper(&mt('Send message'),
-                            $parmlog{$id}{'exe_uname'},
+                             $parmlog{$id}{'exe_uname'},
-                            $parmlog{$id}{'exe_udom'});
+                             $parmlog{$id}{'exe_udom'});
-     }
+         }
-     my $row_start=&Apache::loncommon::start_data_table_row();
+         my $row_start=&Apache::loncommon::start_data_table_row();
-     my $makenewrow=0;
+         my $makenewrow=0;
-     my %istype=();
+         my %istype=();
-     my $output;
+         my $output;
-     foreach my $changed (reverse(sort(@changes))) {
+         foreach my $changed (reverse(sort(@changes))) {
-             my $value=$parmlog{$id}{'logentry'}{$changed};
+                 my $value=$parmlog{$id}{'logentry'}{$changed};
-         my $typeflag = ($changed =~/\.type$/ &&
+             my $typeflag = ($changed =~/\.type$/ &&
-                 !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
+                     !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
              my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
-         &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
+                 &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
-         if ($env{'form.displayfilter'} eq 'currentfolder') {
+             if ($env{'request.course.sec'} ne '') {
-         if ($folder) {
+                 next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));
-             if ($middle!~/^\Q$folder\E/) { next; }
+                 if ($uname ne '') {
-         }
+                     my $stusection = &Apache::lonnet::getsection($uname,$udom,$env{'request.course.id'});
-         }
+                     next if (($stusection ne '-1') && ($stusection ne $env{'request.course.sec'}));
-         if ($typeflag) {
+                 }
-         $istype{$parmname}=$value;
+             }
-         if (!$env{'form.includetypes'}) { next; }
+             if ($env{'form.displayfilter'} eq 'currentfolder') {
-         }
+                 if ($folder) {
-         $count++;
+                     if ($middle!~/^\Q$folder\E/) { next; }
-         if ($makenewrow) {
+                 }
-         $output .= $row_start;
+             }
-         } else {
+             if ($typeflag) {
-         $makenewrow=1;
+                 $istype{$parmname}=$value;
-         }
+                 if (!$env{'form.includetypes'}) { next; }
+             }
+             $count++;
+             if ($makenewrow) {
+                 $output .= $row_start;
+             } else {
+                 $makenewrow=1;
+             }
              my $parmitem = &standard_parameter_names($parmname);
-         $output .='<td>'.$realm.'</td><td>'.$section.'</td><td>'.
+             $output .='<td>'.$realm.'</td><td>'.$section.'</td><td>'.
-               &mt($parmitem).'</td><td>'.
+                 &mt($parmitem).'</td><td>'.
-               ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>';
+                 ($part?&mt('Part: [_1]',$part):&mt('All Parts')).'</td><td>';
-         my $stillactive=0;
+             my $stillactive=0;
-         if ($parmlog{$id}{'delflag'}) {
+             if ($parmlog{$id}{'delflag'}) {
-         $output .= &mt('Deleted');
+                 $output .= &mt('Deleted');
-         } else {
+             } else {
-         if ($typeflag) {
+                 if ($typeflag) {
                      my $parmitem = &standard_parameter_names($value);
                      $parmitem = &mt($parmitem);
-             $output .= &mt('Type: [_1]',$parmitem);
+                     $output .= &mt('Type: [_1]',$parmitem);
-         } else {
+                 } else {
-             my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
+                     my ($level,@all)=&parmval_by_symb($what,$middle,
-                               $uname,$udom,$issection,$issection,$courseopt);
+                         &Apache::lonnet::metadata($middle,$what),
+                         $uname,$udom,$issection,$issection,$courseopt);
                      my $showvalue = $value;
                      if ($istype{$parmname} eq '') {
                          my $type = &standard_parameter_types($parmname);
- Line 4977  sub parm_change_log {
+ Line 6105  sub parm_change_log {
                              }
                          }
                      } else {
-                 if (&isdateparm($istype{$parmname})) {
+                         if (&isdateparm($istype{$parmname})) {
-                 $showvalue =
+                             $showvalue = &Apache::lonlocal::locallocaltime($value);
-                                 &Apache::lonlocal::locallocaltime($value);
+                         }
-                 }
                      }
                      $output .= $showvalue;
-             if ($value ne $all[$level]) {
+                     if ($value ne $all[$level]) {
-             $output .= '<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>';
+                         $output .= '<br /><span class="LC_warning">'.&mt('Not active anymore').'</span>';
-             } else {
+                     } else {
-             $stillactive=1;
+                         $stillactive=1;
+                     }
+                 }
              }
-         }
+             $output .= '</td><td>';
-         }
-         $output .= '</td><td>';
+             if ($stillactive) {
-         if ($stillactive) {
                  my $parmitem = &standard_parameter_names($parmname);
                  $parmitem = &mt($parmitem);
-         my $title=&mt('Changed [_1]',$parmitem);
+                 my $title=&mt('Changed [_1]',$parmitem);
                  my $description=&mt('Changed [_1] for [_2] to [_3]',
-                                     $parmitem,$realmdescription,
+                     $parmitem,$realmdescription,
                      (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
-         if (($uname) && ($udom)) {
+                 if (($uname) && ($udom)) {
-             $output .=
+                     $output .=
-             &Apache::loncommon::messagewrapper('Notify User',
+                     &Apache::loncommon::messagewrapper('Notify User',
-                                $uname,$udom,$title,
+                                     $uname,$udom,$title,
-                                $description);
+                                     $description);
-         } else {
+                 } else {
-             $output .=
+                     $output .=
-             &Apache::lonrss::course_blog_link($id,$title,
+                     &Apache::lonrss::course_blog_link($id,$title,
-                               $description);
+                                     $description);
-         }
+                 }
+             }
+             $output .= '</td>'.&Apache::loncommon::end_data_table_row();
          }
-         $output .= '</td>'.&Apache::loncommon::end_data_table_row();
-     }
          if ($env{'form.displayfilter'} eq 'containing') {
-         my $wholeentry=$about_me_link.':'.
+             my $wholeentry=$about_me_link.':'.
-         $parmlog{$id}{'exe_uname'}.':'.$parmlog{$id}{'exe_udom'}.':'.
+             $parmlog{$id}{'exe_uname'}.':'.$parmlog{$id}{'exe_udom'}.':'.
-         $output;
+             $output;
-         if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
+             if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
-     }
+         }
          if ($count) {
-         $r->print($row_start.'<td rowspan="'.$count.'">'.$time.'</td>
+             $r->print($row_start.'<td rowspan="'.$count.'">'.$time.'</td>
-                        <td rowspan="'.$count.'">'.$about_me_link.
+                         <td rowspan="'.$count.'">'.$about_me_link.
-           '<br /><tt>'.$parmlog{$id}{'exe_uname'}.
+             '<br /><tt>'.$parmlog{$id}{'exe_uname'}.
-                       ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.
+                         ':'.$parmlog{$id}{'exe_udom'}.'</tt>'.
-           $send_msg_link.'</td>'.$output);
+             $send_msg_link.'</td>'.$output);
-         $shown++;
+             $shown++;
-     }
+         }
-     if (!($env{'form.show'} eq &mt('all')
+         if (!($env{'form.show'} eq &mt('all')
-           || $shown<=$env{'form.show'})) { last; }
+             || $shown<=$env{'form.show'})) { last; }
      }
      $r->print(&Apache::loncommon::end_data_table());
      &endSettingsScreen($r);
      $r->print(&Apache::loncommon::end_page());
  }
+ ##################################################
+ # MISC !
+ ##################################################
+ # Stores slot information.
+ # Used by table UI
+ # FIXME: I don't understand how this can work when the symb is not defined (if only a map was selected)
+ #
+ # @param {string} $slot_name - slot name
+ # @param {string} $cdom - course domain
+ # @param {string} $cnum - course number
+ # @param {string} $symb - resource symb
+ # @param {string} $uname - user name
+ # @param {string} $udom - user domain
+ # @returns {string} - 'ok' or error name
  sub update_slots {
      my ($slot_name,$cdom,$cnum,$symb,$uname,$udom) = @_;
      my %slot=&Apache::lonnet::get_slot($slot_name);
- Line 5087  sub update_slots {
+ Line 6229  sub update_slots {
      return $success;
  }
+ # Deletes a slot reservation.
+ # Used by table UI
+ # FIXME: I don't understand how this can work when the symb is not defined (if only a map was selected)
+ #
+ # @param {string} $slot_name - slot name
+ # @param {string} $cdom - course domain
+ # @param {string} $cnum - course number
+ # @param {string} $uname - user name
+ # @param {string} $udom - user domain
+ # @param {string} $symb - resource symb
+ # @returns {string} - 'ok' or error name
  sub delete_slots {
      my ($slot_name,$cdom,$cnum,$uname,$udom,$symb) = @_;
      my $delresult;
- Line 5122  sub delete_slots {
+ Line 6275  sub delete_slots {
      return $delresult;
  }
+ # Returns true if there is a current course.
+ # Used by handler
+ #
+ # @returns {boolean}
  sub check_for_course_info {
      my $navmap = Apache::lonnavmaps::navmap->new();
      return 1 if ($navmap);
      return 0;
  }
+ # Returns the current course host and host LON-CAPA version.
+ #
+ # @returns {Array} - (course hostname, major version number, minor version number)
  sub parameter_release_vars {
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
- Line 5137  sub parameter_release_vars {
+ Line 6297  sub parameter_release_vars {
     return ($chostname,$cmajor,$cminor);
  }
+ # Checks if the course host version can handle a parameter required version,
+ # and if it does, stores the release needed for the course.
+ #
+ # @param {string} $name - parameter name
+ # @param {string} $value - parameter value
+ # @param {string} $valmatch - name of the test used for checking the value
+ # @param {string} $namematch - name of the test used for checking the name
+ # @param {string} $needsrelease - version needed by the parameter, major.minor
+ # @param {integer} $cmajor - course major version number
+ # @param {integer} $cminor - course minor version number
+ # @returns {boolean} - true if a newer version is needed
  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) {
+     } elsif ($name) {
-         &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch});
+         if ($valmatch) {
-     } elsif ($value) {
+             &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch.':'});
-         &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.':'});
+         } 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;
  }
+ ##################################################
+ # HANDLER
+ ##################################################
+ # Main handler for lonparmset.
+ # Sub called based on request parameters action and command:
+ # no command or action: print_main_menu
+ # command 'set': assessparms (direct access to table mode for a resource)
+ #                (this can also be accessed simply with the symb parameter)
+ # action 'setoverview': overview (display all existing parameter settings)
+ # action 'addmetadata': addmetafield (called to add a portfolio metadata field)
+ # action 'ordermetadata': order_meta_fields (called to order portfolio metadata fields)
+ # action 'setrestrictmeta': setrestrictmeta (display or save portfolio metadata)
+ # action 'newoverview': newoverview (overview mode)
+ # action 'setdefaults': defaultsetter (UI to change parameter setting default actions)
+ # action 'settable': assessparms (table mode)
+ # action 'parameterchangelog': parm_change_log (display log for parameter changes,
+ #                              blog postings, user notification changes)
+ # action 'cleanparameters': clean_parameters (unused)
+ # action 'dateshift1': date_shift_one (overview mode, shift all dates)
+ # action 'dateshift2': date_shift_two (overview mode, shift all dates)
  sub handler {
      my $r=shift;
- Line 5192  sub handler {
+ Line 6388  sub handler {
          # 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'})) {
+                 && (!$env{'form.dis'})) || ($env{'form.symb'})) {
-         &assessparms($r);
+             &assessparms($r);
          } elsif (! exists($env{'form.action'})) {
              &print_main_menu($r,$parm_permission);
          } elsif ($env{'form.action'} eq 'setoverview') {
-         &overview($r);
+             &overview($r);
-     } elsif ($env{'form.action'} eq 'addmetadata') {
+         } elsif ($env{'form.action'} eq 'addmetadata') {
-         &addmetafield($r);
+             &addmetafield($r);
-     } elsif ($env{'form.action'} eq 'ordermetadata') {
+         } elsif ($env{'form.action'} eq 'ordermetadata') {
-         &order_meta_fields($r);
+             &order_meta_fields($r);
          } elsif ($env{'form.action'} eq 'setrestrictmeta') {
-         &setrestrictmeta($r);
+             &setrestrictmeta($r);
          } elsif ($env{'form.action'} eq 'newoverview') {
-         &newoverview($r);
+             &newoverview($r);
          } elsif ($env{'form.action'} eq 'setdefaults') {
-         &defaultsetter($r);
+             &defaultsetter($r);
-     } elsif ($env{'form.action'} eq 'settable') {
+         } elsif ($env{'form.action'} eq 'settable') {
-         &assessparms($r);
+             &assessparms($r);
          } elsif ($env{'form.action'} eq 'parameterchangelog') {
-         &parm_change_log($r);
+             &parm_change_log($r);
          } elsif ($env{'form.action'} eq 'cleanparameters') {
-         &clean_parameters($r);
+             &clean_parameters($r);
          } elsif ($env{'form.action'} eq 'dateshift1') {
              &date_shift_one($r);
          } elsif ($env{'form.action'} eq 'dateshift2') {
- Line 5221  sub handler {
+ Line 6417  sub handler {
          }
      } else {
  # ----------------------------- Not in a course, or not allowed to modify parms
-     if ($exists) {
+         if ($exists) {
-         $env{'user.error.msg'}=
+             $env{'user.error.msg'}=
-         "/adm/parmset:opa:0:0:Cannot modify assessment parameters";
+             "/adm/parmset:opa:0:0:Cannot modify assessment parameters";
-     } else {
+         } else {
-         $env{'user.error.msg'}=
+             $env{'user.error.msg'}=
-         "/adm/parmset::0:1:Course environment gone, reinitialize the course";
+             "/adm/parmset::0:1:Course environment gone, reinitialize the course";
-     }
+         }
-     return HTTP_NOT_ACCEPTABLE;
+         return HTTP_NOT_ACCEPTABLE;
      }
      &reset_caches();

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.551
changed lines
	Added in v.1.563