--- loncom/interface/lonparmset.pm	2019/02/18 13:46:05	1.590
+++ loncom/interface/lonparmset.pm	2022/02/21 18:04:35	1.604
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.590 2019/02/18 13:46:05 raeburn Exp $
+# $Id: lonparmset.pm,v 1.604 2022/02/21 18:04:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -976,10 +976,9 @@ sub storeparm_by_symb_inner {
 #
 # @param {string} $value - the parameter value
 # @param {string} $type - the parameter type
-# @param {string} $name - the parameter name (unused)
 # @param {boolean} $editable - Set to true to get an icon when no value is defined.
 sub valout {
-    my ($value,$type,$name,$editable)=@_;
+    my ($value,$type,$editable)=@_;
     my $result = '';
     # Values of zero are valid.
     if (! $value && $value ne '0') {
@@ -1071,8 +1070,12 @@ sub plink {
     my ($type,$dis,$value,$marker,$return,$call,$recursive,$extra)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
-        if ((&isdateparm($type) || (&is_specialstring($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]};
         }
@@ -1080,7 +1083,7 @@ sub plink {
     my ($parmname)=((split(/\&/,$marker))[1]=~/\_([^\_]+)$/);
     my ($hour,$min,$sec,$val)=&preset_defaults($parmname);
     unless (defined($winvalue)) { $winvalue=$val; }
-    my $valout = &valout($value,$type,$parmname,1);
+    my $valout = &valout($value,$type,1);
     my $unencmarker = $marker;
     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
               \$hour, \$min, \$sec, \$extra) {
@@ -1108,14 +1111,14 @@ sub page_js {
     $pjump_def
 
     function psub() {
-        var specstring = /^string_/i;
+        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') || 
-                    (specstring.test(document.parmform.pres_type.value) && (typedef[1]!='yesno')))  {
+                    (specstring.test(document.parmform.pres_type.value)))  {
                     eval('document.parmform.recent_'+
                         document.parmform.pres_type.value+
                         '.value=document.parmform.pres_value.value;');
@@ -1238,12 +1241,17 @@ function validateParms() {
     var tailLenient = /\.lenient$/;
     var patternRelWeight = /^\-?[\d.]+$/;
     var patternLenientStd = /^(yes|no|default)$/;
+    var ipRegExp = /^setip/;
     var ipallowRegExp = /^setipallow_/;
     var ipdenyRegExp = /^setipdeny_/; 
-    var deeplinkRegExp = /^deeplink_(listing|scope)_/;
-    var deeplinkUrlsRegExp = /^deeplink_urls_/;
-    var deeplinkltiRegExp = /^deeplink_lti_/;
-    var deeplinkkeyRegExp = /^deeplink_key_/;
+    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) {
@@ -1272,61 +1280,133 @@ function validateParms() {
                             }
                         }
                     }
-                } else if (ipallowRegExp.test(name)) {
-                    var identifier = name.replace(ipallowRegExp,'');
-                    var possallow = document.parmform.elements[i].value;
-                    possallow = possallow.replace(/^\s+|\s+$/g,'');
-                    if (patternIP.test(possallow)) {
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            possallow = ','+possallow;
-                        }
-                        document.parmform.elements['set_'+identifier].value += possallow;
-                    }
-                } else if (ipdenyRegExp.test(name)) {
-                    var identifier = name.replace(ipdenyRegExp,'');
-                    var possdeny = document.parmform.elements[i].value;
-                    possdeny = possdeny.replace(/^\s+|\s+$/g,'');
-                    if (patternIP.test(possdeny)) {
-                        possdeny = '!'+possdeny;
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            possdeny = ','+possdeny;
+                } else 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 += possdeny;
                         }
-                        document.parmform.elements['set_'+identifier].value += possdeny;
                     }
                 } else if (deeplinkRegExp.test(name)) {
-                    var identifier =  name.replace(deeplinkRegExp,'');
-                    var possdeeplink = document.parmform.elements[i].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 (deeplinkUrlsRegExp.test(name)) {
-                    if (document.parmform.elements[i].checked) {
-                        var identifier =  name.replace(deeplinkUrlsRegExp,'');
-                        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 (deeplinkltiRegExp.test(name)) {
-                    var identifier = name.replace(deeplinkltiRegExp,'');
-                    var posslti = document.parmform.elements[i].value;
-                    posslti = posslti.replace(/\D+/g,'');
-                    if (document.parmform.elements['set_'+identifier].value) {
-                        posslti = ':'+posslti;
-                    }
-                    document.parmform.elements['set_'+identifier].value += posslti;
-                } else if (deeplinkkeyRegExp.test(name)) {
-                    var identifier = name.replace(deeplinkkeyRegExp,'');
-                    var posskey = document.parmform.elements[i].value;
-                    posskey = posskey.replace(/\W+/g,'');
-                    if (document.parmform.elements['set_'+identifier].value) {
-                        posslti = ':'+posskey;
+                    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;
+                        }
                     }
-                    document.parmform.elements['set_'+identifier].value += posskey;
                 }
             }
         }
@@ -1334,6 +1414,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
 }
 
@@ -1398,25 +1495,49 @@ function toggleDeepLink(form,item,key) {
         if (document.getElementById('deeplink_key_'+item+'_'+key)) {
             keybox = document.getElementById('deeplink_key_'+item+'_'+key);
         }
-        var ltidiv;
-        if (document.getElementById('deeplinkdiv_lti_'+item+'_'+key)) {
-            ltidiv = document.getElementById('deeplinkdiv_lti_'+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 (radios[i].value == 'lti') {
-                    ltidiv.style.display = 'inline-block';
-                    keybox.type = 'hidden';
-                    keybox.value = '';
-                } else {
-                    if (ltidiv != '') {
-                        ltidiv.style.display = 'none';
-                        form['deeplink_lti_'+key].selectedIndex = 0;
+                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 (radios[i].value == 'key') {
-                        keybox.type = 'text';
-                    } else {
-                        keybox.type = 'hidden';
+                    if (item == 'protect') {
+                        if (radios[i].value == 'key') {
+                            keybox.type = 'text';
+                        } else {
+                            keybox.type = 'hidden';
+                        }
                     }
                 }
             }
@@ -1612,23 +1733,50 @@ sub print_row {
         $effparm_rec = 1;
     }
     if ($parmname eq 'deeplink') {
-        my %posslti;
+        my ($domltistr,$crsltistr);
         my %lti =
             &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
-                                            'provider');
-        foreach my $item (keys(%lti)) {
-            if (ref($lti{$item}) eq 'HASH') {
-                unless ($lti{$item}{'requser'}) {
-                    $posslti{$item} = $lti{$item}{'consumer'};
+                                            '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;
+            }
         }
-        if (keys(%posslti)) {
-            $extra = 'lti_';
-            foreach my $lti (sort { $a <=> $b } keys(%posslti)) {
-                $extra .= $lti.':'.&js_escape($posslti{$lti}).',';
+        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);
             }
-            $extra =~ s/,$//;
         }
     }
     if ($parmlev eq 'general') {
@@ -1712,13 +1860,13 @@ sub print_row {
             }
         }
         my ($parmname)=($thismarker=~/\_([^\_]+)$/);
-        $effective_parm = &valout($recursinfo->[0],$recursinfo->[1],$parmname);
+        $effective_parm = &valout($recursinfo->[0],$recursinfo->[1]);
         $r->print('<td style="background-color:#CCCCFF;" align="center">'.$effective_parm.
                   '<br /><span class="LC_parm_recursive">'.$rectitle.'&nbsp;'.
                   $effparm_level.'</span></td>');
     } else {
         if ($result) {
-            $effective_parm = &valout($outpar[$result],$typeoutpar[$result],$parmname);
+            $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
         }
         if ($eff_groupparm) {
             $effective_parm = $eff_groupparm;
@@ -1735,7 +1883,7 @@ sub print_row {
             $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>');
@@ -1763,7 +1911,7 @@ sub print_row {
 # @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters
 # @param {boolean} $readonly -true if editing not allowed.
 # @param {boolean} $ismaplevel - true if level is for a map.
-# @param {strring} $extra - extra informatio to pass to plink.
+# @param {string} $extra - extra information to pass to plink.
 sub print_td {
     my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,
         $noeditgrp,$readonly,$ismaplevel,$extra)=@_;
@@ -1805,9 +1953,7 @@ sub print_td {
                 $nolink = 1;
             }
         } elsif ($mprefix =~ /availablestudent\&$/) {
-            if ($which > 4) {
-                $nolink = 1;
-            }
+            $nolink = 1;
         } elsif ($mprefix =~ /examcode\&$/) {
             unless ($which == 2) {
                 $nolink = 1;
@@ -1816,7 +1962,7 @@ sub print_td {
     }
     if ($nolink) {
         my ($parmname)=((split(/\&/,$mprefix))[1]=~/\_([^\_]+)$/);
-        $r->print(&valout($currval,$currtype,$parmname));
+        $r->print(&valout($currval,$currtype));
     } else {
         $r->print(&plink($currtype,
                          $$display{$value},$currval,
@@ -1856,7 +2002,7 @@ sub check_other_groups {
         if ($result > 3) {
             $bgcolor = '#AAFFAA';
         }
-        $grp_parm = &valout($coursereply,$resulttype,$parmname);
+        $grp_parm = &valout($coursereply,$resulttype);
         $output = '<td style="background-color:'.$bgcolor.';" align="center">';
         if ($resultgroup && $resultlevel) {
             if ($resultlevel eq 'recursive') {
@@ -1941,11 +2087,22 @@ sub extractResourceInformation {
     my $uris=shift;
     my $keyorder=shift;
     my $defkeytype=shift;
+    my $pssymb=shift;
 
     my $keyordercnt=100;
 
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my @allres=$navmap->retrieveResources(undef,undef,1,undef,1);
+    return unless(ref($navmap));
+    my @allres;
+    if ($pssymb ne '') {
+        my $res = $navmap->getBySymb($pssymb);
+        if (ref($res)) {
+            @allres = ($res);
+        }
+    }
+    if (!@allres) { 
+        @allres=$navmap->retrieveResources(undef,undef,1,undef,1);
+    }
     foreach my $resource (@allres) {
         my $id=$resource->id();
         my ($mapid,$resid)=split(/\./,$id);
@@ -2069,7 +2226,7 @@ sub isdateparm {
 
 sub is_specialstring {
     my $type=shift;
-    return (($type=~/^string_/) && (($type ne 'string_yesno')));
+    return (($type=~/^string_/) && ($type ne 'string_yesno'));
 }
 
 # Prints the HTML and Javascript to select parameters, with various shortcuts.
@@ -2417,9 +2574,37 @@ sub partmenu {
 sub usermenu {
     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();
 
@@ -2486,7 +2671,7 @@ function group_or_section(caller) {
     }
 
     if (%grouphash) {
-        $groups=&mt('Group:').' <select name="cgroup"';
+        $groups=&mt('Group').': <select name="cgroup"';
         if (%sectionhash && $env{'form.action'} eq 'settable' && $currsec eq '') {
             $groups .= qq| onchange="group_or_section('cgroup')" |;
         }
@@ -3061,27 +3246,124 @@ sub assessparms {
             $csec=&Apache::lonnet::getsection($udom,$uname,
                           $env{'request.course.id'});
             if ($csec eq '-1') {
-                $message=
-                    '<p class="LC_warning">'.
-                    &mt('User [_1] at domain [_2] not in this course',
-                        "'".$uname."'","'".$udom."'").
-                    '</p>';
-                $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 = '';
                 }
             }
         }
@@ -3093,7 +3375,7 @@ sub assessparms {
 # --------------------------------------------------------- Get all assessments
     &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
                 \%mapp, \%symbp,\%maptitles,\%uris,
-                \%keyorder);
+                \%keyorder,undef,$pssymb);
 
     %allmaps_inverted = reverse(%allmaps);
 
@@ -4385,6 +4667,7 @@ 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')) {
@@ -4446,6 +4729,8 @@ sub listdata {
             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;
@@ -4459,6 +4744,7 @@ sub listdata {
                         }
                     }
                     $section=&mt('User').": ".&Apache::loncommon::plainname($stuname,$studom);
+                    $userscope = 1;
                 } else {
                     if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
                         if (exists($grouphash{$issection})) {
@@ -4556,8 +4842,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++;
@@ -4585,6 +4876,9 @@ sub listdata {
                 $r->print(&date_interval_selector($thiskey,$name,
                           $showval,$readonly));
             } elsif ($thistype =~ m/^string/) {
+                if ($name eq 'availablestudent') {
+                    $readonly = 1;
+                }
                 $r->print(&string_selector($thistype,$thiskey,
                           $showval,$name,$readonly));
             } else {
@@ -4739,19 +5033,31 @@ sub string_ip_selector {
 
 sub string_deeplink_selector {
     my ($thiskey, $showval, $readonly) = @_;
-    my (@components,%values,@current,%titles,%options,%optiontext,%defaults,%posslti);
-    @components = ('listing','scope','urls');
+    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',
-                  urls    => 'Supported link types',
+                  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'],
-                   urls    => ['any','only','key','lti'],
+                   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',
@@ -4760,50 +5066,94 @@ sub string_deeplink_selector {
                     res        => 'resource only',
                     map        => 'enclosing map/folder',
                     rec        => 'recursive map/folder',
-                    any        => 'regular + deep',
-                    only       => 'deep only',
-                    key        => 'deep with key',
-                    lti        => 'deep with LTI launch',
+                    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{'listing'}) = ($current[0] =~ /^(full|absent|grades|details|datestatus)$/);
-        ($values{'scope'}) = ($current[1] =~ /^(res|map|rec)$/);
-        ($values{'urls'}) = ($current[2] =~ /^(any|only|key:\w+|lti:\d+)$/);
+        ($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{'urls'} = 'any';
+        $defaults{'protect'} = 'none';
+        $defaults{'menus'} = '0';
     }
     my $disabled;
     if ($readonly) {
         $disabled=' disabled="disabled"';
     }
-    my %lti = 
+    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'},
-                                        'provider');
+                                        'linkprot');
     foreach my $item (keys(%lti)) {
-        if (ref($lti{$item}) eq 'HASH') {
-            unless ($lti{$item}{'requser'}) {
-                $posslti{$item} = $lti{$item}{'consumer'};
+        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 ('listing','scope','urls') {
+    foreach my $item (@components) {
         $output .= '<th>'.$titles{$item}.'</th>';
     }
     $output .= '</tr><tr>';
     foreach my $item (@components) {
         $output .= '<td>';
-        if ($item eq 'urls') {
+        if (($item eq 'protect') || ($item eq 'menus')) {
             my $selected = $values{$item};
             foreach my $option (@{$options{$item}}) {
-                if ($option eq 'lti') {
-                    next unless (keys(%posslti));
+                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 ($selected =~ /^\Q$option\E/) {
+                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;
@@ -4814,7 +5164,7 @@ sub string_deeplink_selector {
                 $output .= '<span class="LC_nobreak"><label>'.
                            '<input type="radio" name="deeplink_'.$item.'_'.$thiskey.'" value="'.$option.'"'.$onclick.$disabled.$checked.' />'."\n".
                            $optiontext{$option}.'</label>';
-                if ($option eq 'key') {
+                if (($item eq 'protect') && ($option eq 'key')) {
                     my $visibility="hidden";
                     my $currkey;
                     if ($checked) {
@@ -4822,26 +5172,46 @@ sub string_deeplink_selector {
                         $currkey = (split(/\:/,$values{$item}))[1];
                     }
                     $output .= '&nbsp;'.
-                        '<input type="'.$visibility.'" name="deeplink_'.$option.'_'.$thiskey.'" id="deeplink_'.$option.'_'.$item.'_'.$thiskey.'" value="'.$currkey.'" size="6"'.$disabled.' />';
-                } elsif ($option eq 'lti') {
+                        '<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 ($currlti,$blankcheck);
+                    my ($current,$blankcheck,@possibles);
                     if ($checked) {
                         $display = 'inline-block';
-                        $currlti = (split(/\:/,$values{$item}))[1];
+                        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.'>'.
-                               '<option value=""'.$blankcheck.'>'.&mt('Select Provider').'</option>'."\n";
-                    foreach my $lti (sort { $a <=> $b } keys(%posslti)) {
+                               '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 ($lti == $currlti) {
+                        if (($poss == $current) || (scalar(@possibles) ==1)) {
                             $selected = ' selected="selected"';
                         }
-                        $output .= '<option value="'.$lti.'"'.$selected.'>'.$posslti{$lti}.'</option>';
+                        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>';
                 }
@@ -4905,7 +5275,7 @@ my %strings =
              => [['_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, and access scope']],
+             => [['on','Set choices for link protection, resource listing, access scope, and shown menu items']],
     );
    
 
@@ -4916,7 +5286,7 @@ my %stringmatches = (
               => [['_allowfrom_','[^\!]+'],
                   ['_denyfrom_','\!']],
          'string_deeplink'
-              => [['on','^(full|absent|grades|details|datestatus)\,(res|map|rec)\,(any|only|key\:\w+|lti\:\d+)$']],
+              => [['on','^(only|off|both)\,(hide|unhide)\,(full|absent|grades|details|datestatus)\,(res|map|rec)\,(none|key\:\w+|ltic\:\d+|ltid\:\d+)\,(\d+|)$']],
     );
 
 my %stringtypes = (
@@ -5382,9 +5752,22 @@ sub oldversion_warning {
 # @param {integer} $shift - time to shift, in seconds
 # @returns {string} - error name or 'ok'
 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)) {
@@ -5399,7 +5782,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;
        }
     }
@@ -5506,7 +5893,7 @@ ENDOVER
 
     &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
                 \%mapp, \%symbp,\%maptitles,\%uris,
-                \%keyorder,\%defkeytype);
+                \%keyorder,\%defkeytype,$pssymb);
 
     if (grep {$_ eq 'all'} (@psprt)) {
         @psprt = keys(%allparts);
@@ -5811,9 +6198,21 @@ sub date_shift_one {
     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 $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);
@@ -5829,7 +6228,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>');
     &endSettingsScreen($r);
     $r->print(&Apache::loncommon::end_page());
 }
@@ -5841,6 +6240,7 @@ 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'};
     my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
         text=>"Shifting Dates"});
@@ -5849,14 +6249,47 @@ sub date_shift_two {
     $r->print($start_page.$breadcrumbs);
     &startSettingsScreen($r,'parmset',$crstype);
     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>']));
@@ -6806,6 +7239,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'}) {
                     return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
@@ -6845,7 +7284,8 @@ sub parm_change_log {
             my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
                 &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},$typeflag);
             if ($env{'request.course.sec'} ne '') {
-                next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));
+                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'}));