--- loncom/interface/lonparmset.pm	2021/01/19 00:44:10	1.522.2.26.2.3
+++ loncom/interface/lonparmset.pm	2023/01/31 15:47:57	1.522.2.28.4.8
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.522.2.26.2.3 2021/01/19 00:44:10 raeburn Exp $
+# $Id: lonparmset.pm,v 1.522.2.28.4.8 2023/01/31 15:47:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -831,7 +831,7 @@ sub valout {
 
 
 sub plink {
-    my ($type,$dis,$value,$marker,$return,$call)=@_;
+    my ($type,$dis,$value,$marker,$return,$call,$extra)=@_;
     my $winvalue=$value;
     unless ($winvalue) {
         if ((&isdateparm($type)) || (&is_specialstring($type))) {
@@ -850,13 +850,13 @@ sub plink {
     my $valout = &valout($value,$type,1);
     my $unencmarker = $marker;
     foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call,
-              \$hour, \$min, \$sec) {
+              \$hour, \$min, \$sec, \$extra) {
     $$item = &HTML::Entities::encode($$item,'"<>&');
     $$item =~ s/\'/\\\'/g;
     }
     return '<table width="100%"><tr valign="top" align="right"><td><a name="'.$unencmarker.'" /></td></tr><tr><td align="center">'.
     '<a href="javascript:pjump('."'".$type."','".$dis."','".$winvalue."','"
-        .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."'".');">'.
+        .$marker."','".$return."','".$call."','".$hour."','".$min."','".$sec."','".$extra."'".');">'.
         $valout.'</a></td></tr></table>';
 }
 
@@ -879,7 +879,7 @@ sub page_js {
             typedef=document.parmform.pres_type.value.split('_');
             if (document.parmform.pres_type.value!='') {
                 if ((typedef[0]=='date') ||
-                    (specstring.test(document.parmform.pres_type.value)))  {
+                    (specstring.test(document.parmform.pres_type.value))) {
                     eval('document.parmform.recent_'+
                         document.parmform.pres_type.value+
                         '.value=document.parmform.pres_value.value;');
@@ -933,31 +933,201 @@ sub validateparms_js {
     return <<'ENDSCRIPT';
 
 function validateParms() {
+    var textRegExp = /^settext_/;
+    var ipRegExp = /^setip/;
     var ipallowRegExp = /^setipallow_/;
     var ipdenyRegExp = /^setipdeny_/;
+    var deeplinkRegExp = /^deeplink_/;
+    var dlListScopeRegExp = /^deeplink_(state|others|listing|scope)_/;
+    var dlLinkProtectRegExp = /^deeplink_protect_/;
+    var dlLtidRegExp = /^deeplink_ltid_/;
+    var dlLticRegExp = /^deeplink_ltic_/;
+    var dlKeyRegExp = /^deeplink_key_/;
+    var dlMenusRegExp = /^deeplink_menus_/;
+    var dlCollsRegExp = /^deeplink_colls_/;
+    var dlTargetRegExp = /^deeplink_target_/;
+    var dlExitRegExp = /^deeplink_exit_/;
+    var dlExitTextRegExp = /^deeplink_exittext_/;
     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 numelements = document.parmform.elements.length;
+    if ((typeof(numelements) != 'undefined') && (numelements != null)) {
+        if (numelements) {
+            for (i=0; i<numelements; i++) {
                 var name=document.parmform.elements[i].name;
-                if (ipallowRegExp.test(name)) {
-                    var identifier = name.replace(ipallowRegExp,'');
-                    var possallow = document.parmform.elements[i].value;
-                    possallow = possallow.replace(/^\s+|\s+$/g,'');
-                    if (patternIP.test(possallow)) {
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            possallow = ','+possallow;
+                if (ipRegExp.test(name)) {
+                    if (ipallowRegExp.test(name)) {
+                        var identifier = name.replace(ipallowRegExp,'');
+                        var possallow = document.parmform.elements[i].value;
+                        possallow = possallow.replace(/^\s+|\s+$/g,'');
+                        if (patternIP.test(possallow)) {
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                possallow = ','+possallow;
+                            }
+                            document.parmform.elements['set_'+identifier].value += possallow;
+                        }
+                    } else if (ipdenyRegExp.test(name)) {
+                        var identifier = name.replace(ipdenyRegExp,'');
+                        var possdeny = document.parmform.elements[i].value;
+                        possdeny = possdeny.replace(/^\s+|\s+$/g,'');
+                        if (patternIP.test(possdeny)) {
+                            possdeny = '!'+possdeny;
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                possdeny = ','+possdeny;
+                            }
+                            document.parmform.elements['set_'+identifier].value += possdeny;
                         }
-                        document.parmform.elements['set_'+identifier].value += possallow;
                     }
-                } else if (ipdenyRegExp.test(name)) {
-                    var identifier = name.replace(ipdenyRegExp,'');
-                    var possdeny = document.parmform.elements[i].value;
-                    possdeny = possdeny.replace(/^\s+|\s+$/g,'');
-                    if (patternIP.test(possdeny)) {
-                        possdeny = '!'+possdeny;
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            possdeny = ','+possdeny;
+                } else if (deeplinkRegExp.test(name)) {
+                    if (dlListScopeRegExp.test(name)) {
+                        var identifier =  name.replace(dlListScopeRegExp,'');
+                        var idx = document.parmform.elements[i].selectedIndex;
+                        if (idx > 0) {
+                            var possdeeplink = document.parmform.elements[i].options[idx].value
+                            possdeeplink = possdeeplink.replace(/^\s+|\s+$/g,'');
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                possdeeplink = ','+possdeeplink;
+                            }
+                            document.parmform.elements['set_'+identifier].value += possdeeplink;
+                        }
+                    } else if (dlLinkProtectRegExp.test(name)) {
+                        if (document.parmform.elements[i].checked) {
+                            var identifier =  name.replace(dlLinkProtectRegExp,'');
+                            var posslinkurl = document.parmform.elements[i].value;
+                            posslinkurl = posslinkurl.replace(/^\s+|\s+$/g,'');
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                posslinkurl = ','+posslinkurl;
+                            }
+                            document.parmform.elements['set_'+identifier].value += posslinkurl;
+                        }
+                    } else if (dlLtidRegExp.test(name)) {
+                        var identifier = name.replace(dlLtidRegExp,'');
+                        if (isRadioSet('deeplink_protect_'+identifier,'ltid')) {
+                            var possltid = document.parmform.elements[i].value;
+                            possltid = possltid.replace(/\D+/g,'');
+                            if (possltid.length) {
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    possltid = ':'+possltid;
+                                }
+                                document.parmform.elements['set_'+identifier].value += possltid;
+                            } else {
+                                document.parmform.elements['set_'+identifier].value = '';
+                                alert("A link type of 'domain LTI launch' was selected but no domain LTI launcher was selected.\nPlease select one, or choose a different supported link type.");
+                                return false;
+                            }
+                        }
+                    } else if (dlLticRegExp.test(name)) {
+                        var identifier = name.replace(dlLticRegExp,'');
+                        if (isRadioSet('deeplink_protect_'+identifier,'ltic')) {
+                            var possltic = document.parmform.elements[i].value;
+                            possltic = possltic.replace(/\D+/g,'');
+                            if (possltic.length) {
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    possltic = ':'+possltic;
+                                }
+                                document.parmform.elements['set_'+identifier].value += possltic;
+                            } else {
+                                document.parmform.elements['set_'+identifier].value = '';
+                                alert("A link type of 'course LTI launch' was selected but no course LTI launcher was selected.\nPlease select one, or choose a different supported link type.");
+                                return false;
+                            }
+                        }
+                    } else if (dlKeyRegExp.test(name)) {
+                        var identifier = name.replace(dlKeyRegExp,'');
+                        if (isRadioSet('deeplink_protect_'+identifier,'key')) {
+                            var posskey = document.parmform.elements[i].value;
+                            posskey = posskey.replace(/^\s+|\s+$/g,'');
+                            var origlength = posskey.length;
+                            posskey = posskey.replace(/[^a-zA-Z\d_.!@#$%^&*()+=-]/g,'');
+                            var newlength = posskey.length;
+                            if (newlength > 0) {
+                                var change = origlength - newlength;
+                                if (change) {
+                                    alert(change+' disallowed character(s) removed from deeplink key');
+                                }
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    posskey = ':'+posskey;
+                                }
+                                document.parmform.elements['set_'+identifier].value += posskey;
+                            } else {
+                                document.parmform.elements['set_'+identifier].value = '';
+                                if (newlength < origlength) {
+                                    alert("A link type of 'deep with key' was selected but the key value was blank, after removing disallowed characters.\nPlease enter a key using one or more of: a-zA-Z0-9_.!@#$%^&*()+=-");
+                                } else {
+                                    alert("A link type of 'deep with key' was selected but the key value was blank.\nPlease enter a key.");
+                                }
+                                return false;
+                            }
+                        }
+                    } else if (dlMenusRegExp.test(name)) {
+                        if (document.parmform.elements[i].checked) {
+                            var identifier =  name.replace(dlMenusRegExp,'');
+                            var posslinkmenu = document.parmform.elements[i].value;
+                            posslinkmenu = posslinkmenu.replace(/^\s+|\s+$/g,'');
+                            if (posslinkmenu == 'std') {
+                                posslinkmenu = '0';
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    posslinkmenu = ','+posslinkmenu;
+                                }
+                                document.parmform.elements['set_'+identifier].value += posslinkmenu;
+                            }
+                        }
+                    } else if (dlCollsRegExp.test(name)) {
+                        var identifier =  name.replace(dlCollsRegExp,'');
+                        if (isRadioSet('deeplink_menus_'+identifier,'colls')) {
+                            var posslinkmenu = document.parmform.elements[i].value;
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                posslinkmenu = ','+posslinkmenu;
+                            }
+                            document.parmform.elements['set_'+identifier].value += posslinkmenu;
+                        }
+                    } else if (dlTargetRegExp.test(name)) {
+                        var identifier =  name.replace(dlTargetRegExp,'');
+                        var idx = document.parmform.elements[i].selectedIndex;
+                        if (idx > 0) {
+                            var linktarget = document.parmform.elements[i].options[idx].value
+                            linktarget = linktarget.replace(/^\s+|\s+$/g,'');
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                linktarget = ','+linktarget;
+                            }
+                            document.parmform.elements['set_'+identifier].value += linktarget;
+                        }
+                    } else if (dlExitRegExp.test(name)) {
+                        if (document.parmform.elements[i].checked) {
+                            var identifier =  name.replace(dlExitRegExp,'');
+                            var posslinkexit = document.parmform.elements[i].value;
+                            posslinkexit = posslinkexit.replace(/^\s+|\s+$/g,'');
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                posslinkexit = ','+posslinkexit;
+                            }
+                            document.parmform.elements['set_'+identifier].value += posslinkexit;
+                        }
+                    } else if (dlExitTextRegExp.test(name)) {
+                        var identifier = name.replace(dlExitTextRegExp,'');
+                        if ((isRadioSet('deeplink_exit_'+identifier,'yes')) ||
+                            (isRadioSet('deeplink_exit_'+identifier,'url'))) {
+                            var posstext = document.parmform.elements[i].value;
+                            posstext = posstext.replace(/^\s+|\s+$/g,'');
+                            var origlength = posstext.length;
+                            posstext = posstext.replace(/[:;'",]/g,'');
+                            var newlength = posstext.length;
+                            if (newlength > 0) {
+                                var change = origlength - newlength;
+                                if (change) {
+                                    alert(change+' disallowed character(s) removed from Exit Button text');
+                                }
+                                if (posstext !== 'Exit Tool') {
+                                    posstext = ':'+posstext;
+                                    document.parmform.elements['set_'+identifier].value += posstext;
+                                }
+                            } else {
+                                document.parmform.elements['set_'+identifier].value = '';
+                                if (newlength < origlength) {
+                                    alert("An exit link type of 'In use' was selected but the button text value was blank, after removing disallowed characters.\nDisallowed characters are ,\":;'");
+                                } else {
+                                    alert("An exit link type of 'In use' was selected but the button text value was blank.\nPlease enter the text to use.");
+                                }
+                                return false;
+                            }
                         }
                     }
                 }
@@ -967,6 +1137,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
 }
 
@@ -996,6 +1183,8 @@ END
 }
 
 sub done_proctor_js {
+    my $defaultdone = &mt('Done');
+    &js_escape(\$defaultdone);
     return <<"END";
 function toggleSecret(form,radio,key) {
     var radios = form[radio+key];
@@ -1012,6 +1201,96 @@ function toggleSecret(form,radio,key) {
                         document.getElementById('done_'+key+'_proctorkey').value='';
                     }
                 }
+                if (document.getElementById('done_'+key+'_buttontext')) {
+                    if (radios[i].value == '') {
+                        document.getElementById('done_'+key+'_buttontext').value = '';
+                    } else {
+                        if (document.getElementById('done_'+key+'_buttontext').value == '') {
+                            document.getElementById('done_'+key+'_buttontext').value = '$defaultdone';
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+END
+
+}
+
+# Javascript function toggle
+sub deeplink_js {
+    return <<"END";
+function toggleDeepLink(form,item,key) {
+    var radios = form['deeplink_'+item+'_'+key];
+    if (radios.length) {
+        var keybox;
+        if (document.getElementById('deeplink_key_'+item+'_'+key)) {
+            keybox = document.getElementById('deeplink_key_'+item+'_'+key);
+        }
+        var divoptions = new Array();
+        if (item == 'protect') {
+            divoptions = ['ltic','ltid'];
+        } else {
+            if (item == 'menus') {
+                divoptions = ['colls'];
+            }
+        }
+        var seldivs = new Array();
+        if ((item == 'protect') || (item == 'menus')) {
+            for (var i=0; i<divoptions.length; i++) {
+                if (document.getElementById('deeplinkdiv_'+divoptions[i]+'_'+item+'_'+key)) {
+                    seldivs[i] = document.getElementById('deeplinkdiv_'+divoptions[i]+'_'+item+'_'+key);
+                } else {
+                    seldivs[i] = '';
+                }
+            }
+        }
+        for (var i=0; i<radios.length; i++) {
+            if (radios[i].checked) {
+                if ((item == 'protect') || (item == 'menus')) {
+                    for (var j=0; j<seldivs.length; j++) {
+                        if (radios[i].value == divoptions[j]) {
+                            if (seldivs[j] != '') {
+                                seldivs[j].style.display = 'inline-block';
+                            }
+                            if (item == 'protect') {
+                                keybox.type = 'hidden';
+                                keybox.value = '';
+                            }
+                        } else {
+                            if (seldivs[j] != '') {
+                                seldivs[j].style.display = 'none';
+                                form['deeplink_'+divoptions[j]+'_'+key].selectedIndex = 0;
+                            }
+                        }
+                    }
+                    if (item == 'protect') {
+                        if (radios[i].value == 'key') {
+                            keybox.type = 'text';
+                        } else {
+                            keybox.type = 'hidden';
+                        }
+                    }
+                } else if (item == 'exit') {
+                    if (document.getElementById('deeplinkdiv_'+item+'_'+key)) {
+                        if (radios[i].value == 'no') {
+                            document.getElementById('deeplinkdiv_'+item+'_'+key).style.display = 'none';
+                            if (document.getElementById('deeplink_exittext_'+key)) {
+                                if (document.getElementById('deeplink_exittext_'+key).value != '') {
+                                    document.getElementById('deeplink_exittext_'+key).value = '';
+                                }
+                            }
+                        } else {
+                            document.getElementById('deeplinkdiv_'+item+'_'+key).style.display = 'inline-block';
+                            if (document.getElementById('deeplink_exittext_'+key)) {
+                                if (document.getElementById('deeplink_exittext_'+key).value == '') {
+                                    document.getElementById('deeplink_exittext_'+key).value = 'Exit Tool';
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
     }
@@ -1109,30 +1388,78 @@ sub print_row {
     my $thismarker=$which;
     $thismarker=~s/^parameter\_//;
     my $mprefix=$rid.'&'.$thismarker.'&';
+    my ($parmname)=($thismarker=~/\_([^\_]+)$/);
     my $effective_parm = &valout($outpar[$result],$typeoutpar[$result]);
-    my ($othergrp,$grp_parm,$controlgrp);
+    my ($othergrp,$grp_parm,$controlgrp,$extra);
 
+    if ($parmname eq 'deeplink') {
+        my ($domltistr,$crsltistr);
+        my %lti =
+            &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
+                                            'linkprot');
+        if (keys(%lti)) {
+            foreach my $item (sort { $a <=> $b }  (keys(%lti))) {
+                if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
+                    $domltistr .= $item.':'.&escape(&escape($lti{$item}{'name'})).',';
+                }
+            }
+            $domltistr =~ s/,$//;
+            if ($domltistr) {
+                $extra = 'ltid_'.$domltistr;
+            }
+        }
+        my %courselti = &Apache::lonnet::get_course_lti($cnum,$cdom);
+        if (keys(%courselti)) {
+            foreach my $item (sort { $a <=> $b } keys(%courselti)) {
+                if (($item =~ /^\d+$/) && (ref($courselti{$item}) eq 'HASH')) {
+                    $crsltistr .= $item.':'.&escape(&escape($courselti{$item}{'name'})).',';
+                }
+            }
+            $crsltistr =~ s/,$//;
+            if ($crsltistr) {
+                if ($extra) {
+                    $extra .= '&';
+                }
+                $extra .= 'ltic_'.$crsltistr;
+            }
+        }
+        if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
+            my @colls;
+            foreach my $item (split(/;/,$env{'course.'.$env{'request.course.id'}.'.menucollections'})) {
+                my ($num,$value) = split(/\%/,$item);
+                if ($num =~ /^\d+$/) {
+                    push(@colls,$num);
+                }
+            }
+            if (@colls) {
+                if ($extra) {
+                    $extra .= '&';
+                }
+                $extra .= 'menus_'.join(',',@colls);
+            }
+        }
+    }
     if ($parmlev eq 'general') {
 
         if ($uname) {
-            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         } elsif ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
         } elsif ($csec) {
-            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         } else {
-            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         }
     } elsif ($parmlev eq 'map') {
 
         if ($uname) {
-            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         } elsif ($cgroup) {
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
         } elsif ($csec) {
-            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         } else {
-            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+            &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
         }
     } else {
         if ($uname) {
@@ -1152,32 +1479,32 @@ sub print_row {
             }
         }
 
-        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,14,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
 
-    &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-    &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-    &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-    &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+    &print_td($r,13,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+    &print_td($r,12,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+    &print_td($r,11,'#FFDDDD',$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+    &print_td($r,10,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
 
     if ($csec) {
-        &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,9,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+        &print_td($r,8,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+        &print_td($r,7,$defbgtwo,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
     }
 
         if ($cgroup) {
-            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
-            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
-            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly);
+            &print_td($r,6,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
+            &print_td($r,5,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
+            &print_td($r,4,$defbgthree,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,$noeditgrp,$readonly,$extra);
         }
 
     if ($uname) {
             if ($othergrp) {
                 $r->print($othergrp);
             }
-        &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
-        &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly);
+        &print_td($r,3,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+        &print_td($r,2,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
+        &print_td($r,1,$defbgone,$result,\@outpar,$mprefix,$_,\@typeoutpar,$display,'',$readonly,$extra);
     }
 
     } # end of $parmlev if/else
@@ -1197,7 +1524,7 @@ sub print_row {
 }
 
 sub print_td {
-    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp,$readonly)=@_;
+    my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,$noeditgrp,$readonly,$extra)=@_;
     $r->print('<td style="background-color:'.(($result==$which)?'#AAFFAA':$defbg).
               ';" align="center">');
     my $nolink = 0;
@@ -1225,7 +1552,7 @@ sub print_td {
     } else {
         $r->print(&plink($$typeoutpar[$which],
                          $$display{$value},$$outpar[$which],
-                         $mprefix."$which",'parmform.pres','psub'));
+                         $mprefix."$which",'parmform.pres','psub',$extra));
     }
     $r->print('</td>'."\n");
 }
@@ -1396,7 +1723,7 @@ sub isdateparm {
 
 sub is_specialstring {
     my $type=shift;
-    return (($type=~/^string_/) && (($type ne 'string_yesno')));
+    return (($type=~/^string_/) && ($type ne 'string_yesno'));
 }
 
 #
@@ -1533,6 +1860,7 @@ sub lookUpTableParameter {
         'buttonshide' => 'hiding',
         'turnoffeditor' => 'hiding',
         'encrypturl' => 'hiding',
+        'deeplink' => 'hiding',
         'randomorder' => 'high_level_randomization',
         'randompick' => 'high_level_randomization',
         'available' => 'slots',
@@ -1809,7 +2137,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')" |;
         }
@@ -1865,7 +2193,7 @@ sub displaymenu {
 }
 
 sub mapmenu {
-    my ($r,$allmaps,$pschp,$maptitles,$symbp)=@_;
+    my ($r,$allmaps,$pschp,$maptitles,$symbp,$parmlev)=@_;
     my %allmaps_inverted = reverse %$allmaps;
     my $navmap = Apache::lonnavmaps::navmap->new();
     my $tree=[];
@@ -1913,7 +2241,11 @@ sub mapmenu {
         }
     }
 # Show it ...    
-    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder'),'','',' id="mapmenu"'));
+    my $rowattr = ' id="mapmenu"';
+    if ($parmlev eq 'general') {
+        $rowattr .= ' style="display:none"';
+    }
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder'),'','',$rowattr));
     if ((ref($tree) eq 'ARRAY') && (ref($treeinfo) eq 'HASH')) {
         my $icon = '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />';
         my $whitespace =
@@ -2390,7 +2722,7 @@ sub assessparms {
             if ($uname ne '') {
                 my %name=&Apache::lonnet::userenvironment($udom,$uname,
                   ('firstname','middlename','lastname','generation','id'));
-                $message .= "\n<p>\n".&mt('Full Name').': ' 
+                $message .= "\n<p>\n".&mt('Full Name').': '
                             .$name{'firstname'}.' '.$name{'middlename'}.' '
                             .$name{'lastname'}.' '.$name{'generation'}
                             ."<br />\n".&mt('Student/Employee ID').': '.$name{'id'}.'</p>';
@@ -2428,6 +2760,7 @@ sub assessparms {
         my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
         my ($got_chostname,$chostname,$cmajor,$cminor);
         my $totalstored = 0;
+        my $totalskippeduser = 0;
         my $now = time;
         for (my $i=0;$i<=$#markers;$i++) {
             my ($needsrelease,$needsnewer,$name);
@@ -2436,6 +2769,11 @@ sub assessparms {
             }
             if ($markers[$i] =~ /\&(6|5|4)$/) {
                 next if ($noeditgrp);
+            } elsif ($markers[$i] =~ /\&(3|2|1)$/) {
+                if ($uname eq '') {
+                    $totalskippeduser ++;
+                    next;
+                }
             }
             if ($markers[$i] =~ /^[\d.]+\&0_availablestudent\&(1|2|3)$/) {
                 my (@ok_slots,@fail_slots,@del_slots);
@@ -2513,9 +2851,27 @@ sub assessparms {
 # ---------------------------------------------------------------- Done storing
         if ($totalstored) {
             $message.='<p class="LC_warning">'
+                     .&mt('Changes for [quant,_1,parameter] saved.',$totalstored)
+                     .'<br />'
                      .&mt('Changes can take up to 10 minutes before being active for all students.')
                      .&Apache::loncommon::help_open_topic('Caching')
                      .'</p>';
+        } else {
+            $message.='<p class="LC_info">'.&mt('No parameter changes saved.').'</p>';
+        }
+        if ($totalskippeduser) {
+            $message .= '<p class="LC_warning">';
+            if ($uhome eq 'no_host') {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the username or ID was invalid.',
+                                $totalskippeduser);
+            } elsif ($env{'form.userroles'} eq 'any') {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the user does not have a course role.',
+                                $totalskippeduser);
+            } else {
+                $message .= &mt('Changes for [quant,_1,user-specific parameter] not saved because the user is not a student.',
+                                $totalskippeduser);
+            }
+            $message .= '</p>';
         }
     }
 #----------------------------------------------- if all selected, fill in array
@@ -2538,13 +2894,20 @@ sub assessparms {
 
     # ----- Start Parameter Selection
 
-    # Hide parm selection?
+    # Hide parm selection and possibly table?
+    my ($tablejs,$tabledivsty);
+    if (((($env{'form.uname'} ne '') || ($env{'form.id'} ne '')) && ($uname eq '')) &&
+        ($env{'form.dis'}) && ($pssymb eq '')) {
+        $tablejs = 'document.getElementById('."'parmtable'".').style.display = "";';
+        $tabledivsty = ' style="display:none"';
+    }
     $r->print(<<ENDPARMSELSCRIPT);
 <script type="text/javascript">
 // <![CDATA[
 function parmsel_show() {
   document.getElementById('parmsel').style.display = "";
   document.getElementById('parmsellink').style.display = "none";
+  $tablejs
 }
 // ]]>
 </script>
@@ -2570,7 +2933,7 @@ ENDPARMSELSCRIPT
         $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
         &levelmenu($r,\%alllevs,$parmlev);
         $r->print(&Apache::lonhtmlcommon::row_closure());
-        &mapmenu($r,\%allmaps,$pschp,\%maptitles, \%symbp);
+        &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp,$parmlev);
         $r->print(&Apache::lonhtmlcommon::row_closure());
         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
         &partmenu($r,\%allparts,\@psprt);
@@ -2656,6 +3019,7 @@ ENDPARMSELSCRIPT
         if ($parm_permission->{'edit'}) {
             undef($readonly);
         }
+        $r->print('<div id="parmtable"'.$tabledivsty.'>');
 
         if ($parmlev eq 'full') {
 #
@@ -2865,7 +3229,7 @@ ENDTABLEHEADFOUR
 
 #-------------------------------------------- for each map, gather information
             my $mapid;
-               foreach $mapid (sort {$maplist{$a} cmp $maplist{$b}} keys %maplist) {
+               foreach $mapid (sort { $a <=> $b } keys(%maplist)) {
                 my $maptitle = $maplist{$mapid};
 
 #-----------------------  loop through ids and get all parameter types for map
@@ -3064,6 +3428,7 @@ ENDMAPONE
                      .'</center>'
             );
         } # end of $parmlev eq general
+        $r->print('</div>');
     }
     $r->print('</form>');
     $r->print(&Apache::loncommon::end_page());
@@ -3145,21 +3510,39 @@ sub storedata {
     if ($key =~ /^form\.([a-z]+)\_(.+)$/) {
         my $cmd=$1;
         my $thiskey=$2;
-        next if ($cmd eq 'setipallow' || $cmd eq 'setipdeny');
+        next if ($cmd eq 'setipallow' || $cmd eq 'setipdeny' || $cmd eq 'setdeeplink');
         my ($tuname,$tudom)=&extractuser($thiskey);
         my $tkey=$thiskey;
             if ($tuname) {
         $tkey=~s/\.\[useropt\:$tuname\:$tudom\]\./\./;
         }
         if ($cmd eq 'set' || $cmd eq 'datepointer' || $cmd eq 'dateinterval') {
-        my ($data, $typeof, $text, $name, $valchk);
+        my ($data, $typeof, $text, $name, $valchk, $valmatch, $namematch);
         if ($cmd eq 'set') {
             $data=$env{$key};
+            $valmatch = '';
             $valchk = $data;
             $typeof=$env{'form.typeof_'.$thiskey};
             $text = &mt('Saved modified parameter for');
             if ($typeof eq 'string_questiontype') {
                 $name = 'type';
+            } elsif ($typeof eq 'string_deeplink') {
+                ($name) = ($typeof =~ /^string_(deeplink)$/);
+                my $stringmatch = &standard_string_matches($typeof);
+                if (ref($stringmatch) eq 'ARRAY') {
+                    foreach my $item (@{$stringmatch}) {
+                        if (ref($item) eq 'ARRAY') {
+                            my ($regexpname,$pattern) = @{$item};
+                            if ($pattern ne '') {
+                                if ($data =~ /$pattern/) {
+                                    $valmatch = $regexpname;
+                                    $valchk = '';
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                }
             } elsif ($typeof eq 'string_lenient') {
                 $name = 'lenient';
             } elsif ($typeof eq 'string_discussvote') {
@@ -3416,6 +3799,7 @@ sub listdata {
         $realm='<span class="LC_parm_scope_folder">'.&mt('Folder/Map').': '.&Apache::lonnet::gettitle($1).' <br /><span class="LC_parm_folder">('.$1.')</span></span>';
         } elsif ($middle) {
         my ($map,$id,$url)=&Apache::lonnet::decode_symb($middle);
+        next if (($url =~ /\.(page|sequence)$/) && ($parmlev eq 'full') && ($caller eq 'newoverview'));
         $realm='<span class="LC_parm_scope_resource">'.&mt('Resource').': '.&Apache::lonnet::gettitle($middle).' <br /><span class="LC_parm_symb">('.$url.' in '.$map.' id: '.$id.')</span></span>';
         }
         if ($sortorder eq 'realmstudent') {
@@ -3521,6 +3905,11 @@ sub date_interval_selector {
     $showval  %= $factor;
     my %select = ((map {$_ => $_} (0..$max)),
               'select_form_order' => [0..$max]);
+    if ($currval eq '') {
+        unshift(@{$select{'select_form_order'}},'');
+        $select{''} = '';
+        $amount = '';
+    }
     $result .= &Apache::loncommon::select_form($amount,$name.'_'.$thiskey,
                            \%select,'',$readonly);
     $result .= ' '.&mt($name);
@@ -3528,6 +3917,7 @@ sub date_interval_selector {
     if ($pname eq 'interval') {
         unless ($skipval{'done'}) {
             my $checkedon = '';
+            my $checkedoff = '';
             my $checkedproc = '';
             my $currproctorkey = '';
             my $currprocdisplay = 'hidden';
@@ -3535,22 +3925,22 @@ sub date_interval_selector {
             my $checkedoff = ' checked="checked"';
             if ($currval =~ /^(?:\d+)_done$/) {
                 $checkedon = ' checked="checked"';
-                $checkedoff = '';
             } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) {
                 $currdonetext = $1;
                 $checkedon = ' checked="checked"';
-                $checkedoff = '';
             } elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
                 $currproctorkey = $1;
                 $checkedproc = ' checked="checked"';
-                $checkedoff = '';
                 $currprocdisplay = 'text';
             } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:_proctor_(.+)$/) {
                 $currdonetext = $1;
                 $currproctorkey = $2;
                 $checkedproc = ' checked="checked"';
-                $checkedoff = '';
                 $currprocdisplay = 'text';
+            } elsif ($currval ne '') {
+                $checkedoff = ' checked="checked"';
+            } else {
+                $currdonetext = '';
             }
             my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
             my $disabled;
@@ -3567,7 +3957,8 @@ sub date_interval_selector {
                        '<input type="'.$currprocdisplay.'" id="done_'.$thiskey.'_proctorkey" '.
                        'name="done_'.$thiskey.'_proctorkey" value="'.&HTML::Entities::encode($currproctorkey,'"<>&').'"'.$disabled.' /></span><br />'.
                        '<span class="LC_nobreak">'.&mt('Button text').': '.
-                       '<input type="text" name="done_'.$thiskey.'_buttontext" value="'.&HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
+                       '<input type="text" name="done_'.$thiskey.'_buttontext" value="'.
+                       &HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
         }
     }
     unless ($readonly) {
@@ -3580,15 +3971,36 @@ sub date_interval_selector {
 sub get_date_interval_from_form {
     my ($key) = @_;
     my $seconds = 0;
+    my $numnotnull = 0;
     foreach my $which (['days', 86400],
                ['hours', 3600],
                ['minutes', 60],
                ['seconds',  1]) {
     my ($name, $factor) = @{ $which };
     if (defined($env{'form.'.$name.'_'.$key})) {
-        $seconds += $env{'form.'.$name.'_'.$key} * $factor;
+        unless ($env{'form.'.$name.'_'.$key} eq '') {
+            $numnotnull ++;
+            $seconds += $env{'form.'.$name.'_'.$key} * $factor;
+        }
     }
     }
+    if (($key =~ /\.interval$/) &&
+            (($env{'form.done_'.$key} eq '_done') || ($env{'form.done_'.$key} eq '_done_proctor'))) {
+        if ($env{'form.done_'.$key.'_buttontext'}) {
+            $env{'form.done_'.$key.'_buttontext'} =~ s/\://g;
+            $seconds .= '_done:'.$env{'form.done_'.$key.'_buttontext'}.':';
+            if ($env{'form.done_'.$key} eq '_done_proctor') {
+                $seconds .= '_proctor';
+            }
+        } else {
+            $seconds .= $env{'form.done_'.$key};
+        }
+        if (($env{'form.done_'.$key} eq '_done_proctor') &&
+                ($env{'form.done_'.$key.'_proctorkey'})) {
+            $seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'};
+        }
+    }
+    return if (!$numnotnull);
     return $seconds;
 }
 
@@ -3662,6 +4074,257 @@ sub string_ip_selector {
     return $output;
 }
 
+sub string_deeplink_selector {
+    my ($thiskey, $showval, $readonly) = @_;
+    my (@tables,%values,@current,%titles,%options,%optiontext,%defaults,
+        %selectnull,%domlti,%crslti,@possmenus,%components);
+    @tables = ('upper','lower');
+    %components = (
+                    upper => ['state','others','listing','scope'],
+                    lower => ['protect','menus','target','exit'],
+                  );
+    %titles = &Apache::lonlocal::texthash (
+                  state   => 'Access status',
+                  others  => 'Hide other resources',
+                  listing => 'In Contents and/or Gradebook',
+                  scope   => 'Access scope for link',
+                  protect => 'Link protection',
+                  menus   => 'Menu Items Displayed',
+                  target  => 'Embedded?',
+                  exit    => 'Exit Tool Button?',
+              );
+    %options = (
+                   state   => ['only','off','both'],
+                   others  => ['hide','unhide'],
+                   listing => ['full','absent','grades','details','datestatus'],
+                   scope   => ['res','map','rec'],
+                   protect => ['none','key','ltid','ltic'],
+                   menus   => ['std','colls'],
+                   target  => ['_self','_top'],
+                   exit    => ['no','yes','url'],
+               );
+    %optiontext = &Apache::lonlocal::texthash (
+                    only       => 'deep only',
+                    off        => 'deeplink off',
+                    both       => 'regular + deep',
+                    hide       => 'Hidden',
+                    unhide     => 'Unhidden',
+                    full       => 'Listed (linked) in both',
+                    absent     => 'Not listed',
+                    grades     => 'Listed in grades only',
+                    details    => 'Listed (unlinked) in both',
+                    datestatus => 'Listed (unlinked) inc. status in both',
+                    res        => 'resource only',
+                    map        => 'enclosing map/folder',
+                    rec        => 'recursive map/folder',
+                    none       => 'not in use',
+                    key        => 'key access',
+                    ltic       => 'LTI access (course)',
+                    ltid       => 'LTI access (domain)' ,
+                    std        => 'Standard (all menus)',
+                    colls      => 'Numbered collection',
+                    _self      => 'Embedded',
+                    _top       => 'Not embedded',
+                    no         => 'Not in use',
+                    yes        => 'In use, no URL redirect',
+                    url        => 'In use, redirect to URL',
+                  );
+    %selectnull = &Apache::lonlocal::texthash (
+                    ltic => 'Select Launcher',
+                    ltid => 'Select Launcher',
+                    colls => 'Select',
+                  );
+    if ($showval =~ /,/) {
+        %values=();
+        @current = split(/,/,$showval);
+        ($values{'state'}) = ($current[0] =~ /^(only|off|both)$/);
+        ($values{'others'}) = ($current[1] =~ /^(hide|unhide)$/);
+        ($values{'listing'}) = ($current[2] =~ /^(full|absent|grades|details|datestatus)$/);
+        ($values{'scope'}) = ($current[3] =~ /^(res|map|rec)$/);
+        ($values{'protect'}) = ($current[4] =~ /^(key:[a-zA-Z\d_.!\@#\$%^&*()+=-]+|ltic:\d+|ltid:\d+)$/);
+        ($values{'menus'}) = ($current[5] =~ /^(\d+)$/);
+        ($values{'target'}) = ($current[6] =~ /^(_self|_top)$/);
+        ($values{'exit'}) = ($current[7] =~ /^((?:(?:yes|url)(?:|\:[^:;"',]+))|no)$/);
+    } else {
+        $defaults{'state'} = 'off',
+        $defaults{'others'} = 'unhide',
+        $defaults{'listing'} = 'full';
+        $defaults{'scope'} = 'res';
+        $defaults{'protect'} = 'none';
+        $defaults{'menus'} = '0';
+        $defaults{'target'} = '_top';
+        $defaults{'exit'} = 'yes';
+    }
+    my $disabled;
+    if ($readonly) {
+        $disabled=' disabled="disabled"';
+    }
+    my %courselti =
+        &Apache::lonnet::get_course_lti($env{'course.'.$env{'request.course.id'}.'.num'},
+                                        $env{'course.'.$env{'request.course.id'}.'.domain'});
+    foreach my $item (keys(%courselti)) {
+        if (ref($courselti{$item}) eq 'HASH') {
+            $crslti{$item} = $courselti{$item}{'name'};
+        }
+    }
+    my %lti =
+        &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
+                                        'linkprot');
+    foreach my $item (keys(%lti)) {
+        if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
+            $domlti{$item} = $lti{$item}{'name'};
+        }
+    }
+    if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
+        foreach my $item (split(/;/,$env{'course.'.$env{'request.course.id'}.'.menucollections'})) {
+            my ($num,$value) = split(/\%/,$item);
+            if ($num =~ /^\d+$/) {
+                push(@possmenus,$num);
+            }
+        }
+    }
+
+    my $output = '<input type="hidden" name="set_'.$thiskey.'" />';
+    foreach my $table ('upper','lower') {
+        next unless (ref($components{$table}) eq 'ARRAY');
+        $output .= '<table width="100%"><tr>';
+        foreach my $item (@{$components{$table}}) {
+            $output .= '<th>'.$titles{$item}.'</th>';
+        }
+        $output .= '</tr><tr>';
+        foreach my $item (@{$components{$table}}) {
+            $output .= '<td>';
+            if (($item eq 'protect') || ($item eq 'menus') || ($item eq 'exit')) {
+                my $selected = $values{$item};
+                foreach my $option (@{$options{$item}}) {
+                    if ($item eq 'protect') {
+                        if ($option eq 'ltid') {
+                            next unless (keys(%domlti));
+                        } elsif ($option eq 'ltic') {
+                            next unless (keys(%crslti));
+                        }
+                    } elsif (($item eq 'menus') && ($option eq 'colls')) {
+                        next unless (@possmenus);
+                    }
+                    my $checked;
+                    if ($item eq 'menus') {
+                        if (($selected =~ /^\d+$/) && (@possmenus) &&
+                            (grep(/^\Q$selected\E$/,@possmenus))) {
+                            if ($option eq 'colls') {
+                                $checked = ' checked="checked"';
+                            }
+                        } elsif (($option eq 'std') && ($selected == 0) && ($selected ne '')) {
+                            $checked = ' checked="checked"';
+                        }
+                    } elsif ($selected =~ /^\Q$option\E/) {
+                        $checked = ' checked="checked"';
+                    }
+                    my $onclick;
+                    unless ($readonly) {
+                        my $esc_key = &js_escape($thiskey);
+                        $onclick = ' onclick="toggleDeepLink(this.form,'."'$item','$esc_key'".');"';
+                    }
+                    $output .= '<span class="LC_nobreak"><label>'.
+                               '<input type="radio" name="deeplink_'.$item.'_'.$thiskey.'" value="'.$option.'"'.$onclick.$disabled.$checked.' />'."\n".
+                               $optiontext{$option}.'</label>';
+                    if (($item eq 'protect') && ($option eq 'key')) {
+                        my $visibility="hidden";
+                        my $currkey;
+                        if ($checked) {
+                            $visibility = "text";
+                            $currkey = (split(/\:/,$values{$item}))[1];
+                        }
+                        $output .= '&nbsp;'.
+                                   '<input type="'.$visibility.'" name="deeplink_'.$option.'_'.$thiskey.'" id="deeplink_'.$option.'_'.$item.'_'.$thiskey.'" value="'.$currkey.'" size="10"'.$disabled.' />';
+                    } elsif (($option eq 'ltic') || ($option eq 'ltid') || ($option eq 'colls')) {
+                        my $display="none";
+                        my ($current,$blankcheck,@possibles);
+                        if ($checked) {
+                            $display = 'inline-block';
+                            if (($option eq 'ltic') || ($option eq 'ltid'))  {
+                                $current = (split(/\:/,$selected))[1];
+                            } else {
+                                $current = $selected;
+                            }
+                        } else {
+                            $blankcheck = ' selected="selected"';
+                        }
+                        if ($option eq 'ltid') {
+                            @possibles = keys(%domlti);
+                        } elsif ($option eq 'ltic') {
+                            @possibles = keys(%crslti);
+                        } else {
+                            @possibles = @possmenus;
+                        }
+                        $output .= '<div id="deeplinkdiv_'.$option.'_'.$item.'_'.$thiskey.'"'.
+                                   ' style="display: '.$display.'">&nbsp;<select name="'.
+                                   'deeplink_'.$option.'_'.$thiskey.'"'.$disabled.'>';
+                        if (@possibles > 1) {
+                            $output .= '<option value=""'.$blankcheck.'>'.$selectnull{$option}.
+                                       '</option>'."\n";
+                        }
+                        foreach my $poss (sort { $a <=> $b } @possibles) {
+                            my $selected;
+                            if (($poss == $current) || (scalar(@possibles) ==1)) {
+                                $selected = ' selected="selected"';
+                            }
+                            my $shown = $poss;
+                            if ($option eq 'ltid') {
+                                $shown = $domlti{$poss};
+                            } elsif ($option eq 'ltic') {
+                                $shown = $crslti{$poss};
+                            }
+                            $output .= '<option value="'.$poss.'"'.$selected.'>'.$shown.'</option>';
+                        }
+                        $output .= '</select></div>';
+                    }
+                    $output .= '</span> ';
+                }
+                if ($item eq 'exit') {
+                    my $exitsty = 'none';
+                    my $displayval;
+                    if ($values{$item} =~ /^(yes|url)/) {
+                        $exitsty = 'inline-block';
+                        my $currval = (split(/\:/,$values{$item}))[1];
+                        if ($currval eq '') {
+                            $displayval = 'Exit Tool';
+                        } else {
+                            $displayval = $currval;
+                        }
+                    }
+                    $output .= '<div id="deeplinkdiv_'.$item.'_'.$thiskey.'"'.
+                               ' style="display: '.$exitsty.'"><br />'.&mt('Button text').': '.
+                               '<input type="text" name="deeplink_exittext_'.$thiskey.'"'.
+                               ' id="deeplink_exittext_'.$thiskey.'" value="'.$displayval.'"'.
+                               ' size="10"'.$disabled.' /></div>';
+                }
+            } 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";
+        if ($table eq 'upper') {
+            $output .= '<br />';
+        }
+    }
+    return $output;
+}
+
 {
 
 my %strings =
@@ -3694,8 +4357,28 @@ my %strings =
      'string_ip'
              => [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
                  ['_denyfrom_','Hostname(s) or IP(s) from which access is disallowed']],
+     'string_deeplink'
+             => [['on','Set choices for link protection, resource listing, access scope, shown menu items, embedding, and exit link']],
      );
 
+my %stringmatches = (
+         'string_ip'
+              => [['_allowfrom_','[^\!]+'],
+                  ['_denyfrom_','\!']],
+         'string_deeplink'
+              => [['on','^(only|off|both)\,(hide|unhide)\,(full|absent|grades|details|datestatus)\,(res|map|rec)\,(none|key\:\w+|ltic\:\d+|ltid\:\d+)\,(\d+|)\,_(self|top),(yes|url|no)(|:[^:;\'",]+)$']],
+    );
+
+my %stringtypes = (
+                    type         => 'string_questiontype',
+                    lenient      => 'string_lenient',
+                    retrypartial => 'string_yesno',
+                    discussvote  => 'string_discussvote',
+                    examcode     => 'string_examcode',
+                    acc          => 'string_ip',
+                    deeplink     => 'string_deeplink',
+                  );
+
 sub standard_string_options {
     my ($string_type) = @_;
     if (ref($strings{$string_type}) eq 'ARRAY') {
@@ -3704,6 +4387,14 @@ sub standard_string_options {
     return;
 }
 
+sub standard_string_matches {
+    my ($string_type) = @_;
+    if (ref($stringmatches{$string_type}) eq 'ARRAY') {
+        return $stringmatches{$string_type};
+    }
+    return;
+}
+
 sub string_selector {
     my ($thistype, $thiskey, $showval, $name, $readonly) = @_;
 
@@ -3737,6 +4428,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);
@@ -3914,7 +4607,10 @@ sub newoverview {
 '.
             &Apache::lonhtmlcommon::resize_scrollbox_js('params')."\n".
             &showhide_js()."\n".
+            &validateparms_js()."\n".
+            &ipacc_boxes_js()."\n".
             &done_proctor_js()."\n".
+            &deeplink_js()."\n".
 '// ]]>
 </script>
 ';
@@ -3923,7 +4619,7 @@ sub newoverview {
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
     $r->print(<<ENDOVER);
-<form method="post" action="/adm/parmset?action=newoverview" name="parmform">
+<form method="post" action="/adm/parmset?action=newoverview" name="parmform" onsubmit="return validateParms();">
 ENDOVER
     my @ids=();
     my %typep=();
@@ -3989,10 +4685,8 @@ ENDOVER
     $r->print('<div>');
     $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
     &levelmenu($r,\%alllevs,$parmlev);
-    if ($parmlev ne 'general') {
-        $r->print(&Apache::lonhtmlcommon::row_closure());
-        &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp);
-    }
+    $r->print(&Apache::lonhtmlcommon::row_closure());
+    &mapmenu($r,\%allmaps,$pschp,\%maptitles,\%symbp,$parmlev);
     $r->print(&Apache::lonhtmlcommon::row_closure(1));
     $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print('</div></div>');
@@ -4108,6 +4802,9 @@ sub overview {
     my $js = '<script type="text/javascript">'."\n".
              '// <![CDATA['."\n".
              &done_proctor_js()."\n".
+             &validateparms_js()."\n".
+             &ipacc_boxes_js()."\n".
+             &deeplink_js()."\n".
              '// ]]>'."\n".
              '</script>'."\n";
     my $readonly = 1;
@@ -4119,7 +4816,7 @@ sub overview {
     my $start_page=&Apache::loncommon::start_page('Modify Parameters',$js);
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
     $r->print($start_page.$breadcrumbs);
-    $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform">');
+    $r->print('<form method="post" action="/adm/parmset?action=setoverview" name="parmform" onsubmit="return validateParms();">');
 
 # Store modified
     unless ($readonly) {