--- loncom/interface/lonparmset.pm	2016/11/29 05:23:30	1.522.2.22
+++ loncom/interface/lonparmset.pm	2020/01/15 00:38:38	1.522.2.26.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.22 2016/11/29 05:23:30 raeburn Exp $
+# $Id: lonparmset.pm,v 1.522.2.26.2.1 2020/01/15 00:38:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,7 +36,8 @@ lonparmset - Handler to set parameters f
 
 =head1 SYNOPSIS
 
-lonparmset provides an interface to setting course parameters. 
+lonparmset provides an interface to setting content parameters in a 
+course.
 
 =head1 DESCRIPTION
 
@@ -129,7 +130,7 @@ javascript function 'pjump'.
 
 =item print_td()
 
-=item print_usergroups()
+=item check_other_groups()
 
 =item parm_control_group()
 
@@ -766,7 +767,17 @@ sub valout {
         }
     } else {
         if ($type eq 'date_interval') {
-            my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+            my ($totalsecs,$donesuffix) = split(/_/,$value,2);
+            my ($usesdone,$donebuttontext,$proctor,$secretkey);
+            if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) {
+                $donebuttontext = $1;
+                (undef,$proctor,$secretkey) = split(/_/,$2);
+                $usesdone = 'done';
+            } elsif ($donesuffix =~ /^done(|_.+)$/) {
+                $donebuttontext = &mt('Done');
+                ($usesdone,$proctor,$secretkey) = split(/_/,$donesuffix);
+            }
+            my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($totalsecs);
             my @timer;
             $year=$year-70;
             $mday--;
@@ -799,6 +810,13 @@ sub valout {
                 push(@timer,&mt('[quant,_1,sec]',0));
             }
             $result.=join(", ",@timer);
+            if ($usesdone eq 'done') {
+                if ($secretkey) {
+                    $result .= ' '.&mt('+ "[_1]" with proctor key: [_2]',$donebuttontext,$secretkey);
+                } else {
+                    $result .= ' + "'.$donebuttontext.'"';
+                }
+            }
         } elsif (&isdateparm($type)) {
             $result = &Apache::lonlocal::locallocaltime($value).
         &date_sanity_info($value);
@@ -816,8 +834,12 @@ sub plink {
     my ($type,$dis,$value,$marker,$return,$call)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
-    if (&isdateparm($type)) {
+        if ((&isdateparm($type)) || (&is_specialstring($type))) {
             $winvalue=$env{'form.recent_'.$type};
+        } elsif ($type eq 'string_yesno') {
+            if ($env{'form.recent_string'} =~ /^(yes|no)$/i) {
+                $winvalue=$env{'form.recent_string'};
+            }
         } else {
             $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
         }
@@ -850,20 +872,22 @@ sub page_js {
     $pjump_def
 
     function psub() {
+        var specstring = /^string_!(yesno|any)/i;
         if (document.parmform.pres_marker.value!='') {
             document.parmform.action+='#'+document.parmform.pres_marker.value;
             var typedef=new Array();
             typedef=document.parmform.pres_type.value.split('_');
-           if (document.parmform.pres_type.value!='') {
-            if (typedef[0]=='date') {
-                eval('document.parmform.recent_'+
-                     document.parmform.pres_type.value+
-             '.value=document.parmform.pres_value.value;');
-            } else {
-                eval('document.parmform.recent_'+typedef[0]+
-             '.value=document.parmform.pres_value.value;');
+            if (document.parmform.pres_type.value!='') {
+                if ((typedef[0]=='date') ||
+                    (specstring.test(document.parmform.pres_type.value)))  {
+                    eval('document.parmform.recent_'+
+                        document.parmform.pres_type.value+
+                        '.value=document.parmform.pres_value.value;');
+                } else {
+                    eval('document.parmform.recent_'+typedef[0]+
+                        '.value=document.parmform.pres_value.value;');
+                }
             }
-       }
             document.parmform.submit();
         } else {
             document.parmform.pres_value.value='';
@@ -905,6 +929,97 @@ function showHide_courseContent() {
 COURSECONTENTSCRIPT
 }
 
+sub validateparms_js {
+    return <<'ENDSCRIPT';
+
+function validateParms() {
+    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 (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;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return true;
+}
+
+ENDSCRIPT
+}
+
+# Javascript initialization, for overview mode
+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 done_proctor_js {
+    return <<"END";
+function toggleSecret(form,radio,key) {
+    var radios = form[radio+key];
+    if (radios.length) {
+        for (var i=0; i<radios.length; i++) {
+            if (radios[i].checked) {
+                if (radios[i].value == '_done_proctor') {
+                    if (document.getElementById('done_'+key+'_proctorkey')) {
+                        document.getElementById('done_'+key+'_proctorkey').type='text';
+                    }
+                } else {
+                    if (document.getElementById('done_'+key+'_proctorkey')) {
+                        document.getElementById('done_'+key+'_proctorkey').type='hidden';
+                        document.getElementById('done_'+key+'_proctorkey').value='';
+                    }
+                }
+            }
+        }
+    }
+}
+END
+
+}
+
 sub startpage {
     my ($r,$psymb) = @_;
 
@@ -1024,7 +1139,7 @@ sub print_row {
             if (@{$usersgroups} > 1) {
                 my ($coursereply,$grp_parm,$controlgrp);
                 ($coursereply,$othergrp,$grp_parm,$controlgrp) =
-                    &print_usergroups($r,$$part{$which}.'.'.$$name{$which},
+                    &check_other_groups($$part{$which}.'.'.$$name{$which},
                        $rid,$cgroup,$defbgone,$usersgroups,$result,$courseopt);
                 if ($coursereply && $result > 3) {
                     if (defined($controlgrp)) {
@@ -1091,6 +1206,12 @@ sub print_td {
     } else {
         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;
@@ -1111,8 +1232,8 @@ sub print_td {
     $r->print('</td>'."\n");
 }
 
-sub print_usergroups {
-    my ($r,$what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
+sub check_other_groups {
+    my ($what,$rid,$cgroup,$defbg,$usersgroups,$result,$courseopt) = @_;
     my $courseid = $env{'request.course.id'};
     my $output;
     my $symb = &symbcache($rid);
@@ -1127,7 +1248,6 @@ sub print_usergroups {
     if (($coursereply) && ($cgroup ne $resultgroup)) {
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
-            $grp_parm = &valout($coursereply,$resulttype);
         }
         $grp_parm = &valout($coursereply,$resulttype);
         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
@@ -1273,14 +1393,21 @@ sub isdateparm {
     return (($type=~/^date/) && (!($type eq 'date_interval')));
 }
 
+# Determine if parameter type is specialized string type (i.e.,
+# not just string or string_yesno.
+
+sub is_specialstring {
+    my $type=shift;
+    return (($type=~/^string_/) && (($type ne 'string_yesno')));
+}
+
 #
 # parmmenu displays a list of the selected parameters.
 # It also offers a link to show/hide the complete parameter list
 # from which you can select all desired parameters.
 #
 sub parmmenu {
-    my ($r,$allparms,$pscat,$keyorder)=@_;
-    my $tempkey;
+    my ($r)=@_;
     $r->print(<<ENDSCRIPT);
 <script type="text/javascript">
 // <![CDATA[
@@ -1359,7 +1486,7 @@ sub parmmenu {
 ENDSCRIPT
 
     $r->print('<hr />');
-    &shortCuts($r,$allparms,$pscat,$keyorder);
+    &shortCuts($r);
     $r->print('<hr />');
 }
 # return a hash
@@ -1424,7 +1551,7 @@ sub lookUpTableParameter {
         'retrypartial' => 'tries',
         'discussvote'  => 'misc',
         'examcode' => 'high_level_randomization',
-    );    
+    );
 }
 
 sub whatIsMyCategory {
@@ -1506,6 +1633,7 @@ sub parmboxes {
                   .&mt($categories{$key})
                   .'</h4>'."\n");
         foreach $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+            next if ($tempkey eq '');
             $r->print('<span class="LC_nobreak">'
                      .'<label><input type="checkbox" name="pscat" '
                      .'value="'.$tempkey.'" ');
@@ -1525,7 +1653,7 @@ sub parmboxes {
 # This function offers some links on the parameter section to get with one click a group a parameters
 #
 sub shortCuts {
-    my ($r,$allparms,$pscat,$keyorder)=@_;
+    my ($r)=@_;
 
     # Parameter Selection
     $r->print(
@@ -1584,7 +1712,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();
@@ -1593,12 +1721,23 @@ 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')" |;
@@ -1612,7 +1751,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">
@@ -1631,7 +1770,7 @@ function group_or_section(caller) {
 // ]]>
 </script>
 |;
-    } else {
+    } elsif ($currsec eq '') {
         $sections .= qq|
 <script type="text/javascript">
 // <![CDATA[
@@ -1645,7 +1784,7 @@ 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 .= '>';
@@ -1684,12 +1823,12 @@ 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,$divid)=@_;
+    my ($r,$allparms,$pscat,$keyorder,$divid)=@_;
 
     $r->print(&Apache::lonhtmlcommon::start_pick_box());
     $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
 
-    &parmmenu($r,$allparms,$pscat,$keyorder);
+    &parmmenu($r);
     $r->print(&Apache::loncommon::start_scrollbox('480px','440px','200px',$divid));
     &parmboxes($r,$allparms,$pscat,$keyorder);
     $r->print(&Apache::loncommon::end_scrollbox());
@@ -1869,44 +2008,52 @@ sub levelmenu {
 
 
 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));
@@ -2025,12 +2172,17 @@ 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'})))) {
+                (!grep(/^\Q$cgroup\E$/,split(/:/,$env{'request.course.groups'})))) {
                 $noeditgrp = 1;
             }
         }
@@ -2152,9 +2304,14 @@ sub assessparms {
         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);
@@ -2244,11 +2401,14 @@ sub assessparms {
 
     &startpage($r,$pssymb);
 
-    foreach ('tolerance','date_default','date_start','date_end',
-        'date_interval','int','float','string') {
+    foreach my $item ('tolerance','date_default','date_start','date_end',
+                      'date_interval','int','float','string','string_lenient',
+                      'string_examcode','string_deeplink','string_discussvote',
+                      'string_useslots','string_problemstatus','string_ip',
+                      'string_questiontype') {
         $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
@@ -2294,12 +2454,12 @@ ENDPARMSELSCRIPT
 
         # Step 2
         $r->print(&Apache::lonhtmlcommon::topic_bar(2,&mt('Parameter Specification'),'parmstep2'));
-        &displaymenu($r,\%allparms,\@pscat,\@psprt,\%keyorder,'parmmenuscroll');
+        &displaymenu($r,\%allparms,\@pscat,\%keyorder,'parmmenuscroll');
 
         # Step 3
         $r->print(&Apache::lonhtmlcommon::topic_bar(3,&mt('User Specification (optional)'),'parmstep3'));
         $r->print(&Apache::lonhtmlcommon::start_pick_box());
-        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+        &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups,$pssymb);
         $r->print(&Apache::lonhtmlcommon::row_closure(1));
         $r->print(&Apache::lonhtmlcommon::end_pick_box());
 
@@ -2338,7 +2498,7 @@ ENDPARMSELSCRIPT
                   ($env{'form.psprt'}?' checked="checked"':'').' />'.
                   &mt('Show all parts').
                   '</label></td></tr>');
-        &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>'
@@ -2860,6 +3020,7 @@ sub storedata {
     if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
         my $cmd=$1;
         my $thiskey=$2;
+        next if ($cmd eq 'setipallow' || $cmd eq 'setipdeny');
         my ($tuname,$tudom)=&extractuser($thiskey);
         my $tkey=$thiskey;
             if ($tuname) {
@@ -3029,6 +3190,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);
@@ -3071,25 +3242,46 @@ sub listdata {
     } keys %{$listdata}) {
 
     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($1,$2);
+            } 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/^\.+//;
         my $realm='<span class="LC_parm_scope_all">'.&mt('All Resources').'</span>';
+
         if ($middle=~/^(.+)\_\_\_\(all\)$/) {
         $realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</span></span>';
         } elsif ($middle) {
@@ -3159,7 +3351,7 @@ sub listdata {
               );
             }
         } elsif ($thistype eq 'date_interval') {
-            $r->print(&date_interval_selector($thiskey,
+            $r->print(&date_interval_selector($thiskey,$name,
                       $$resourcedata{$thiskey},$readonly));
         } elsif ($thistype =~ m/^string/) {
             $r->print(&string_selector($thistype,$thiskey,
@@ -3179,8 +3371,9 @@ sub listdata {
 
 
 sub date_interval_selector {
-    my ($thiskey, $showval, $readonly) = @_;
-    my $result;
+    my ($thiskey, $pname, $showval, $readonly) = @_;
+    my ($result,%skipval);
+    my $currval = $showval;
     foreach my $which (['days', 86400, 31],
                ['hours', 3600, 23],
                ['minutes', 60, 59],
@@ -3194,6 +3387,51 @@ sub date_interval_selector {
                            \%select,'',$readonly);
     $result .= ' '.&mt($name);
     }
+    if ($pname eq 'interval') {
+        unless ($skipval{'done'}) {
+            my $checkedon = '';
+            my $checkedproc = '';
+            my $currproctorkey = '';
+            my $currprocdisplay = 'hidden';
+            my $currdonetext = &mt('Done');
+            my $checkedoff = ' checked="checked"';
+            if ($currval =~ /^(?:\d+)_done$/) {
+                $checkedon = ' checked="checked"';
+                $checkedoff = '';
+            } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) {
+                $currdonetext = $1;
+                $checkedon = ' checked="checked"';
+                $checkedoff = '';
+            } elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
+                $currproctorkey = $1;
+                $checkedproc = ' checked="checked"';
+                $checkedoff = '';
+                $currprocdisplay = 'text';
+            } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:_proctor_(.+)$/) {
+                $currdonetext = $1;
+                $currproctorkey = $2;
+                $checkedproc = ' checked="checked"';
+                $checkedoff = '';
+                $currprocdisplay = 'text';
+            }
+            my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
+            my $disabled;
+            if ($readonly) {
+                $disabled = ' disabled="disabled"';
+            }
+            $result .= '<br /><span class="LC_nobreak">'.&mt('Include "done" button').
+                       '<label><input type="radio" value="" name="done_'.$thiskey.'"'.$checkedoff.$onclick.$disabled.' />'.
+                       &mt('No').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" value="_done" name="done_'.$thiskey.'"'.$checkedon.$onclick.$disabled.' />'.
+                       &mt('Yes').'</label>'.('&nbsp;'x2).
+                       '<label><input type="radio" value="_done_proctor" name="done_'.$thiskey.'"'.$checkedproc.$onclick.$disabled.' />'.
+                       &mt('Yes, with proctor key').'</label>'.
+                       '<input type="'.$currprocdisplay.'" id="done_'.$thiskey.'_proctorkey" '.
+                       'name="done_'.$thiskey.'_proctorkey" value="'.&HTML::Entities::encode($currproctorkey,'"<>&').'"'.$disabled.' /></span><br />'.
+                       '<span class="LC_nobreak">'.&mt('Button text').': '.
+                       '<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
+        }
+    }
     unless ($readonly) {
         $result .= '<input type="hidden" name="dateinterval_'.$thiskey.'" />';
     }
@@ -3226,6 +3464,68 @@ sub default_selector {
     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 ($readonly) {
+        $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'
@@ -3253,6 +3553,9 @@ my %strings =
              => [['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']],
      );
 
 sub standard_string_options {
@@ -3293,6 +3596,10 @@ sub string_selector {
             }
         }
     }
+
+    if ($thistype eq 'string_ip') {
+        return &string_ip_selector($thiskey,$showval,$readonly);
+    }
  
     my ($result,$disabled);
 
@@ -3347,6 +3654,55 @@ sub string_selector {
     return $result;
 }
 
+sub oldversion_warning {
+    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
+    my $desc;
+    my %stringtypes = (
+                        type         => 'string_questiontype',
+                        lenient      => 'string_lenient',
+                        retrypartial => 'string_yesno',
+                        discussvote  => 'string_discussvote',
+                        examcode     => 'string_examcode',
+                      );
+    if (exists($stringtypes{$name})) {
+        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 };
+                if ($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
 #
@@ -3403,6 +3759,7 @@ sub newoverview {
 '.
             &Apache::lonhtmlcommon::resize_scrollbox_js('params')."\n".
             &showhide_js()."\n".
+            &done_proctor_js()."\n".
 '// ]]>
 </script>
 ';
@@ -3448,6 +3805,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');
 
@@ -3487,16 +3847,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>');
@@ -3579,13 +3949,19 @@ sub overview {
     my ($r,$parm_permission) = @_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    my $js = '<script type="text/javascript">'."\n".
+             '// <![CDATA['."\n".
+             &done_proctor_js()."\n".
+             '// ]]>'."\n".
+             '</script>'."\n";
     my $readonly = 1;
     if ($parm_permission->{'edit'}) {
         undef($readonly);
     }
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
     text=>"Overview Mode"});
-    my $start_page=&Apache::loncommon::start_page('Modify Parameters');
+    my $start_page=&Apache::loncommon::start_page('Modify Parameters',$js);
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
     $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform">');
@@ -3685,10 +4061,8 @@ ENDOVER
         $r->print(&mt('All users'));
         } elsif ($data{'scope_type'} eq 'user') {
         $r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
-        } elsif ($data{'scope_type'} eq 'section') {
-        $r->print(&mt('Section: [_1]',$data{'scope'}));
-        } elsif ($data{'scope_type'} eq 'group') {
-        $r->print(&mt('Group: [_1]',$data{'scope'}));
+        } elsif ($data{'scope_type'} eq 'secgroup') {
+        $r->print(&mt('Group/Section: [_1]',$data{'scope'}));
         }
         $r->print('<br />');
         if ($data{'realm_type'} eq 'all') {
@@ -3774,8 +4148,7 @@ sub parse_key {
         $data{'scope_type'} = 'user';
         $data{'scope'} = [$1,$2];
     } else {
-        #FIXME check for group scope
-        $data{'scope_type'} = 'section';
+        $data{'scope_type'} = 'secgroup';
     }
     $middle=~s/^\[(.*)\]//;
     }
@@ -4089,7 +4462,7 @@ sub continue {
     my $output;
     $output .= '<form action="" method="post">';
     $output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
-    $output .= '<input type="submit" value="Continue" />';
+    $output .= '<input type="submit" value="'.&mt('Continue').'" />';
     return ($output);
 }
 
@@ -4111,7 +4484,10 @@ sub addmetafield {
             my $put_result = &Apache::lonnet::put('environment',
                                         {'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);
 
-            $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
+            $r->print(&mt('Undeleted Metadata Field [_1] with result [_2]',
+                          '<strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}.
+                          '</strong>',$put_result).
+                      '<br />');
         }
         $r->print(&continue());
     } elsif (exists($env{'form.fieldname'})) {
@@ -4123,12 +4499,17 @@ sub addmetafield {
                             {'metadata.'.$meta_field.'.values'=>"",
                              'metadata.'.$meta_field.'.added'=>"$display_field",
                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
-        $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
+        $r->print(&mt('Added new Metadata Field [_1] with result [_2]',
+                      '<strong>'.$env{'form.fieldname'}.'</strong>',$put_result).
+                  '<br />');
         $r->print(&continue());
     } else {
         my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
         if ($fields) {
-            $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
+            $r->print(&mt('You may undelete previously deleted fields.').
+                      '<br />'.
+                      &mt('Check those you wish to undelete and click Undelete.').
+                      '<br />');
             $r->print('<form method="post" action="">');
             foreach my $key(keys(%$fields)) {
                 $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
@@ -4136,9 +4517,12 @@ sub addmetafield {
             $r->print('<input type="submit" name="undelete" value="Undelete" />');
             $r->print('</form>');
         }
-        $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
+        $r->print('<hr />'.
+                  &mt('[_1]Or[_2] you may enter a new metadata field name.',
+                      '<strong>','</strong>').
+                 '<form method="post" action="/adm/parmset?action=addmetadata">');
         $r->print('<input type="text" name="fieldname" /><br />');
-        $r->print('<input type="submit" value="Add Metadata Field" />');
+        $r->print('<input type="submit" value="'.&mt('Add Metadata Field').'" />');
     }
     $r->print('</form>');
 }
@@ -4159,6 +4543,11 @@ sub setrestrictmeta {
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
     my $save_field = '';
+    my %lt = &Apache::lonlocal::texthash(
+                                           addm => 'Add Metadata Field',
+                                           ordm => 'Order Metadata Fields',
+                                           save => 'Save',
+                                        );
     if ($env{'form.restrictmeta'}) {
         foreach my $field (sort(keys(%env))) {
             if ($field=~m/^form.(.+)_(.+)$/) {
@@ -4197,28 +4586,25 @@ sub setrestrictmeta {
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
     # Now get possible added metadata fields
     my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
-    my $row_alt = 1;
     $output .= &Apache::loncommon::start_data_table();
     foreach my $field (sort(keys(%metadata_fields))) {
         if ($field ne 'courserestricted') {
-            $row_alt = $row_alt ? 0 : 1;
         $output.= &output_row($r, $field, $metadata_fields{$field});
     }
     }
     my $buttons = (<<ENDButtons);
-        <input type="submit" name="restrictmeta" value="Save" />
+        <input type="submit" name="restrictmeta" value="$lt{'save'}" />
         </form><br />
         <form method="post" action="/adm/parmset?action=addmetadata" name="form1">
-        <input type="submit" name="restrictmeta" value="Add a Metadata Field" />
+        <input type="submit" name="restrictmeta" value="$lt{'addm'}" />
         </form>
         <br />
         <form method="post" action="/adm/parmset?action=ordermetadata" name="form2">
-        <input type="submit" name="restrictmeta" value="Order Metadata Fields" />
+        <input type="submit" name="restrictmeta" value="$lt{'ordm'}" />
 ENDButtons
     my $added_flag = 1;
     foreach my $field (sort(keys(%$added_metadata_fields))) {
-        $row_alt = $row_alt ? 0 : 1;
-        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag, $row_alt);
+        $output.= &output_row($r,$field,$$added_metadata_fields{$field},$added_flag);
     }
     $output .= &Apache::loncommon::end_data_table();
     $r->print(<<ENDenv);
@@ -4463,7 +4849,7 @@ my %standard_parms;
 my %standard_parms_types;
 
 sub load_parameter_names {
-    open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
+    open(my $config,"<","$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
     while (my $configline=<$config>) {
     if ($configline !~ /\S/ || $configline=~/^\#/) { next; }
     chomp($configline);
@@ -4478,6 +4864,7 @@ sub load_parameter_names {
     close($config);
     $standard_parms{'int_pos'}      = 'Positive Integer';
     $standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
+    $standard_parms{'scoreformat'}  = 'Format for display of score';
 }
 
 sub standard_parameter_names {
@@ -4596,6 +4983,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; }
@@ -4812,53 +5206,6 @@ sub parameter_releasecheck {
     return $needsnewer;
 }
 
-sub oldversion_warning {
-    my ($name,$value,$chostname,$cmajor,$cminor,$needsrelease) = @_;
-    my $desc;
-    my %stringtypes = (
-                        type         => 'string_questiontype',
-                        lenient      => 'string_lenient',
-                        retrypartial => 'string_yesno',
-                        discussvote  => 'string_discussvote',
-                        examcode     => 'string_examcode',
-                      );
-    if (exists($stringtypes{$name})) {
-        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 };
-                if ($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>';
-}
-
 sub get_permission {
     my %permission;
     my $allowed = 0;