--- loncom/interface/lonparmset.pm	2011/12/04 16:27:06	1.517
+++ loncom/interface/lonparmset.pm	2015/09/13 21:48:05	1.554
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.517 2011/12/04 16:27:06 www Exp $
+# $Id: lonparmset.pm,v 1.554 2015/09/13 21:48:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,8 +46,6 @@ This module sets coursewide and assessme
 
 =over
 
-=pod
-
 =item parmval()
 
 Figure out a cascading parameter.
@@ -139,16 +137,22 @@ javascript function 'pjump'.
 
  extractResourceInformation extracts lots of information about all of the the course's resources into a variety of hashes.
 
-Input: See list below:
+Input: See list below
+
+=over 4
 
 =item * B<env{'user.name'}> : Current username
 
 =item * B<env{'user.domain'}> : Domain of current user.
 
-=item * b<env{"request.course.fn"} : Course
+=item * B<env{"request.course.fn"}> : Course
+
+=back
 
 Outputs: See list below:
 
+=over 4
+
 =item * B<ids> (out) : An array that will contain all of the ids in the course.
 
 =item * B<typep>(out) : hash, id->type, where "type" contains the extension of the file, thus, I<problem exam quiz assess survey form>.
@@ -173,6 +177,8 @@ Outputs: See list below:
 
 =item * B<defkeytype>
 
+=back
+
 =item isdateparm()
 
 =item parmmenu()
@@ -210,6 +216,8 @@ Returns: nothing
 
 Variables used (guessed by Jeremy):
 
+=over
+
 =item * B<pscat>: ParameterS CATegories? ends up a list of the types of parameters that exist, e.g., tol, weight, acc, opendate, duedate, answerdate, sig, maxtries, type.
 
 =item * B<psprt>: ParameterS PaRTs? a list of the parts of a problem that we are displaying? Used to display only selected parts?
@@ -222,6 +230,8 @@ Variables used (guessed by Jeremy):
         When storing information, store as part 0
         When requesting information, request from full part
 
+=back
+
 =item tablestart()
 
 =item tableend()
@@ -288,7 +298,6 @@ Set portfolio metadata
 
 Main handler.  Calls &assessparms subroutine.
 
-
 =back
 
 =cut
@@ -315,17 +324,21 @@ use LONCAPA qw(:DEFAULT :match);
 
 
 sub startSettingsScreen {
-    my ($r,$mode)=@_;
+    my ($r,$mode,$crstype)=@_;
 
+    my $tabtext = &mt('Course Settings');
+    if ($crstype eq 'Community') {
+        $tabtext = &mt('Community Settings');
+    } 
     $r->print("\n".'<ul class="LC_TabContentBigger" id="main">');
     $r->print("\n".'<li'.($mode eq 'coursepref'?' class="active"':'').'><a href="/adm/courseprefs"><b>&nbsp;&nbsp;&nbsp;&nbsp;'.
-                                          &mt('Course Settings').
+                                          $tabtext.
                                           '&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>');
 
-    $r->print("\n".'<li'.($mode eq 'parmset'?' class="active"':'').'><a href="/adm/parmset"><b>'.
+    $r->print("\n".'<li'.($mode eq 'parmset'?' class="active"':'').' id="tabbededitor"><a href="/adm/parmset"><b>'.
                                                                  &mt('Content and Problem Settings').'</b></a></li>');
     $r->print("\n".'</ul>'."\n");
-    $r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
+    $r->print('<div class="LC_Box" style="clear:both;margin:0;" id="parameditor"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
 }
 
 sub endSettingsScreen {
@@ -661,7 +674,7 @@ sub storeparm_by_symb {
 }
 
 sub log_parmset {
-    return &Apache::lonnet::instructor_log('parameterlog',@_);
+    return &Apache::lonnet::write_log('course','parameterlog',@_);
 }
 
 sub storeparm_by_symb_inner {
@@ -764,18 +777,22 @@ sub storeparm_by_symb_inner {
 
 
 sub valout {
-    my ($value,$type,$editable)=@_;
+    my ($value,$type,$name,$editable)=@_;
     my $result = '';
     # Values of zero are valid.
     if (! $value && $value ne '0') {
-    if ($editable) {
-        $result = '<span class="LC_clickhere">*</span>';
-    } else {
-        $result='&nbsp;';
-    }
+        if ($editable) {
+            $result =
+                '<img src="/res/adm/pages/editmap.png"'
+               .' alt="'.&mt('Change').'"'
+               .' title="'.&mt('Change').'" style="border:0;" />';
+        } else {
+            $result='&nbsp;';
+        }
     } else {
         if ($type eq 'date_interval') {
-            my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+            my ($totalsecs,$donebutton) = split(/_/,$value);
+            my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
             my @timer;
             $year=$year-70;
             $mday--;
@@ -808,6 +825,9 @@ sub valout {
                 push(@timer,&mt('[quant,_1,sec]',0));
             }
             $result.=join(", ",@timer);
+            if ($donebutton eq 'done') {
+                $result .= ' '.&mt('+ "done"');
+            }
         } elsif (&isdateparm($type)) {
             $result = &Apache::lonlocal::locallocaltime($value).
         &date_sanity_info($value);
@@ -834,7 +854,7 @@ sub plink {
     my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
     my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
     unless (defined($winvalue)) { $winvalue=$val; }
-    my $valout = &valout($value,$type,1);
+    my $valout = &valout($value,$type,$parmname,1);
     my $unencmarker = $marker;
     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
               \$hour, \$min, \$sec) {
@@ -855,16 +875,10 @@ sub page_js {
     return(<<ENDJS);
 <script type="text/javascript">
 // <![CDATA[
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
 
     $pjump_def
 
     function psub() {
-        pclose();
         if (document.parmform.pres_marker.value!='') {
             document.parmform.action+='#'+document.parmform.pres_marker.value;
             var typedef=new Array();
@@ -893,22 +907,199 @@ sub page_js {
         var newWin = window.open(url, wdwName, options);
         newWin.focus();
     }
+
 // ]]>
+
 </script>
 $selscript
 ENDJS
 
 }
 
+sub showhide_js {
+    return <<"COURSECONTENTSCRIPT";
+
+function showHide_courseContent() {
+    var parmlevValue=document.getElementById("parmlev").value;
+    if (parmlevValue == 'general') {
+        document.getElementById('mapmenu').style.display="none";
+    } else {
+        if ((parmlevValue == "full") || (parmlevValue == "map")) {
+            document.getElementById('mapmenu').style.display ="";
+        } else {
+            document.getElementById('mapmenu').style.display="none";
+        }
+    }
+    return;
+}
+
+COURSECONTENTSCRIPT
+}
+
+sub toggleparmtextbox_js {
+    return <<"ENDSCRIPT";
+
+if (!document.getElementsByClassName) {
+    function getElementsByClassName(node, classname) {
+        var a = [];
+        var re = new RegExp('(^| )'+classname+'( |$)');
+        var els = node.getElementsByTagName("*");
+        for(var i=0,j=els.length; i<j; i++)
+            if(re.test(els[i].className))a.push(els[i]);
+        return a;
+    }
+}
+
+function showHideLenient() {
+    var lenients;
+    var setRegExp = /^set_/;
+    if (document.getElementsByClassName) {
+        lenients = document.getElementsByClassName('LC_lenient_radio');
+    } else {
+        lenients = getElementsByClassName(document.body,'LC_lenient_radio');
+    }
+    if (lenients != 'undefined') {
+        for (var i=0; i<lenients.length; i++) {
+            if (lenients[i].checked) {
+                if (lenients[i].value == 'weighted') {
+                    if (setRegExp.test(lenients[i].name)) {
+                        var identifier = lenients[i].name.replace(setRegExp,'');
+                        toggleParmTextbox(document.parmform,identifier);
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+function toggleParmTextbox(form,key) {
+    var divfortext = document.getElementById('LC_parmtext_'+key);
+    if (divfortext) {
+        var caller = form.elements['set_'+key];
+        if (caller.length) {
+            for (i=0; i<caller.length; i++) {
+                if (caller[i].checked) {
+                    if (caller[i].value == 'weighted') {
+                        divfortext.style.display = 'inline';
+                    } else {
+                        divfortext.style.display = 'none';
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+ENDSCRIPT
+}
+
+sub validateparms_js {
+    return <<'ENDSCRIPT';
+
+function validateParms() {
+    var textRegExp = /^settext_/;
+    var tailLenient = /\.lenient$/;
+    var patternRelWeight = /^\-?[\d.]+$/;
+    var patternLenientStd = /^(yes|no|default)$/;
+    var ipallowRegExp = /^setipallow_/;
+    var ipdenyRegExp = /^setipdeny_/; 
+    var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
+    if ((document.parmform.elements.length != 'undefined')  && (document.parmform.elements.length) != 'null') {
+        if (document.parmform.elements.length) {
+            for (i=0; i<document.parmform.elements.length; i++) {
+                var name=document.parmform.elements[i].name;
+                if (textRegExp.test(name)) { 
+                    var identifier = name.replace(textRegExp,'');
+                    if (tailLenient.test(identifier)) {
+                        if (document.parmform.elements['set_'+identifier].length) {
+                            for (var j=0; j<document.parmform.elements['set_'+identifier].length; j++) {
+                                if (document.parmform.elements['set_'+identifier][j].checked) {
+                                    if (!(patternLenientStd.test(document.parmform.elements['set_'+identifier][j].value))) {
+                                        var relweight = document.parmform.elements[i].value;
+                                        relweight = relweight.replace(/^\s+|\s+$/g,'');
+                                        if (!patternRelWeight.test(relweight)) {
+                                            relweight = '0.0';
+                                        }
+                                        if (document.parmform.elements['set_'+identifier][j].value == 'weighted') {
+                                            document.parmform.elements['set_'+identifier][j].value = relweight;
+                                        } else {
+                                            document.parmform.elements['set_'+identifier][j].value += ','+relweight;
+                                        }
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    if (ipallowRegExp.test(name)) {
+                        var identifier = name.replace(ipallowRegExp,'');
+                        var possallow = document.parmform.elements[i].value;
+                        possallow = possallow.replace(/^\s+|\s+$/g,'');
+                        if (patternIP.test(possallow)) {
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                possallow = ','+possallow;
+                            }
+                            document.parmform.elements['set_'+identifier].value += possallow; 
+                        }
+                    } else {
+                        if (ipdenyRegExp.test(name)) {
+                            var identifier = name.replace(ipdenyRegExp,'');
+                            var possdeny = document.parmform.elements[i].value;
+                            possdeny = possdeny.replace(/^\s+|\s+$/g,'');
+                            if (patternIP.test(possdeny)) {
+                                possdeny = '!'+possdeny;
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    possdeny = ','+possdeny;
+                                }
+                                document.parmform.elements['set_'+identifier].value += possdeny;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return true;
+}
+
+ENDSCRIPT
+}
+
+sub ipacc_boxes_js  {
+    my $remove = &mt('Remove');
+    return <<"END";
+\$(document).ready(function() {
+    var wrapper         = \$(".LC_string_ipacc_wrap");
+    var add_button      = \$(".LC_add_ipacc_button");
+    var ipaccRegExp     = /^LC_string_ipacc_/;
+
+    \$(add_button).click(function(e){
+        e.preventDefault();
+        var identifier = \$(this).closest("div").attr("id");
+        identifier = identifier.replace(ipaccRegExp,'');
+        \$(this).closest('div').find('.LC_string_ipacc_inner').append('<div><input type="text" name="setip'+identifier+'" /><a href="#" class="LC_remove_ipacc">$remove</a></div>');
+    });
+
+    \$(wrapper).delegate(".LC_remove_ipacc","click", function(e){
+        e.preventDefault(); \$(this).closest("div").remove();
+    })
+});
+
+
+END
+}
+
 sub startpage {
-    my ($r,$psymb) = @_;
+    my ($r,$psymb,$crstype) = @_;
 
     my %loaditems = (
-                      'onunload' => "pclose()",
                       'onload'   => "group_or_section('cgroup')",
                     );
     if (!$psymb) {
-        $loaditems{'onload'} = "showHide_courseContent(); group_or_section('cgroup')";
+        $loaditems{'onload'} = "showHide_courseContent(); group_or_section('cgroup'); resize_scrollbox('mapmenuscroll','1','1');";
     }
 
     if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
@@ -920,16 +1111,23 @@ sub startpage {
        text=>"Table Mode",
        help => 'Course_Setting_Parameters'});
     }
+    my $js = &page_js().'
+<script type="text/javascript">
+// <![CDATA[
+'.
+            &Apache::lonhtmlcommon::resize_scrollbox_js('params').'
+// ]]>
+</script>
+';
     my $start_page =
-    &Apache::loncommon::start_page('Set/Modify Course Parameters',
-                       &page_js(),
-                       {'add_entries' => \%loaditems,});
+        &Apache::loncommon::start_page('Set/Modify Course Parameters',$js,
+                                       {'add_entries' => \%loaditems,});
     my $breadcrumbs =
     &Apache::lonhtmlcommon::breadcrumbs('Table Mode Parameter Setting','Table_Mode');
     my $escfilter=&Apache::lonhtmlcommon::entity_encode($env{'form.filter'});
     my $escpart=&Apache::lonhtmlcommon::entity_encode($env{'form.part'});
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDHEAD);
 <form method="post" action="/adm/parmset?action=settable" name="parmform">
 <input type="hidden" value="" name="pres_value" />
@@ -944,10 +1142,11 @@ ENDHEAD
 
 sub print_row {
     my ($r,$which,$part,$name,$symbp,$rid,$default,$defaulttype,$display,$defbgone,
-    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups)=@_;
+    $defbgtwo,$defbgthree,$parmlev,$uname,$udom,$csec,$cgroup,$usersgroups,$noeditgrp)=@_;
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
+
 # get the values for the parameter in cascading order
 # empty levels will remain empty
     my ($result,@outpar)=&parmval($$part{$which}.'.'.$$name{$which},
@@ -983,30 +1182,29 @@ sub print_row {
     my $thismarker=$which;
     $thismarker=~s/^parameter\_//;
     my $mprefix=$rid.'&'.$thismarker.'&';
-    my $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
+    my $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$thismarker);
     my ($othergrp,$grp_parm,$controlgrp);
 
     if ($parmlev eq 'general') {
-
         if ($uname) {
-            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } elsif ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         } elsif ($csec) {
-            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } else {
-            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         }
     } elsif ($parmlev eq 'map') {
 
         if ($uname) {
-            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } elsif ($cgroup) {
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         } elsif ($csec) {
-            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         } else {
-            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
         }
     } else {
         if ($uname) {
@@ -1026,33 +1224,32 @@ sub print_row {
             }
         }
 
-        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-
-    &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-    &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-    &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-    &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-
-    if ($csec) {
-        &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-        &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-        &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-    }
+        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+
+        if ($csec) {
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+            &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display);
+        }
 
         if ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
+            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp);
         }
 
-    if ($uname) {
+        if ($uname) {
             if ($othergrp) {
                 $r->print($othergrp);
             }
-        &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-        &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-        &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display);
-    }
+            &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);
+        }
 
     } # end of $parmlev if/else
     $r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.'</td>');
@@ -1063,7 +1260,7 @@ sub print_row {
         my $sessionvaltype=$typeoutpar[$result];
         if (!defined($sessionvaltype)) { $sessionvaltype=$$defaulttype{$which}; }
         $r->print('<td style="background-color:#999999;" align="center"><font color="#FFFFFF">'.
-                  &valout($sessionval,$sessionvaltype).'&nbsp;'.
+                  &valout($sessionval,$sessionvaltype,$$name{$which}).'&nbsp;'.
                   '</font></td>');
     }
     $r->print('</tr>');
@@ -1071,19 +1268,29 @@ sub print_row {
 }
 
 sub print_td {
-    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display)=@_;
+    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp)=@_;
     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
               ';" align="center">');
     my $nolink = 0;
     if ($which == 11 || $which == 12) {
         $nolink = 1;
+    } elsif (($env{'request.course.sec'} ne '') && ($which > 9)) {
+        $nolink = 1;
+    } elsif ($which == 4 || $which ==  5 || $which == 6) {
+        if ($noeditgrp) {
+            $nolink = 1;
+        }
     } elsif ($mprefix =~ /availablestudent\&$/) {
         if ($which > 3) {
             $nolink = 1;
         }
+    } elsif ($mprefix =~ /examcode\&$/) {
+        unless ($which == 2) {
+            $nolink = 1;
+        }
     }
     if ($nolink) {
-        $r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
+        $r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));
     } else {
         $r->print(&plink($$typeoutpar[$which],
                          $$display{$value},$$outpar[$which],
@@ -1108,9 +1315,9 @@ sub print_usergroups {
     if (($coursereply) && ($cgroup ne $resultgroup)) {
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
-            $grp_parm = &valout($coursereply,$resulttype);
+            $grp_parm = &valout($coursereply,$resulttype,$what);
         }
-        $grp_parm = &valout($coursereply,$resulttype);
+        $grp_parm = &valout($coursereply,$resulttype,$what);
         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
         if ($resultgroup && $resultlevel) {
             $output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm;
@@ -1234,7 +1441,7 @@ sub extractResourceInformation {
             $$mapp{$mapid}=$$mapp{$id};
             $$allmaps{$mapid}=$$mapp{$id};
             if ($mapid eq '1') {
-                $$maptitles{$mapid}=&mt('Main Course Documents');
+                $$maptitles{$mapid}=&mt('Main Content');
             } else {
                 $$maptitles{$mapid}=&Apache::lonnet::gettitle($$mapp{$id});
             }
@@ -1302,8 +1509,9 @@ sub parmmenu {
     }
 
     function checkdisset() {
-    checkthis('discussend','pscat');
+     checkthis('discussend','pscat');
      checkthis('discusshide','pscat');
+     checkthis('discussvote','pscat');
     }
 
     function checkcontdates() {
@@ -1367,8 +1575,8 @@ sub lookUpTableParameter {
         'contentopen' => 'time_settings',
         'contentclose' => 'time_settings',
         'discussend' => 'time_settings',
-	'printopendate' => 'time_settings',
-	'printclosedate' => 'time_settings',
+	'printstartdate' => 'time_settings',
+	'printenddate' => 'time_settings',
         'weight' => 'grading',
         'handgrade' => 'grading',
         'maxtries' => 'tries',
@@ -1401,7 +1609,9 @@ sub lookUpTableParameter {
         'maxcollaborators' => 'misc',
         'scoreformat' => 'misc',
         'lenient' => 'grading',
-
+        'retrypartial' => 'tries',
+        'discussvote'  => 'misc',
+        'examcode' => 'high_level_randomization', 
     );    
 }
 
@@ -1453,9 +1663,7 @@ sub category_order {
 
 sub parmboxes {
     my ($r,$allparms,$pscat,$keyorder)=@_;
-    my $tempkey;
-    my $tempparameter;
-    my %categories = &categories;
+    my %categories = &categories();
     my %category_order = &category_order();
     my %categoryList = (
         'time_settings' => [],
@@ -1470,37 +1678,29 @@ sub parmboxes {
         'misc' => [],
     );
 
-    foreach $tempparameter (keys %$allparms) {
+    foreach my $tempparameter (keys(%$allparms)) {
         &whatIsMyCategory($tempparameter, \%categoryList);
     }
     #part to print the parm-list
-    $r->print('<div class="LC_columnSection">'."\n");
-
-    #Print parameters
-    for my $key (sort { $category_order{$a} <=> $category_order{$b} } keys %categoryList) {
-        if(@{$categoryList{$key}} == 0) {
-            next;
-        } else { 
-            $r->print('<div class="LC_Box LC_400Box">'
-                     .'<h4 class="LC_hcell">'
-                     .&mt($categories{$key})
-                     .'</h4>'."\n");
-            foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
-                    $r->print('<span class="LC_nobreak">'
-                             .'<label><input type="checkbox" name="pscat" ');
-                $r->print('value="'.$tempkey.'" ');
-                if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
-                    $r->print(' checked="checked"');
-                }
-                $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
-                                                      : $tempkey)
-                        .'</label></span><br />'."\n");
+    foreach my $key (sort { $category_order{$a} <=> $category_order{$b} } keys(%categoryList)) {
+        next if (@{$categoryList{$key}} == 0);
+        next if ($key eq '');
+        $r->print('<div class="LC_Box LC_400Box">'
+                 .'<h4 class="LC_hcell">'.&mt($categories{$key}).'</h4>'."\n");
+        foreach my $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+            $r->print('<span class="LC_nobreak">'
+                     .'<label><input type="checkbox" name="pscat" '
+                     .'value="'.$tempkey.'" ');
+            if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
+                $r->print( ' checked="checked"');
             }
-            $r->print("</div>\n");
+            $r->print(' />'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
+                                                      : $tempkey)
+                     .'</label></span><br />'."\n");
         }
+        $r->print('</div>');
     }
-
-    $r->print("</div>\n");
+    $r->print("\n");
 }
 #
 # This function offers some links on the parameter section to get with one click a group a parameters
@@ -1539,8 +1739,12 @@ sub shortCuts {
 
 sub partmenu {
     my ($r,$allparts,$psprt)=@_;
+    my $selsize = 1+scalar(keys(%{$allparts}));
+    if ($selsize > 8) {
+        $selsize = 8;
+    }
 
-    $r->print('<select multiple="multiple" name="psprt" size="8">');
+    $r->print('<select multiple="multiple" name="psprt" size="'.$selsize.'">');
     $r->print('<option value="all"');
     $r->print(' selected="selected"') unless (@{$psprt});
     $r->print('>'.&mt('All Parts').'</option>');
@@ -1561,7 +1765,7 @@ sub partmenu {
 }
 
 sub usermenu {
-    my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups)=@_;
+    my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups,$pssymb)=@_;
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
         &Apache::loncommon::selectstudent_link('parmform','uname','udom');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
@@ -1570,18 +1774,29 @@ sub usermenu {
     my %sectionhash = &Apache::loncommon::get_sections();
 
     my $groups;
-    my %grouphash = &Apache::longroup::coursegroups();
+    my %grouphash;
+    if (($pssymb) || &Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+        %grouphash = &Apache::longroup::coursegroups();
+    } elsif ($env{'request.course.groups'} ne '') {
+        map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
+    }
 
     my $g_s_header='';
     my $g_s_footer='';
 
-    if (%sectionhash) {
+    my $currsec = $env{'request.course.sec'};
+    if ($currsec) {
+        $sections=&mt('Section:').' '.$currsec;
+        if (%grouphash) {
+            $sections .= ';'.('&nbsp;' x2);
+        }
+    } elsif (%sectionhash && $currsec eq '') {
         $sections=&mt('Section:').' <select name="csec"';
         if (%grouphash && $parmlev ne 'full') {
             $sections .= qq| onchange="group_or_section('csec')" |;
         }
         $sections .= '>';
-    foreach my $section ('',sort keys %sectionhash) {
+    foreach my $section ('',sort(keys(%sectionhash))) {
         $sections.='<option value="'.$section.'" '.
         ($section eq $csec?'selected="selected"':'').'>'.$section.
                                                               '</option>';
@@ -1589,7 +1804,7 @@ sub usermenu {
         $sections.='</select>';
     }
 
-    if (%sectionhash && %grouphash && $parmlev ne 'full') {
+    if (%sectionhash && %grouphash && $parmlev ne 'full' && $currsec eq '') {
         $sections .= '&nbsp;'.&mt('or').'&nbsp;';
         $sections .= qq|
 <script type="text/javascript">
@@ -1622,11 +1837,11 @@ function group_or_section(caller) {
 
     if (%grouphash) {
         $groups=&mt('Group:').' <select name="cgroup"';
-        if (%sectionhash && $env{'form.action'} eq 'settable') {
+        if (%sectionhash && $env{'form.action'} eq 'settable' && $currsec eq '') {
             $groups .= qq| onchange="group_or_section('cgroup')" |;
         }
         $groups .= '>';
-        foreach my $grp ('',sort keys %grouphash) {
+        foreach my $grp ('',sort(keys(%grouphash))) {
             $groups.='<option value="'.$grp.'" ';
             if ($grp eq $cgroup) {
                 unless ((defined($uname)) && ($grp eq '')) {
@@ -1648,6 +1863,8 @@ function group_or_section(caller) {
         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section')));
         $r->print($sections.$groups);
         $r->print(&Apache::lonhtmlcommon::row_closure());
+    } else {
+        $r->print($sections); 
     }
 
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('User')));
@@ -1661,13 +1878,13 @@ function group_or_section(caller) {
 # This function shows on table Mode the available Parameters for the selected Resources
 #
 sub displaymenu {
-    my ($r,$allparms,$pscat,$psprt,$keyorder)=@_;
+    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);
-    $r->print(&Apache::loncommon::start_scrollbox());
+    $r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
     &parmboxes($r,$allparms,$pscat,$keyorder);
     $r->print(&Apache::loncommon::end_scrollbox());
 
@@ -1741,12 +1958,12 @@ sub mapmenu {
            .'</div>'
         );
 
-        $r->print(&Apache::loncommon::start_scrollbox());
-        $r->print(&Apache::loncommon::start_data_table());
+        $r->print(&Apache::loncommon::start_scrollbox('700px','680px','400px','mapmenuscroll'));
+        $r->print(&Apache::loncommon::start_data_table(undef,'mapmenuinner'));
 
         # Display row: "All Maps or Folders"
         $r->print(
-            &Apache::loncommon::start_data_table_row()
+            &Apache::loncommon::start_data_table_row(undef,'picklevel')
            .'<td>'
            .'<label>'
            .'<input type="radio" name="pschp"'
@@ -1760,7 +1977,7 @@ sub mapmenu {
            .&Apache::loncommon::end_data_table_row()
         );
 
-        # Display row: "Main Course Documents"
+        # Display row: "Main Content"
         if (exists($$allmaps{1})) {
             $r->print(
                 &Apache::loncommon::start_data_table_row()
@@ -1821,8 +2038,9 @@ sub mapmenu {
             );
         }
 
-        $r->print(&Apache::loncommon::end_data_table());
-        $r->print(&Apache::loncommon::end_scrollbox());
+        $r->print(&Apache::loncommon::end_data_table().
+                  '<br style="line-height:2px;" />'.
+                  &Apache::loncommon::end_scrollbox());
     }
 }
 
@@ -1831,58 +2049,67 @@ sub mapmenu {
 sub levelmenu {
     my ($r,$alllevs,$parmlev)=@_;
 
-    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').
+                                                &Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
     $r->print('<select id="parmlev" name="parmlev" onchange="showHide_courseContent()">');
-    foreach (reverse sort keys %{$alllevs}) {
-    $r->print('<option value="'.$$alllevs{$_}.'"');
-    if ($parmlev eq $$alllevs{$_}) {
-        $r->print(' selected="selected"');
-    }
-    $r->print('>'.&mt($_).'</option>');
+    foreach my $lev (reverse(sort(keys(%{$alllevs})))) {
+        $r->print('<option value="'.$$alllevs{$lev}.'"');
+        if ($parmlev eq $$alllevs{$lev}) {
+            $r->print(' selected="selected"');
+        }
+        $r->print('>'.&mt($lev).'</option>');
     }
     $r->print("</select>");
 }
 
 
 sub sectionmenu {
-    my ($r,$selectedsections)=@_;
+    my ($selectedsections)=@_;
     my %sectionhash = &Apache::loncommon::get_sections();
-    return if (!%sectionhash);
+    return '' if (!%sectionhash);
 
-    $r->print('<select name="Section" multiple="multiple" size="8">');
-    foreach my $s ('all',sort keys %sectionhash) {
-    $r->print('    <option value="'.$s.'"');
-    foreach (@{$selectedsections}) {
-        if ($s eq $_) {
-        $r->print(' selected="selected"');
-        last;
-        }
+    my (@possibles,$disabled);
+    if ($env{'request.course.sec'} ne '') {
+        @possibles = ($env{'request.course.sec'});
+        $selectedsections = [$env{'request.course.sec'}];
+        $disabled = ' disabled="disabled"';
+    } else {
+        @possibles = ('all',sort(keys(%sectionhash)));
     }
-    $r->print('>'.$s."</option>\n");
+    my $output = '<select name="Section" multiple="multiple" size="8"'.$disabled.'>';
+    foreach my $s (@possibles) {
+        $output .= '    <option value="'.$s.'"';
+        if ((@{$selectedsections}) && (grep(/^\Q$s\E$/,@{$selectedsections}))) {  
+            $output .= ' selected="selected"';
+        }
+        $output .= '>'."$s</option>\n";
     }
-    $r->print("</select>\n");
+    $output .= "</select>\n";
+    return $output;
 }
 
 sub groupmenu {
-    my ($r,$selectedgroups)=@_;
-    my %grouphash = &Apache::longroup::coursegroups();
-    return if (!%grouphash);
+    my ($selectedgroups)=@_;
+    my %grouphash;
+    if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+        %grouphash = &Apache::longroup::coursegroups();
+    } elsif ($env{'request.course.groups'} ne '') {
+         map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
+    }
+    return '' if (!%grouphash);
 
-    $r->print('<select name="Group" multiple="multiple" size="8">');
+    my $output = '<select name="Group" multiple="multiple" size="8">';
     foreach my $group (sort(keys(%grouphash))) {
-    $r->print('    <option value="'.$group.'"');
-    foreach (@{$selectedgroups}) {
-        if ($group eq $_) {
-        $r->print(' selected="selected"');
-        last;
+        $output .= '    <option value="'.$group.'"';
+        if ((@{$selectedgroups}) && (grep(/^\Q$group\E$/,\@{$selectedgroups}))) {
+            $output .=  ' selected="selected"';
         }
+        $output .= '>'."$group</option>\n";
     }
-    $r->print('>'.$group."</option>\n");
-    }
-    $r->print("</select>\n");
+    $output .= "</select>\n";
+    return $output;
 }
 
-
 sub keysplit {
     my $keyp=shift;
     return (split(/\,/,$keyp));
@@ -1892,7 +2119,7 @@ sub keysinorder {
     my ($name,$keyorder)=@_;
     return sort {
     $$keyorder{$a} <=> $$keyorder{$b};
-    } (keys %{$name});
+    } (keys(%{$name}));
 }
 
 sub keysinorder_bytype {
@@ -1904,14 +2131,14 @@ sub keysinorder_bytype {
         return ($a cmp $b);
     }
     $$keyorder{'parameter_0_'.$ta} <=> $$keyorder{'parameter_0_'.$tb};
-    } (keys %{$name});
+    } (keys(%{$name}));
 }
 
 sub keysindisplayorder {
     my ($name,$keyorder)=@_;
     return sort {
     $$keyorder{'parameter_0_'.$a} <=> $$keyorder{'parameter_0_'.$b};
-    } (keys %{$name});
+    } (keys(%{$name}));
 }
 
 sub sortmenu {
@@ -1948,10 +2175,11 @@ sub standardkeyorder {
         'parameter_0_tol' => 16,
         'parameter_0_sig' => 17,
         'parameter_0_turnoffunit' => 18,
-            'parameter_0_discussend' => 19,
-            'parameter_0_discusshide' => 20,
-	'parameter_0_printopendate'  =>  21,
-	'parameter_0_printclosedate' =>  22);
+        'parameter_0_discussend' => 19,
+        'parameter_0_discusshide' => 20,
+        'parameter_0_discussvote' => 21,
+	'parameter_0_printstartdate'  =>  22,
+	'parameter_0_printenddate' =>  23);
 }
 
 
@@ -2001,7 +2229,21 @@ sub assessparms {
     my $message='';
 
     $csec=$env{'form.csec'};
+    if ($env{'request.course.sec'} ne '') {
+        $csec = $env{'request.course.sec'};    
+    }
+
+# Check group privs.
     $cgroup=$env{'form.cgroup'};
+    my $noeditgrp; 
+    if ($cgroup ne '') {
+        unless (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+            if (($env{'request.course.groups'} eq '') || 
+                (!grep(/^\Q$cgroup\E$/,split(/,/,$env{'request.course.groups'})))) {
+                $noeditgrp = 1;
+            }
+        }
+    }
 
     if      ($udom=$env{'form.udom'}) {
     } elsif ($udom=$env{'request.role.domain'}) {
@@ -2054,8 +2296,10 @@ sub assessparms {
             $id='';
         } else {
             $message=
-            '<span class="LC_error">'.&mt("Unknown ID")." '$id' ".
-            &mt('at domain')." '$udom'</span>";
+                '<p class="LC_warning">'.
+                &mt('Unknown ID [_1] at domain [_2]',
+                    "'".$id."'","'".$udom."'").
+                '</p>';
         }
     } else {
         $uname=$env{'form.uname'};
@@ -2066,16 +2310,20 @@ sub assessparms {
         $uhome=&Apache::lonnet::homeserver($uname,$udom);
         if ($uhome eq 'no_host') {
             $message=
-            '<span class="LC_error">'.&mt("Unknown user")." '$uname' ".
-            &mt("at domain")." '$udom'</span>";
+                '<p class="LC_warning">'.
+                &mt('Unknown user [_1] at domain [_2]',
+                    "'".$uname."'","'".$udom."'").
+                '</p>';
             $uname='';
         } else {
             $csec=&Apache::lonnet::getsection($udom,$uname,
                           $env{'request.course.id'});
             if ($csec eq '-1') {
-                $message='<span class="LC_error">'.
-                &mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
-                &mt("not in this course")."</span>";
+                $message=
+                    '<p class="LC_warning">'.
+                    &mt('User [_1] at domain [_2] not in this course',
+                        "'".$uname."'","'".$udom."'").
+                    '</p>';
                 $uname='';
                 $csec=$env{'form.csec'};
                 $cgroup=$env{'form.cgroup'};
@@ -2118,10 +2366,15 @@ sub assessparms {
         my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
-
-
+        my $now = time;
         for (my $i=0;$i<=$#markers;$i++) {
             my ($needsrelease,$needsnewer,$name);
+            if (($env{'request.course.sec'} ne '') && ($markers[$i] =~ /\&(7|8|9)$/)) {
+                next if ($csec ne $env{'request.course.sec'});
+            }
+            if ($markers[$i] =~ /\&(6|5|4)$/) {
+                next if ($noeditgrp);
+            } 
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
                 my (@ok_slots,@fail_slots,@del_slots);
                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
@@ -2152,18 +2405,70 @@ sub assessparms {
                         }
                     }
                 }
-            } elsif ($markers[$i] =~ /_(type|lenient)\&\d+$/) {
+            } elsif ($markers[$i] =~ /_(type|lenient|retrypartial|discussvote|examcode|printstartdate|printenddate|acc|interval)\&\d+$/) {
                 $name = $1;
+                my $val = $values[$i];
+                my $valmatch = '';
+                if ($name eq 'examcode') {
+                    if (&Apache::lonnet::validCODE($values[$i])) {
+                        $val = 'valid';
+                    }
+                } elsif ($name eq 'printstartdate') {
+                    if ($val =~ /^\d+$/) {
+                        if ($val > $now) {
+                            $val = 'future';
+                        }
+                    } 
+                } elsif ($name eq 'printenddate') {
+                    if ($val =~ /^\d+$/) {
+                        if ($val < $now) {
+                            $val = 'past';
+                        }
+                    }
+                } elsif (($name eq 'lenient') || ($name eq 'acc')) {
+                    my $stringtype = &get_stringtype($name);
+                    my $stringmatch = &standard_string_matches($stringtype);
+                    if (ref($stringmatch) eq 'ARRAY') {
+                        foreach my $item (@{$stringmatch}) {
+                            if (ref($item) eq 'ARRAY') {
+                                my ($regexpname,$pattern) = @{$item};
+                                if ($pattern ne '') {
+                                    if ($val =~ /$pattern/) {
+                                        $valmatch = $regexpname;
+                                        $val = '';
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } elsif ($name eq 'interval') {
+                    my $intervaltype = &get_intervaltype($name);
+                    my $intervalmatch = &standard_interval_matches($intervaltype);
+                    if (ref($intervalmatch) eq 'ARRAY') {
+                        foreach my $item (@{$intervalmatch}) {
+                            if (ref($item) eq 'ARRAY') {
+                                my ($regexpname,$pattern) = @{$item};
+                                if ($pattern ne '') {
+                                    if ($val =~ /$pattern/) {
+                                        $valmatch = $regexpname;
+                                        $val = '';
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
                 $needsrelease =
-                    $Apache::lonnet::needsrelease{"parameter:$name:$values[$i]"};
+                    $Apache::lonnet::needsrelease{"parameter:$name:$val:$valmatch"};
                 if ($needsrelease) {
                     unless ($got_chostname) {
                         ($chostname,$cmajor,$cminor) = &parameter_release_vars();
                         $got_chostname = 1;
-                    }
-                    $needsnewer = &parameter_releasecheck($name,$values[$i],
+                    } 
+                    $needsnewer = &parameter_releasecheck($name,$val,$valmatch,
                                                           $needsrelease,
-                                                          $chostname,
                                                           $cmajor,$cminor);
                 }
             }
@@ -2187,18 +2492,19 @@ sub assessparms {
         }
     }
 #----------------------------------------------- if all selected, fill in array
-    if ($pscat[0] eq "all") {@pscat = (keys %allparms);}
+    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 ($psprt[0] eq "all" || !@psprt) {@psprt = (keys(%allparts));}
 # ------------------------------------------------------------------ Start page
 
-    &startpage($r,$pssymb);
+    my $crstype = &Apache::loncommon::course_type();
+    &startpage($r,$pssymb,$crstype);
 
-    foreach ('tolerance','date_default','date_start','date_end',
+    foreach my $item ('tolerance','date_default','date_start','date_end',
         'date_interval','int','float','string') {
         $r->print('<input type="hidden" value="'.
-          &HTML::Entities::encode($env{'form.recent_'.$_},'"&<>').
-          '" name="recent_'.$_.'" />');
+          &HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
+          '" name="recent_'.$item.'" />');
     }
 
     # ----- Start Parameter Selection
@@ -2224,27 +2530,15 @@ ENDPARMSELSCRIPT
         }
 
         # Step 1
-        $r->print(&Apache::lonhtmlcommon::topic_bar(1,&mt('Resource Specification')));
-        $r->print(<<COURSECONTENTSCRIPT);
+        $r->print(&Apache::lonhtmlcommon::topic_bar(1,&mt('Resource Specification'),'parmstep1'));
+        $r->print('
 <script type="text/javascript">
-// <![CDATA[
-function showHide_courseContent(){
-        var parmlevValue=document.getElementById("parmlev").value;
-        if (parmlevValue == 'general') {
-            document.getElementById('mapmenu').style.display="none";
-        } else {
-            if ((parmlevValue == "full") || (parmlevValue == "map")) {
-                document.getElementById('mapmenu').style.display ="";
-            } else {
-                document.getElementById('mapmenu').style.display="none";
-            }
-        }        
-    }
+// <![CDATA['.
+                 &showhide_js().'
 // ]]>
 </script>
-COURSECONTENTSCRIPT
-
-        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+');
+        $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
         &levelmenu($r,\%alllevs,$parmlev);
         $r->print(&Apache::lonhtmlcommon::row_closure());
         &mapmenu($r,\%allmaps,$pschp,\%maptitles, \%symbp);
@@ -2255,13 +2549,13 @@ COURSECONTENTSCRIPT
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
 
         # Step 2
-        $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification')));
-        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder);
+        $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));
+        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder,'parmmenuscroll');
 
         # Step 3
-        $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)')));
+        $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
-        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
 
@@ -2284,7 +2578,6 @@ COURSECONTENTSCRIPT
              .'</a>'
              .'</p>');
     } else {
-        $r->print();
         # parameter screen for a single resource. 
         my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb);
         my $title = &Apache::lonnet::gettitle($pssymb);
@@ -2294,7 +2587,7 @@ COURSECONTENTSCRIPT
                   '<br />');
         $r->print(&Apache::lonhtmlcommon::topic_bar('',&mt('Additional Display Specification (optional)')));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
-        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
         $r->print('<p>'
@@ -2318,6 +2611,7 @@ COURSECONTENTSCRIPT
 
     @pscat = @temp_pscat;
 
+
     if (($env{'form.prevvisit'}) || ($pschp) || ($pssymb)) {
 # ----------------------------------------------------------------- Start Table
         my @catmarker=map { tr|.|_|; 'parameter_'.$_; } @pscat;
@@ -2345,7 +2639,7 @@ COURSECONTENTSCRIPT
                        $userspan ++;
                    }
                    $r->print('<th colspan="'.$userspan.'" rowspan="2">');
-                   $r->print(&mt("User")." $uname ".&mt('at Domain')." $udom</th>");
+                   $r->print(&mt('User [_1] at Domain [_2]',"'".$uname."'","'".$udom."'").'</th>');
                }
                my %lt=&Apache::lonlocal::texthash(
                 'pie'    => "Parameter in Effect",
@@ -2408,9 +2702,8 @@ ENDTABLEHEADFOUR
                my $defbgtwo='';
                my $defbgthree = '';
 
-               foreach (@ids) {
+               foreach my $rid (@ids) {
 
-                my $rid=$_;
                 my ($inmapid)=($rid=~/\.(\d+)$/);
 
                 if ((!$pssymb &&
@@ -2444,35 +2737,34 @@ ENDTABLEHEADFOUR
                     my $uri=&Apache::lonnet::declutter($uris{$rid});
 
                     my $filter=$env{'form.filter'};
-                    foreach (&keysplit($keyp{$rid})) {
-                        my $tempkeyp = $_;
+                    foreach my $tempkeyp (&keysplit($keyp{$rid})) {
                         if (grep $_ eq $tempkeyp, @catmarker) {
-                          my $parmname=&Apache::lonnet::metadata($uri,$_.'.name');
+                          my $parmname=&Apache::lonnet::metadata($uri,$tempkeyp.'.name');
 # We may only want certain parameters listed
                           if ($filter) {
                              unless ($filter=~/\Q$parmname\E/) { next; }
                           }
-                          $name{$_}=$parmname;
-                          $part{$_}=&Apache::lonnet::metadata($uri,$_.'.part');
+                          $name{$tempkeyp}=$parmname;
+                          $part{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.part');
 
-                          my $parmdis=&Apache::lonnet::metadata($uri,$_.'.display');
-                          if ($allparms{$name{$_}} ne '') {
+                          my $parmdis=&Apache::lonnet::metadata($uri,$tempkeyp.'.display');
+                          if ($allparms{$name{$tempkeyp}} ne '') {
                               my $identifier;
                               if ($parmdis =~ /(\s*\[Part.*)$/) {
                                   $identifier = $1;
                               }
-                              $display{$_} = $allparms{$name{$_}}.$identifier;
+                              $display{$tempkeyp} = $allparms{$name{$tempkeyp}}.$identifier;
                           } else {
-                              $display{$_} = $parmdis;
+                              $display{$tempkeyp} = $parmdis;
                           }
-                          unless ($display{$_}) { $display{$_}=''; }
-                          $display{$_}.=' ('.$name{$_}.')';
-                          $default{$_}=&Apache::lonnet::metadata($uri,$_);
-                          $type{$_}=&Apache::lonnet::metadata($uri,$_.'.type');
-                          $thistitle=&Apache::lonnet::metadata($uri,$_.'.title');
+                          unless ($display{$tempkeyp}) { $display{$tempkeyp}=''; }
+                          $display{$tempkeyp}.=' ('.$name{$tempkeyp}.')';
+                          $default{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp);
+                          $type{$tempkeyp}=&Apache::lonnet::metadata($uri,$tempkeyp.'.type');
+                          $thistitle=&Apache::lonnet::metadata($uri,$tempkeyp.'.title');
                         }
                     }
-                    my $totalparms=scalar keys %name;
+                    my $totalparms=scalar(keys(%name));
                     if ($totalparms>0) {
                            my $firstrow=1;
                         my $title=&Apache::lonnet::gettitle($symbp{$rid});
@@ -2498,17 +2790,16 @@ ENDTABLEHEADFOUR
                         $r->print('<td style="background-color:'.$defbgone.';"'.
                                       ' rowspan='.$totalparms.
                                       '>'.$maptitles{$mapp{$rid}}.'</td>');
-                        foreach (&keysinorder_bytype(\%name,\%keyorder)) {
-
+                        foreach my $item (&keysinorder_bytype(\%name,\%keyorder)) {
                             unless ($firstrow) {
                                 $r->print('<tr>');
                             } else {
                                 undef $firstrow;
                             }
-                            &print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
+                            &print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,
                                        \%type,\%display,$defbgone,$defbgtwo,
                                        $defbgthree,$parmlev,$uname,$udom,$csec,
-                                                            $cgroup,\@usersgroups);
+                                       $cgroup,\@usersgroups,$noeditgrp);
                         }
                     }
                 }
@@ -2532,7 +2823,7 @@ ENDTABLEHEADFOUR
 
 #-------------------------------------------- for each map, gather information
             my $mapid;
-               foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys %maplist) {
+               foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys(%maplist)) {
                 my $maptitle = $maplist{$mapid};
 
 #-----------------------  loop through ids and get all parameter types for map
@@ -2546,9 +2837,9 @@ ENDTABLEHEADFOUR
 
 #        $r->print("Catmarker: @catmarker<br />\n");
 
-                foreach (@ids) {
-                    ($map)=(/([\d]*?)\./);
-                      my $rid = $_;
+                foreach my $id (@ids) {
+                    ($map)=($id =~ /([\d]*?)\./);
+                    my $rid = $id;
 
 #                  $r->print("$mapid:$map:   $rid <br /> \n");
 
@@ -2563,12 +2854,11 @@ ENDTABLEHEADFOUR
 # When storing information, store as part 0
 # When requesting information, request from full part
 #-------------------------------------------------------------------
-                        foreach (&keysplit($keyp{$rid})) {
-                             my $tempkeyp = $_;
-                              my $fullkeyp = $tempkeyp;
-                              $tempkeyp =~ s/_\w+_/_0_/;
+                        foreach my $fullkeyp (&keysplit($keyp{$rid})) {
+                            my $tempkeyp = $fullkeyp;
+                            $tempkeyp =~ s/_\w+_/_0_/;
 
-                              if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
+                            if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                                 $part{$tempkeyp}="0";
                                 $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
                                 my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
@@ -2627,11 +2917,11 @@ ENDTABLEHEADFOUR
                          .&Apache::loncommon::end_data_table_header_row()
                 );
 
-                foreach (&keysinorder(\%name,\%keyorder)) {
+                foreach my $item (&keysinorder(\%name,\%keyorder)) {
                     $r->print(&Apache::loncommon::start_data_table_row());
-                    &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
+                    &print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
                            \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                           $parmlev,$uname,$udom,$csec,$cgroup);
+                           $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
                 }
                 $r->print(&Apache::loncommon::end_data_table().'</p>'
                          .'</div>'
@@ -2654,8 +2944,8 @@ ENDTABLEHEADFOUR
             my %type = ();
             my %default = ();
 
-            foreach (@ids) {
-                my $rid = $_;
+            foreach $id (@ids) {
+                my $rid = $id;
 
                 my $uri=&Apache::lonnet::declutter($uris{$rid});
 
@@ -2666,11 +2956,10 @@ ENDTABLEHEADFOUR
 # When storing information, store as part 0
 # When requesting information, request from full part
 #-------------------------------------------------------------------
-                foreach (&keysplit($keyp{$rid})) {
-                    my $tempkeyp = $_;
-                      my $fullkeyp = $tempkeyp;
-                      $tempkeyp =~ s/_\w+_/_0_/;
-                      if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
+                foreach my $fullkeyp (&keysplit($keyp{$rid})) {
+                    my $tempkeyp = $fullkeyp;
+                    $tempkeyp =~ s/_\w+_/_0_/;
+                    if ((grep $_ eq $fullkeyp, @catmarker) &&(!$name{$tempkeyp})) {
                         $part{$tempkeyp}="0";
                         $name{$tempkeyp}=&Apache::lonnet::metadata($uri,$fullkeyp.'.name');
                         my $parmdis=&Apache::lonnet::metadata($uri,$fullkeyp.'.display');
@@ -2718,11 +3007,11 @@ ENDMAPONE
                      .&Apache::loncommon::end_data_table_header_row()
             );
 
-            foreach (&keysinorder(\%name,\%keyorder)) {
+            foreach my $item (&keysinorder(\%name,\%keyorder)) {
                 $r->print(&Apache::loncommon::start_data_table_row());
-                &print_row($r,$_,\%part,\%name,\%symbp,$mapid,\%default,
+                &print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
                        \%type,\%display,$defbgone,$defbgtwo,$defbgthree,
-                                   $parmlev,$uname,$udom,$csec,$cgroup);
+                                   $parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp);
             }
             $r->print(&Apache::loncommon::end_data_table()
                      .'</p>'
@@ -2741,12 +3030,19 @@ ENDMAPONE
 my $tableopen;
 
 sub tablestart {
+    my ($readonly) = @_;
     if ($tableopen) {
-    return '';
+        return '';
     } else {
-    $tableopen=1;
-    return &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th><th>'.
-        &mt('Delete').'</th><th>'.&mt('Set to ...').'</th></tr>';
+        $tableopen=1;
+        my $output = &Apache::loncommon::start_data_table().'<tr><th>'.&mt('Parameter').'</th>';
+        if ($readonly) {
+            $output .= '<th>'.&mt('Current value').'</th>';
+        } else {
+            $output .= '<th>'.&mt('Delete').'</th><th>'.&mt('Set to ...').'</th>';
+        }
+        $output .= '</tr>';
+        return $output;
     }
 }
 
@@ -2766,20 +3062,24 @@ sub readdata {
 # Read userdata
 
     my $classlist=&Apache::loncoursedata::get_classlist();
-    foreach (keys %$classlist) {
-        if ($_=~/^($match_username)\:($match_domain)$/) {
-        my ($tuname,$tudom)=($1,$2);
-        my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
-            foreach my $userkey (keys %{$useropt}) {
-        if ($userkey=~/^$env{'request.course.id'}/) {
+    foreach my $user (keys(%$classlist)) {
+        if ($user=~/^($match_username)\:($match_domain)$/) {
+            my ($tuname,$tudom)=($1,$2);
+            my $useropt=&Apache::lonnet::get_userresdata($tuname,$tudom);
+            foreach my $userkey (keys(%{$useropt})) {
+                if ($userkey=~/^\Q$env{'request.course.id'}\E/) {
                     my $newkey=$userkey;
-            $newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
-            $$resourcedata{$newkey}=$$useropt{$userkey};
-        }
+                    $newkey=~s/^($env{'request.course.id'}\.)/$1\[useropt\:$tuname\:$tudom\]\./;
+                    $$resourcedata{$newkey}=$$useropt{$userkey};
+                }
+            }
         }
     }
+    if (wantarray) {
+        return ($resourcedata,$classlist);
+    } else {
+        return $resourcedata;
     }
-    return $resourcedata;
 }
 
 
@@ -2795,55 +3095,118 @@ sub storedata {
     my @deldata=();
     undef @deldata;
     my ($got_chostname,$chostname,$cmajor,$cminor);
+    my $now = time;
     foreach my $key (keys(%env)) { 
     if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
         my $cmd=$1;
         my $thiskey=$2;
+        next if ($cmd eq 'settext' || $cmd eq 'setipallow' || $cmd eq 'setipdeny');
         my ($tuname,$tudom)=&extractuser($thiskey);
         my $tkey=$thiskey;
             if ($tuname) {
         $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
         }
         if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
-        my ($data, $typeof, $text, $name);
+        my ($data, $typeof, $text, $name, $valchk, $valmatch);
         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';
-            }
-            if ($name ne '') {
-                my ($needsrelease,$needsnewer);
-                $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$data"};
-                if ($needsrelease) {
-                    unless ($got_chostname) {
-                        ($chostname,$cmajor,$cminor)=&parameter_release_vars();
-                        $got_chostname = 1;
+                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;
+                                }
+                            }
+                        }
                     }
-                    $needsnewer = &parameter_releasecheck($name,$data,
-                                                          $needsrelease,
-                                                          $chostname,$cmajor,
-                                                          $cminor);
                 }
-                if ($needsnewer) {
-                    $r->print('<br />'.&oldversion_warning($name,$data,
-                                                           $chostname,$cmajor,
-                                                           $cminor,$needsrelease));
-                    next;
+            } elsif ($typeof eq 'string_discussvote') {
+                $name = 'discussvote';
+            } elsif ($typeof eq 'string_examcode') {
+                $name = 'examcode';
+                if (&Apache::lonnet::validCODE($data)) {
+                    $valchk = 'valid';
+                }
+            } elsif ($typeof eq 'string_yesno') {
+                if ($thiskey =~ /\.retrypartial$/) {
+                    $name = 'retrypartial';
                 }
             }
         } elsif ($cmd eq 'datepointer') {
             $data=&Apache::lonhtmlcommon::get_date_from_form($env{$key});
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified date for');
+            if ($typeof eq 'date_start') {
+                if ($thiskey =~ /\.printstartdate$/) {
+                    $name = 'printstartdate';
+                    if (($data) && ($data > $now)) {
+                        $valchk = 'future';
+                    }
+                }
+            } elsif ($typeof eq 'date_end') {
+                if ($thiskey =~ /\.printenddate$/) {
+                    $name = 'printenddate';
+                    if (($data) && ($data < $now)) {
+                        $valchk = 'past';
+                    }
+                }
+            }
         } elsif ($cmd eq 'dateinterval') {
             $data=&get_date_interval_from_form($thiskey);
+            if ($thiskey =~ /\.interval$/) {
+                $name = 'interval';
+                my $intervaltype = &get_intervaltype($name);
+                my $intervalmatch = &standard_interval_matches($intervaltype);
+                if (ref($intervalmatch) eq 'ARRAY') {
+                    foreach my $item (@{$intervalmatch}) {
+                        if (ref($item) eq 'ARRAY') {
+                            my ($regexpname,$pattern) = @{$item};
+                            if ($pattern ne '') {
+                                if ($data =~ /$pattern/) {
+                                    $valmatch = $regexpname;
+                                    $valchk = '';
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified date for');
         }
+        if ($name ne '') {
+            my ($needsrelease,$needsnewer);
+            $needsrelease = $Apache::lonnet::needsrelease{"parameter:$name:$valchk:$valmatch"};
+            if ($needsrelease) {
+                unless ($got_chostname) {
+                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                    $got_chostname = 1;
+                }
+                $needsnewer = &parameter_releasecheck($name,$valchk,$valmatch,
+                                                      $needsrelease,
+                                                      $cmajor,$cminor);
+                if ($needsnewer) {
+                    $r->print('<br />'.&oldversion_warning($name,$data,
+                                                           $chostname,$cmajor,
+                                                           $cminor,$needsrelease));
+                    next;
+                }
+            }
+        }
         if (defined($data) and $$olddata{$thiskey} ne $data) {
             if ($tuname) {
             if (&Apache::lonnet::put('resourcedata',{$tkey=>$data,
@@ -2880,13 +3243,13 @@ sub storedata {
     }
 # Store all course level
     my $delentries=$#deldata+1;
-    my @newdatakeys=keys %newdata;
+    my @newdatakeys=keys(%newdata);
     my $putentries=$#newdatakeys+1;
     if ($delentries) {
     if (&Apache::lonnet::del('resourcedata',\@deldata,$dom,$crs) eq 'ok') {
         my %loghash=map { $_ => '' } @deldata;
         &log_parmset(\%loghash,1);
-        $r->print('<h2>'.&mt('Deleted [_1] parameter(s)</h2>',$delentries));
+        $r->print('<h2>'.&mt('Deleted [quant,_1,parameter]',$delentries/2).'</h2>');
     } else {
         $r->print('<div class="LC_error">'.
               &mt('Error deleting parameters').'</div>');
@@ -2896,7 +3259,7 @@ sub storedata {
     if ($putentries) {
     if (&Apache::lonnet::put('resourcedata',\%newdata,$dom,$crs) eq 'ok') {
                 &log_parmset(\%newdata,0);
-        $r->print('<h3>'.&mt('Saved [_1] parameter(s)',$putentries/2).'</h3>');
+        $r->print('<h3>'.&mt('Saved [quant,_1,parameter]',$putentries/2).'</h3>');
     } else {
         $r->print('<div class="LC_error">'.
               &mt('Error saving parameters').'</div>');
@@ -2931,7 +3294,8 @@ sub parse_listdata_key {
 }
 
 sub listdata {
-    my ($r,$resourcedata,$listdata,$sortorder)=@_;
+    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist)=@_;
+    
 # Start list output
 
     my $oldsection='';
@@ -2942,6 +3306,16 @@ sub listdata {
     my $foundkeys=0;
     my %keyorder=&standardkeyorder();
 
+    my ($secidx,%grouphash);
+    if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
+        $secidx = &Apache::loncoursedata::CL_SECTION();
+        if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+            %grouphash = &Apache::longroup::coursegroups();
+        } elsif ($env{'request.course.groups'} ne '') {
+            map { $grouphash{$_} = 1; } split(/,/,$env{'request.course.groups'});
+        }
+    }
+
     foreach my $thiskey (sort {
     my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
     my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
@@ -2981,24 +3355,45 @@ sub listdata {
     }
 
     $result;
-    } keys %{$listdata}) {
+    } keys(%{$listdata})) {
 
+    my $readonly;
     if ($$listdata{$thiskey.'.type'}) {
-            my $thistype=$$listdata{$thiskey.'.type'};
-            if ($$resourcedata{$thiskey.'.type'}) {
-        $thistype=$$resourcedata{$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+)$/);
         my $section=&mt('All Students');
         if ($middle=~/^\[(.*)\]/) {
-        my $issection=$1;
-        if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
-            $section=&mt('User').": ".&Apache::loncommon::plainname($1,$2);
-        } else {
-            $section=&mt('Group/Section').': '.$issection;
-        }
-        $middle=~s/^\[(.*)\]//;
+            my $issection=$1;
+            if ($issection=~/^useropt\:($match_username)\:($match_domain)/) {
+                my ($stuname,$studom) = ($1,$2);
+                if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
+                    if (ref($classlist) eq 'HASH') {
+                        if (ref($classlist->{$stuname.':'.$studom}) eq 'ARRAY') {
+                            next unless ($classlist->{$stuname.':'.$studom}->[$secidx] eq $env{'request.course.sec'}); 
+                        }
+                    }
+                }
+                $section=&mt('User').": ".&Apache::loncommon::plainname($stuname,$studom);
+            } else {
+                if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
+                    if (exists($grouphash{$issection})) {
+                        $section=&mt('Group').': '.$issection;
+                    } elsif ($issection eq $env{'request.course.sec'}) {
+                        $section = &mt('Section').': '.$issection;
+                    } else {
+                        next; 
+                    }
+                } else {
+                    $section=&mt('Group/Section').': '.$issection;
+                }
+            }
+            $middle=~s/^\[(.*)\]//;
+        } elsif (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
+            $readonly = 1;
         }
         $middle=~s/\.+$//;
         $middle=~s/^\.+//;
@@ -3041,64 +3436,55 @@ sub listdata {
 # Ready to print
 #
             my $parmitem = &standard_parameter_names($name);
-        $r->print(&tablestart().
+        $r->print(&tablestart($readonly).
               &Apache::loncommon::start_data_table_row().
               '<td><b>'.&mt($parmitem).
-              '</b></td><td><input type="checkbox" name="del_'.
-              $thiskey.'" /></td><td>');
+              '</b></td>');
+        unless ($readonly) {
+            $r->print('<td><input type="checkbox" name="del_'.
+                      $thiskey.'" /></td>');
+        }
+        $r->print('<td>');
         $foundkeys++;
         if (&isdateparm($thistype)) {
-        my $jskey='key_'.$pointer;
-        $pointer++;
-        $r->print(
-              &Apache::lonhtmlcommon::date_setter('parmform',
-                                  $jskey,
-                              $$resourcedata{$thiskey},
-                                  '',1,'','').
+            my $jskey='key_'.$pointer;
+            my $state;
+            $pointer++;
+            if ($readonly) {
+                $state = 'disabled';
+            }
+            $r->print(
+                &Apache::lonhtmlcommon::date_setter('parmform',
+                                                    $jskey,
+                                                    $$resourcedata{$thiskey},
+                                                    '',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}.'">'.
 &mt('Shift all dates based on this date').'</a></span>':'').
 &date_sanity_info($$resourcedata{$thiskey})
-              );
+                );
+            }
         } elsif ($thistype eq 'date_interval') {
-        $r->print(&date_interval_selector($thiskey,
-                          $$resourcedata{$thiskey}));
+            $r->print(&date_interval_selector($thiskey,$name,
+                      $$resourcedata{$thiskey},$readonly));
         } elsif ($thistype =~ m/^string/) {
-        $r->print(&string_selector($thistype,$thiskey,
-                       $$resourcedata{$thiskey},$name));
+            $r->print(&string_selector($thistype,$thiskey,
+                      $$resourcedata{$thiskey},$name,$readonly));
         } else {
-        $r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
+            $r->print(&default_selector($thiskey,$$resourcedata{$thiskey},$readonly));
+        }
+        unless ($readonly) {
+            $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
+                      $thistype.'" />');
         }
-        $r->print('<input type="hidden" name="typeof_'.$thiskey.'" value="'.
-              $thistype.'" />');
         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
     }
     }
     return $foundkeys;
 }
 
-
-sub date_interval_selector {
-    my ($thiskey, $showval) = @_;
-    my $result;
-    foreach my $which (['days', 86400, 31],
-               ['hours', 3600, 23],
-               ['minutes', 60, 59],
-               ['seconds',  1, 59]) {
-    my ($name, $factor, $max) = @{ $which };
-    my $amount = int($showval/$factor);
-    $showval  %= $factor;
-    my %select = ((map {$_ => $_} (0..$max)),
-              'select_form_order' => [0..$max]);
-    $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
-                           \%select);
-    $result .= ' '.&mt($name);
-    }
-    $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
-    return $result;
-
-}
-
 sub get_date_interval_from_form {
     my ($key) = @_;
     my $seconds = 0;
@@ -3111,15 +3497,83 @@ sub get_date_interval_from_form {
         $seconds += $env{'form.'.$name.'_'.$key} * $factor;
     }
     }
+    if (($key =~ /\.interval$/) && ($env{'form.done_'.$key} eq '_done')) {
+        $seconds .= $env{'form.done_'.$key};
+    }
     return $seconds;
 }
 
 
 sub default_selector {
-    my ($thiskey, $showval) = @_;
-    return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'" />';
+    my ($thiskey, $showval, $readonly) = @_;
+    my $disabled;
+    if ($readonly) {
+        $disabled = ' disabled="disabled"';
+    }
+    return '<input type="text" name="set_'.$thiskey.'" value="'.$showval.'"'.$disabled.' />';
+}
+
+sub string_ip_selector {
+    my ($thiskey, $showval, $readonly) = @_;
+    my %access = (
+                   allow => [],
+                   deny  => [],
+                 );
+    if ($showval ne '') {
+        my @current;
+        if ($showval =~ /,/) {
+            @current = split(/,/,$showval);
+        } else {
+            @current = ($showval);
+        }
+        foreach my $item (@current) {
+            if ($item =~ /^\!([\[\]a-zA-Z\.\d\*\-]+)$/) {
+                push(@{$access{'deny'}},$1);
+            } elsif ($item =~ /^([\[\]a-zA-Z\.\d\*\-]+)$/) {
+                push(@{$access{'allow'}},$item);
+            }
+        }
+    }
+    if (!@{$access{'allow'}}) {
+        @{$access{'allow'}} = ('');
+    }
+    if (!@{$access{'deny'}}) {
+        @{$access{'deny'}} = ('');
+    }
+    my ($disabled,$addmore);
+    if ($disabled) {
+        $disabled=' disabled="disabled"';
+    } else {
+        $addmore = "\n".'<button class="LC_add_ipacc_button">'.&mt('Add more').'</button>';
+    }
+    my $output = '<input type="hidden" name="set_'.$thiskey.'" />
+<table><tr><th>'.&mt('Allow from').'</th><th>'.&mt('Deny from').'</th></tr><tr>';
+    foreach my $acctype ('allow','deny') {
+        $output .= '
+<td valign="top">
+<div class="LC_string_ipacc_wrap" id="LC_string_ipacc_'.$acctype.'_'.$thiskey.'">
+  <div class="LC_string_ipacc_inner">'."\n";
+        my $num = 0;
+        foreach my $curr (@{$access{$acctype}}) {
+            $output .= '<div><input type="text" name="setip'.$acctype.'_'.$thiskey.'" value="'.$curr.'"'.$disabled.' />';
+            if ($num > 0) {
+                $output .= '<a href="#" class="LC_remove_ipacc">'.&mt('Remove').'</a>'; 
+            }
+            $output .= '</div>'."\n";
+            $num ++;
+        }
+        $output .= '
+  </div>'.$addmore.'
+</div>
+</td>';
+   }
+   $output .= '
+</tr>
+</table>'."\n";
+    return $output;
 }
 
+{
 my %strings =
     (
      'string_yesno'
@@ -3134,7 +3588,7 @@ my %strings =
              => [[ 'problem', 'Standard Problem'],
                  [ 'survey', 'Survey'],
                  [ 'anonsurveycred', 'Anonymous Survey (credit for submission)'],
-                 [ 'exam', 'Exam'],
+                 [ 'exam', 'Bubblesheet Exam'],
                  [ 'anonsurvey', 'Anonymous Survey'],
                  [ 'randomizetry', 'New Randomization Each N Tries (default N=1)'],
                  [ 'practice', 'Practice'],
@@ -3142,9 +3596,34 @@ my %strings =
      'string_lenient'
              => [['yes', 'Yes' ],
                  [ 'no', 'No' ],
-                 [ 'default', 'Default - only bubblesheet grading is lenient' ]] 
+                 [ 'default', 'Default - only bubblesheet grading is lenient' ],
+                 [ 'weighted', 'Yes, weighted (optionresponse in checkbox mode)' ]],
+     'string_discussvote'
+             => [['yes','Yes'],
+                 ['notended','Yes, unless discussion ended'],
+                 ['no','No']],
+     'string_ip'
+             => [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
+                 ['_denyfrom_',], 'Hostname(s) or IP(s) from which access is disallowed'], 
      );
 
+my %stringmatches = (
+         'string_lenient'
+              => [['weighted','^\-?[.\d]+,\-?[.\d]+,\-?[.\d]+,\-?[.\d]+$'],],
+         'string_ip'
+              => [['_allowfrom_','[^\!]+'],
+                  ['_denyfrom_','\!']],
+    );
+
+my %stringtypes = (
+                    type         => 'string_questiontype',
+                    lenient      => 'string_lenient',
+                    retrypartial => 'string_yesno',
+                    discussvote  => 'string_discussvote',
+                    examcode     => 'string_examcode',
+                    acc          => 'string_ip',
+                  );
+
 sub standard_string_options {
     my ($string_type) = @_;
     if (ref($strings{$string_type}) eq 'ARRAY') {
@@ -3153,38 +3632,79 @@ sub standard_string_options {
     return;
 }
 
+sub standard_string_matches {
+    my ($string_type) = @_;
+    if (ref($stringmatches{$string_type}) eq 'ARRAY') {
+        return $stringmatches{$string_type};
+    }
+    return;
+}
+
+sub get_stringtype {
+    my ($name) = @_;
+    if (exists($stringtypes{$name})) {
+        return $stringtypes{$name};
+    }
+    return;
+}
+
 sub string_selector {
-    my ($thistype, $thiskey, $showval, $name) = @_;
+    my ($thistype, $thiskey, $showval, $name, $readonly) = @_;
 
     if (!exists($strings{$thistype})) {
-    return &default_selector($thiskey,$showval);
+        return &default_selector($thiskey,$showval,$readonly);
     }
 
     my %skiptype;
     if (($thistype eq 'string_questiontype') || 
-        ($thistype eq 'string_lenient')) {
+        ($thistype eq 'string_lenient') ||
+        ($thistype eq 'string_discussvote') ||
+        ($thistype eq 'string_ip') ||
+        ($name eq 'retrypartial')) {
         my ($got_chostname,$chostname,$cmajor,$cminor); 
         foreach my $possibilities (@{ $strings{$thistype} }) {
             next unless (ref($possibilities) eq 'ARRAY');
             my ($parmval, $description) = @{ $possibilities };
-            my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval"};
+            my $parmmatch;
+            if (ref($stringmatches{$thistype}) eq 'ARRAY') {
+                foreach my $item (@{$stringmatches{$thistype}}) {
+                    if (ref($item) eq 'ARRAY') {
+                        if ($parmval eq $item->[0]) {
+                            $parmmatch = $parmval;
+                            $parmval = '';
+                            last;
+                        }
+                    }
+                }
+            }
+            my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval:$parmmatch"}; 
             if ($needsrelease) {
                 unless ($got_chostname) {
                     ($chostname,$cmajor,$cminor)=&parameter_release_vars();
                     $got_chostname = 1;
                 }
-                my $needsnewer=&parameter_releasecheck($name,$parmval,$needsrelease,
-                                                       $chostname,$cmajor,
-                                                       $cminor);
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,
+                                                       $needsrelease,$cmajor,$cminor);
                 if ($needsnewer) {
-                    $skiptype{$parmval} = 1;
+                    if ($parmmatch ne '') {
+                        $skiptype{$parmmatch} = 1;
+                    } elsif ($parmval ne '') {
+                        $skiptype{$parmval} = 1;
+                    }
                 }
             }
         }
     }
-    
 
-    my $result;
+    if ($thistype eq 'string_ip') {
+        return &string_ip_selector($thiskey,$showval,$readonly); 
+    }
+
+    my ($result,$disabled);
+
+    if ($readonly) {
+        $disabled = ' disabled="disabled"';
+    }
     my $numinrow = 3;
     if ($thistype eq 'string_problemstatus') {
         $numinrow = 2;
@@ -3199,7 +3719,7 @@ sub string_selector {
         foreach my $possibilities (@{ $strings{$thistype} }) {
             next unless (ref($possibilities) eq 'ARRAY');
             my ($name, $description) = @{ $possibilities };
-            next if ($skiptype{$name}); 
+            next if ($skiptype{$name});
             $rem = $i%($numinrow);
             if ($rem == 0) {
                 if ($i > 0) {
@@ -3207,24 +3727,66 @@ sub string_selector {
                 }
                 $result .= '<tr>';
             }
-            $result .= '<td class="LC_left_item">'.
+            my $colspan;
+            if ($i == @{ $strings{$thistype} }-1) {
+                $rem = @{ $strings{$thistype} }%($numinrow);
+                if ($rem) {
+                    my $colsleft = $numinrow - $rem;
+                    if ($colsleft) {
+                        $colspan = $colsleft+1;
+                        $colspan = ' colspan="'.$colspan.'"';
+                    }
+                }
+            }
+            my ($add,$onchange,$css_class);
+            if ($thistype eq 'string_lenient') {
+                if ($name eq 'weighted') {
+                    my $display;
+                    my %relatives = &Apache::lonlocal::texthash(
+                                        corrchkd     => 'Correct (checked)',
+                                        corrunchkd   => 'Correct (unchecked)',
+                                        incorrchkd   => 'Incorrect (checked)',
+                                        incorrunchkd => 'Incorrect (unchecked)',
+                    );
+                    my %textval = (
+                                    corrchkd     => '1.0',
+                                    corrunchkd   => '1.0',
+                                    incorrchkd   => '0.0',
+                                    incorrunchkd => '0.0',
+                    );
+                    if ($showval =~ /^([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)\,([\-\d\.]+)$/) {
+                        $textval{'corrchkd'} = $1;
+                        $textval{'corrunchkd'} = $2;
+                        $textval{'incorrchkd'} = $3;
+                        $textval{'incorrunchkd'} = $4;
+                        $display = 'inline';
+                        $showval = $name;
+                    } else {
+                        $display = 'none';
+                    }
+                    $add = ' <div id="LC_parmtext_'.$thiskey.'" style="display:'.$display.'"><table>'.
+                           '<tr><th colspan="2">'.&mt("Foil's submission status").'</th><th>'.&mt('Points').'</th></tr>';  
+                    foreach my $reltype ('corrchkd','corrunchkd','incorrchkd','incorrunchkd') {
+                        $add .= '<tr><td>&nbsp;</td><td>'.$relatives{$reltype}.'</td>'."\n".
+                                '<td><input type="text" name="settext_'.$thiskey.'"'.
+                                ' value="'.$textval{$reltype}.'" size="3"'.$disabled.' />'.
+                                '</td></tr>';
+                    }
+                    $add .= '</table></div>'."\n";
+                }
+                $onchange = ' onclick="javascript:toggleParmTextbox(this.form,'."'$thiskey'".');"';
+                $css_class = ' class="LC_lenient_radio"';
+            }
+            $result .= '<td class="LC_left_item"'.$colspan.'>'.
                        '<span class="LC_nobreak"><label>'.
                        '<input type="radio" name="set_'.$thiskey.
-                       '" value="'.$name.'"';
+                       '" value="'.$name.'"'.$onchange.$css_class.$disabled;
             if ($showval eq $name) {
                 $result .= ' checked="checked"';
             }
-            $result .= ' />'.&mt($description).'</label></span></td>';
+            $result .= ' />'.&mt($description).'</label>'.$add.'</span></td>';
             $i++;
         }
-        $rem = @{ $strings{$thistype} }%($numinrow);
-        my $colsleft = $numinrow - $rem;
-        if ($colsleft > 1 ) {
-            $result .= '<td colspan="'.$colsleft.'" class="LC_left_item">'.
-                       '&nbsp;</td>';
-        } elsif ($colsleft == 1) {
-            $result .= '<td class="LC_left_item">&nbsp;</td>';
-        }
         $result .= '</tr>';
     }
     if ($result) {
@@ -3233,6 +3795,179 @@ sub string_selector {
     return $result;
 }
 
+my %intervals =
+    (
+     'date_interval'
+             => [[ 'done', 'Yes' ],
+                 [ '', 'No' ]],
+    );
+
+my %intervalmatches = (
+         'date_interval'
+              => [['done','\d+_done$'],],
+    );
+
+my %intervaltypes = (
+                      interval => 'date_interval',
+    );
+
+sub standard_interval_matches {
+    my ($interval_type) = @_;
+    if (ref($intervalmatches{$interval_type}) eq 'ARRAY') {
+        return $intervalmatches{$interval_type};
+    }
+    return;
+}
+
+sub get_intervaltype {
+    my ($name) = @_;
+    if (exists($intervaltypes{$name})) {
+        return $intervaltypes{$name};
+    }
+    return;
+}
+
+sub standard_interval_options {
+    my ($interval_type) = @_;
+    if (ref($intervals{$interval_type}) eq 'ARRAY') {
+        return $intervals{$interval_type};
+    }
+    return;
+}
+
+sub date_interval_selector {
+    my ($thiskey, $name, $showval, $readonly) = @_;
+    my ($result,%skipval);
+    if ($name eq 'interval') {
+        my $intervaltype = &get_intervaltype($name);
+        my ($got_chostname,$chostname,$cmajor,$cminor);
+        foreach my $possibilities (@{ $intervals{$intervaltype} }) {
+            next unless (ref($possibilities) eq 'ARRAY');
+            my ($parmval, $description) = @{ $possibilities };
+            my $parmmatch;
+            if (ref($intervalmatches{$intervaltype}) eq 'ARRAY') {
+                foreach my $item (@{$intervalmatches{$intervaltype}}) {
+                    if (ref($item) eq 'ARRAY') {
+                        if ($parmval eq $item->[0]) {
+                            $parmmatch = $parmval;
+                            $parmval = '';
+                            last;
+                        }
+                    }
+                }
+            }
+            my $needsrelease=$Apache::lonnet::needsrelease{"parameter:$name:$parmval:$parmmatch"};
+            if ($needsrelease) {
+                unless ($got_chostname) {
+                    ($chostname,$cmajor,$cminor)=&parameter_release_vars();
+                    $got_chostname = 1;
+                }
+                my $needsnewer=&parameter_releasecheck($name,$parmval,$parmmatch,
+                                                       $needsrelease,$cmajor,$cminor);
+                if ($needsnewer) {
+                    if ($parmmatch ne '') {
+                        $skipval{$parmmatch} = 1;
+                    } elsif ($parmval ne '') {
+                        $skipval{$parmval} = 1;
+                    }
+                }
+            }
+        }
+    }
+
+    my $currval = $showval;
+    foreach my $which (['days', 86400, 31],
+               ['hours', 3600, 23],
+               ['minutes', 60, 59],
+               ['seconds',  1, 59]) {
+    my ($name, $factor, $max) = @{ $which };
+    my $amount = int($showval/$factor);
+    $showval  %= $factor;
+    my %select = ((map {$_ => $_} (0..$max)),
+              'select_form_order' => [0..$max]);
+    $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
+                           \%select,'',$readonly);
+    $result .= ' '.&mt($name);
+    }
+    if ($name eq 'interval') {
+        unless ($skipval{'done'}) {
+            my $checkedon = '';
+            my $checkedoff = ' checked="checked"';
+            if ($currval =~ /^(\d+)_done$/) {
+                $checkedon = ' checked="checked"';
+                $checkedoff = '';
+            }
+            $result .= '<span class="LC_nobreak">'.('&nbsp;' x 3).'('.&mt('Include "done" button').
+                       '<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.' />'.
+                       &mt('Yes').'</label>'.
+                       '<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.' />'.
+                       &mt('No').'</label>)</span>';
+        }
+    }
+    unless ($readonly) {
+        $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
+    }
+    return $result;
+}
+
+sub oldversion_warning {
+    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
+    my $desc;
+    my $stringtype = &get_stringtype($name);
+    if ($stringtype ne '') {
+        if ($name eq 'examcode') {
+            $desc = $value;
+        } elsif (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
+            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
+                next unless (ref($possibilities) eq 'ARRAY');
+                my ($parmval, $description) = @{ $possibilities };
+                my $parmmatch;
+                if (ref($stringmatches{$stringtypes{$name}}) eq 'ARRAY') {
+                    foreach my $item (@{$stringmatches{$stringtypes{$name}}}) {
+                        if (ref($item) eq 'ARRAY') {
+                            my ($regexpname,$pattern) = @{$item};
+                            if ($parmval eq $regexpname) {
+                                if ($value =~ /$pattern/) {
+                                    $desc = $description; 
+                                    $parmmatch = 1;
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                    last if ($parmmatch);
+                } elsif ($parmval eq $value) {
+                    $desc = $description;
+                    last;
+                }
+            }
+        }
+    } elsif (($name eq 'printstartdate') || ($name eq 'printenddate')) {
+        my $now = time;
+        if ($value =~ /^\d+$/) {
+            if ($name eq 'printstartdate') {
+                if ($value > $now) {
+                    $desc = &Apache::lonlocal::locallocaltime($value);
+                }
+            } elsif ($name eq 'printenddate') {
+                if ($value < $now) {
+                    $desc = &Apache::lonlocal::locallocaltime($value);
+                }
+            }
+        }
+    }
+    my $standard_name = &standard_parameter_names($name);
+    return '<p class="LC_warning">'.
+           &mt('[_1] was [_2]not[_3] set to [_4].',
+               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
+           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
+           $cmajor.'.'.$cminor,$chostname,
+           $needsrelease).
+           '</p>';
+}
+
+}
+
 #
 # Shift all start and end dates by $shift
 #
@@ -3243,7 +3978,7 @@ sub dateshift {
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
 # ugly retro fix for broken version of types
-    foreach my $key (keys %data) {
+    foreach my $key (keys(%data)) {
         if ($key=~/\wtype$/) {
             my $newkey=$key;
             $newkey=~s/type$/\.type/;
@@ -3253,7 +3988,7 @@ sub dateshift {
     }
     my %storecontent=();
 # go through all parameters and look for dates
-    foreach my $key (keys %data) {
+    foreach my $key (keys(%data)) {
        if ($data{$key.'.type'}=~/^date_(start|end)$/) {
           my $newdate=$data{$key}+$shift;
           $storecontent{$key}=$newdate;
@@ -3273,14 +4008,33 @@ sub newoverview {
 
     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'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
         text=>"Overview Mode"});
-    my $start_page = &Apache::loncommon::start_page('Set Parameters');
+
+    my %loaditems = (
+                      'onload'   => "showHide_courseContent(); resize_scrollbox('mapmenuscroll','1','1'); showHideLenient();",
+                    );
+    my $js = '
+<script type="text/javascript">
+// <![CDATA[
+'.
+            &Apache::lonhtmlcommon::resize_scrollbox_js('params')."\n".
+            &showhide_js()."\n".
+            &toggleparmtextbox_js()."\n".
+            &validateparms_js()."\n".
+            &ipacc_boxes_js()."\n".
+'// ]]>
+</script>
+';
+
+    my $start_page = &Apache::loncommon::start_page('Set Parameters',$js,
+                                                    {'add_entries' => \%loaditems,});
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDOVER);
-<form method="post" action="/adm/parmset?action=newoverview" name="parmform">
+<form method="post" action="/adm/parmset?action=newoverview" name="parmform" onsubmit="return validateParms();">
 ENDOVER
     my @ids=();
     my %typep=();
@@ -3317,6 +4071,9 @@ ENDOVER
             @selected_sections = ('all');
         }
     }
+    if ($env{'request.course.sec'} ne '') {
+        @selected_sections = ($env{'request.course.sec'});
+    }
     my @selected_groups =
         &Apache::loncommon::get_env_multiple('form.Group');
 
@@ -3341,7 +4098,7 @@ ENDOVER
     $r->print('<div class="LC_Box">');
     #$r->print('<h2 class="LC_hcell">Step 1</h2>');
     $r->print('<div>');
-    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
     &levelmenu($r,\%alllevs,$parmlev);
     if ($parmlev ne 'general') {
         $r->print(&Apache::lonhtmlcommon::row_closure());
@@ -3356,16 +4113,26 @@ ENDOVER
     &displaymenu($r,\%allparms,\@pscat,\%keyorder);
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
+    my $sectionselector = &sectionmenu(\@selected_sections);
+    my $groupselector = &groupmenu(\@selected_groups);
     $r->print('<table>'.
-              '<tr><th>'.&mt('Parts').'</th><th>'.&mt('Section(s)').
-              '</th><th>'.&mt('Group(s)').'</th></tr><tr><td>');
+              '<tr><th>'.&mt('Parts').'</th>');
+    if ($sectionselector) {
+        $r->print('<th>'.&mt('Section(s)').'</th>');
+    }
+    if ($groupselector) {
+        $r->print('<th>'.&mt('Group(s)').'</th>');
+    }
+    $r->print('</tr><tr><td>');
     &partmenu($r,\%allparts,\@psprt);
-    $r->print('</td><td>');
-    &sectionmenu($r,\@selected_sections);
-    $r->print('</td><td>');
-    &groupmenu($r,\@selected_groups);
-    $r->print('</td></tr></table>');
-    #$r->print('</td></tr></table>');
+    $r->print('</td>');
+    if ($sectionselector) { 
+        $r->print('<td>'.$sectionselector.'</td>');
+    }
+    if ($groupselector) {
+        $r->print('<td>'.$groupselector.'</td>');
+    }
+    $r->print('</tr></table>');
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print('</div></div>');
@@ -3399,7 +4166,7 @@ ENDOVER
 
 # List data
 
-        &listdata($r,$resourcedata,$listdata,$sortorder);
+        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview');
     }
     $r->print(&tableend().
          ((($env{'form.store'}) || ($env{'form.dis'}))?'<p><input type="submit" name="store" value="'.&mt('Save').'" /></p>':'').
@@ -3423,7 +4190,7 @@ sub secgroup_lister {
                 $$listdata{$newparmkey.'.type'}=$$defkeytype{$cat};
             } elsif ($parmlev eq 'map') {
 # map-level parameter
-                foreach my $mapid (keys %{$allmaps}) {
+                foreach my $mapid (keys(%{$allmaps})) {
                     if (($pschp ne 'all') && ($pschp ne $mapid)) { next; }
                     my $newparmkey=$rootparmkey.'.'.$$allmaps{$mapid}.'___(all).'.$part.'.'.$cat;
                     $$listdata{$newparmkey}=1;
@@ -3447,14 +4214,25 @@ sub overview {
     my ($r) = @_;
     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 $js = '<script type="text/javascript">'."\n".
+             '// <![CDATA['."\n".
+             &toggleparmtextbox_js()."\n".
+             &validateparms_js()."\n".
+             &ipacc_boxes_js()."\n".
+             '// ]]>'."\n".
+             '</script>'."\n";
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
     text=>"Overview Mode"});
-    my $start_page=&Apache::loncommon::start_page('Modify Parameters');
+    my %loaditems = (
+                      'onload'   => "showHideLenient();",
+                    );
+
+    my $start_page=&Apache::loncommon::start_page('Modify Parameters',$js,{'add_entries' => \%loaditems,});
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
-    $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform">');
+    &startSettingsScreen($r,'parmset',$crstype);
+    $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform" onsubmit="return validateParms();">');
 
 # Store modified
 
@@ -3462,7 +4240,7 @@ sub overview {
 
 # Read modified data
 
-    my $resourcedata=&readdata($crs,$dom);
+    my ($resourcedata,$classlist)=&readdata($crs,$dom);
 
 
     my $sortorder=$env{'form.sortorder'};
@@ -3471,10 +4249,9 @@ sub overview {
 
 # List data
 
-    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder);
-
+    my $foundkeys=&listdata($r,$resourcedata,$resourcedata,$sortorder,'overview',$classlist);
     $r->print(&tableend().'<p>'.
-    ($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':&mt('There are no parameters.')).'</p></form>'.
+    ($foundkeys?'<input type="submit" value="'.&mt('Save').'" />':'<span class="LC_info">'.&mt('There are no parameters.').'</span>').'</p></form>'.
           &Apache::loncommon::end_page());
 }
 
@@ -3550,8 +4327,9 @@ ENDOVER
         } elsif ($data{'realm_type'} eq 'symb') {
         my ($map,$resid,$url) =
             &Apache::lonnet::decode_symb($data{'realm'});
-        $r->print(&mt('Resource: [_1] <br />&nbsp;&nbsp;&nbsp;with ID: [_2] <br />&nbsp;&nbsp;&nbsp;in folder [_3]',
-                  $url,$resid,$map));
+        $r->print(&mt('Resource: [_1]with ID: [_2]in folder [_3]',
+                      $url.' <br />&nbsp;&nbsp;&nbsp;',
+                      $resid.' <br />&nbsp;&nbsp;&nbsp;',$map));
         }
         $r->print(' <br />&nbsp;&nbsp;&nbsp;'.&mt('Part: [_1]',$data{'parameter_part'}));
         $r->print('</td></tr>');
@@ -3569,19 +4347,19 @@ sub date_shift_one {
     my ($r) = @_;
     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'};
 
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
-    $r->print('<form name="shiftform" method="post">'.
+    &startSettingsScreen($r,'parmset',$crstype);
+    $r->print('<form name="shiftform" method="post" action="">'.
               '<table><tr><td>'.&mt('Currently set date:').'</td><td>'.
               &Apache::lonlocal::locallocaltime($env{'form.timebase'}).'</td></tr>'.
               '<tr><td>'.&mt('Shifted date:').'</td><td>'.
-                    &Apache::lonhtmlcommon::dshowerfuck.net
-ate_setter('shiftform',
+                    &Apache::lonhtmlcommon::date_setter('shiftform',
                                                         'timeshifted',
                                                         $env{'form.timebase'},,
                                                         '').
@@ -3597,18 +4375,25 @@ sub date_shift_two {
     my ($r) = @_;
     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'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
+    &startSettingsScreen($r,'parmset',$crstype);
     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
-    $r->print(&mt('Shifting all dates such that [_1] becomes [_2]',
+    $r->print('<h2>'.&mt('Shift Dates').'</h2>'.
+              '<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
               &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
-              &Apache::lonlocal::locallocaltime($timeshifted)));
+              &Apache::lonlocal::locallocaltime($timeshifted)).'</p>');
     my $delta=$timeshifted-$env{'form.timebase'};
     &dateshift($delta);
+    $r->print(
+        &Apache::lonhtmlcommon::confirm_success(&mt('Done')).
+        '<br /><br />'.
+        &Apache::lonhtmlcommon::actionbox(
+            ['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));
     &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
@@ -3664,7 +4449,10 @@ sub print_main_menu {
     #
     $r->print(&header());
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content and Problem Settings'));
-    &startSettingsScreen($r,'parmset');
+    my $crstype = &Apache::loncommon::course_type();
+    my $lc_crstype = lc($crstype);
+
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print(<<ENDMAINFORMHEAD);
 <form method="post" enctype="multipart/form-data"
       action="/adm/parmset" name="studentform">
@@ -3674,9 +4462,11 @@ ENDMAINFORMHEAD
     my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $vgr  = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
     my $mgr  = &Apache::lonnet::allowed('mgr',$env{'request.course.id'});
-
-    my $crstype = &Apache::loncommon::course_type();
-    my $lc_crstype = lc($crstype);
+    my $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'});
+    if ((!$dcm) && ($env{'request.course.sec'} ne '')) {
+        $dcm = &Apache::lonnet::allowed('dcm',$env{'request.course.id'}.
+                                        '/'.$env{'request.course.sec'});
+    }
 
     my @menu =
         ( { categorytitle=>"Content Settings for this $crstype",
@@ -3693,7 +4483,12 @@ ENDMAINFORMHEAD
             linktitle => "Reset access times for folders/maps, resources or the $lc_crstype."  ,
             icon => 'start-here.png'  ,
             },
-
+          { linktext => 'Blocking Communication/Resource Access',
+            url => '/adm/setblock',
+            permission => $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,
@@ -3740,7 +4535,9 @@ ENDMAINFORMHEAD
             }]}
           );
     $r->print(&Apache::lonhtmlcommon::generate_menu(@menu));
+    $r->print('</form>');
     &endSettingsScreen($r);
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
@@ -3808,6 +4605,7 @@ sub order_meta_fields {
     my $idx = 1;
     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'};;
     $r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
         text=>"Add Metadata Field"});
@@ -3816,12 +4614,12 @@ sub order_meta_fields {
               text=>"Restrict Metadata"},
              {text=>"Order Metadata"});
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Order Metadata'));
-    &startSettingsScreen($r,'parmset');
+    &startSettingsScreen($r,'parmset',$crstype);
     if ($env{'form.storeorder'}) {
         my $newpos = $env{'form.newpos'} - 1;
         my $currentpos = $env{'form.currentpos'} - 1;
         my @neworder = ();
-        my @oldorder = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+        my @oldorder = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
         my $i;
         if ($newpos > $currentpos) {
         # moving stuff up
@@ -3855,10 +4653,10 @@ sub order_meta_fields {
     }
     my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
     my $ordered_fields;
-    my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+    my @fields_in_order = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
     if (!@fields_in_order) {
         # no order found, pick sorted order then create metadata.addedorder key.
-        foreach my $key (sort keys %$fields) {
+        foreach my $key (sort(keys(%$fields))) {
             push @fields_in_order, $key;
             $ordered_fields = join ",", @fields_in_order;
         }
@@ -3870,7 +4668,7 @@ sub order_meta_fields {
     foreach my $key (@fields_in_order) {
         $r->print('<tr><td>');
         $r->print('<form method="post" action="">');
-        $r->print('<select name="newpos" onChange="this.form.submit()">');
+        $r->print('<select name="newpos" onchange="this.form.submit()">');
         for (my $i = 1;$i le $num_fields;$i ++) {
             if ($i eq $idx) {
                 $r->print('<option value="'.$i.'"  SELECTED>('.$i.')</option>');
@@ -3906,9 +4704,10 @@ sub addmetafield {
         text=>"Add Metadata Field"});
     $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
-    &startSettingsScreen($r,'parmset');
     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'};
+    &startSettingsScreen($r,'parmset',$crstype);
     if (exists($env{'form.undelete'})) {
         my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
         foreach my $meta_field(@meta_fields) {
@@ -3963,9 +4762,10 @@ sub setrestrictmeta {
         text=>"Restrict Metadata"});
     $r->print(&Apache::loncommon::start_page('Restrict Metadata'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
-    &startSettingsScreen($r,'parmset');
     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'};
+    &startSettingsScreen($r,'parmset',$crstype);
     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
     my $save_field = '';
     if ($env{'form.restrictmeta'}) {
@@ -4077,15 +4877,16 @@ sub defaultsetter {
 
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
         text=>"Set Defaults"});
+    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 $start_page =
-    &Apache::loncommon::start_page('Parameter Setting Default Actions');
+        &Apache::loncommon::start_page('Parameter Setting Default Actions');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
     $r->print($start_page.$breadcrumbs);
-    &startSettingsScreen($r,'parmset');
+    &startSettingsScreen($r,'parmset',$crstype);
     $r->print('<form method="post" action="/adm/parmset?action=setdefaults" name="defaultform">');
 
-    my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-    my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my @ids=();
     my %typep=();
     my %keyp=();
@@ -4136,11 +4937,11 @@ sub defaultsetter {
         }
         }
     }
-    foreach my $key (keys %allparms) {
+    foreach my $key (keys(%allparms)) {
         $newrules{$key.'_triggers'}=$triggers{$key};
     }
-    &Apache::lonnet::put('parmdefactions',\%newrules,$dom,$crs);
-    &Apache::lonnet::del('parmdefactions',\@delrules,$dom,$crs);
+    &Apache::lonnet::put('parmdefactions',\%newrules,$cdom,$cnum);
+    &Apache::lonnet::del('parmdefactions',\@delrules,$cdom,$cnum);
     &resetrulescache();
     }
     my %lt=&Apache::lonlocal::texthash('days' => 'Days',
@@ -4317,18 +5118,26 @@ sub standard_parameter_types {
 
 sub parm_change_log {
     my ($r)=@_;
+    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'}
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
     text=>"Parameter Change Log"});
-    $r->print(&Apache::loncommon::start_page('Parameter Change Log'));
+    my $js = '<script type="text/javascript">'."\n".
+             '// <![CDATA['."\n".
+             &Apache::loncommon::display_filter_js('parmslog')."\n".
+             '// ]]>'."\n".
+             '</script>'."\n";
+    $r->print(&Apache::loncommon::start_page('Parameter Change Log',$js));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
-    &startSettingsScreen($r,'parmset');
-    my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
-                      $env{'course.'.$env{'request.course.id'}.'.domain'},
-                      $env{'course.'.$env{'request.course.id'}.'.num'});
+    &startSettingsScreen($r,'parmset',$crstype);
+    my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',$cdom,$cnum);
 
     if ((keys(%parmlog))[0]=~/^error\:/) { undef(%parmlog); }
 
-    $r->print('<form action="/adm/parmset?action=parameterchangelog"
+    $r->print('<div class="LC_left_float">'.
+              '<fieldset><legend>'.&mt('Display of Changes').'</legend>'.
+              '<form action="/adm/parmset?action=parameterchangelog"
                      method="post" name="parameterlog">');
 
     my %saveable_parameters = ('show' => 'scalar',);
@@ -4336,13 +5145,11 @@ sub parm_change_log {
                                               \%saveable_parameters);
     &Apache::loncommon::restore_course_settings('parameter_log',
                                                 \%saveable_parameters);
-    $r->print(&Apache::loncommon::display_filter().
-              '<label>'.&Apache::lonhtmlcommon::checkbox('includetypes',$env{'form.includetypes'},'1').
-          ' '.&mt('Include parameter types').'</label>'.
-          '<input type="submit" value="'.&mt('Display').'" /></form>');
+    $r->print(&Apache::loncommon::display_filter('parmslog').'&nbsp;'."\n".
+              '<input type="submit" value="'.&mt('Display').'" />'.
+              '</form></fieldset></div><br clear="all" />');
 
-    my $courseopt=&Apache::lonnet::get_courseresdata($env{'course.'.$env{'request.course.id'}.'.num'},
-                             $env{'course.'.$env{'request.course.id'}.'.domain'});
+    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>'.
@@ -4396,6 +5203,13 @@ sub parm_change_log {
                 !exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
             my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
         &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
+        if ($env{'request.course.sec'} ne '') {
+            next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));
+            if ($uname ne '') {
+                my $stusection = &Apache::lonnet::getsection($uname,$udom,$env{'request.course.id'});
+                next if (($stusection ne '-1') && ($stusection ne $env{'request.course.sec'})); 
+            }
+        }
         if ($env{'form.displayfilter'} eq 'currentfolder') {
         if ($folder) {
             if ($middle!~/^\Q$folder\E/) { next; }
@@ -4537,11 +5351,11 @@ sub update_slots {
                           action  => 'reserve',
                           context => 'parameter',
                         );
-        &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
-                                        '',$uname,$udom,$cnum,$cdom);
+        &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
+                                   '',$uname,$udom,$cnum,$cdom);
 
-        &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                        '',$uname,$udom,$uname,$udom);
+        &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
+                                   '',$uname,$udom,$uname,$udom);
     }
     return $success;
 }
@@ -4571,10 +5385,10 @@ sub delete_slots {
                                   action  => 'release',
                                   context => 'parameter',
                                 );
-                &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
-                                                1,$uname,$udom,$cnum,$cdom);
-                &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
-                                                1,$uname,$udom,$uname,$udom);
+                &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
+                                           1,$uname,$udom,$cnum,$cdom);
+                &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
+                                           1,$uname,$udom,$uname,$udom);
             }
         }
     }
@@ -4597,47 +5411,20 @@ sub parameter_release_vars {
 }
 
 sub parameter_releasecheck {
-    my ($name,$value,$needsrelease,$chostname,$cmajor,$cminor) = @_;
+    my ($name,$value,$valmatch,$needsrelease,$cmajor,$cminor) = @_;
     my $needsnewer;
     my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
     if (($cmajor < $needsmajor) || 
         ($cmajor == $needsmajor && $cminor < $needsminor)) {
         $needsnewer = 1;
-    } else {
-        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value});
+    } elsif ($valmatch) {
+        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.'::'.$valmatch});
+    } elsif ($value) { 
+        &Apache::lonnet::update_released_required($Apache::lonnet::needsrelease{'parameter:'.$name.':'.$value.':'});
     }
     return $needsnewer;
 }
 
-sub oldversion_warning {
-    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
-    my $desc;
-    my %stringtypes = (
-                        type    => 'string_questiontype',
-                        lenient => 'string_lenient'
-                      );
-    if (exists($stringtypes{$name})) {
-        if (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
-            foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
-                next unless (ref($possibilities) eq 'ARRAY');
-                my ($parmval, $description) = @{ $possibilities };
-                if ($parmval eq $value) {
-                    $desc = $description;
-                    last;
-                }
-            }
-        }
-    }
-    my $standard_name = &standard_parameter_names($name);
-    return '<p class="LC_warning">'.
-           &mt('[_1] was [_2]not[_3] set to [_4].',
-               $standard_name,'<b>','</b>','"'.$desc.'"').'<br />'.
-           &mt('LON-CAPA version ([_1]) installed on home server ([_2]) does not meet version requirements ([_3] or newer).',
-           $cmajor.'.'.$cminor,$chostname,
-           $needsrelease).
-           '</p>';
-}
-
 sub handler {
     my $r=shift;