--- loncom/interface/lonparmset.pm	2019/03/02 16:25:45	1.522.2.23.2.3
+++ loncom/interface/lonparmset.pm	2022/03/23 17:29:29	1.522.2.28.4.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.23.2.3 2019/03/02 16:25:45 raeburn Exp $
+# $Id: lonparmset.pm,v 1.522.2.28.4.3 2022/03/23 17:29:29 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()
 
@@ -752,7 +753,7 @@ sub storeparm_by_symb_inner {
 
 
 sub valout {
-    my ($value,$type,$name,$editable)=@_;
+    my ($value,$type,$editable)=@_;
     my $result = '';
     # Values of zero are valid.
     if (! $value && $value ne '0') {
@@ -830,7 +831,7 @@ sub valout {
 
 
 sub plink {
-    my ($type,$dis,$value,$marker,$return,$call)=@_;
+    my ($type,$dis,$value,$marker,$return,$call,$extra)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
         if ((&isdateparm($type)) || (&is_specialstring($type))) {
@@ -846,16 +847,16 @@ 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,$parmname,1);
+    my $valout = &valout($value,$type,1);
     my $unencmarker = $marker;
     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
-              \$hour, \$min, \$sec) {
+              \$hour, \$min, \$sec, \$extra) {
     $$item = &HTML::Entities::encode($$item,'"<>&');
     $$item =~ s/\'/\\\'/g;
     }
     return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.
     '<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
-        .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
+        .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."','".$extra."'".');">'.
         $valout.'</a></td></tr></table>';
 }
 
@@ -876,17 +877,17 @@ sub page_js {
             document.parmform.action+='#'+document.parmform.pres_marker.value;
             var typedef=new Array();
             typedef=document.parmform.pres_type.value.split('_');
-           if (document.parmform.pres_type.value!='') {
-            if ((typedef[0]=='date') ||
-                (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;');
+            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='';
@@ -932,31 +933,147 @@ sub validateparms_js {
     return <<'ENDSCRIPT';
 
 function validateParms() {
+    var textRegExp = /^settext_/;
+    var ipRegExp = /^setip/;
     var ipallowRegExp = /^setipallow_/;
     var ipdenyRegExp = /^setipdeny_/;
+    var deeplinkRegExp = /^deeplink_/;
+    var dlListScopeRegExp = /^deeplink_(state|others|listing|scope)_/;
+    var dlLinkProtectRegExp = /^deeplink_protect_/;
+    var dlLtidRegExp = /^deeplink_ltid_/;
+    var dlLticRegExp = /^deeplink_ltic_/;
+    var dlKeyRegExp = /^deeplink_key_/;
+    var dlMenusRegExp = /^deeplink_menus_/;
+    var dlCollsRegExp = /^deeplink_colls_/;
     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;
+                if (ipRegExp.test(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;
+                            }
                         }
-                        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;
+                } else if (deeplinkRegExp.test(name)) {
+                    if (dlListScopeRegExp.test(name)) {
+                        var identifier =  name.replace(dlListScopeRegExp,'');
+                        var idx = document.parmform.elements[i].selectedIndex;
+                        if (idx > 0) {
+                            var possdeeplink = document.parmform.elements[i].options[idx].value
+                            possdeeplink = possdeeplink.replace(/^\s+|\s+$/g,'');
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                possdeeplink = ','+possdeeplink;
+                            }
+                            document.parmform.elements['set_'+identifier].value += possdeeplink;
+                        }
+                    } else if (dlLinkProtectRegExp.test(name)) {
+                        if (document.parmform.elements[i].checked) {
+                            var identifier =  name.replace(dlLinkProtectRegExp,'');
+                            var posslinkurl = document.parmform.elements[i].value;
+                            posslinkurl = posslinkurl.replace(/^\s+|\s+$/g,'');
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                posslinkurl = ','+posslinkurl;
+                            }
+                            document.parmform.elements['set_'+identifier].value += posslinkurl;
+                        }
+                    } else if (dlLtidRegExp.test(name)) {
+                        var identifier = name.replace(dlLtidRegExp,'');
+                        if (isRadioSet('deeplink_protect_'+identifier,'ltid')) {
+                            var possltid = document.parmform.elements[i].value;
+                            possltid = possltid.replace(/\D+/g,'');
+                            if (possltid.length) {
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    possltid = ':'+possltid;
+                                }
+                                document.parmform.elements['set_'+identifier].value += possltid;
+                            } else {
+                                document.parmform.elements['set_'+identifier].value = '';
+                                alert("A link type of 'domain LTI launch' was selected but no domain LTI launcher was selected.\nPlease select one, or choose a different supported link type.");
+                                return false;
+                            }
+                        }
+                    } else if (dlLticRegExp.test(name)) {
+                        var identifier = name.replace(dlLticRegExp,'');
+                        if (isRadioSet('deeplink_protect_'+identifier,'ltic')) {
+                            var possltic = document.parmform.elements[i].value;
+                            possltic = possltic.replace(/\D+/g,'');
+                            if (possltic.length) {
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    possltic = ':'+possltic;
+                                }
+                                document.parmform.elements['set_'+identifier].value += possltic;
+                            } else {
+                                document.parmform.elements['set_'+identifier].value = '';
+                                alert("A link type of 'course LTI launch' was selected but no course LTI launcher was selected.\nPlease select one, or choose a different supported link type.");
+                                return false;
+                            }
+                        }
+                    } else if (dlKeyRegExp.test(name)) {
+                        var identifier = name.replace(dlKeyRegExp,'');
+                        if (isRadioSet('deeplink_protect_'+identifier,'key')) {
+                            var posskey = document.parmform.elements[i].value;
+                            posskey = posskey.replace(/^\s+|\s+$/g,'');
+                            var origlength = posskey.length;
+                            posskey = posskey.replace(/[^a-zA-Z\d_.!@#$%^&*()+=-]/g,'');
+                            var newlength = posskey.length;
+                            if (newlength > 0) {
+                                var change = origlength - newlength;
+                                if (change) {
+                                    alert(change+' disallowed character(s) removed from deeplink key');
+                                }
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    posskey = ':'+posskey;
+                                }
+                                document.parmform.elements['set_'+identifier].value += posskey;
+                            } else {
+                                document.parmform.elements['set_'+identifier].value = '';
+                                if (newlength < origlength) {
+                                    alert("A link type of 'deep with key' was selected but the key value was blank, after removing disallowed characters.\nPlease enter a key using one or more of: a-zA-Z0-9_.!@#$%^&*()+=-");
+                                } else {
+                                    alert("A link type of 'deep with key' was selected but the key value was blank.\nPlease enter a key.");
+                                }
+                                return false;
+                            }
+                        }
+                    } else if (dlMenusRegExp.test(name)) {
+                        if (document.parmform.elements[i].checked) {
+                            var identifier =  name.replace(dlMenusRegExp,'');
+                            var posslinkmenu = document.parmform.elements[i].value;
+                            posslinkmenu = posslinkmenu.replace(/^\s+|\s+$/g,'');
+                            if (posslinkmenu == 'std') {
+                                posslinkmenu = '0';
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    posslinkmenu = ','+posslinkmenu;
+                                }
+                                document.parmform.elements['set_'+identifier].value += posslinkmenu;
+                            }
+                        }
+                    } else if (dlCollsRegExp.test(name)) {
+                        var identifier =  name.replace(dlCollsRegExp,'');
+                        if (isRadioSet('deeplink_menus_'+identifier,'colls')) {
+                            var posslinkmenu = document.parmform.elements[i].value;
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                posslinkmenu = ','+posslinkmenu;
+                            }
+                            document.parmform.elements['set_'+identifier].value += posslinkmenu;
                         }
                     }
                 }
@@ -966,6 +1083,23 @@ function validateParms() {
     return true;
 }
 
+function isRadioSet(name,expected) {
+    var menuitems = document.getElementsByName(name);
+    var radioLength = menuitems.length;
+    result = false;
+    if (radioLength  > 1) {
+        for (var j=0; j<radioLength; j++) {
+            if (menuitems[j].checked) {
+                if (menuitems[j].value == expected) {
+                    result = true;
+                    break;
+                }
+            }
+        }
+    }
+    return result;
+}
+
 ENDSCRIPT
 }
 
@@ -1019,6 +1153,69 @@ END
 
 }
 
+# Javascript function toggle
+sub deeplink_js {
+    return <<"END";
+function toggleDeepLink(form,item,key) {
+    var radios = form['deeplink_'+item+'_'+key];
+    if (radios.length) {
+        var keybox;
+        if (document.getElementById('deeplink_key_'+item+'_'+key)) {
+            keybox = document.getElementById('deeplink_key_'+item+'_'+key);
+        }
+        var divoptions = new Array();
+        if (item == 'protect') {
+            divoptions = ['ltic','ltid'];
+        } else {
+            if (item == 'menus') {
+                divoptions = ['colls'];
+            }
+        }
+        var seldivs = new Array();
+        if ((item == 'protect') || (item == 'menus')) {
+            for (var i=0; i<divoptions.length; i++) {
+                if (document.getElementById('deeplinkdiv_'+divoptions[i]+'_'+item+'_'+key)) {
+                    seldivs[i] = document.getElementById('deeplinkdiv_'+divoptions[i]+'_'+item+'_'+key);
+                } else {
+                    seldivs[i] = '';
+                }
+            }
+        }
+        for (var i=0; i<radios.length; i++) {
+            if (radios[i].checked) {
+                if ((item == 'protect') || (item == 'menus')) {
+                    for (var j=0; j<seldivs.length; j++) {
+                        if (radios[i].value == divoptions[j]) {
+                            if (seldivs[j] != '') {
+                                seldivs[j].style.display = 'inline-block';
+                            }
+                            if (item == 'protect') {
+                                keybox.type = 'hidden';
+                                keybox.value = '';
+                            }
+                        } else {
+                            if (seldivs[j] != '') {
+                                seldivs[j].style.display = 'none';
+                                form['deeplink_'+divoptions[j]+'_'+key].selectedIndex = 0;
+                            }
+                        }
+                    }
+                    if (item == 'protect') {
+                        if (radios[i].value == 'key') {
+                            keybox.type = 'text';
+                        } else {
+                            keybox.type = 'hidden';
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+END
+
+}
+
 sub startpage {
     my ($r,$psymb) = @_;
 
@@ -1108,37 +1305,85 @@ sub print_row {
     my $thismarker=$which;
     $thismarker=~s/^parameter\_//;
     my $mprefix=$rid.'&'.$thismarker.'&';
-    my $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$thismarker);
-    my ($othergrp,$grp_parm,$controlgrp);
-
+    my ($parmname)=($thismarker=~/\_([^\_]+)$/);
+    my $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
+    my ($othergrp,$grp_parm,$controlgrp,$extra);
+
+    if ($parmname eq 'deeplink') {
+        my ($domltistr,$crsltistr);
+        my %lti =
+            &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
+                                            'linkprot');
+        if (keys(%lti)) {
+            foreach my $item (sort { $a <=> $b }  (keys(%lti))) {
+                if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
+                    $domltistr .= $item.':'.&escape(&escape($lti{$item}{'name'})).',';
+                }
+            }
+            $domltistr =~ s/,$//;
+            if ($domltistr) {
+                $extra = 'ltid_'.$domltistr;
+            }
+        }
+        my %courselti = &Apache::lonnet::get_course_lti($cnum,$cdom);
+        if (keys(%courselti)) {
+            foreach my $item (sort { $a <=> $b } keys(%courselti)) {
+                if (($item =~ /^\d+$/) && (ref($courselti{$item}) eq 'HASH')) {
+                    $crsltistr .= $item.':'.&escape(&escape($courselti{$item}{'name'})).',';
+                }
+            }
+            $crsltistr =~ s/,$//;
+            if ($crsltistr) {
+                if ($extra) {
+                    $extra .= '&';
+                }
+                $extra .= 'ltic_'.$crsltistr;
+            }
+        }
+        if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
+            my @colls;
+            foreach my $item (split(/;/,$env{'course.'.$env{'request.course.id'}.'.menucollections'})) {
+                my ($num,$value) = split(/\%/,$item);
+                if ($num =~ /^\d+$/) {
+                    push(@colls,$num);
+                }
+            }
+            if (@colls) {
+                if ($extra) {
+                    $extra .= '&';
+                }
+                $extra .= 'menus_'.join(',',@colls);
+            }
+        }
+    }
     if ($parmlev eq 'general') {
 
         if ($uname) {
-            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         } elsif ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
         } elsif ($csec) {
-            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         } else {
-            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         }
     } elsif ($parmlev eq 'map') {
 
         if ($uname) {
-            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         } elsif ($cgroup) {
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
         } elsif ($csec) {
-            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         } else {
-            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         }
     } else {
         if ($uname) {
             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)) {
@@ -1151,32 +1396,32 @@ sub print_row {
             }
         }
 
-        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
 
-    &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-    &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-    &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-    &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+    &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+    &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+    &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+    &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
 
     if ($csec) {
-        &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+        &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+        &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
     }
 
         if ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
-            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
+            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
         }
 
     if ($uname) {
             if ($othergrp) {
                 $r->print($othergrp);
             }
-        &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+        &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+        &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
     }
 
     } # end of $parmlev if/else
@@ -1188,7 +1433,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,$$name{$which}).'&nbsp;'.
+                  &valout($sessionval,$sessionvaltype).'&nbsp;'.
                   '</font></td>');
     }
     $r->print('</tr>');
@@ -1196,7 +1441,7 @@ sub print_row {
 }
 
 sub print_td {
-    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp,$readonly)=@_;
+    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp,$readonly,$extra)=@_;
     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
               ';" align="center">');
     my $nolink = 0;
@@ -1205,10 +1450,14 @@ sub print_td {
     } else {
         if ($which == 11 || $which == 12) {
             $nolink = 1;
-        } elsif ($mprefix =~ /availablestudent\&$/) {
-            if ($which > 3) {
+        } elsif (($env{'request.course.sec'} ne '') && ($which > 9)) {
+            $nolink = 1;
+        } elsif ($which == 4 || $which ==  5 || $which == 6) {
+            if ($noeditgrp) {
                 $nolink = 1;
             }
+        } elsif ($mprefix =~ /availablestudent\&$/) {
+            $nolink = 1;
         } elsif ($mprefix =~ /examcode\&$/) {
             unless ($which == 2) {
                 $nolink = 1;
@@ -1216,17 +1465,17 @@ sub print_td {
         }
     }
     if ($nolink) {
-        $r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));
+        $r->print(&valout($$outpar[$which],$$typeoutpar[$which]));
     } else {
         $r->print(&plink($$typeoutpar[$which],
                          $$display{$value},$$outpar[$which],
-                         $mprefix."$which",'parmform.pres','psub'));
+                         $mprefix."$which",'parmform.pres','psub',$extra));
     }
     $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);
@@ -1241,9 +1490,8 @@ sub print_usergroups {
     if (($coursereply) && ($cgroup ne $resultgroup)) {
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
-            $grp_parm = &valout($coursereply,$resulttype,$what);
         }
-        $grp_parm = &valout($coursereply,$resulttype,$what);
+        $grp_parm = &valout($coursereply,$resulttype);
         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
         if ($resultgroup && $resultlevel) {
             $output .= '<small><b>'.$resultgroup.'</b> ('.$resultlevel.'): </small>'.$grp_parm;
@@ -1392,7 +1640,7 @@ sub isdateparm {
 
 sub is_specialstring {
     my $type=shift;
-    return (($type=~/^string_/) && (($type ne 'string_yesno')));
+    return (($type=~/^string_/) && ($type ne 'string_yesno'));
 }
 
 #
@@ -1401,8 +1649,7 @@ sub is_specialstring {
 # 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[
@@ -1481,7 +1728,7 @@ sub parmmenu {
 ENDSCRIPT
 
     $r->print('<hr />');
-    &shortCuts($r,$allparms,$pscat,$keyorder);
+    &shortCuts($r);
     $r->print('<hr />');
 }
 # return a hash
@@ -1530,6 +1777,7 @@ sub lookUpTableParameter {
         'buttonshide' => 'hiding',
         'turnoffeditor' => 'hiding',
         'encrypturl' => 'hiding',
+        'deeplink' => 'hiding',
         'randomorder' => 'high_level_randomization',
         'randompick' => 'high_level_randomization',
         'available' => 'slots',
@@ -1546,7 +1794,7 @@ sub lookUpTableParameter {
         'retrypartial' => 'tries',
         'discussvote'  => 'misc',
         'examcode' => 'high_level_randomization',
-    );    
+    );
 }
 
 sub whatIsMyCategory {
@@ -1628,6 +1876,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.'" ');
@@ -1647,7 +1896,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(
@@ -1706,21 +1955,60 @@ 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();
+                  &Apache::loncommon::selectstudent_link('parmform','uname','udom','condition').
+                  &Apache::lonhtmlcommon::scripttag(<<ENDJS);
+function setCourseadv(form,caller) {
+    if (caller.value == 'st') {
+        form.courseadv.value = 'none';
+    } else {
+        form.courseadv.value = '';
+    }
+    return;
+}
+ENDJS
 
+    my (%chkroles,$stuonly,$courseadv);
+    if ($env{'form.userroles'} eq 'any') {
+        $chkroles{'any'} = ' checked="checked"';
+    } else {
+        $chkroles{'st'} = ' checked="checked"';
+        $courseadv = 'none';
+    }
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    if ($crstype eq 'Community') {
+        $stuonly = &mt('member only');
+    } else {
+        $stuonly = &mt('student only');
+    }
+    $chooseopt .= '<br /><span class="LC_cusr_subheading">'.
+                  &mt("User's role").':&nbsp;'.
+                  '<label><input type="radio" name="userroles" value="st"'.$chkroles{'st'}.' onclick="setCourseadv(this.form,this);" />'.
+                  $stuonly.'</label>&nbsp;&nbsp;'.
+                  '<label><input type="radio" name="userroles" value="any"'.$chkroles{'any'}.' onclick="setCourseadv(this.form,this);" />'.
+                  &mt('any role').'</label><input type="hidden" id="courseadv" name="courseadv" value="'.$courseadv.'" /></span>';
     my $sections='';
     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')" |;
@@ -1734,7 +2022,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">
@@ -1753,7 +2041,7 @@ function group_or_section(caller) {
 // ]]>
 </script>
 |;
-    } else {
+    } elsif ($currsec eq '') {
         $sections .= qq|
 <script type="text/javascript">
 // <![CDATA[
@@ -1766,8 +2054,8 @@ function group_or_section(caller) {
     }
 
     if (%grouphash) {
-        $groups=&mt('Group:').' <select name="cgroup"';
-        if (%sectionhash && $env{'form.action'} eq 'settable') {
+        $groups=&mt('Group').': <select name="cgroup"';
+        if (%sectionhash && $env{'form.action'} eq 'settable' && $currsec eq '') {
             $groups .= qq| onchange="group_or_section('cgroup')" |;
         }
         $groups .= '>';
@@ -1806,12 +2094,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());
@@ -1991,44 +2279,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));
@@ -2147,12 +2443,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;
             }
         }
@@ -2228,25 +2529,124 @@ sub assessparms {
             $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>";
-                $uname='';
-                $csec=$env{'form.csec'};
+                my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+                if ($env{'form.userroles'} eq 'any') {
+                    if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) {
+                        $csec = $env{'request.course.sec'};
+                        $message = '<span class="LC_info">';
+                        if ($crstype eq 'Community') {
+                            $message .= &mt('User [_1] at domain [_2] has a non-member role in this community',
+                                            $uname,$udom);
+                        } else {
+                            $message .= &mt('User [_1] at domain [_2] has a non-student role in this course',
+                                            $uname,$udom);
+                        }
+                        $message .= '</span>';
+                    } else {
+                        my @possroles = ('in','ep','ta','cr');
+                        if ($crstype eq 'Community') {
+                            unshift(@possroles,'co');
+                        } else {
+                            unshift(@possroles,'cc');
+                        }
+                        my %not_student_roles =
+                            &Apache::lonnet::get_my_roles($uname,$udom,'userroles',['active'],
+                                                          \@possroles,[$udom],1,1);
+                        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                        my %sections_by_role;
+                        foreach my $role (keys(%not_student_roles)) {
+                            if ($role =~ /^\Q$cnum:$cdom:\E([^:]+):(|[^:]+)$/) {
+                                my ($rolename,$sec) = ($1,$2);
+                                if ($rolename =~ m{^cr/}) {
+                                    $rolename = 'cr';
+                                }
+                                push(@{$sections_by_role{$rolename}},$sec);
+                            }
+                        }
+                        my $numroles = scalar(keys(%sections_by_role));
+                        if ($numroles) {
+                            foreach my $role (@possroles) {
+                                if (ref($sections_by_role{$role}) eq 'ARRAY') {
+                                    my @secs = sort { $a <=> $b } @{$sections_by_role{$role}};
+                                    $csec = $secs[0];
+                                    last;
+                                }
+                            }
+                        }
+                        if ($csec eq '-1') {
+                            $message = '<span class="LC_warning">';
+                            if ($crstype eq 'Community') {
+                                $message .= &mt('User [_1] at domain [_2] does not have a role in this community',
+                                                $uname,$udom);
+                            } else {
+                                $message .= &mt('User [_1] at domain [_2] does not have a role in this course',
+                                                $uname,$udom);
+                            }
+                            $message .= '</span>';
+                            $uname='';
+                            if ($env{'request.course.sec'} ne '') {
+                                $csec=$env{'request.course.sec'};
+                            } else {
+                                $csec=$env{'form.csec'};
+                            }
+                            $cgroup=$env{'form.cgroup'};
+                        } else {
+                            $message = '<span class="LC_info">';
+                            if ($crstype eq 'Community') {
+                                $message .= &mt('User [_1] at domain [_2] has a non-member role in this community',
+                                         $uname,$udom);
+                            } else {
+                                $message .= &mt('User [_1] at domain [_2] has a non-student role in this course',
+                                                $uname,$udom);
+                            }
+                            $message .= '</span>';
+                        }
+                    }
+                } else {
+                    $message = '<span class="LC_warning">';
+                    if ($crstype eq 'Community') {
+                        $message .= &mt('User [_1] at domain [_2] does not have a member role in this community',
+                                         $uname,$udom);
+                    } else {
+                         $message .= &mt('User [_1] at domain [_2] does not have a student role in this course',
+                                         $uname,$udom);
+                    }
+                    $message .= '</span>';
+                    $uname='';
+                    if ($env{'request.course.sec'} ne '') {
+                        $csec=$env{'request.course.sec'};
+                    } else {
+                        $csec=$env{'form.csec'};
+                    }
+                    $cgroup=$env{'form.cgroup'};
+                }
+            } elsif ($env{'request.course.sec'} ne '') {
+                if ($csec ne $env{'request.course.sec'}) {
+                    $message='<span class="LC_warning">'.
+                              &mt("User '[_1]' at domain '[_2]' not in section '[_3]'",
+                                  $uname,$udom,$env{'request.course.sec'}).
+                              '</span>';
+                    $uname='';
+                    $csec=$env{'request.course.sec'};
+                }
                 $cgroup=$env{'form.cgroup'};
-            } else {
+            }
+            if ($uname ne '') {
                 my %name=&Apache::lonnet::userenvironment($udom,$uname,
                   ('firstname','middlename','lastname','generation','id'));
-                $message="\n<p>\n".&mt("Full Name").": ".
-                $name{'firstname'}.' '.$name{'middlename'}.' '
-                .$name{'lastname'}.' '.$name{'generation'}.
-                "<br />\n".&mt('Student/Employee ID').": ".$name{'id'}.'<p>';
-            }
-            @usersgroups = &Apache::lonnet::get_users_groups(
-                                       $udom,$uname,$env{'request.course.id'});
-            if (@usersgroups > 0) {
-                unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
-                    $cgroup = $usersgroups[0];
+                $message .= "\n<p>\n".&mt('Full Name').': '
+                            .$name{'firstname'}.' '.$name{'middlename'}.' '
+                            .$name{'lastname'}.' '.$name{'generation'}
+                            ."<br />\n".&mt('Student/Employee ID').': '.$name{'id'}.'</p>';
+                @usersgroups = &Apache::lonnet::get_users_groups(
+                                   $udom,$uname,$env{'request.course.id'});
+                if (@usersgroups > 0) {
+                    unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
+                        $cgroup = $usersgroups[0];
+                    }
+                } else {
+                    $cgroup = '';
                 }
             }
         }
@@ -2273,9 +2673,21 @@ sub assessparms {
         my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
+        my $totalskippeduser = 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);
+            } elsif ($markers[$i] =~ /\&(3|2|1)$/) {
+                if ($uname eq '') {
+                    $totalskippeduser ++;
+                    next;
+                }
+            }
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
                 my (@ok_slots,@fail_slots,@del_slots);
                 my $courseopt=&Apache::lonnet::get_courseresdata($cnum,$cdom);
@@ -2352,9 +2764,27 @@ sub assessparms {
 # ---------------------------------------------------------------- Done storing
         if ($totalstored) {
             $message.='<p class="LC_warning">'
+                     .&mt('Changes for [quant,_1,parameter] saved.',$totalstored)
+                     .'<br />'
                      .&mt('Changes can take up to 10 minutes before being active for all students.')
                      .&Apache::loncommon::help_open_topic('Caching')
                      .'</p>';
+        } else {
+            $message.='<p class="LC_info">'.&mt('No parameter changes saved.').'</p>';
+        }
+        if ($totalskippeduser) {
+            $message .= '<p class="LC_warning">';
+            if ($uhome eq 'no_host') {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the username or ID was invalid.',
+                                $totalskippeduser);
+            } elsif ($env{'form.userroles'} eq 'any') {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the user does not have a course role.',
+                                $totalskippeduser);
+            } else {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the user is not a student.',
+                                $totalskippeduser);
+            }
+            $message .= '</p>';
         }
     }
 #----------------------------------------------- if all selected, fill in array
@@ -2418,12 +2848,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());
 
@@ -2462,7 +2892,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>'
@@ -2984,21 +3414,39 @@ sub storedata {
     if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
         my $cmd=$1;
         my $thiskey=$2;
-        next if ($cmd eq 'setipallow' || $cmd eq 'setipdeny');
+        next if ($cmd eq 'setipallow' || $cmd eq 'setipdeny' || $cmd eq 'setdeeplink');
         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, $valchk);
+        my ($data, $typeof, $text, $name, $valchk, $valmatch, $namematch);
         if ($cmd eq 'set') {
             $data=$env{$key};
+            $valmatch = '';
             $valchk = $data;
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified parameter for');
             if ($typeof eq 'string_questiontype') {
                 $name = 'type';
+            } elsif ($typeof eq 'string_deeplink') {
+                ($name) = ($typeof =~ /^string_(deeplink)$/);
+                my $stringmatch = &standard_string_matches($typeof);
+                if (ref($stringmatch) eq 'ARRAY') {
+                    foreach my $item (@{$stringmatch}) {
+                        if (ref($item) eq 'ARRAY') {
+                            my ($regexpname,$pattern) = @{$item};
+                            if ($pattern ne '') {
+                                if ($data =~ /$pattern/) {
+                                    $valmatch = $regexpname;
+                                    $valchk = '';
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                }
             } elsif ($typeof eq 'string_lenient') {
                 $name = 'lenient';
             } elsif ($typeof eq 'string_discussvote') {
@@ -3153,6 +3601,17 @@ sub listdata {
     $tableopen=0;
     my $foundkeys=0;
     my %keyorder=&standardkeyorder();
+    my $readonlyall = $readonly;
+
+    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);
@@ -3196,25 +3655,50 @@ 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');
+        $readonly = $readonlyall;
+        my $userscope;
+        my $showval = $$resourcedata{$thiskey};
         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);
+                $userscope = 1;
+            } 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) {
@@ -3258,8 +3742,13 @@ sub listdata {
               '<td><b>'.&mt($parmitem).
               '</b></td>');
         unless ($readonly) {
+            my $disabled;
+            if (($name eq 'availablestudent') &&
+                (($showval eq '') || ($userscope))) {
+                $disabled = ' disabled="disabled"';
+            }
             $r->print('<td><input type="checkbox" name="del_'.
-                      $thiskey.'" /></td>');
+                      $thiskey.'"'.$disabled.' /></td>');
         }
         $r->print('<td>');
         $foundkeys++;
@@ -3287,6 +3776,9 @@ sub listdata {
             $r->print(&date_interval_selector($thiskey,$name,
                       $$resourcedata{$thiskey},$readonly));
         } elsif ($thistype =~ m/^string/) {
+            if ($name eq 'availablestudent') {
+                $readonly = 1;
+            }
             $r->print(&string_selector($thistype,$thiskey,
                       $$resourcedata{$thiskey},$name,$readonly));
         } else {
@@ -3457,6 +3949,215 @@ sub string_ip_selector {
     return $output;
 }
 
+sub string_deeplink_selector {
+    my ($thiskey, $showval, $readonly) = @_;
+    my (@components,%values,@current,%titles,%options,%optiontext,%defaults,
+        %selectnull,%domlti,%crslti,@possmenus);
+    @components = ('state','others','listing','scope','protect','menus');
+    %titles = &Apache::lonlocal::texthash (
+                  state   => 'Access status',
+                  others  => 'Hide other resources',
+                  listing => 'In Contents and/or Gradebook',
+                  scope   => 'Access scope for link',
+                  protect => 'Link protection',
+                  menus   => 'Menu Items Displayed',
+              );
+    %options = (
+                   state   => ['only','off','both'],
+                   others  => ['hide','unhide'],
+                   listing => ['full','absent','grades','details','datestatus'],
+                   scope   => ['res','map','rec'],
+                   protect => ['none','key','ltid','ltic'],
+                   menus   => ['std','colls'],
+               );
+    %optiontext = &Apache::lonlocal::texthash (
+                    only       => 'deep only',
+                    off        => 'deeplink off',
+                    both       => 'regular + deep',
+                    hide       => 'Hidden',
+                    unhide     => 'Unhidden',
+                    full       => 'Listed (linked) in both',
+                    absent     => 'Not listed',
+                    grades     => 'Listed in grades only',
+                    details    => 'Listed (unlinked) in both',
+                    datestatus => 'Listed (unlinked) inc. status in both',
+                    res        => 'resource only',
+                    map        => 'enclosing map/folder',
+                    rec        => 'recursive map/folder',
+                    none       => 'not in use',
+                    key        => 'key access',
+                    ltic       => 'LTI access (course)',
+                    ltid       => 'LTI access (domain)' ,
+                    std        => 'Standard (all menus)',
+                    colls      => 'Numbered collection',
+                  );
+    %selectnull = &Apache::lonlocal::texthash (
+                    ltic => 'Select Launcher',
+                    ltid => 'Select Launcher',
+                    colls => 'Select',
+                  );
+    if ($showval =~ /,/) {
+        %values=();
+        @current = split(/,/,$showval);
+        ($values{'state'}) = ($current[0] =~ /^(only|off|both)$/);
+        ($values{'others'}) = ($current[1] =~ /^(hide|unhide)$/);
+        ($values{'listing'}) = ($current[2] =~ /^(full|absent|grades|details|datestatus)$/);
+        ($values{'scope'}) = ($current[3] =~ /^(res|map|rec)$/);
+        ($values{'protect'}) = ($current[4] =~ /^(key:[a-zA-Z\d_.!\@#\$%^&*()+=-]+|ltic:\d+|ltid:\d+)$/);
+        ($values{'menus'}) = ($current[5] =~ /^(\d+)$/);
+    } else {
+        $defaults{'state'} = 'off',
+        $defaults{'others'} = 'unhide',
+        $defaults{'listing'} = 'full';
+        $defaults{'scope'} = 'res';
+        $defaults{'protect'} = 'none';
+        $defaults{'menus'} = '0';
+    }
+    my $disabled;
+    if ($readonly) {
+        $disabled=' disabled="disabled"';
+    }
+    my %courselti =
+        &Apache::lonnet::get_course_lti($env{'course.'.$env{'request.course.id'}.'.num'},
+                                        $env{'course.'.$env{'request.course.id'}.'.domain'});
+    foreach my $item (keys(%courselti)) {
+        if (ref($courselti{$item}) eq 'HASH') {
+            $crslti{$item} = $courselti{$item}{'name'};
+        }
+    }
+    my %lti =
+        &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
+                                        'linkprot');
+    foreach my $item (keys(%lti)) {
+        if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
+            $domlti{$item} = $lti{$item}{'name'};
+        }
+    }
+    if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
+        foreach my $item (split(/;/,$env{'course.'.$env{'request.course.id'}.'.menucollections'})) {
+            my ($num,$value) = split(/\%/,$item);
+            if ($num =~ /^\d+$/) {
+                push(@possmenus,$num);
+            }
+        }
+    }
+
+    my $output = '<input type="hidden" name="set_'.$thiskey.'" /><table><tr>';
+    foreach my $item (@components) {
+        $output .= '<th>'.$titles{$item}.'</th>';
+    }
+    $output .= '</tr><tr>';
+    foreach my $item (@components) {
+        $output .= '<td>';
+        if (($item eq 'protect') || ($item eq 'menus')) {
+            my $selected = $values{$item};
+            foreach my $option (@{$options{$item}}) {
+                if ($item eq 'protect') {
+                    if ($option eq 'ltid') {
+                        next unless (keys(%domlti));
+                    } elsif ($option eq 'ltic') {
+                        next unless (keys(%crslti));
+                    }
+                } elsif (($item eq 'menus') && ($option eq 'colls')) {
+                    next unless (@possmenus);
+                }
+                my $checked;
+                if ($item eq 'menus') {
+                    if (($selected =~ /^\d+$/) && (@possmenus) &&
+                        (grep(/^\Q$selected\E$/,@possmenus))) {
+                        if ($option eq 'colls') {
+                            $checked = ' checked="checked"';
+                        }
+                    } elsif (($option eq 'std') && ($selected == 0) && ($selected ne '')) {
+                        $checked = ' checked="checked"';
+                    }
+                } elsif ($selected =~ /^\Q$option\E/) {
+                    $checked = ' checked="checked"';
+                }
+                my $onclick;
+                unless ($readonly) {
+                    my $esc_key = &js_escape($thiskey);
+                    $onclick = ' onclick="toggleDeepLink(this.form,'."'$item','$esc_key'".');"';
+                }
+                $output .= '<span class="LC_nobreak"><label>'.
+                           '<input type="radio" name="deeplink_'.$item.'_'.$thiskey.'" value="'.$option.'"'.$onclick.$disabled.$checked.' />'."\n".
+                           $optiontext{$option}.'</label>';
+                if (($item eq 'protect') && ($option eq 'key')) {
+                    my $visibility="hidden";
+                    my $currkey;
+                    if ($checked) {
+                        $visibility = "text";
+                        $currkey = (split(/\:/,$values{$item}))[1];
+                    }
+                    $output .= '&nbsp;'.
+                        '<input type="'.$visibility.'" name="deeplink_'.$option.'_'.$thiskey.'" id="deeplink_'.$option.'_'.$item.'_'.$thiskey.'" value="'.$currkey.'" size="10"'.$disabled.' />';
+                } elsif (($option eq 'ltic') || ($option eq 'ltid') || ($option eq 'colls')) {
+                    my $display="none";
+                    my ($current,$blankcheck,@possibles);
+                    if ($checked) {
+                        $display = 'inline-block';
+                        if (($option eq 'ltic') || ($option eq 'ltid'))  {
+                            $current = (split(/\:/,$selected))[1];
+                        } else {
+                            $current = $selected;
+                        }
+                    } else {
+                        $blankcheck = ' selected="selected"';
+                    }
+                    if ($option eq 'ltid') {
+                        @possibles = keys(%domlti);
+                    } elsif ($option eq 'ltic') {
+                        @possibles = keys(%crslti);
+                    } else {
+                        @possibles = @possmenus;
+                    }
+                    $output .= '<div id="deeplinkdiv_'.$option.'_'.$item.'_'.$thiskey.'"'.
+                               ' style="display: '.$display.'">&nbsp;<select name="'.
+                               'deeplink_'.$option.'_'.$thiskey.'"'.$disabled.'>';
+                    if (@possibles > 1) {
+                        $output .= '<option value=""'.$blankcheck.'>'.$selectnull{$option}.
+                                   '</option>'."\n";
+                    }
+                    foreach my $poss (sort { $a <=> $b } @possibles) {
+                        my $selected;
+                        if (($poss == $current) || (scalar(@possibles) ==1)) {
+                            $selected = ' selected="selected"';
+                        }
+                        my $shown = $poss;
+                        if ($option eq 'ltid') {
+                            $shown = $domlti{$poss};
+                        } elsif ($option eq 'ltic') {
+                            $shown = $crslti{$poss};
+                        }
+                        $output .= '<option value="'.$poss.'"'.$selected.'>'.$shown.'</option>';
+                    }
+                    $output .= '</select></div>';
+                }
+                $output .= '</span> ';
+            }
+        } else {
+            my $selected = $values{$item};
+            my $defsel;
+            if ($selected eq '') {
+                $defsel = ' selected="selected"';
+            }
+            $output .= '<select name="deeplink_'.$item.'_'.$thiskey.'"'.$disabled.'>'."\n".
+                       '<option value=""'.$defsel.'>'.&mt('Please select').'</option>'."\n";
+            foreach my $option (@{$options{$item}}) {
+                $output .= '<option value="'.$option.'"';
+                if ($option eq $selected) {
+                    $output .= ' selected="selected"';
+                }
+                $output .= '>'.$optiontext{$option}.'</option>';
+            }
+            $output .= '</select>';
+        }
+        $output .= '</td>';
+    }
+    $output .= '</tr></table>'."\n";
+    return $output;
+}
+
 {
 
 my %strings =
@@ -3489,8 +4190,28 @@ my %strings =
      'string_ip'
              => [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
                  ['_denyfrom_','Hostname(s) or IP(s) from which access is disallowed']],
+     'string_deeplink'
+             => [['on','Set choices for link protection, resource listing, access scope, and shown menu items']],
+     );
+
+my %stringmatches = (
+         'string_ip'
+              => [['_allowfrom_','[^\!]+'],
+                  ['_denyfrom_','\!']],
+         'string_deeplink'
+              => [['on','^(only|off|both)\,(hide|unhide)\,(full|absent|grades|details|datestatus)\,(res|map|rec)\,(none|key\:\w+|ltic\:\d+|ltid\:\d+)\,(\d+|)$']],
     );
 
+my %stringtypes = (
+                    type         => 'string_questiontype',
+                    lenient      => 'string_lenient',
+                    retrypartial => 'string_yesno',
+                    discussvote  => 'string_discussvote',
+                    examcode     => 'string_examcode',
+                    acc          => 'string_ip',
+                    deeplink     => 'string_deeplink',
+                  );
+
 sub standard_string_options {
     my ($string_type) = @_;
     if (ref($strings{$string_type}) eq 'ARRAY') {
@@ -3499,6 +4220,14 @@ 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 string_selector {
     my ($thistype, $thiskey, $showval, $name, $readonly) = @_;
 
@@ -3529,11 +4258,13 @@ sub string_selector {
             }
         }
     }
- 
+
     if ($thistype eq 'string_ip') {
         return &string_ip_selector($thiskey,$showval,$readonly);
+    } elsif ($thistype eq 'string_deeplink') {
+        return &string_deeplink_selector($thiskey,$showval,$readonly);
     }
-
+ 
     my ($result,$disabled);
 
     if ($readonly) {
@@ -3641,9 +4372,22 @@ sub oldversion_warning {
 #
 
 sub dateshift {
-    my ($shift)=@_;
+    my ($shift,$numchanges)=@_;
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my $sec = $env{'request.course.sec'};
+    my $secgrpregex;
+    if ($sec ne '') {
+        my @groups;
+        if ($env{'request.course.groups'} ne '') {
+            @groups = split(/:/,$env{'request.course.groups'});
+        }
+        if (@groups) {
+            $secgrpregex = '(?:'.join('|',($sec,@groups)).')';
+        } else {
+            $secgrpregex = $sec;
+        }
+    }
     my %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
 # ugly retro fix for broken version of types
     foreach my $key (keys %data) {
@@ -3658,7 +4402,11 @@ sub dateshift {
 # go through all parameters and look for dates
     foreach my $key (keys %data) {
        if ($data{$key.'.type'}=~/^date_(start|end)$/) {
+          if ($sec ne '') {
+              next unless ($key =~ /^$env{'request.course.id'}\.\[$secgrpregex\]\./);
+          }
           my $newdate=$data{$key}+$shift;
+          $$numchanges ++;
           $storecontent{$key}=$newdate;
        }
     }
@@ -3693,6 +4441,7 @@ sub newoverview {
             &Apache::lonhtmlcommon::resize_scrollbox_js('params')."\n".
             &showhide_js()."\n".
             &done_proctor_js()."\n".
+            &deeplink_js()."\n".
 '// ]]>
 </script>
 ';
@@ -3738,6 +4487,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');
 
@@ -3777,16 +4529,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>');
@@ -3873,6 +4635,7 @@ sub overview {
     my $js = '<script type="text/javascript">'."\n".
              '// <![CDATA['."\n".
              &done_proctor_js()."\n".
+             &deeplink_js()."\n".
              '// ]]>'."\n".
              '</script>'."\n";
     my $readonly = 1;
@@ -3981,10 +4744,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') {
@@ -4013,9 +4774,21 @@ 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 $sec = $env{'request.course.sec'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
+    my $submit_text = &mt('Shift all dates accordingly');
+    if ($sec ne '') {
+        my @groups;
+        if ($env{'request.course.groups'} ne '') {
+            @groups = split(/:/,$env{'request.course.groups'});
+        }
+        if (@groups) {
+            $submit_text = &mt("Shift dates set just for your section/group(s), accordingly");
+        } else {
+            $submit_text = &mt("Shift dates set just for your section, accordingly");
+        }
+    }
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
@@ -4030,7 +4803,7 @@ sub date_shift_one {
               '</td></tr></table>'.
               '<input type="hidden" name="action" value="dateshift2" />'.
               '<input type="hidden" name="timebase" value="'.$env{'form.timebase'}.'" />'.
-              '<input type="submit" value="'.&mt('Shift all dates accordingly').'" /></form>');
+              '<input type="submit" value="'.$submit_text.'" /></form>');
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -4038,20 +4811,54 @@ 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 $sec = $env{'request.course.sec'};
     &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);
     my $timeshifted=&Apache::lonhtmlcommon::get_date_from_form('timeshifted');
-    $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)).'</p>');
+    $r->print('<h2>'.&mt('Shift Dates').'</h2>');
+    if ($sec ne '') {
+        my @groups;
+        if ($env{'request.course.groups'} ne '') {
+            @groups = split(/:/,$env{'request.course.groups'});
+        }
+        if (@groups) {
+            $r->print('<p>'.
+                      &mt("Shift dates set just for your section/group(s), such that [_1] becomes [_2]",
+                          &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+                          &Apache::lonlocal::locallocaltime($timeshifted)).
+                      '</p>');
+        } else {
+            $r->print('<p>'.
+                      &mt("Shift dates set just for your section, such that [_1] becomes [_2]",
+                          &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+                          &Apache::lonlocal::locallocaltime($timeshifted)).
+                      '</p>');
+        }
+    } else {
+        $r->print('<p>'.&mt('Shifting all dates such that [_1] becomes [_2]',
+                            &Apache::lonlocal::locallocaltime($env{'form.timebase'}),
+                            &Apache::lonlocal::locallocaltime($timeshifted)).
+                  '</p>');
+    }
     my $delta=$timeshifted-$env{'form.timebase'};
-    &dateshift($delta);
+    my $numchanges = 0;
+    my $result = &dateshift($delta,\$numchanges);
+    if ($result eq 'ok') {
+        $r->print(
+            &Apache::lonhtmlcommon::confirm_success(&mt('Completed shifting of [quant,_1,date setting]',
+                                                    $numchanges)));
+    } elsif ($result eq 'con_delayed') {
+        $r->print(
+            &Apache::lonhtmlcommon::confirm_success(&mt('Queued shifting of [quant,_1,date setting]',
+                                                        $numchanges)));
+    } else {
+        $r->print(
+            &Apache::lonhtmlcommon::confirm_success(&mt('An error occurred attempting to shift dates'),1));
+    }
     $r->print(
-        &Apache::lonhtmlcommon::confirm_success(&mt('Done')).
         '<br /><br />'.
         &Apache::lonhtmlcommon::actionbox(
             ['<a href="/adm/parmset">'.&mt('Content and Problem Settings').'</a>']));
@@ -4070,8 +4877,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/^\[(.*)\]//;
     }
@@ -4385,7 +5191,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);
 }
 
@@ -4407,7 +5213,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'})) {
@@ -4419,12 +5228,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 /');
@@ -4432,9 +5246,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>');
 }
@@ -4455,6 +5272,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.(.+)_(.+)$/) {
@@ -4493,28 +5315,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);
@@ -4759,7 +5578,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);
@@ -4774,6 +5593,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 {
@@ -4853,6 +5673,12 @@ sub parm_change_log {
     }
     if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
     }
+    my $numgroups = 0;
+    my @groups;
+    if ($env{'request.course.groups'} ne '') {
+        @groups = split(/:/,$env{'request.course.groups'});
+        $numgroups = scalar(@groups);
+    }
     foreach my $id (sort
             {
             if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
@@ -4892,6 +5718,14 @@ 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 eq $env{'request.course.sec'}) ||
+                                              ($numgroups && (grep(/^\Q$issection\E$/,@groups))))));
+            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; }