--- loncom/interface/lonparmset.pm	2018/09/14 18:27:49	1.586
+++ loncom/interface/lonparmset.pm	2020/02/10 02:11:46	1.594
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.586 2018/09/14 18:27:49 raeburn Exp $
+# $Id: lonparmset.pm,v 1.594 2020/02/10 02:11:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -976,7 +976,6 @@ 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)=@_;
@@ -1065,13 +1064,18 @@ sub valout {
 # @param {string} $marker - identifier for the parameter, "resource id&part_parameter name&level", will be passed as pres_marker when the user submits a change.
 # @param {string} $return - prefix for the name of the form and field names that will be used to submit the form ('parmform.pres')
 # @param {string} $call - javascript function to call to submit the form ('psub')
-# @param {boolean} $recursive - true if link is for a map/folder where parameter is currently set to be recursive. 
+# @param {boolean} $recursive - true if link is for a map/folder where parameter is currently set to be recursive.
+# @param {string} $extra - optional additional information to send as tenth arg in call to javascript pjump function.
 sub plink {
-    my ($type,$dis,$value,$marker,$return,$call,$recursive)=@_;
+    my ($type,$dis,$value,$marker,$return,$call,$recursive,$extra)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
-        if (&isdateparm($type)) {
+        if (&isdateparm($type) || (&is_specialstring($type))) {
             $winvalue=$env{'form.recent_'.$type};
+        } elsif ($type eq 'string_yesno') {
+            if ($env{'form.recent_string'} =~ /^(yes|no)$/i) {
+                $winvalue=$env{'form.recent_string'};
+            }
         } else {
             $winvalue=$env{'form.recent_'.(split(/\_/,$type))[0]};
         }
@@ -1079,16 +1083,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>'.($recursive?'<tr><td align="center" class="LC_parm_recursive">'.
                                               &mt('recursive').'</td></tr>' : '').'</table>';
 
@@ -1107,12 +1111,14 @@ sub page_js {
     $pjump_def
 
     function psub() {
+        var specstring = /^string_!(yesno|any)/i;
         if (document.parmform.pres_marker.value!='') {
             document.parmform.action+='#'+document.parmform.pres_marker.value;
             var typedef=new Array();
             typedef=document.parmform.pres_type.value.split('_');
             if (document.parmform.pres_type.value!='') {
-                if (typedef[0]=='date') {
+                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;');
@@ -1237,12 +1243,16 @@ function validateParms() {
     var patternLenientStd = /^(yes|no|default)$/;
     var ipallowRegExp = /^setipallow_/;
     var ipdenyRegExp = /^setipdeny_/; 
+    var deeplinkRegExp = /^deeplink_(listing|scope)_/;
+    var deeplinkUrlsRegExp = /^deeplink_urls_/;
+    var deeplinkltiRegExp = /^deeplink_lti_/;
+    var deeplinkkeyRegExp = /^deeplink_key_/;
     var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
     if ((document.parmform.elements.length != 'undefined')  && (document.parmform.elements.length) != 'null') {
         if (document.parmform.elements.length) {
             for (i=0; i<document.parmform.elements.length; i++) {
                 var name=document.parmform.elements[i].name;
-                if (textRegExp.test(name)) { 
+                if (textRegExp.test(name)) {
                     var identifier = name.replace(textRegExp,'');
                     if (tailLenient.test(identifier)) {
                         if (document.parmform.elements['set_'+identifier].length) {
@@ -1265,31 +1275,61 @@ 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;
-                                }
-                                document.parmform.elements['set_'+identifier].value += possdeny;
-                            }
-                        }
+                } else if (ipallowRegExp.test(name)) {
+                    var identifier = name.replace(ipallowRegExp,'');
+                    var possallow = document.parmform.elements[i].value;
+                    possallow = possallow.replace(/^\s+|\s+$/g,'');
+                    if (patternIP.test(possallow)) {
+                        if (document.parmform.elements['set_'+identifier].value) {
+                            possallow = ','+possallow;
+                        }
+                        document.parmform.elements['set_'+identifier].value += possallow;
+                    }
+                } else if (ipdenyRegExp.test(name)) {
+                    var identifier = name.replace(ipdenyRegExp,'');
+                    var possdeny = document.parmform.elements[i].value;
+                    possdeny = possdeny.replace(/^\s+|\s+$/g,'');
+                    if (patternIP.test(possdeny)) {
+                        possdeny = '!'+possdeny;
+                        if (document.parmform.elements['set_'+identifier].value) {
+                            possdeny = ','+possdeny;
+                        }
+                        document.parmform.elements['set_'+identifier].value += possdeny;
+                    }
+                } 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;
                     }
+                    document.parmform.elements['set_'+identifier].value += posskey;
                 }
             }
         }
@@ -1351,6 +1391,45 @@ 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 ltidiv;
+        if (document.getElementById('deeplinkdiv_lti_'+item+'_'+key)) {
+            ltidiv = document.getElementById('deeplinkdiv_lti_'+item+'_'+key);
+        }
+        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 (radios[i].value == 'key') {
+                        keybox.type = 'text';
+                    } else {
+                        keybox.type = 'hidden';
+                    }
+                }
+            }
+        }
+    }
+}
+END
+
+}
+
 # Prints HTML page start for table mode.
 # @param {Apache2::RequestRec} $r - the Apache request
 # @param {string} $psymb - resource symb
@@ -1477,7 +1556,7 @@ sub print_row {
     my $mprefix=$rid.'&'.$thismarker.'&';
     my ($parmname)=($thismarker=~/\_([^\_]+)$/);
     my ($othergrp,$grp_parm,$controlgrp,$effective_parm,$effparm_rec,$effparm_level,
-        $eff_groupparm,$recurse_check,$recursinfo);
+        $eff_groupparm,$recurse_check,$recursinfo,$extra);
     if ((ref($recurseup) eq 'ARRAY') && (@{$recurseup} > 0)) {
         if ($result eq '') {
             $recurse_check = 1;
@@ -1535,25 +1614,45 @@ sub print_row {
         ($result == 16 || $result == 10 || $result == 6 || $result == 2)) {
         $effparm_rec = 1;
     }
+    if ($parmname eq 'deeplink') {
+        my %posslti;
+        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'};
+                }
+            }
+        }
+        if (keys(%posslti)) {
+            $extra = 'lti_';
+            foreach my $lti (sort { $a <=> $b } keys(%posslti)) {
+                $extra .= $lti.':'.&js_escape($posslti{$lti}).',';
+            }
+            $extra =~ s/,$//;
+        }
+    }
     if ($parmlev eq 'general') {
         if ($uname) {
-            &print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
         } elsif ($cgroup) {
-            &print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,'',$extra);
         } elsif ($csec) {
-            &print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
         } else {
-            &print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
         }
     } elsif ($parmlev eq 'map') {
         if ($uname) {
-            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1); 
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
         } elsif ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,1);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,1,$extra);
         } elsif ($csec) {
-            &print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);
+            &print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
         } else {
-            &print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);
+            &print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
         }
     } else {
         if ($uname) {
@@ -1576,31 +1675,31 @@ sub print_row {
             }
         }
 
-        &print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);
-        &print_td($r,15,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,14,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,18,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
+        &print_td($r,16,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
+        &print_td($r,15,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
+        &print_td($r,14,'#FFDDDD',$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
+        &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
 
         if ($csec) {
-            &print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
-            &print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);
-            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,12,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
+            &print_td($r,10,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
         }
 
         if ($cgroup) {
-            &print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly);
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,1);
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp.$readonly);
+            &print_td($r,8,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,'',$extra);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp,$readonly,1,$extra);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,$noeditgrp.$readonly,'',$extra);
         }
 
         if ($uname) {
             if ($othergrp) {
                 $r->print($othergrp);
             }
-            &print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
-            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1);
-            &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,4,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,1,$extra);
+            &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$which,\@typeoutpar,$display,'',$readonly,'',$extra);
         }
     } # end of $parmlev if/else
     if (ref($recursinfo) eq 'ARRAY') {
@@ -1616,13 +1715,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;
@@ -1639,7 +1738,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>');
@@ -1666,10 +1765,11 @@ sub print_row {
 # @param {hash reference} $display - parameter key -> full title for the parameter
 # @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters
 # @param {boolean} $readonly -true if editing not allowed.
-# @param {boolean} $ismaplevel - true if level is for a map. 
+# @param {boolean} $ismaplevel - true if level is for a map.
+# @param {strring} $extra - extra informatio to pass to plink.
 sub print_td {
     my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,
-        $noeditgrp,$readonly,$ismaplevel)=@_;
+        $noeditgrp,$readonly,$ismaplevel,$extra)=@_;
     my ($ineffect,$recursive,$currval,$currtype,$currlevel);
     $ineffect = 0;
     $currval = $$outpar[$which];
@@ -1719,11 +1819,12 @@ 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,
-                         $mprefix.$currlevel,'parmform.pres','psub',$recursive));
+                         $mprefix.$currlevel,'parmform.pres','psub',$recursive,
+                         $extra));
     }
     $r->print('</td>'."\n");
 }
@@ -1758,7 +1859,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') {
@@ -1966,6 +2067,14 @@ sub isdateparm {
     return (($type=~/^date/) && (!($type eq 'date_interval')));
 }
 
+# Determine if parameter type is specialized string type (i.e.,
+# not just string or string_yesno.  
+
+sub is_specialstring {
+    my $type=shift;
+    return (($type=~/^string_/) && (($type ne 'string_yesno')));
+}
+
 # Prints the HTML and Javascript to select parameters, with various shortcuts.
 #
 # @param {Apache2::RequestRec} $r - the Apache request
@@ -2101,6 +2210,7 @@ sub lookUpTableParameter {
         'buttonshide' => 'hiding',
         'turnoffeditor' => 'hiding',
         'encrypturl' => 'hiding',
+        'deeplink' => 'hiding',
         'randomorder' => 'high_level_randomization',
         'randompick' => 'high_level_randomization',
         'available' => 'slots',
@@ -2960,7 +3070,21 @@ sub assessparms {
                         "'".$uname."'","'".$udom."'").
                     '</p>';
                 $uname='';
-                $csec=$env{'form.csec'};
+                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_error">'.
+                              &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 {
                 my %name=&Apache::lonnet::userenvironment($udom,$uname,
@@ -3171,7 +3295,10 @@ sub assessparms {
     &startpage($r,$pssymb,$crstype);
 
     foreach my $item ('tolerance','date_default','date_start','date_end',
-            'date_interval','int','float','string') {
+            'date_interval','int','float','string','string_lenient',
+            'string_examcode','string_deeplink','string_discussvote',
+            'string_useslots','string_problemstatus','string_ip',
+            'string_questiontype') {
         $r->print('<input type="hidden" value="'.
             &HTML::Entities::encode($env{'form.recent_'.$item},'"&<>').
             '" name="recent_'.$item.'" />');
@@ -3831,7 +3958,7 @@ sub readdata {
 # Stores parameter data, using form parameters directly.
 #
 # Uses the following form parameters. The variable part in the names is a resourcedata key (except for a modification for user data).
-# set_* (except settext, setipallow, setipdeny) - set a parameter value
+# set_* (except settext, setipallow, setipdeny, setdeeplink) - set a parameter value
 # del_* - remove a parameter
 # datepointer_* - set a date parameter (value is key_* refering to a set of other form parameters)
 # dateinterval_* - set a date interval parameter (value refers to more form parameters)
@@ -3864,7 +3991,7 @@ sub storedata {
             my $cmd=$1;
             my $thiskey=$2;
             my ($altkey,$recursive,$tkey,$tkeyrec,$tkeynonrec);
-            next if ($cmd eq 'rec' || $cmd eq 'settext' || $cmd eq 'setipallow' || $cmd eq 'setipdeny');
+            next if ($cmd eq 'rec' || $cmd eq 'settext' || $cmd eq 'setipallow' || $cmd eq 'setipdeny' || $cmd eq 'setdeeplink');
             if ((($cmd eq 'set') || ($cmd eq 'datepointer') || ($cmd eq 'dateinterval') || ($cmd eq 'del')) && 
                  ($thiskey =~ /(?:sequence|page)\Q___(all)\E/)) {
                 unless ($thiskey =~ /(encrypturl|hiddenresource)$/) {
@@ -3895,8 +4022,8 @@ sub storedata {
                     $text = &mt('Saved modified parameter for');
                     if ($typeof eq 'string_questiontype') {
                         $name = 'type';
-                    } elsif ($typeof eq 'string_lenient') {
-                        $name = 'lenient';
+                    } elsif (($typeof eq 'string_lenient') || ($typeof eq 'string_deeplink')) {
+                        ($name) = ($typeof =~ /^string_(lenient|deeplink)$/);
                         my $stringmatch = &standard_string_matches($typeof);
                         if (ref($stringmatch) eq 'ARRAY') {
                             foreach my $item (@{$stringmatch}) {
@@ -4275,6 +4402,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')) {
@@ -4336,6 +4464,7 @@ sub listdata {
             my ($middle,$part,$name)=
                 ($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s\-]+)\.(\w+)$/);
             my $section=&mt('All Students');
+            $readonly = $readonlyall;
             my $showval = $$resourcedata{$thiskey}; 
             if ($middle=~/^\[(.*)\]/) {
                 my $issection=$1;
@@ -4627,6 +4756,139 @@ sub string_ip_selector {
     return $output;
 }
 
+sub string_deeplink_selector {
+    my ($thiskey, $showval, $readonly) = @_;
+    my (@components,%values,@current,%titles,%options,%optiontext,%defaults,%posslti);
+    @components = ('listing','scope','urls');
+    %titles = &Apache::lonlocal::texthash (
+                  listing => 'In Contents and/or Gradebook',
+                  scope   => 'Access scope for link',
+                  urls    => 'Supported link types',
+              );
+    %options = (
+                   listing => ['full','absent','grades','details','datestatus'],
+                   scope   => ['res','map','rec'],
+                   urls    => ['any','only','key','lti'],
+               );
+    %optiontext = &Apache::lonlocal::texthash (
+                    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',
+                    any        => 'regular + deep',
+                    only       => 'deep only',
+                    key        => 'deep with key',
+                    lti        => 'deep with LTI launch',
+                  );
+    if ($showval =~ /,/) {
+        @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+)$/);
+    } else {
+        $defaults{'listing'} = 'full';
+        $defaults{'scope'} = 'res';
+        $defaults{'urls'} = 'any';
+    }
+    my $disabled;
+    if ($readonly) {
+        $disabled=' disabled="disabled"';
+    }
+    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'};
+            }
+        }
+    }
+    my $output = '<input type="hidden" name="set_'.$thiskey.'" /><table><tr>';
+    foreach my $item ('listing','scope','urls') {
+        $output .= '<th>'.$titles{$item}.'</th>';
+    }
+    $output .= '</tr><tr>';
+    foreach my $item (@components) {
+        $output .= '<td>';
+        if ($item eq 'urls') {
+            my $selected = $values{$item};
+            foreach my $option (@{$options{$item}}) {
+                if ($option eq 'lti') {
+                    next unless (keys(%posslti));
+                }
+                my $checked;
+                if ($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 ($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="6"'.$disabled.' />';
+                } elsif ($option eq 'lti') {
+                    my $display="none";
+                    my ($currlti,$blankcheck);
+                    if ($checked) {
+                        $display = 'inline-block';
+                        $currlti = (split(/\:/,$values{$item}))[1];
+                    } else {
+                        $blankcheck = ' selected="selected"';
+                    }
+                    $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)) {
+                        my $selected;
+                        if ($lti == $currlti) {
+                            $selected = ' selected="selected"';
+                        }
+                        $output .= '<option value="'.$lti.'"'.$selected.'>'.$posslti{$lti}.'</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;
+}
+
 
 { # block using some constants related to parameter types (overview mode)
 
@@ -4660,8 +4922,11 @@ my %strings =
                  ['no','No']],
      'string_ip'
              => [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
-                 ['_denyfrom_',], 'Hostname(s) or IP(s) from which access is disallowed'], 
-     );
+                 ['_denyfrom_','Hostname(s) or IP(s) from which access is disallowed']], 
+     'string_deeplink'
+             => [['on','Set choices for link protection, resource listing, and access scope']],
+    );
+   
 
 my %stringmatches = (
          'string_lenient'
@@ -4669,6 +4934,8 @@ my %stringmatches = (
          'string_ip'
               => [['_allowfrom_','[^\!]+'],
                   ['_denyfrom_','\!']],
+         'string_deeplink'
+              => [['on','^(full|absent|grades|details|datestatus)\,(res|map|rec)\,(any|only|key\:\w+|lti\:\d+)$']],
     );
 
 my %stringtypes = (
@@ -4678,6 +4945,7 @@ my %stringtypes = (
                     discussvote  => 'string_discussvote',
                     examcode     => 'string_examcode',
                     acc          => 'string_ip',
+                    deeplink     => 'string_deeplink',
                   );
 
 # Returns the possible values and titles for a given string type, or undef if there are none.
@@ -4737,6 +5005,7 @@ sub string_selector {
             ($thistype eq 'string_lenient') ||
             ($thistype eq 'string_discussvote') ||
             ($thistype eq 'string_ip') ||
+            ($thistype eq 'string_deeplink') ||
             ($name eq 'retrypartial')) {
         my ($got_chostname,$chostname,$cmajor,$cminor); 
         foreach my $possibilities (@{ $strings{$thistype} }) {
@@ -4775,6 +5044,8 @@ 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);
@@ -5130,9 +5401,10 @@ 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 %data=&Apache::lonnet::dump('resourcedata',$dom,$crs);
 # ugly retro fix for broken version of types
     foreach my $key (keys(%data)) {
@@ -5147,7 +5419,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'}\.\[$sec\]\./);
+          }
           my $newdate=$data{$key}+$shift;
+          $$numchanges ++;
           $storecontent{$key}=$newdate;
        }
     }
@@ -5189,6 +5465,7 @@ sub newoverview {
             &validateparms_js()."\n".
             &ipacc_boxes_js()."\n".
             &done_proctor_js()."\n".
+            &deeplink_js()."\n".
 '// ]]>
 </script>
 ';
@@ -5410,6 +5687,7 @@ sub overview {
              &validateparms_js()."\n".
              &ipacc_boxes_js()."\n".
              &done_proctor_js()."\n".
+             &deeplink_js()."\n".
              '// ]]>'."\n".
              '</script>'."\n";
     &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
@@ -5557,9 +5835,13 @@ 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 '') {
+        $submit_text = &mt("Shift all dates set explicitly for section '[_1]', accordingly",$sec);
+    }
     my $start_page=&Apache::loncommon::start_page('Shift Dates');
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
     $r->print($start_page.$breadcrumbs);
@@ -5575,7 +5857,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());
 }
@@ -5587,6 +5869,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"});
@@ -5595,14 +5878,35 @@ 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 '') {
+        $r->print('<p>'.
+                  &mt("Shift all dates set explicitly for section '[_1]', such that [_2] becomes [_3]",
+                      $sec,&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>']));