--- loncom/interface/lonparmset.pm	2016/07/15 18:03:52	1.561
+++ loncom/interface/lonparmset.pm	2017/07/10 13:55:36	1.576
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.561 2016/07/15 18:03:52 damieng Exp $
+# $Id: lonparmset.pm,v 1.576 2017/07/10 13:55:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -367,14 +367,14 @@ sub endSettingsScreen {
 
 
 ##################################################
-# TABLE MODE
+# (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.
+# Calls parmval_by_symb, getting the symb from $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} $id - resource id or map pc
 # @param {string} $def - the resource's default value for this parameter
 # @param {string} $uname - user name
 # @param {string} $udom - user domain
@@ -394,7 +394,7 @@ sub parmval {
 #   (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} $symb - resource symb or map src
 # @param {string} $def - the resource's default value for this parameter
 # @param {string} $uname - user name
 # @param {string} $udom - user domain
@@ -597,7 +597,7 @@ sub reset_caches {
     }
 }
 
-# cache big hash id -> symb, using lonnavmaps to find association
+# cache resource id or map pc -> resource symb or map src, using lonnavmaps to find association
 {
     my $symbsid; # course identifier, to initialize the cache only once for a course
     my %symbs; # hash id->symb
@@ -607,7 +607,8 @@ sub reset_caches {
         undef(%symbs);
     }
 
-    # returns the symb corresponding to a big hash id (using lonnavmaps and a cache)
+    # returns the resource symb or map src corresponding to a resource id or map pc
+    # (using lonnavmaps and a cache)
     sub symbcache {
         my $id=shift;
         if ($symbsid ne $env{'request.course.id'}) {
@@ -718,8 +719,8 @@ sub date_sanity_info {
 
 # 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 {string} $sresid - resource id or map pc
+# @param {string} $spnam - part info and parameter name separated by a dot or underscore, e.g. '0.weight'
 # @param {integer} $snum - level
 # @param {string} $nval - new value
 # @param {string} $ntype - new type
@@ -737,8 +738,8 @@ my %recstack; # hash parameter name -> 1
 # 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 {string} $symb - resource symb or map src
+# @param {string} $spnam - part info and parameter name separated by a dot or underscore, e.g. '0.weight'
 # @param {integer} $snum - level
 # @param {string} $nval - new value
 # @param {string} $ntype - new type
@@ -776,8 +777,7 @@ sub storeparm_by_symb {
             # are there restrictions?
                 if (&rulescache($triggered.'_triggervalue')=~/\w/) {
                     $active=0;
-                    foreach my $possiblevalue (split(/\s*\,
-                            \s*/,&rulescache($triggered.'_triggervalue'))) {
+                    foreach my $possiblevalue (split(/\s*\,\s*/,&rulescache($triggered.'_triggervalue'))) {
                         if (lc($possiblevalue) eq lc($nval)) { $active=1; }
                     }
                 }
@@ -808,7 +808,7 @@ sub log_parmset {
 # Store a parameter value and type by symb, without using the parameter default actions.
 # Expire related sheets.
 #
-# @param {string} $symb - resource symb
+# @param {string} $symb - resource symb or map src
 # @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
@@ -1065,16 +1065,16 @@ 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 (typedef[0]=='date') {
-                eval('document.parmform.recent_'+
-                     document.parmform.pres_type.value+
-             '.value=document.parmform.pres_value.value;');
-            } else {
-                eval('document.parmform.recent_'+typedef[0]+
-             '.value=document.parmform.pres_value.value;');
+            if (document.parmform.pres_type.value!='') {
+                if (typedef[0]=='date') {
+                    eval('document.parmform.recent_'+
+                        document.parmform.pres_type.value+
+                        '.value=document.parmform.pres_value.value;');
+                } else {
+                    eval('document.parmform.recent_'+typedef[0]+
+                        '.value=document.parmform.pres_value.value;');
+                }
             }
-       }
             document.parmform.submit();
         } else {
             document.parmform.pres_value.value='';
@@ -1365,7 +1365,7 @@ ENDHEAD
 # @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 {hash reference} $symbp - map pc or resource/map id -> map src.'___(all)' or resource 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
@@ -1380,9 +1380,11 @@ ENDHEAD
 # @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
+# @param {boolean} $readonly - true if no editing allowed. 
 sub print_row {
     my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
-    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp)=@_;
+    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp,
+    $readonly)=@_;
     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);
@@ -1427,27 +1429,27 @@ sub print_row {
 
     if ($parmlev eq 'general') {
         if ($uname) {
-            &print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
         } elsif ($cgroup) {
-            &print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);
         } elsif ($csec) {
-            &print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
         } else {
-            &print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
         }
     } elsif ($parmlev eq 'map') {
         if ($uname) {
-            &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,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly); 
         } elsif ($cgroup) {
-            &print_td($r,7,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,7,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);
         } elsif ($csec) {
-            &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,11,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
         } else {
-            &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,17,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
         }
     } else {
         if ($uname) {
@@ -1467,35 +1469,35 @@ sub print_row {
             }
         }
 
-        &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,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,17,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,15,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,14,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
 
         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,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,11,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
         }
 
         if ($cgroup) {
-            &print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
-            &print_td($r,7,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,7,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp.$readonly);
         }
 
         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);
+            &print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
         }
 
     } # end of $parmlev if/else
@@ -1532,26 +1534,35 @@ sub print_row {
 # @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
+# @param {boolean} $readonly -true if editing not allowed.
 sub print_td {
-    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp)=@_;
+    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp,$readonly)=@_;
     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
               ';" align="center">');
     my $nolink = 0;
-    if ($which == 14 || $which == 15) {
-        $nolink = 1;
-    } elsif (($env{'request.course.sec'} ne '') && ($which > 12)) {
+    if ($readonly) {
         $nolink = 1;
-    } elsif ($which == 5 || $which ==  6 || $which == 7 || $which == 8) {
-        if ($noeditgrp) {
+    } else { 
+        if ($which == 14 || $which == 15 || $mprefix =~ /mapalias\&/) {
             $nolink = 1;
-        }
-    } elsif ($mprefix =~ /availablestudent\&$/) {
-        if ($which > 4) {
-            $nolink = 1;
-        }
-    } elsif ($mprefix =~ /examcode\&$/) {
-        unless ($which == 2) {
+        } 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 > 4) {
+                $nolink = 1;
+            }
+        } elsif ($mprefix =~ /examcode\&$/) {
+            unless ($which == 2) {
+                $nolink = 1;
+            }
+        } elsif ($mprefix =~ /(encrypturl|hiddenresource)/) {
+            if ($which == 16 || $which == 10 || $which == 6 || $which == 2) {
+                $nolink = 1;
+            }
         }
     }
     if ($nolink) {
@@ -1648,7 +1659,21 @@ sub parm_control_group {
 
 
 
-# extracts lots of information about all of the the course's resources into a variety of hashes.
+# 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 and map ids
+# @param {hash reference} $typep - hash resource/map id -> resource type (file extension)
+# @param {hash reference} $keyp - hash resource/map 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 pc -> map src
+# @param {hash reference} $mapp - hash map pc or resource/map id -> enclosing map src
+# @param {hash reference} $symbp - hash map pc or resource/map id -> map src.'___(all)' for a map or resource symb for a resource
+# @param {hash reference} $maptitles - hash map pc or src -> map title (this should really be two separate hashes)
+# @param {hash reference} $uris - hash resource/map 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;
@@ -1749,17 +1774,22 @@ 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.
-# It also offers a link to show/hide the complete parameter list
-# from which you can select all desired parameters.
-#
+# @param {Apache2::RequestRec} $r - the Apache request (unused)
+# @param {hash reference} $allparms - hash parameter name -> parameter title
+# @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;
@@ -1775,7 +1805,7 @@ 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;
@@ -1784,56 +1814,54 @@ 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) {
-            document.forms.parmform.elements[i].checked=true;
-        }
+                if (ele.value == thisvalue) {
+                    document.forms.parmform.elements[i].checked=true;
+                }
             }
         }
     }
 
     function checkdates() {
-    checkthis('duedate','pscat');
-     checkthis('opendate','pscat');
-    checkthis('answerdate','pscat');
+        checkthis('duedate','pscat');
+        checkthis('opendate','pscat');
+        checkthis('answerdate','pscat');
     }
 
     function checkdisset() {
-     checkthis('discussend','pscat');
-     checkthis('discusshide','pscat');
-     checkthis('discussvote','pscat');
+        checkthis('discussend','pscat');
+        checkthis('discusshide','pscat');
+        checkthis('discussvote','pscat');
     }
 
     function checkcontdates() {
-    checkthis('contentopen','pscat');
-     checkthis('contentclose','pscat');
+        checkthis('contentopen','pscat');
+        checkthis('contentclose','pscat');
     }
 
     function checkvisi() {
-    checkthis('hiddenresource','pscat');
-     checkthis('encrypturl','pscat');
-    checkthis('problemstatus','pscat');
-    checkthis('contentopen','pscat');
-    checkthis('opendate','pscat');
+        checkthis('hiddenresource','pscat');
+        checkthis('encrypturl','pscat');
+        checkthis('problemstatus','pscat');
+        checkthis('contentopen','pscat');
+        checkthis('opendate','pscat');
     }
 
     function checkparts() {
-    checkthis('hiddenparts','pscat');
-    checkthis('display','pscat');
-    checkthis('ordered','pscat');
+        checkthis('hiddenparts','pscat');
+        checkthis('display','pscat');
+        checkthis('ordered','pscat');
     }
 
     function checkstandard() {
         checkall(false,'pscat');
-    checkdates();
-    checkthis('weight','pscat');
-    checkthis('maxtries','pscat');
-    checkthis('type','pscat');
-    checkthis('problemstatus','pscat');
+        checkdates();
+        checkthis('weight','pscat');
+        checkthis('maxtries','pscat');
+        checkthis('type','pscat');
+        checkthis('problemstatus','pscat');
     }
 
 // ]]>
@@ -1844,7 +1872,10 @@ 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',
@@ -1858,7 +1889,9 @@ 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 ( 
@@ -1906,9 +1939,13 @@ sub lookUpTableParameter {
         'retrypartial' => 'tries',
         'discussvote'  => 'misc',
         'examcode' => 'high_level_randomization', 
-    );    
+    );
 }
 
+# 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;
@@ -1932,6 +1969,11 @@ 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 {
@@ -1939,6 +1981,9 @@ sub keysindisplayorderCategory {
     } ( @{$name});
 }
 
+# Returns a hash category name -> order, starting at 1 (integer)
+#
+# @returns {hash}
 sub category_order {
     return (
         'time_settings' => 1,
@@ -1955,6 +2000,12 @@ 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();
@@ -1982,6 +2033,7 @@ sub parmboxes {
         $r->print('<div class="LC_Box LC_400Box">'
                  .'<h4 class="LC_hcell">'.&mt($categories{$key}).'</h4>'."\n");
         foreach my $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+            next if ($tempkey eq '');
             $r->print('<span class="LC_nobreak">'
                      .'<label><input type="checkbox" name="pscat" '
                      .'value="'.$tempkey.'" ');
@@ -1996,9 +2048,14 @@ 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)=@_;
 
@@ -2031,6 +2088,12 @@ 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}));
@@ -2040,7 +2103,7 @@ 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; }
@@ -2058,6 +2121,18 @@ sub partmenu {
     $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,$pssymb)=@_;
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
@@ -2168,16 +2243,23 @@ 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());
@@ -2187,6 +2269,14 @@ 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 pc -> map src
+# @param {string} $pschp - selected map pc, or 'all'
+# @param {hash reference} $maptitles - hash map id or src -> map title
+# @param {hash reference} $symbp - hash map pc or resource/map id -> map src.'___(all)' or resource symb
 sub mapmenu {
     my ($r,$allmaps,$pschp,$maptitles,$symbp)=@_;
     my %allmaps_inverted = reverse %$allmaps;
@@ -2338,8 +2428,12 @@ sub mapmenu {
     }
 }
 
-# Build up the select Box to choose if your parameter specification should work for the resource, map/folder or the course level
-# The value of default selection in the select box is set by the value that is given by the argument in $parmlev.
+# Prints HTML to select the parameter level (resource, map/folder or course).
+# 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)=@_;
 
@@ -2357,6 +2451,11 @@ 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 ($selectedsections)=@_;
     my %sectionhash = &Apache::loncommon::get_sections();
@@ -2382,6 +2481,11 @@ sub sectionmenu {
     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 ($selectedgroups)=@_;
     my %grouphash;
@@ -2404,11 +2508,23 @@ sub groupmenu {
     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 {
@@ -2416,10 +2532,16 @@ sub keysinorder {
     } (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];
         if ($$keyorder{'parameter_0_'.$ta} == $$keyorder{'parameter_0_'.$tb}) {
             return ($a cmp $b);
@@ -2428,6 +2550,12 @@ sub keysinorder_bytype {
     } (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 {
@@ -2435,6 +2563,11 @@ sub keysindisplayorder {
     } (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"');
@@ -2450,6 +2583,9 @@ 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,
@@ -2478,28 +2614,58 @@ sub standardkeyorder {
 
 
 # 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 pc, 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
+# @param $parm_permission - ref to hash of permissions
+#                           if $parm_permission->{'edit'} is true, editing is allowed.
 sub assessparms {
 
-    my $r=shift;
+    my ($r,$parm_permission) = @_;
 
 
 # -------------------------------------------------------- Variable declaration
-    my @ids=();
-    my %symbp=();
-    my %mapp=();
-    my %typep=();
-    my %keyp=();
-    my %uris=();
-    my %maptitles=();
-    my %allmaps=();
-    my %alllevs=();
-
-    my $uname;
-    my $udom;
-    my $uhome;
-    my $csec;
-    my $cgroup;
-    my @usersgroups = ();
+    my @ids=(); # resource and map ids
+    my %symbp=(); # hash map pc or resource/map id -> map src.'___(all)' or resource symb
+    my %mapp=(); # hash map pc or resource/map id -> enclosing map src
+    my %typep=(); # hash resource/map id -> resource type (file extension)
+    my %keyp=(); # hash resource/map id -> comma-separated list of parameter keys
+    my %uris=(); # hash resource/map id -> resource src
+    my %maptitles=(); # hash map pc or src -> map title
+    my %allmaps=(); # hash map pc -> map src
+    my %alllevs=(); # hash English level title -> value
+
+    my $uname; # selected user name
+    my $udom; # selected user domain
+    my $uhome; # server with the user's files, or 'no_host'
+    my $csec; # selected section name
+    my $cgroup; # selected group name
+    my @usersgroups = (); # list of the user groups
 
     my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
 
@@ -2507,8 +2673,8 @@ sub assessparms {
     $alllevs{'Map/Folder Level'}='map';
     $alllevs{'Course Level'}='general';
 
-    my %allparms;
-    my %allparts;
+    my %allparms; # hash parameter name -> parameter title
+    my %allparts; # hash parameter part -> part title
 # ------------------------------------------------------------------------------
 
 #
@@ -2651,7 +2817,7 @@ sub assessparms {
     $symbp{'0.0'} = '';
 
 # ---------------------------------------------------------- Anything to store?
-    if ($env{'form.pres_marker'}) {
+    if ($env{'form.pres_marker'} && $parm_permission->{'edit'}) {
         my @markers=split(/\&\&\&/,$env{'form.pres_marker'});
         my @values=split(/\&\&\&/,$env{'form.pres_value'});
         my @types=split(/\&\&\&/,$env{'form.pres_type'});
@@ -2812,19 +2978,25 @@ sub assessparms {
         }
     }
 #----------------------------------------------- if all selected, fill in array
-    if ($pscat[0] eq "all") {@pscat = (keys(%allparms));}
-    if (!@pscat) { @pscat=('duedate','opendate','answerdate','weight','maxtries','type','problemstatus') };
-    if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys(%allparts));}
+    if ($pscat[0] eq "all") {
+        @pscat = (keys(%allparms));
+    }
+    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},'"&<>').
-          '" name="recent_'.$item.'" />');
+            &HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
+            '" name="recent_'.$item.'" />');
     }
 
     # ----- Start Parameter Selection
@@ -2834,14 +3006,15 @@ sub assessparms {
 <script type="text/javascript">
 // <![CDATA[
 function parmsel_show() {
-  document.getElementById('parmsel').style.display = "";
-  document.getElementById('parmsellink').style.display = "none";
+    document.getElementById('parmsel').style.display = "";
+    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.'>');
@@ -2937,6 +3110,10 @@ ENDPARMSELSCRIPT
         my @catmarker=map { tr|.|_|; 'parameter_'.$_; } @pscat;
         my $csuname=$env{'user.name'};
         my $csudom=$env{'user.domain'};
+        my $readonly = 1;
+        if ($parm_permission->{'edit'}) {
+            undef($readonly); 
+        }
 
         if ($parmlev eq 'full') {
 #
@@ -3120,7 +3297,7 @@ ENDTABLEHEADFOUR
                             &print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
                                        $defbgthree,$parmlev,$uname,$udom,$csec,
-                                       $cgroup,\@usersgroups,$noeditgrp);
+                                       $cgroup,\@usersgroups,$noeditgrp,$readonly);
                         }
                     }
                 }
@@ -3243,7 +3420,8 @@ 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,'',$noeditgrp);
+                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,
+                           $readonly);
                 }
                 $r->print(&Apache::loncommon::end_data_table().'</p>'
                          .'</div>'
@@ -3332,8 +3510,9 @@ ENDMAPONE
             foreach my $item (&keysinorder(\%name,\%keyorder)) {
                 $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,'',$noeditgrp);
+                           \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
+                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,
+                           $readonly);
             }
             $r->print(&Apache::loncommon::end_data_table()
                      .'</p>'
@@ -3351,10 +3530,14 @@ ENDMAPONE
 ##################################################
 # 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) = @_;
+    my ($readonly,$is_map) = @_;
     if ($tableopen) {
         return '';
     } else {
@@ -3363,13 +3546,19 @@ sub tablestart {
         if ($readonly) {
             $output .= '<th>'.&mt('Current value').'</th>';
         } else {
-            $output .= '<th>'.&mt('Delete').'</th><th>'.&mt('Set to ...').'</th>';
+            $output .= '<th>'.&mt('Delete').'</th>'.
+                       '<th>'.&mt('Set to ...').'</th>';
+            if ($is_map) {
+                $output .= '<th>'.&mt('Recursive?').'</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;
@@ -3379,6 +3568,13 @@ sub tableend {
     }
 }
 
+# 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
@@ -3407,8 +3603,24 @@ sub readdata {
 }
 
 
-# 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
@@ -3417,6 +3629,8 @@ sub storedata {
     my %newdata=();
     undef %newdata;
     my @deldata=();
+    my @delrec=();
+    my @delnonrec=();
     undef @deldata;
     my ($got_chostname,$chostname,$cmajor,$cminor);
     my $now = time;
@@ -3424,188 +3638,346 @@ sub storedata {
         if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
             my $cmd=$1;
             my $thiskey=$2;
-            next if ($cmd eq 'settext' || $cmd eq 'setipallow' || $cmd eq 'setipdeny');
+            my ($altkey,$recursive,$tkey,$tkeyrec,$tkeynonrec);
+            next if ($cmd eq 'rec' || $cmd eq 'settext' || $cmd eq 'setipallow' || $cmd eq 'setipdeny');
+            if ((($cmd eq 'set') || ($cmd eq 'datepointer') || ($cmd eq 'dateinterval') || ($cmd eq 'del')) && 
+                 ($thiskey =~ /(?:sequence|page)\Q___(all)\E/)) {
+                unless ($thiskey =~ /(encrypturl|hiddenresource)$/) {
+                    $altkey = $thiskey;
+                    $altkey =~ s/\Q___(all)\E/___(rec)/;
+                    if ($env{'form.rec_'.$thiskey}) {
+                        $recursive = 1;
+                    }
+                }
+            }
             my ($tuname,$tudom)=&extractuser($thiskey);
-            my $tkey=$thiskey;
             if ($tuname) {
+                $tkey=$thiskey;
                 $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
+                if ($altkey) {
+                    $tkeynonrec = $tkey; 
+                    $tkeyrec = $altkey;
+                    $tkeyrec=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
+                }
             }
             if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
-            my ($data, $typeof, $text, $name, $valchk, $valmatch, $namematch);
-            if ($cmd eq 'set') {
-                $data=$env{$key};
-                $valmatch = '';
-                $valchk = $data;
-                $typeof=$env{'form.typeof_'.$thiskey};
-                $text = &mt('Saved modified parameter for');
-                if ($typeof eq 'string_questiontype') {
-                    $name = 'type';
-                } elsif ($typeof eq 'string_lenient') {
-                    $name = 'lenient';
-                    my $stringmatch = &standard_string_matches($typeof);
-                    if (ref($stringmatch) eq 'ARRAY') {
-                        foreach my $item (@{$stringmatch}) {
-                            if (ref($item) eq 'ARRAY') {
-                                my ($regexpname,$pattern) = @{$item};
-                                if ($pattern ne '') {
-                                    if ($data =~ /$pattern/) {
-                                        $valmatch = $regexpname;
-                                        $valchk = '';
-                                        last;
+                my ($data, $typeof, $text, $name, $valchk, $valmatch, $namematch);
+                if ($cmd eq 'set') {
+                    $data=$env{$key};
+                    $valmatch = '';
+                    $valchk = $data;
+                    $typeof=$env{'form.typeof_'.$thiskey};
+                    $text = &mt('Saved modified parameter for');
+                    if ($typeof eq 'string_questiontype') {
+                        $name = 'type';
+                    } elsif ($typeof eq 'string_lenient') {
+                        $name = 'lenient';
+                        my $stringmatch = &standard_string_matches($typeof);
+                        if (ref($stringmatch) eq 'ARRAY') {
+                            foreach my $item (@{$stringmatch}) {
+                                if (ref($item) eq 'ARRAY') {
+                                    my ($regexpname,$pattern) = @{$item};
+                                    if ($pattern ne '') {
+                                        if ($data =~ /$pattern/) {
+                                            $valmatch = $regexpname;
+                                            $valchk = '';
+                                            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 '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 ($typeof eq 'date_end') {
-                    if ($thiskey =~ /\.printenddate$/) {
-                        $name = 'printenddate';
-                        if (($data) && ($data < $now)) {
-                            $valchk = 'past';
+                } 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;
+                } 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');
                 }
-                $typeof=$env{'form.typeof_'.$thiskey};
-                $text = &mt('Saved modified date for');
-            }
-            if ($thiskey =~ m{\.(?:sequence|page)___\(rec\)}) {
-                $namematch = 'maplevelrecurse';
-            }
-            if (($name ne '') || ($namematch ne '')) {
-                my ($needsrelease,$needsnewer);
-                if ($name ne '') {
-                    $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch:"};
-                    if ($needsrelease) {
-                        unless ($got_chostname) {
-                            ($chostname,$cmajor,$cminor)=&parameter_release_vars();
-                            $got_chostname = 1;
-                        }
-                        $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,undef,
-                                                            $needsrelease,
-                                                            $cmajor,$cminor);
-                    }
+                if ($recursive) {
+                    $namematch = 'maplevelrecurse';
                 }
-                if ($namematch ne '') {
-                    if ($needsnewer) {
-                        undef($namematch);
-                    } else {
-                        my $currneeded;
+                if (($name ne '') || ($namematch ne '')) {
+                    my ($needsrelease,$needsnewer);
+                    if ($name ne '') {
+                        $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch:"};
                         if ($needsrelease) {
-                            $currneeded = $needsrelease;
-                        }
-                        $needsrelease =
-                            $Apache::lonnet::needsrelease{"parameter::::$namematch"};
-                        if (($needsrelease) && (($currneeded eq '') || ($needsrelease < $currneeded))) {
                             unless ($got_chostname) {
-                                ($chostname,$cmajor,$cminor) = &parameter_release_vars();
+                                ($chostname,$cmajor,$cminor)=&parameter_release_vars();
                                 $got_chostname = 1;
                             }
-                            $needsnewer = &parameter_releasecheck(undef,$valchk,$valmatch,$namematch,
-                                                                $needsrelease,$cmajor,$cminor);
-                        } else {
+                            $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,undef,
+                                                                $needsrelease,
+                                                                $cmajor,$cminor);
+                        }
+                    }
+                    if ($namematch ne '') {
+                        if ($needsnewer) {
                             undef($namematch);
+                        } else {
+                            my $currneeded;
+                            if ($needsrelease) {
+                                $currneeded = $needsrelease;
+                            }
+                            $needsrelease =
+                                $Apache::lonnet::needsrelease{"parameter::::$namematch"};
+                            if (($needsrelease) &&
+                                    (($currneeded eq '') || ($needsrelease < $currneeded))) {
+                                unless ($got_chostname) {
+                                    ($chostname,$cmajor,$cminor) = &parameter_release_vars();
+                                    $got_chostname = 1;
+                                }
+                                $needsnewer = &parameter_releasecheck(undef,$valchk,$valmatch,
+                                    $namematch, $needsrelease,$cmajor,$cminor);
+                            } else {
+                                undef($namematch);
+                            }
                         }
                     }
+                    if ($needsnewer) {
+                        $r->print('<br />'.&oldversion_warning($name,$namematch,$data,
+                                                            $chostname,$cmajor,
+                                                            $cminor,$needsrelease));
+                        next;
+                    }
                 }
-                if ($needsnewer) {
-                    $r->print('<br />'.&oldversion_warning($name,$namematch,$data,
-                                                        $chostname,$cmajor,
-                                                        $cminor,$needsrelease));
-                    next;
-                }
-            }
-            if (defined($data) and $$olddata{$thiskey} ne $data) {
+                my ($reconlychg,$haschange,$storekey);
                 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));
+                    my $ustorekey;
+                    if ($altkey) {
+                        if ($recursive) {
+                            if (exists($$olddata{$thiskey})) {
+                                if ($$olddata{$thiskey} eq $data) {
+                                    $reconlychg = 1;
+                                }
+                                &Apache::lonnet::del('resourcedata',[$tkeynonrec,$tkeynonrec.'.type'],$tudom,$tuname);
+                            }
+                            if (exists($$olddata{$altkey})) {
+                                if (defined($data) && $$olddata{$altkey} ne $data) {
+                                    $haschange = 1;
+                                }
+                            } elsif ((!$reconlychg) && ($data ne '')) {
+                                $haschange = 1;
+                            }
+                            $ustorekey = $tkeyrec;
+                        } else {
+                            if (exists($$olddata{$altkey})) {
+                                if ($$olddata{$altkey} eq $data) {
+                                    $reconlychg = 1;
+                                }
+                                &Apache::lonnet::del('resourcedata',[$tkeyrec,$tkeyrec.'.type'],$tudom,$tuname);
+                            }
+                            if (exists($$olddata{$thiskey})) {
+                                if (defined($data) && $$olddata{$thiskey} ne $data) {
+                                    $haschange = 1;
+                                }
+                            } elsif ((!$reconlychg) && ($data ne '')) {
+                                $haschange = 1;
+                            }
+                            $ustorekey = $tkeynonrec;
+                        }
                     } else {
-                        $r->print('<div class="LC_error">'.
-                            &mt('Error saving parameters').'</div>');
+                        if (exists($$olddata{$tkey})) {
+                            if (defined($data) && $$olddata{$tkey} ne $data) {
+                                $haschange = 1;
+                            }
+                            $ustorekey = $tkey;
+                        }
+                    }
+                    if ($haschange || $reconlychg)  {
+                        unless ($env{'form.del_'.$thiskey}) {
+                            if (&Apache::lonnet::put('resourcedata',{$ustorekey=>$data,
+                                                                     $ustorekey.'.type' => $typeof},
+                                                                     $tudom,$tuname) eq 'ok') {
+                                &log_parmset({$ustorekey=>$data,$ustorekey.'.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);
+                        }
                     }
-                    &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
                 } else {
-                    $newdata{$thiskey}=$data;
-                    $newdata{$thiskey.'.type'}=$typeof;
+                    if ($altkey) {
+                        if ($recursive) {
+                            if (exists($$olddata{$thiskey})) {
+                                if ($$olddata{$thiskey} eq $data) {
+                                    $reconlychg = 1;
+                                }
+                                push(@delnonrec,($thiskey,$thiskey.'.type'));
+                            }
+                            if (exists($$olddata{$altkey})) {
+                                if (defined($data) && $$olddata{$altkey} ne $data) {
+                                    $haschange = 1;
+                                }
+                            } elsif (($data ne '') && (!$reconlychg)) {
+                                $haschange = 1;
+                            }
+                            $storekey = $altkey;
+                        } else {
+                            if (exists($$olddata{$altkey})) {
+                                if ($$olddata{$altkey} eq $data) {
+                                    $reconlychg = 1;
+                                }
+                                push(@delrec,($altkey,$altkey.'.type'));
+                            } 
+                            if (exists($$olddata{$thiskey})) {
+                                if (defined($data) && $$olddata{$thiskey} ne $data) {
+                                    $haschange = 1;
+                                }
+                            } elsif (($data ne '') && (!$reconlychg)) {
+                                $haschange = 1;
+                            }
+                            $storekey = $thiskey;
+                        }
+                    } else {
+                        if (defined($data) && $$olddata{$thiskey} ne $data) {
+                            $haschange = 1;
+                            $storekey = $thiskey;
+                        }
+                    }
+                }
+                if ($reconlychg || $haschange) {
+                    unless ($env{'form.del_'.$thiskey}) {
+                        $newdata{$storekey}=$data;
+                        $newdata{$storekey.'.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));
+                    my $error;
+                    if ($altkey) {  
+                        if (exists($$olddata{$altkey})) {
+                            if (&Apache::lonnet::del('resourcedata',[$tkeyrec,$tkeyrec.'.type'],$tudom,$tuname) eq 'ok') {
+                                &log_parmset({$tkeyrec=>''},1,$tuname,$tudom);
+                                if ($recursive) {
+                                    $r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+                                }
+                            } elsif ($recursive) {
+                                $error = 1;
+                            }
+                        }
+                        if (exists($$olddata{$thiskey})) {
+                            if (&Apache::lonnet::del('resourcedata',[$tkeynonrec,$tkeynonrec.'.type'],$tudom,$tuname) eq 'ok') {
+                                &log_parmset({$tkeynonrec=>''},1,$tuname,$tudom);
+                                unless ($recursive) {
+                                    $r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+                                }
+                            } elsif (!$recursive) {
+                                $error = 1;
+                            }
+                        }
                     } else {
+                        if (exists($$olddata{$thiskey})) {
+                            if (&Apache::lonnet::del('resourcedata',[$tkey,$tkey.'.type'],$tudom,$tuname) eq 'ok') {
+                                &log_parmset({$tkey=>''},1,$tuname,$tudom);
+                                $r->print('<br />'.&mt('Deleted parameter for').' '.&Apache::loncommon::plainname($tuname,$tudom));
+                            } else {
+                                $error = 1;
+                            }
+                        }
+                    }
+                    if ($error) { 
                         $r->print('<div class="LC_error">'.
                             &mt('Error deleting parameters').'</div>');
                     }
                     &Apache::lonnet::devalidateuserresdata($tuname,$tudom);
                 } else {
-                    push (@deldata,$thiskey,$thiskey.'.type');
+                    if ($altkey) {
+                        if (exists($$olddata{$altkey})) {
+                            unless (grep(/^\Q$altkey\E$/,@delrec)) {
+                                push(@deldata,($altkey,$altkey.'.type'));
+                            }
+                        }
+                        if (exists($$olddata{$thiskey})) {
+                            unless (grep(/^\Q$thiskey\E$/,@delnonrec)) {
+                                push(@deldata,($thiskey,$thiskey.'.type'));
+                            }
+                        }
+                    } elsif (exists($$olddata{$thiskey})) {
+                        push(@deldata,($thiskey,$thiskey.'.type'));
+                    }
                 }
             }
         }
     }
 # Store all course level
     my $delentries=$#deldata+1;
+    my @alldels;
+    if (@delrec) {
+        push(@alldels,@delrec);
+    }
+    if (@delnonrec) {
+        push(@alldels,@delnonrec);
+    }
+    if (@deldata) {
+        push(@alldels,@deldata);
+    }
     my @newdatakeys=keys(%newdata);
     my $putentries=$#newdatakeys+1;
-    if ($delentries) {
-        if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
-            my %loghash=map { $_ => '' } @deldata;
+    my ($delresult,$devalidate);
+    if (@alldels) {
+        if (&Apache::lonnet::del('resourcedata',\@alldels,$dom,$crs) eq 'ok') {
+            my %loghash=map { $_ => '' } @alldels;
             &log_parmset(\%loghash,1);
-            $r->print('<h2>'.&mt('Deleted [quant,_1,parameter]',$delentries/2).'</h2>');
-        } else {
+            if ($delentries) {
+                $r->print('<h2>'.&mt('Deleted [quant,_1,parameter]',$delentries/2).'</h2>');
+            }
+        } elsif ($delentries) {
             $r->print('<div class="LC_error">'.
                 &mt('Error deleting parameters').'</div>');
         }
-        &Apache::lonnet::devalidatecourseresdata($crs,$dom);
+        $devalidate = 1; 
     }
     if ($putentries) {
         if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
@@ -3615,15 +3987,27 @@ sub storedata {
             $r->print('<div class="LC_error">'.
                 &mt('Error saving parameters').'</div>');
         }
+        $devalidate = 1; 
+    }
+    if ($devalidate) {
         &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
@@ -3644,9 +4028,18 @@ sub parse_listdata_key {
     return ($student,$res,$part,$parm);
 }
 
-# Displays forms for the given data in overview mode (newoverview or overview).
+# 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
+# @param {boolean} $readonly - true if editing not allowed
+# @returns{integer} - number of $listdata parameters processed
 sub listdata {
-    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist)=@_;
+    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist,$readonly)=@_;
     
 # Start list output
 
@@ -3668,7 +4061,7 @@ sub listdata {
         }
     }
 
-    foreach my $thiskey (sort {
+    foreach my $key (sort {
         my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
         my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
 
@@ -3708,17 +4101,17 @@ sub listdata {
 
         $result;
         
-    } keys(%{$listdata})) { # foreach my $thiskey
-
-        my $readonly;
+    } keys(%{$listdata})) { # foreach my $key
+        my $thiskey = $key;
         if ($$listdata{$thiskey.'.type'}) {
             my $thistype=$$listdata{$thiskey.'.type'};
             if ($$resourcedata{$thiskey.'.type'}) {
                 $thistype=$$resourcedata{$thiskey.'.type'};
             }
             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 $showval = $$resourcedata{$thiskey}; 
             if ($middle=~/^\[(.*)\]/) {
                 my $issection=$1;
                 if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
@@ -3751,12 +4144,37 @@ sub listdata {
             $middle=~s/\.+$//;
             $middle=~s/^\.+//;
             my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
-            if ($middle=~/^(.+)\_\_\_\((all|rec)\)$/) {
-                my $mapurl = $1;
-                my $maplevel = $2;
+            my ($is_map,$is_recursive,$mapurl,$maplevel);
+            if ($caller eq 'overview') {
+                if ($middle=~/^(.+)\_\_\_\((all|rec)\)$/) {
+                    $mapurl = $1;
+                    $maplevel = $2;
+                    $is_map = 1;
+                }
+            } elsif ($caller eq 'newoverview') {
+                if ($middle=~/^(.+)\_\_\_\((all)\)$/) {
+                    $mapurl = $1;
+                    $maplevel = $2;
+                    $is_map = 1;
+                }
+            }
+            if ($is_map) {
                 my $leveltitle = &mt('Folder/Map');
-                if ($maplevel eq 'rec') {
-                    $leveltitle = &mt('Recursive');
+                unless (($name eq 'hiddenresource') || ($name eq 'encrypturl')) {   
+                    if ($caller eq 'newoverview') {
+                        my $altkey = $thiskey;
+                        $altkey =~ s/\Q___(all)\E/___(rec)/;
+                        if ((exists($$resourcedata{$altkey})) & (!exists($$resourcedata{$thiskey}))) {
+                            $is_recursive = 1;
+                            if ($$resourcedata{$altkey.'.type'}) {
+                                $thistype=$$resourcedata{$altkey.'.type'};
+                            }
+                            $showval = $$resourcedata{$altkey};
+                        }
+                    } elsif (($caller eq 'overview') && ($maplevel eq 'rec')) {
+                        $thiskey =~ s/\Q___(rec)\E/___(all)/;
+                        $is_recursive = 1;
+                    }
                 }
                 $realm='<span class="LC_parm_scope_folder">'.$leveltitle.': '.&Apache::lonnet::gettitle($mapurl).' <br /><span class="LC_parm_folder">('.$mapurl.')</span></span>';
             } elsif ($middle) {
@@ -3798,7 +4216,7 @@ sub listdata {
     # Ready to print
     #
             my $parmitem = &standard_parameter_names($name);
-            $r->print(&tablestart($readonly).
+            $r->print(&tablestart($readonly,$is_map).
                 &Apache::loncommon::start_data_table_row().
                 '<td><b>'.&mt($parmitem).
                 '</b></td>');
@@ -3818,35 +4236,59 @@ sub listdata {
                 $r->print(
                     &Apache::lonhtmlcommon::date_setter('parmform',
                                                         $jskey,
-                                                        $$resourcedata{$thiskey},
+                                                        $showval,
                                                         '',1,$state));
                 unless  ($readonly) {
                     $r->print(
     '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
-    (($$resourcedata{$thiskey}!=0)?'<span class="LC_nobreak"><a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
+    (($showval!=0)?'<span class="LC_nobreak"><a href="/adm/parmset?&action=dateshift1&timebase='.$showval.'">'.
     &mt('Shift all dates based on this date').'</a></span>':'').
-    &date_sanity_info($$resourcedata{$thiskey})
+    &date_sanity_info($showval)
                     );
                 }
             } elsif ($thistype eq 'date_interval') {
                 $r->print(&date_interval_selector($thiskey,$name,
-                        $$resourcedata{$thiskey},$readonly));
+                          $showval,$readonly));
             } elsif ($thistype =~ m/^string/) {
                 $r->print(&string_selector($thistype,$thiskey,
-                        $$resourcedata{$thiskey},$name,$readonly));
+                          $showval,$name,$readonly));
             } else {
-                $r->print(&default_selector($thiskey,$$resourcedata{$thiskey},$readonly));
+                $r->print(&default_selector($thiskey,$showval,$readonly));
             }
             unless ($readonly) {
                 $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
                         $thistype.'" />');
             }
-            $r->print('</td>'.&Apache::loncommon::end_data_table_row());
+            $r->print('</td>');
+            if ($is_map) {
+                if (($name eq 'encrypturl') || ($name eq 'hiddenresource')) {
+                    $r->print('<td><table><tr><td>'.&mt('Yes').'</td></tr></table></td>');
+                } else {
+                    my ($disabled,$recon,$recoff);
+                    if ($readonly) {
+                        $disabled = ' disabled="disabled"';
+                    }
+                    if ($is_recursive) {
+                        $recon = ' checked="checked"';
+                    } else {
+                        $recoff = ' checked="checked"';
+                    }
+                    $r->print('<td><table><tr><td><label><input type="radio" name="rec_'.$thiskey.'" value="1"'.$recon.$disabled.' />'.&mt('Yes').'</label>'.
+                              '</td><td><label><input type="radio" name="rec_'.$thiskey.'" value="0"'.$recoff.$disabled.' />'.&mt('No').'</label></td></tr></table></td>');
+                }
+            }
+            $r->print(&Apache::loncommon::end_data_table_row());
         }
     }
     return $foundkeys;
 }
 
+# Returns a string representing the interval, directly using form data matching the given key.
+# The returned string may also include information related to proctored exams.
+# Format: seconds['_done'[':'done button title':']['_proctor'['_'proctor key]]]
+#
+# @param {string} $key - suffix for form fields related to the interval
+# @returns {string}
 sub get_date_interval_from_form {
     my ($key) = @_;
     my $seconds = 0;
@@ -3879,6 +4321,12 @@ sub get_date_interval_from_form {
 }
 
 
+# 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, $readonly) = @_;
     my $disabled;
@@ -3888,6 +4336,12 @@ sub default_selector {
     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, $readonly) = @_;
     my %access = (
@@ -3916,7 +4370,7 @@ sub string_ip_selector {
         @{$access{'deny'}} = ('');
     }
     my ($disabled,$addmore);
-    if ($disabled) {
+    if ($readonly) {
         $disabled=' disabled="disabled"';
     } else {
         $addmore = "\n".'<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>';
@@ -4001,6 +4455,11 @@ 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') {
@@ -4009,6 +4468,10 @@ 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') {
@@ -4017,6 +4480,10 @@ 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})) {
@@ -4025,6 +4492,14 @@ 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, $readonly) = @_;
 
@@ -4190,6 +4665,10 @@ 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') {
@@ -4198,6 +4677,10 @@ sub standard_interval_matches {
     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})) {
@@ -4206,6 +4689,11 @@ sub get_intervaltype {
     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') {
@@ -4214,6 +4702,13 @@ sub standard_interval_options {
     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);
@@ -4296,17 +4791,21 @@ sub date_interval_selector {
                 $currprocdisplay = 'text';
             }
             my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
+            my $disabled;
+            if ($readonly) {
+                $disabled = ' disabled="disabled"';
+            }
             $result .= '<br /><span class="LC_nobreak">'.&mt('Include "done" button').
-                       '<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.' />'.
+                       '<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.$disabled.' />'.
                        &mt('No').'</label>'.('&nbsp;'x2).
-                       '<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.$onclick.' />'.
+                       '<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.$onclick.$disabled.' />'.
                        &mt('Yes').'</label>'.('&nbsp;'x2).
-                       '<label><input type="radio" value="_done_proctor" name="done_'.$thiskey.'"'.$checkedproc.$onclick.' />'.
+                       '<label><input type="radio" value="_done_proctor" name="done_'.$thiskey.'"'.$checkedproc.$onclick.$disabled.' />'.
                        &mt('Yes, with proctor key').'</label>'.
                        '<input type="'.$currprocdisplay.'" id="done_'.$thiskey.'_proctorkey" '.
-                       'name="done_'.$thiskey.'_proctorkey" value="'.&HTML::Entities::encode($currproctorkey,'"<>&').'" /></span><br />'.
+                       'name="done_'.$thiskey.'_proctorkey" value="'.&HTML::Entities::encode($currproctorkey,'"<>&').'"'.$disabled.' /></span><br />'.
                        '<span class="LC_nobreak">'.&mt('Button text').': '.
-                       '<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'" /></span>';
+                       '<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
         }
     }
     unless ($readonly) {
@@ -4315,6 +4814,16 @@ sub date_interval_selector {
     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,$namematch,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
     my $standard_name = &standard_parameter_names($name);
@@ -4390,10 +4899,11 @@ sub oldversion_warning {
 } # 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'};
@@ -4425,12 +4935,19 @@ sub dateshift {
     return $reply;
 }
 
+# Overview mode UI to edit course parameters.
+#
+# @param {Apache2::RequestRec} $r - the Apache request
 sub newoverview {
-    my ($r) = @_;
+    my ($r,$parm_permission) = @_;
 
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $crstype =  $env{'course.'.$env{'request.course.id'}.'.type'};
+    my $readonly = 1;
+    if ($parm_permission->{'edit'}) {
+        undef($readonly);
+    }
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
         text=>"Overview Mode"});
 
@@ -4533,7 +5050,7 @@ 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);
@@ -4589,15 +5106,31 @@ ENDOVER
 
 # List data
 
-        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview');
+        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly);
     }
-    $r->print(&tableend().
-         ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
-          '</form>');
+    $r->print(&tableend());
+    unless ($readonly) {
+        $r->print( ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'') );
+    }
+    $r->print('</form>');
     &endSettingsScreen($r);
     $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 pc, 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 pc -> map src
+# @param {array reference} $ids - resource and map ids
+# @param {hash reference} $symbp - hash map pc or resource/map id -> map src.'___(all)' or resource symb
 sub secgroup_lister {
     my ($cat,$pschp,$parmlev,$listdata,$psprt,$selections,$defkeytype,$allmaps,$ids,$symbp) = @_;
     foreach my $item (@{$selections}) {
@@ -4618,9 +5151,6 @@ 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
@@ -4636,12 +5166,19 @@ sub secgroup_lister {
     }
 }
 
-# Display all existing parameter settings.
+# 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 ($r,$parm_permission) = @_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    my $readonly = 1;
+    if ($parm_permission->{'edit'}) {
+        undef($readonly);
+    }
     my $js = '<script type="text/javascript">'."\n".
              '// <![CDATA['."\n".
              &toggleparmtextbox_js()."\n".
@@ -4664,7 +5201,9 @@ sub overview {
 
 # Store modified
 
-    &storedata($r,$crs,$dom);
+    unless ($readonly) {
+        &storedata($r,$crs,$dom);
+    }
 
 # Read modified data
 
@@ -4675,15 +5214,29 @@ sub overview {
     unless ($sortorder) { $sortorder='realmstudent'; }
     &sortmenu($r,$sortorder);
 
+    my $submitbutton = '<input type="submit" value="'.&mt('Save').'" />';
+
+    if ($readonly) {
+        $r->print('<p>'.$submitbutton.'</p>');
+    }
+
 # List data
 
-    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());
+    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder,'overview',$classlist,$readonly);
+    $r->print(&tableend().'<p>');
+    if ($foundkeys) {
+        unless ($readonly) {
+            $r->print('<p>'.$submitbutton.'</p>');
+        }
+    } else {
+        $r->print('<p class="LC_info">'.&mt('There are no parameters.').'</p>');
+    }
+    $r->print('</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'};
@@ -4772,7 +5325,10 @@ ENDOVER
     $r->print(&Apache::loncommon::end_page());
 }
 
-# Overview mode, UI to shift all dates.
+# 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'};
@@ -4801,7 +5357,9 @@ sub date_shift_one {
     $r->print(&Apache::loncommon::end_page());
 }
 
-# Overview mode, UI to shift all dates (second form).
+# 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'};
@@ -4829,11 +5387,18 @@ 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;
     my ($middle,$part,$name)=
-    ($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+    ($key=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s\-]+)\.(\w+)$/);
     $data{'scope_type'} = 'all';
     if ($middle=~/^\[(.*)\]/) {
         $data{'scope'} = $1;
@@ -4869,6 +5434,7 @@ sub parse_key {
 }
 
 
+# Calls loncommon::start_page with the "Settings" title.
 sub header {
     return &Apache::loncommon::start_page('Settings');
 }
@@ -4879,6 +5445,10 @@ sub header {
 # 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)=@_;
     #
@@ -4898,35 +5468,73 @@ ENDMAINFORMHEAD
     my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
     my $mgr  = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
     my $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'});
+    my $vcb = &Apache::lonnet::allowed('vcb',$env{'request.course.id'});
+    my $vpa = &Apache::lonnet::allowed('vpa',$env{'request.course.id'});
     if ((!$dcm) && ($env{'request.course.sec'} ne '')) {
         $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'}.
                                         '/'.$env{'request.course.sec'});
     }
-
+    if ((!$vcb) && ($env{'request.course.sec'} ne '')) {
+        $vcb = &Apache::lonnet::allowed('vcb',$env{'request.course.id'}.
+                                        '/'.$env{'request.course.sec'});
+    }
+    my (%linktext,%linktitle,%url);
+    if ($parm_permission->{'edit'}) {
+        %linktext = (
+                     newoverview     => 'Edit Resource Parameters - Overview Mode',
+                     settable        => 'Edit Resource Parameters - Table Mode',
+                     setoverview     => 'Modify Resource Parameters - Overview Mode',
+                    );
+        %linktitle = (
+                     newoverview     => 'Set/Modify resource parameters in overview mode.',
+                     settable        => 'Set/Modify resource parameters in table mode.',
+                     setoverview     => 'Set/Modify existing resource parameters in overview mode.',
+                     );
+    } else {
+        %linktext = (
+                     newoverview     => 'View Resource Parameters - Overview Mode',
+                     settable        => 'View Resource Parameters - Table Mode',
+                     setoverview     => 'View Resource Parameters - Overview Mode',
+                   );
+        %linktitle = (
+                     newoverview     => 'Display resource parameters in overview mode.',
+                     settable        => 'Display resource parameters in table mode.',
+                     setoverview     => 'Display existing resource parameters in overview mode.',
+                     );
+    }
+    if ($mgr) {
+        $linktext{'resettimes'} = 'Reset Student Access Times';
+        $linktitle{'resettimes'} = "Reset access times for folders/maps, resources or the $lc_crstype.";
+        $url{'resettimes'} = '/adm/helper/resettimes.helper';
+    } elsif ($vgr) {
+        $linktext{'resettimes'} = 'Display Student Access Times',
+        $linktitle{'resettimes'} = "Display access times for folders/maps, resources or the $lc_crstype.",
+        $url{'resettimes'} = '/adm/accesstimes';
+    }
     my @menu =
         ( { categorytitle=>"Content Settings for this $crstype",
         items => [
           { linktext => 'Portfolio Metadata',
             url => '/adm/parmset?action=setrestrictmeta',
-            permission => $parm_permission,
+            permission => $parm_permission->{'setrestrictmeta'},
             linktitle => "Restrict metadata for this $lc_crstype." ,
             icon =>'contact-new.png'   ,
             },
-          { linktext => 'Reset Student Access Times',
-            url => '/adm/helper/resettimes.helper',
-            permission => $mgr,
-            linktitle => "Reset access times for folders/maps, resources or the $lc_crstype."  ,
-            icon => 'start-here.png'  ,
+          { linktext => $linktext{'resettimes'},
+            url => $url{'resettimes'},
+            permission => ($vgr || $mgr),
+            linktitle => $linktitle{'resettimes'},
+            icon => 'start-here.png',
             },
           { linktext => 'Blocking Communication/Resource Access',
             url => '/adm/setblock',
-            permission => $dcm,
+            permission => ($vcb || $dcm),
             linktitle => 'Configure blocking of communication/collaboration and access to resources during an exam',
             icon => 'comblock.png',
             },
           { linktext => 'Set Parameter Setting Default Actions',
             url => '/adm/parmset?action=setdefaults',
-            permission => $parm_permission,
+            permission => $parm_permission->{'setdefaults'},
             linktitle =>'Set default actions for parameters.'  ,
             icon => 'folder-new.png'  ,
             }]},
@@ -4934,37 +5542,37 @@ ENDMAINFORMHEAD
         items => [
           { linktext => 'Edit Resource Parameters - Helper Mode',
             url => '/adm/helper/parameter.helper',
-            permission => $parm_permission,
+            permission => $parm_permission->{'helper'},
             linktitle =>'Set/Modify resource parameters in helper mode.'  ,
             icon => 'dialog-information.png'  ,
             #help => 'Parameter_Helper',
             },
-          { linktext => 'Edit Resource Parameters - Overview Mode',
+          { linktext => $linktext{'newoverview'},
             url => '/adm/parmset?action=newoverview',
-            permission => $parm_permission,
-            linktitle =>'Set/Modify resource parameters in overview mode.'  ,
-            icon => 'edit-find.png'  ,
+            permission => $parm_permission->{'newoverview'},
+            linktitle => $linktitle{'newoverview'},
+            icon => 'edit-find.png',
             #help => 'Parameter_Overview',
             },
-          { linktext => 'Edit Resource Parameters - Table Mode',
+          { linktext => $linktext{'settable'},
             url => '/adm/parmset?action=settable',
-            permission => $parm_permission,
-            linktitle =>'Set/Modify resource parameters in table mode.'  ,
-            icon => 'edit-copy.png'  ,
+            permission => $parm_permission->{'settable'},
+            linktitle => $linktitle{'settable'},
+            icon => 'edit-copy.png',
             #help => 'Table_Mode',
             }]},
            { categorytitle => 'Existing Parameter Settings for Resources',
          items => [
-          { linktext => 'Modify Resource Parameters - Overview Mode',
+          { linktext => $linktext{'setoverview'},
             url => '/adm/parmset?action=setoverview',
-            permission => $parm_permission,
-            linktitle =>'Set/Modify existing resource parameters in overview mode.'  ,
-            icon => 'preferences-desktop-wallpaper.png'  ,
+            permission => $parm_permission->{'setoverview'},
+            linktitle => $linktitle{'setoverview'},
+            icon => 'preferences-desktop-wallpaper.png',
             #help => 'Parameter_Overview',
             },
           { linktext => 'Change Log',
             url => '/adm/parmset?action=parameterchangelog',
-            permission => $parm_permission,
+            permission => $parm_permission->{'parameterchangelog'},
             linktitle =>"View parameter and $lc_crstype blog posting/user notification change log."  ,
             icon => 'document-properties.png',
             }]}
@@ -4982,6 +5590,13 @@ 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;
@@ -5039,6 +5654,9 @@ sub output_row {
 
 
 # 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;
@@ -5129,6 +5747,8 @@ 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">';
@@ -5138,6 +5758,10 @@ 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',
@@ -5182,7 +5806,7 @@ 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">');
         $r->print('<input type="text" name="fieldname" /><br />');
         $r->print('<input type="submit" value="Add Metadata Field" />');
     }
@@ -5193,6 +5817,8 @@ sub addmetafield {
 
 
 # Display or save portfolio metadata.
+#
+# @param {Apache2::RequestRec} $r - the Apache request
 sub setrestrictmeta {
     my ($r)=@_;
     my $next_meta;
@@ -5268,7 +5894,7 @@ 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);
@@ -5283,6 +5909,10 @@ 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;
@@ -5297,6 +5927,10 @@ 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;
@@ -5318,6 +5952,8 @@ sub get_deleted_meta_fieldnames {
 ##################################################
 
 # UI to change parameter setting default actions
+#
+# @param {Apache2::RequestRec} $r - the Apache request
 sub defaultsetter {
     my ($r) = @_;
 
@@ -5411,8 +6047,8 @@ sub defaultsetter {
             push @datedisplay,&mt('Automatically set earlier than ').$tempkey;
         }
     }
-$r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
-      &mt('Automatic setting rules apply to table mode interfaces only.'));
+    $r->print(&mt('Manual setting rules apply to all interfaces.').'<br />'.
+        &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>'.
@@ -5456,7 +6092,7 @@ $r->print(&mt('Manual setting rules appl
     <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\_sec" type="text" size="4" value="$sec" />$lt{'sec'}
-    ENDINPUTDATE
+ENDINPUTDATE
         } elsif ($defkeytype{$tempkey} eq 'string_yesno') {
                 my $yeschecked='';
                 my $nochecked='';
@@ -5466,7 +6102,7 @@ $r->print(&mt('Manual setting rules appl
             $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="no"$nochecked /> $lt{'no'}</label>
-    ENDYESNO
+ENDYESNO
         } else {
             $r->print('<input type="text" size="20" name="'.$tempkey.'_value" value="'.&rulescache($tempkey.'_value').'" />');
         }
@@ -5484,6 +6120,28 @@ $r->print(&mt('Manual setting rules appl
 # 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)=@_;
 
@@ -5492,7 +6150,7 @@ sub components {
     }
 
     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');
@@ -5532,9 +6190,10 @@ sub components {
         $what,$middle,$uname,$udom,$issection,$realmdescription);
 }
 
-my %standard_parms;
-my %standard_parms_types;
+my %standard_parms; # hash parameter name -> parameter title (not localized)
+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>) {
@@ -5551,8 +6210,13 @@ sub load_parameter_names {
     close($config);
     $standard_parms{'int_pos'}      = 'Positive Integer';
     $standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
+    $standard_parms{'scoreformat'}  = 'Format for display of score';
 }
 
+# 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) {
@@ -5565,6 +6229,10 @@ sub standard_parameter_names {
     }
 }
 
+# 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) {
@@ -5576,6 +6244,10 @@ 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 = (
@@ -5591,11 +6263,13 @@ sub standard_parameter_levels {
 }
 
 # Display log for parameter changes, blog postings, user notification changes.
+#
+# @param {Apache2::RequestRec} $r - the Apache request
 sub parm_change_log {
-    my ($r)=@_;
+    my ($r,$parm_permission)=@_;
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'}
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
     text=>"Parameter Change Log"});
     my $js = '<script type="text/javascript">'."\n".
@@ -5624,11 +6298,18 @@ sub parm_change_log {
               '<input type="submit" value="'.&mt('Display').'" />'.
               '</form></fieldset></div><br clear="all" />');
 
+    my $readonly = 1;
+    if ($parm_permission->{'edit'}) {
+        undef($readonly);
+    }
     my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
           '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Extent').'</th><th>'.&mt('Users').'</th><th>'.
-          &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th><th>'.&mt('Announce').'</th>'.
-          &Apache::loncommon::end_data_table_header_row());
+          &mt('Parameter').'</th><th>'.&mt('Part').'</th><th>'.&mt('New Value').'</th>');
+    unless ($readonly) {
+        $r->print('<th>'.&mt('Announce').'</th>');
+    }
+    $r->print(&Apache::loncommon::end_data_table_header_row());
     my $shown=0;
     my $folder='';
     if ($env{'form.displayfilter'} eq 'currentfolder') {
@@ -5660,7 +6341,8 @@ sub parm_change_log {
                             $parmlog{$id}{'exe_uname'},
                             $parmlog{$id}{'exe_udom'});
         my $send_msg_link='';
-        if ((($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
+        if ((!$readonly) && 
+            (($parmlog{$id}{'exe_uname'} ne $env{'user.name'})
             || ($parmlog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
             $send_msg_link ='<br />'.
             &Apache::loncommon::messagewrapper(&mt('Send message'),
@@ -5737,27 +6419,31 @@ sub parm_change_log {
                     }
                 }
             }
-            $output .= '</td><td>';
-                
-            if ($stillactive) {
-                my $parmitem = &standard_parameter_names($parmname);
-                $parmitem = &mt($parmitem);
-                my $title=&mt('Changed [_1]',$parmitem);
-                my $description=&mt('Changed [_1] for [_2] to [_3]',
-                    $parmitem,$realmdescription,
-                    (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
-                if (($uname) && ($udom)) {
-                    $output .=
-                    &Apache::loncommon::messagewrapper('Notify User',
-                                    $uname,$udom,$title,
-                                    $description);
-                } else {
-                    $output .=
-                    &Apache::lonrss::course_blog_link($id,$title,
-                                    $description);
+            $output .= '</td>';
+
+            unless ($readonly) { 
+                $output .= '<td>';
+                if ($stillactive) {
+                    my $parmitem = &standard_parameter_names($parmname);
+                    $parmitem = &mt($parmitem);
+                    my $title=&mt('Changed [_1]',$parmitem);
+                    my $description=&mt('Changed [_1] for [_2] to [_3]',
+                        $parmitem,$realmdescription,
+                        (&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
+                    if (($uname) && ($udom)) {
+                        $output .=
+                        &Apache::loncommon::messagewrapper('Notify User',
+                                                           $uname,$udom,$title,
+                                                           $description);
+                    } else {
+                        $output .=
+                            &Apache::lonrss::course_blog_link($id,$title,
+                                                              $description);
+                    }
                 }
+                $output .= '</td>';
             }
-            $output .= '</td>'.&Apache::loncommon::end_data_table_row();
+            $output .= &Apache::loncommon::end_data_table_row();
         }
         if ($env{'form.displayfilter'} eq 'containing') {
             my $wholeentry=$about_me_link.':'.
@@ -5785,7 +6471,17 @@ sub parm_change_log {
 # 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);
@@ -5839,7 +6535,17 @@ 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;
@@ -5875,13 +6581,19 @@ 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'};
@@ -5891,6 +6603,17 @@ 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,$namematch,$needsrelease,$cmajor,$cminor) = @_;
     my $needsnewer;
@@ -5910,6 +6633,46 @@ sub parameter_releasecheck {
     return $needsnewer;
 }
 
+sub get_permission {
+    my %permission;
+    my $allowed = 0;
+    return (\%permission,$allowed) unless ($env{'request.course.id'});
+    if ((&Apache::lonnet::allowed('opa',$env{'request.course.id'})) ||
+        (&Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
+                  $env{'request.course.sec'}))) {
+        %permission= (
+                       'edit'               => 1,
+                       'set'                => 1,
+                       'setoverview'        => 1,
+                       'addmetadata'        => 1,
+                       'ordermetadata'      => 1,
+                       'setrestrictmeta'    => 1,
+                       'newoverview'        => 1,
+                       'setdefaults'        => 1,
+                       'settable'           => 1,
+                       'parameterchangelog' => 1,
+                       'cleanparameters'    => 1,
+                       'dateshift1'         => 1,
+                       'dateshift2'         => 1,
+                       'helper'             => 1,
+         );
+    } elsif ((&Apache::lonnet::allowed('vpa',$env{'request.course.id'})) ||
+             (&Apache::lonnet::allowed('vpa',$env{'request.course.id'}.'/'.
+                  $env{'request.course.sec'}))) {
+        %permission = (
+                       'set'                => 1,
+                       'settable'           => 1,
+                       'newoverview'        => 1,
+                       'setoverview'        => 1,
+                       'parameterchangelog' => 1,
+                      );
+    }
+    foreach my $perm (values(%permission)) {
+        if ($perm) { $allowed=1; last; }
+    }
+    return (\%permission,$allowed);
+}
+
 ##################################################
 # HANDLER
 ##################################################
@@ -5958,25 +6721,25 @@ sub handler {
                                             'Parameter_Manager,Course_Environment,Parameter_Helper,Parameter_Overview,Table_Mode'});
 
 # ----------------------------------------------------- Needs to be in a course
-    my $parm_permission =
-    (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) ||
-     &Apache::lonnet::allowed('opa',$env{'request.course.id'}.'/'.
-                  $env{'request.course.sec'}));
+    my ($parm_permission,$allowed) = &get_permission();
     my $exists = &check_for_course_info();
 
-    if ($env{'request.course.id'} &&  $parm_permission && $exists) {
+    if ($env{'request.course.id'} && $allowed && $exists) {
         #
         # Main switch on form.action and form.state, as appropriate
         #
         # Check first if coming from someone else headed directly for
         #  the table mode
-        if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
-                && (!$env{'form.dis'})) || ($env{'form.symb'})) {
-            &assessparms($r);
+        if (($parm_permission->{'set'}) && 
+            ((($env{'form.command'} eq 'set') && ($env{'form.url'})
+                && (!$env{'form.dis'})) || ($env{'form.symb'}))) {
+            &assessparms($r,$parm_permission);
         } elsif (! exists($env{'form.action'})) {
             &print_main_menu($r,$parm_permission);
+        } elsif (!$parm_permission->{$env{'form.action'}}) {
+            &print_main_menu($r,$parm_permission);
         } elsif ($env{'form.action'} eq 'setoverview') {
-            &overview($r);
+            &overview($r,$parm_permission);
         } elsif ($env{'form.action'} eq 'addmetadata') {
             &addmetafield($r);
         } elsif ($env{'form.action'} eq 'ordermetadata') {
@@ -5984,13 +6747,13 @@ sub handler {
         } elsif ($env{'form.action'} eq 'setrestrictmeta') {
             &setrestrictmeta($r);
         } elsif ($env{'form.action'} eq 'newoverview') {
-            &newoverview($r);
+            &newoverview($r,$parm_permission);
         } elsif ($env{'form.action'} eq 'setdefaults') {
             &defaultsetter($r);
         } elsif ($env{'form.action'} eq 'settable') {
-            &assessparms($r);
+            &assessparms($r,$parm_permission);
         } elsif ($env{'form.action'} eq 'parameterchangelog') {
-            &parm_change_log($r);
+            &parm_change_log($r,$parm_permission);
         } elsif ($env{'form.action'} eq 'cleanparameters') {
             &clean_parameters($r);
         } elsif ($env{'form.action'} eq 'dateshift1') {