--- loncom/interface/lonparmset.pm	2020/02/10 19:48:56	1.595
+++ loncom/interface/lonparmset.pm	2022/07/03 04:31:07	1.615
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.595 2020/02/10 19:48:56 raeburn Exp $
+# $Id: lonparmset.pm,v 1.615 2022/07/03 04:31:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -978,7 +978,7 @@ sub storeparm_by_symb_inner {
 # @param {string} $type - the parameter type
 # @param {boolean} $editable - Set to true to get an icon when no value is defined.
 sub valout {
-    my ($value,$type,$name,$editable)=@_;
+    my ($value,$type,$editable)=@_;
     my $result = '';
     # Values of zero are valid.
     if (! $value && $value ne '0') {
@@ -1241,12 +1241,18 @@ function validateParms() {
     var tailLenient = /\.lenient$/;
     var patternRelWeight = /^\-?[\d.]+$/;
     var patternLenientStd = /^(yes|no|default)$/;
+    var ipRegExp = /^setip/;
     var ipallowRegExp = /^setipallow_/;
     var ipdenyRegExp = /^setipdeny_/; 
-    var deeplinkRegExp = /^deeplink_(listing|scope)_/;
-    var deeplinkUrlsRegExp = /^deeplink_urls_/;
-    var deeplinkltiRegExp = /^deeplink_lti_/;
-    var deeplinkkeyRegExp = /^deeplink_key_/;
+    var deeplinkRegExp = /^deeplink_/;
+    var dlListScopeRegExp = /^deeplink_(state|others|listing|scope)_/; 
+    var dlLinkProtectRegExp = /^deeplink_protect_/;
+    var dlLtidRegExp = /^deeplink_ltid_/;
+    var dlLticRegExp = /^deeplink_ltic_/;
+    var dlKeyRegExp = /^deeplink_key_/;
+    var dlMenusRegExp = /^deeplink_menus_/;
+    var dlCollsRegExp = /^deeplink_colls_/;
+    var dlTargetRegExp = /^deeplink_target_/;
     var patternIP = /[\[\]\*\.a-zA-Z\d\-]+/;
     if ((document.parmform.elements.length != 'undefined')  && (document.parmform.elements.length) != 'null') {
         if (document.parmform.elements.length) {
@@ -1275,61 +1281,144 @@ function validateParms() {
                             }
                         }
                     }
-                } else if (ipallowRegExp.test(name)) {
-                    var identifier = name.replace(ipallowRegExp,'');
-                    var possallow = document.parmform.elements[i].value;
-                    possallow = possallow.replace(/^\s+|\s+$/g,'');
-                    if (patternIP.test(possallow)) {
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            possallow = ','+possallow;
-                        }
-                        document.parmform.elements['set_'+identifier].value += possallow;
-                    }
-                } else if (ipdenyRegExp.test(name)) {
-                    var identifier = name.replace(ipdenyRegExp,'');
-                    var possdeny = document.parmform.elements[i].value;
-                    possdeny = possdeny.replace(/^\s+|\s+$/g,'');
-                    if (patternIP.test(possdeny)) {
-                        possdeny = '!'+possdeny;
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            possdeny = ','+possdeny;
+                } else if (ipRegExp.test(name)) {
+                    if (ipallowRegExp.test(name)) {
+                        var identifier = name.replace(ipallowRegExp,'');
+                        var possallow = document.parmform.elements[i].value;
+                        possallow = possallow.replace(/^\s+|\s+$/g,'');
+                        if (patternIP.test(possallow)) {
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                possallow = ','+possallow;
+                            }
+                            document.parmform.elements['set_'+identifier].value += possallow;
+                        }
+                    } else if (ipdenyRegExp.test(name)) {
+                        var identifier = name.replace(ipdenyRegExp,'');
+                        var possdeny = document.parmform.elements[i].value;
+                        possdeny = possdeny.replace(/^\s+|\s+$/g,'');
+                        if (patternIP.test(possdeny)) {
+                            possdeny = '!'+possdeny;
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                possdeny = ','+possdeny;
+                            }
+                            document.parmform.elements['set_'+identifier].value += possdeny;
                         }
-                        document.parmform.elements['set_'+identifier].value += possdeny;
                     }
                 } else if (deeplinkRegExp.test(name)) {
-                    var identifier =  name.replace(deeplinkRegExp,'');
-                    var possdeeplink = document.parmform.elements[i].value;
-                    possdeeplink = possdeeplink.replace(/^\s+|\s+$/g,'');
-                    if (document.parmform.elements['set_'+identifier].value) {
-                        possdeeplink = ','+possdeeplink;
-                    }
-                    document.parmform.elements['set_'+identifier].value += possdeeplink;
-                } else if (deeplinkUrlsRegExp.test(name)) {
-                    if (document.parmform.elements[i].checked) {
-                        var identifier =  name.replace(deeplinkUrlsRegExp,'');
-                        var posslinkurl = document.parmform.elements[i].value;
-                        posslinkurl = posslinkurl.replace(/^\s+|\s+$/g,'');
-                        if (document.parmform.elements['set_'+identifier].value) {
-                            posslinkurl = ','+posslinkurl;
-                        }
-                        document.parmform.elements['set_'+identifier].value += posslinkurl;
-                    }
-                } else if (deeplinkltiRegExp.test(name)) {
-                    var identifier = name.replace(deeplinkltiRegExp,'');
-                    var posslti = document.parmform.elements[i].value;
-                    posslti = posslti.replace(/\D+/g,'');
-                    if (document.parmform.elements['set_'+identifier].value) {
-                        posslti = ':'+posslti;
-                    }
-                    document.parmform.elements['set_'+identifier].value += posslti;
-                } else if (deeplinkkeyRegExp.test(name)) {
-                    var identifier = name.replace(deeplinkkeyRegExp,'');
-                    var posskey = document.parmform.elements[i].value;
-                    posskey = posskey.replace(/\W+/g,'');
-                    if (document.parmform.elements['set_'+identifier].value) {
-                        posslti = ':'+posskey;
+                    if (dlListScopeRegExp.test(name)) {
+                        var identifier =  name.replace(dlListScopeRegExp,'');
+                        var idx = document.parmform.elements[i].selectedIndex;
+                        if (idx > 0) { 
+                            var possdeeplink = document.parmform.elements[i].options[idx].value
+                            possdeeplink = possdeeplink.replace(/^\s+|\s+$/g,'');
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                possdeeplink = ','+possdeeplink;
+                            }
+                            document.parmform.elements['set_'+identifier].value += possdeeplink;
+                        }
+                    } else if (dlLinkProtectRegExp.test(name)) {
+                        if (document.parmform.elements[i].checked) {
+                            var identifier =  name.replace(dlLinkProtectRegExp,'');
+                            var posslinkurl = document.parmform.elements[i].value;
+                            posslinkurl = posslinkurl.replace(/^\s+|\s+$/g,'');
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                posslinkurl = ','+posslinkurl;
+                            }
+                            document.parmform.elements['set_'+identifier].value += posslinkurl;
+                        }
+                    } else if (dlLtidRegExp.test(name)) {
+                        var identifier = name.replace(dlLtidRegExp,'');
+                        if (isRadioSet('deeplink_protect_'+identifier,'ltid')) {
+                            var possltid = document.parmform.elements[i].value;
+                            possltid = possltid.replace(/\D+/g,'');
+                            if (possltid.length) {
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    possltid = ':'+possltid;
+                                }
+                                document.parmform.elements['set_'+identifier].value += possltid;
+                            } else {
+                                document.parmform.elements['set_'+identifier].value = '';
+                                alert("A link type of 'domain LTI launch' was selected but no domain LTI launcher was selected.\nPlease select one, or choose a different supported link type.");
+                                return false;  
+                            }
+                        }
+                    } else if (dlLticRegExp.test(name)) {
+                        var identifier = name.replace(dlLticRegExp,'');
+                        if (isRadioSet('deeplink_protect_'+identifier,'ltic')) {
+                            var possltic = document.parmform.elements[i].value;
+                            possltic = possltic.replace(/\D+/g,'');
+                            if (possltic.length) {
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    possltic = ':'+possltic;
+                                }
+                                document.parmform.elements['set_'+identifier].value += possltic;
+                            } else {
+                                document.parmform.elements['set_'+identifier].value = '';
+                                alert("A link type of 'course LTI launch' was selected but no course LTI launcher was selected.\nPlease select one, or choose a different supported link type.");
+                                return false;
+                            }
+                        }
+                    } else if (dlKeyRegExp.test(name)) {
+                        var identifier = name.replace(dlKeyRegExp,'');
+                        if (isRadioSet('deeplink_protect_'+identifier,'key')) {
+                            var posskey = document.parmform.elements[i].value;
+                            posskey = posskey.replace(/^\s+|\s+$/g,'');
+                            var origlength = posskey.length;
+                            posskey = posskey.replace(/[^a-zA-Z\d_.!@#$%^&*()+=-]/g,'');
+                            var newlength = posskey.length;
+                            if (newlength > 0) {
+                                var change = origlength - newlength;
+                                if (change) {
+                                    alert(change+' disallowed character(s) removed from deeplink key'); 
+                                }
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    posskey = ':'+posskey;
+                                }
+                                document.parmform.elements['set_'+identifier].value += posskey;
+                            } else {
+                                document.parmform.elements['set_'+identifier].value = '';
+                                if (newlength < origlength) {
+                                    alert("A link type of 'deep with key' was selected but the key value was blank, after removing disallowed characters.\nPlease enter a key using one or more of: a-zA-Z0-9_.!@#$%^&*()+=-");
+                                } else {
+                                    alert("A link type of 'deep with key' was selected but the key value was blank.\nPlease enter a key.");
+                                }
+                                return false;
+                            }
+                        }
+                    } else if (dlMenusRegExp.test(name)) {
+                        if (document.parmform.elements[i].checked) {
+                            var identifier =  name.replace(dlMenusRegExp,'');
+                            var posslinkmenu = document.parmform.elements[i].value;
+                            posslinkmenu = posslinkmenu.replace(/^\s+|\s+$/g,'');
+                            if (posslinkmenu == 'std') {
+                                posslinkmenu = '0';
+                                if (document.parmform.elements['set_'+identifier].value) {
+                                    posslinkmenu = ','+posslinkmenu;
+                                }
+                                document.parmform.elements['set_'+identifier].value += posslinkmenu;
+                            }
+                        }
+                    } else if (dlCollsRegExp.test(name)) {
+                        var identifier =  name.replace(dlCollsRegExp,'');
+                        if (isRadioSet('deeplink_menus_'+identifier,'colls')) {
+                            var posslinkmenu = document.parmform.elements[i].value;
+                            if (document.parmform.elements['set_'+identifier].value) {
+                                posslinkmenu = ','+posslinkmenu;
+                            }
+                            document.parmform.elements['set_'+identifier].value += posslinkmenu;
+                        }
+                    } else if (dlTargetRegExp.test(name)) {
+                        var identifier =  name.replace(dlTargetRegExp,'');
+                        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;
+                        }
                     }
-                    document.parmform.elements['set_'+identifier].value += posskey;
                 }
             }
         }
@@ -1337,6 +1426,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
 }
 
@@ -1367,6 +1473,8 @@ END
 
 # Javascript function toggleSecret, for overview mode.
 sub done_proctor_js {
+    my $defaultdone = &mt('Done');
+    &js_escape(\$defaultdone);
     return <<"END";
 function toggleSecret(form,radio,key) {
     var radios = form[radio+key];
@@ -1383,6 +1491,15 @@ 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';
+                        }
+                    }
+                }
             }
         }
     }
@@ -1401,25 +1518,49 @@ function toggleDeepLink(form,item,key) {
         if (document.getElementById('deeplink_key_'+item+'_'+key)) {
             keybox = document.getElementById('deeplink_key_'+item+'_'+key);
         }
-        var ltidiv;
-        if (document.getElementById('deeplinkdiv_lti_'+item+'_'+key)) {
-            ltidiv = document.getElementById('deeplinkdiv_lti_'+item+'_'+key);
+        var divoptions = new Array();
+        if (item == 'protect') {
+            divoptions = ['ltic','ltid'];
+        } else {
+            if (item == 'menus') {
+                divoptions = ['colls'];
+            }
+        }
+        var seldivs = new Array();
+        if ((item == 'protect') || (item == 'menus')) {
+            for (var i=0; i<divoptions.length; i++) {
+                if (document.getElementById('deeplinkdiv_'+divoptions[i]+'_'+item+'_'+key)) {
+                    seldivs[i] = document.getElementById('deeplinkdiv_'+divoptions[i]+'_'+item+'_'+key);
+                } else {
+                    seldivs[i] = '';
+                }
+            }
         }
         for (var i=0; i<radios.length; i++) {
             if (radios[i].checked) {
-                if (radios[i].value == 'lti') {
-                    ltidiv.style.display = 'inline-block';
-                    keybox.type = 'hidden';
-                    keybox.value = '';
-                } else {
-                    if (ltidiv != '') {
-                        ltidiv.style.display = 'none';
-                        form['deeplink_lti_'+key].selectedIndex = 0;
+                if ((item == 'protect') || (item == 'menus')) {
+                    for (var j=0; j<seldivs.length; j++) {
+                        if (radios[i].value == divoptions[j]) {
+                            if (seldivs[j] != '') {
+                                seldivs[j].style.display = 'inline-block';
+                            }
+                            if (item == 'protect') {
+                                keybox.type = 'hidden';
+                                keybox.value = '';
+                            }
+                        } else {
+                            if (seldivs[j] != '') {
+                                seldivs[j].style.display = 'none';
+                                form['deeplink_'+divoptions[j]+'_'+key].selectedIndex = 0;
+                            }
+                        }
                     }
-                    if (radios[i].value == 'key') {
-                        keybox.type = 'text';
-                    } else {
-                        keybox.type = 'hidden';
+                    if (item == 'protect') {
+                        if (radios[i].value == 'key') {
+                            keybox.type = 'text';
+                        } else {
+                            keybox.type = 'hidden';
+                        }
                     }
                 }
             }
@@ -1615,23 +1756,50 @@ sub print_row {
         $effparm_rec = 1;
     }
     if ($parmname eq 'deeplink') {
-        my %posslti;
+        my ($domltistr,$crsltistr);
         my %lti =
             &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
-                                            'provider');
-        foreach my $item (keys(%lti)) {
-            if (ref($lti{$item}) eq 'HASH') {
-                unless ($lti{$item}{'requser'}) {
-                    $posslti{$item} = $lti{$item}{'consumer'};
+                                            'linkprot');
+        if (keys(%lti)) {
+            foreach my $item (sort { $a <=> $b }  (keys(%lti))) {
+                if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
+                    $domltistr .= $item.':'.&escape(&escape($lti{$item}{'name'})).',';
+                }
+            }
+            $domltistr =~ s/,$//;
+            if ($domltistr) {
+                $extra = 'ltid_'.$domltistr;
+            }
+        }
+        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 (keys(%posslti)) {
-            $extra = 'lti_';
-            foreach my $lti (sort { $a <=> $b } keys(%posslti)) {
-                $extra .= $lti.':'.&js_escape($posslti{$lti}).',';
+        if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
+            my @colls;
+            foreach my $item (split(/;/,$env{'course.'.$env{'request.course.id'}.'.menucollections'})) {
+                my ($num,$value) = split(/\%/,$item);
+                if ($num =~ /^\d+$/) {
+                    push(@colls,$num);
+                }
+            }
+            if (@colls) {
+                if ($extra) {
+                    $extra .= '&';
+                }
+                $extra .= 'menus_'.join(',',@colls);
             }
-            $extra =~ s/,$//;
         }
     }
     if ($parmlev eq 'general') {
@@ -1766,7 +1934,7 @@ sub print_row {
 # @param {boolean} $noeditgrp - true if no edit is allowed for group level parameters
 # @param {boolean} $readonly -true if editing not allowed.
 # @param {boolean} $ismaplevel - true if level is for a map.
-# @param {strring} $extra - extra informatio to pass to plink.
+# @param {string} $extra - extra information to pass to plink.
 sub print_td {
     my ($r,$which,$defbg,$result,$outpar,$mprefix,$value,$typeoutpar,$display,
         $noeditgrp,$readonly,$ismaplevel,$extra)=@_;
@@ -1808,9 +1976,7 @@ sub print_td {
                 $nolink = 1;
             }
         } elsif ($mprefix =~ /availablestudent\&$/) {
-            if ($which > 4) {
-                $nolink = 1;
-            }
+            $nolink = 1;
         } elsif ($mprefix =~ /examcode\&$/) {
             unless ($which == 2) {
                 $nolink = 1;
@@ -1931,6 +2097,7 @@ sub parm_control_group {
 # @param {hash reference} $uris - hash resource/map id -> resource src
 # @param {hash reference} $keyorder - hash parameter key -> appearance rank for this parameter when looking through every resource and every parameter, starting at 100 (integer)
 # @param {hash reference} $defkeytype - hash parameter name -> parameter type
+# @param {string} $pssymb - resource symb (when a single resource is selected)
 sub extractResourceInformation {
     my $ids = shift;
     my $typep = shift;
@@ -1944,11 +2111,22 @@ sub extractResourceInformation {
     my $uris=shift;
     my $keyorder=shift;
     my $defkeytype=shift;
+    my $pssymb=shift;
 
     my $keyordercnt=100;
 
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my @allres=$navmap->retrieveResources(undef,undef,1,undef,1);
+    return unless(ref($navmap));
+    my @allres;
+    if ($pssymb ne '') {
+        my $res = $navmap->getBySymb($pssymb);
+        if (ref($res)) {
+            @allres = ($res);
+        }
+    }
+    if (!@allres) { 
+        @allres=$navmap->retrieveResources(undef,undef,1,undef,1);
+    }
     foreach my $resource (@allres) {
         my $id=$resource->id();
         my ($mapid,$resid)=split(/\./,$id);
@@ -2072,7 +2250,7 @@ sub isdateparm {
 
 sub is_specialstring {
     my $type=shift;
-    return (($type=~/^string_/) && (($type ne 'string_yesno')));
+    return (($type=~/^string_/) && ($type ne 'string_yesno'));
 }
 
 # Prints the HTML and Javascript to select parameters, with various shortcuts.
@@ -2420,9 +2598,37 @@ sub partmenu {
 sub usermenu {
     my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups,$pssymb)=@_;
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
-        &Apache::loncommon::selectstudent_link('parmform','uname','udom');
-    my $selscript=&Apache::loncommon::studentbrowser_javascript();
+                  &Apache::loncommon::selectstudent_link('parmform','uname','udom','condition').
+                  &Apache::lonhtmlcommon::scripttag(<<ENDJS);
+function setCourseadv(form,caller) {
+    if (caller.value == 'st') {
+        form.courseadv.value = 'none';
+    } else {
+        form.courseadv.value = '';
+    }
+    return;
+}
+ENDJS
 
+    my (%chkroles,$stuonly,$courseadv);
+    if ($env{'form.userroles'} eq 'any') {
+        $chkroles{'any'} = ' checked="checked"';
+    } else {
+        $chkroles{'st'} = ' checked="checked"';
+        $courseadv = 'none';
+    }
+    my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+    if ($crstype eq 'Community') {
+        $stuonly = &mt('member only');
+    } else {
+        $stuonly = &mt('student only');
+    }
+    $chooseopt .= '<br /><span class="LC_cusr_subheading">'.
+                  &mt("User's role").':&nbsp;'.
+                  '<label><input type="radio" name="userroles" value="st"'.$chkroles{'st'}.' onclick="setCourseadv(this.form,this);" />'.
+                  $stuonly.'</label>&nbsp;&nbsp;'.
+                  '<label><input type="radio" name="userroles" value="any"'.$chkroles{'any'}.' onclick="setCourseadv(this.form,this);" />'.
+                  &mt('any role').'</label><input type="hidden" id="courseadv" name="courseadv" value="'.$courseadv.'" /></span>';
     my $sections='';
     my %sectionhash = &Apache::loncommon::get_sections();
 
@@ -2489,7 +2695,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')" |;
         }
@@ -2560,8 +2766,9 @@ sub displaymenu {
 # @param {string} $pschp - selected map pc, or 'all'
 # @param {hash reference} $maptitles - hash map id or src -> map title
 # @param {hash reference} $symbp - hash map pc or resource/map id -> map src.'___(all)' or resource symb
+# @param {string} $parmlev - parameter level (Resource:'full', Map:'map', Course:'general')
 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=[];
@@ -2609,7 +2816,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 =
@@ -2851,19 +3062,33 @@ sub keysindisplayorder {
 #
 # @param {Apache2::RequestRec} $r - the Apache request
 # @param {string} $sortorder - realmstudent|studentrealm
+# @param {string} $context - newoverview|overview
 sub sortmenu {
-    my ($r,$sortorder)=@_;
-    $r->print('<br /><label><input type="radio" name="sortorder" value="realmstudent"');
-    if ($sortorder eq 'realmstudent') {
-       $r->print(' checked="checked"');
+    my ($r,$sortorder,$context)=@_;
+    my %text;
+    if ($context eq 'newoverview') {
+        %text = &Apache::lonlocal::texthash (
+                   realmstudent => 'Sort by location in course first, then student (group/section)',
+                   studentrealm => 'Sort by student (group/section) first, then location in course',
+        );
+    } else {
+        %text = &Apache::lonlocal::texthash (
+                   realmstudent => 'Sort by realm first, then student (group/section)',
+                   studentrealm => 'Sort by student (group/section) first, then realm',
+        );
     }
-    $r->print(' />'.&mt('Sort by realm first, then student (group/section)'));
-    $r->print('</label><br /><label><input type="radio" name="sortorder" value="studentrealm"');
+    my %sortchecked = (
+       realmstudent => ' checked="checked"',
+       studentrealm => '',
+    );
     if ($sortorder eq 'studentrealm') {
-       $r->print(' checked="checked"');
+        $sortchecked{'studentrealm'} = $sortchecked{'realmstudent'};
+        $sortchecked{'realmstudent'} = '';
+    }
+    foreach my $sorttype ('realmstudent','studentrealm') {
+        $r->print('<br /><label><input type="radio" name="sortorder" value="'.$sorttype.'"'.$sortchecked{$sorttype}.' />'.
+                  $text{$sorttype}.'</label>');
     }
-    $r->print(' />'.&mt('Sort by student (group/section) first, then realm').
-          '</label>');
 }
 
 # Returns a hash parameter key -> order (integer) giving the order for some parameters.
@@ -3064,21 +3289,101 @@ sub assessparms {
             $csec=&Apache::lonnet::getsection($udom,$uname,
                           $env{'request.course.id'});
             if ($csec eq '-1') {
-                $message=
-                    '<p class="LC_warning">'.
-                    &mt('User [_1] at domain [_2] not in this course',
-                        "'".$uname."'","'".$udom."'").
-                    '</p>';
-                $uname='';
-                if ($env{'request.course.sec'} ne '') {
-                    $csec=$env{'request.course.sec'};
+                my $crstype = $env{'course.'.$env{'request.course.id'}.'.type'};
+                if ($env{'form.userroles'} eq 'any') {
+                    if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) {
+                        $csec = $env{'request.course.sec'};
+                        $message = '<span class="LC_info">';
+                        if ($crstype eq 'Community') {
+                            $message .= &mt('User [_1] at domain [_2] has a non-member role in this community',
+                                            $uname,$udom);
+                        } else {
+                            $message .= &mt('User [_1] at domain [_2] has a non-student role in this course',
+                                            $uname,$udom);
+                        }
+                        $message .= '</span>';
+                    } else {
+                        my @possroles = ('in','ep','ta','cr');
+                        if ($crstype eq 'Community') {
+                            unshift(@possroles,'co');
+                        } else {
+                            unshift(@possroles,'cc');
+                        }
+                        my %not_student_roles =
+                            &Apache::lonnet::get_my_roles($uname,$udom,'userroles',['active'],
+                                                          \@possroles,[$udom],1,1);
+                        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+                        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+                        my %sections_by_role;
+                        foreach my $role (keys(%not_student_roles)) {
+                            if ($role =~ /^\Q$cnum:$cdom:\E([^:]+):(|[^:]+)$/) {
+                                my ($rolename,$sec) = ($1,$2);
+                                if ($rolename =~ m{^cr/}) {
+                                    $rolename = 'cr';
+                                }
+                                push(@{$sections_by_role{$rolename}},$sec);
+                            }
+                        }
+                        my $numroles = scalar(keys(%sections_by_role));
+                        if ($numroles) {
+                            foreach my $role (@possroles) {
+                                if (ref($sections_by_role{$role}) eq 'ARRAY') {
+                                    my @secs = sort { $a <=> $b } @{$sections_by_role{$role}};
+                                    $csec = $secs[0];
+                                    last;
+                                }
+                            }
+                        }
+                        if ($csec eq '-1') {
+                            $message = '<span class="LC_warning">';
+                            if ($crstype eq 'Community') {
+                                $message .= &mt('User [_1] at domain [_2] does not have a role in this community',
+                                                $uname,$udom);
+                            } else {
+                                $message .= &mt('User [_1] at domain [_2] does not have a role in this course',
+                                                $uname,$udom);
+                            }
+                            $message .= '</span>';
+                            $uname='';
+                            if ($env{'request.course.sec'} ne '') {
+                                $csec=$env{'request.course.sec'};
+                            } else {
+                                $csec=$env{'form.csec'};
+                            }
+                            $cgroup=$env{'form.cgroup'};
+                        } else {
+                            $message = '<span class="LC_info">';
+                            if ($crstype eq 'Community') {
+                                $message .= &mt('User [_1] at domain [_2] has a non-member role in this community',
+                                         $uname,$udom);
+                            } else {
+                                $message .= &mt('User [_1] at domain [_2] has a non-student role in this course',
+                                                $uname,$udom);
+                            }
+                            $message .= '</span>';
+                        }
+                    }
                 } else {
-                    $csec=$env{'form.csec'};
+                    $message = '<span class="LC_warning">';
+                    if ($crstype eq 'Community') {
+                        $message .= &mt('User [_1] at domain [_2] does not have a member role in this community',
+                                         $uname,$udom);
+                    } else {
+                         $message .= &mt('User [_1] at domain [_2] does not have a student role in this course',
+                                         $uname,$udom);
+                    }
+                    $message .= '</span>';
+                    $uname='';
+                    if ($env{'request.course.sec'} ne '') {
+                        $csec=$env{'request.course.sec'};
+                    } else {
+                        $csec=$env{'form.csec'};
+                    }
+                    $cgroup=$env{'form.cgroup'};
                 }
-                $cgroup=$env{'form.cgroup'};
             } elsif ($env{'request.course.sec'} ne '') {
                 if ($csec ne $env{'request.course.sec'}) {
-                    $message='<span class="LC_error">'.
+                    $message='<span class="LC_warning">'.
                               &mt("User '[_1]' at domain '[_2]' not in section '[_3]'",
                                   $uname,$udom,$env{'request.course.sec'}).
                               '</span>';
@@ -3086,19 +3391,22 @@ sub assessparms {
                     $csec=$env{'request.course.sec'};
                 }
                 $cgroup=$env{'form.cgroup'};
-            } else {
+            }
+            if ($uname ne '') {
                 my %name=&Apache::lonnet::userenvironment($udom,$uname,
                   ('firstname','middlename','lastname','generation','id'));
-                $message="\n<p>\n".&mt("Full Name").": ".
-                $name{'firstname'}.' '.$name{'middlename'}.' '
-                .$name{'lastname'}.' '.$name{'generation'}.
-                "<br />\n".&mt('Student/Employee ID').": ".$name{'id'}.'<p>';
-            }
-            @usersgroups = &Apache::lonnet::get_users_groups(
-                                       $udom,$uname,$env{'request.course.id'});
-            if (@usersgroups > 0) {
-                unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
-                    $cgroup = $usersgroups[0];
+                $message .= "\n<p>\n".&mt('Full Name').': '
+                            .$name{'firstname'}.' '.$name{'middlename'}.' '
+                            .$name{'lastname'}.' '.$name{'generation'}
+                            ."<br />\n".&mt('Student/Employee ID').': '.$name{'id'}.'</p>';
+                @usersgroups = &Apache::lonnet::get_users_groups(
+                                   $udom,$uname,$env{'request.course.id'});
+                if (@usersgroups > 0) {
+                    unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
+                        $cgroup = $usersgroups[0];
+                    }
+                } else {
+                    $cgroup = '';
                 }
             }
         }
@@ -3110,7 +3418,7 @@ sub assessparms {
 # --------------------------------------------------------- Get all assessments
     &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
                 \%mapp, \%symbp,\%maptitles,\%uris,
-                \%keyorder);
+                \%keyorder,undef,$pssymb);
 
     %allmaps_inverted = reverse(%allmaps);
 
@@ -3127,6 +3435,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,$namematch);
@@ -3135,6 +3444,11 @@ sub assessparms {
             }
             if ($markers[$i] =~ /\&(8|7|6|5)$/) {
                 next if ($noeditgrp);
+            } elsif ($markers[$i] =~ /\&(4|3|2|1)$/) {
+                if ($uname eq '') {
+                    $totalskippeduser ++;
+                    next;
+                }
             }
             if ($markers[$i] =~ /\&(17|11|7|3)$/) {
                 $namematch = 'maplevelrecurse';
@@ -3273,9 +3587,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>';
         }
     }
 
@@ -3306,13 +3638,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>
@@ -3339,7 +3678,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);
@@ -3419,6 +3758,7 @@ ENDPARMSELSCRIPT
         if ($parm_permission->{'edit'}) {
             undef($readonly); 
         }
+        $r->print('<div id="parmtable"'.$tabledivsty.'>');
 
         if ($parmlev eq 'full') {
 #
@@ -3635,7 +3975,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
@@ -3852,6 +4192,7 @@ ENDMAPONE
                      .'</center>'
             );
         } # end of $parmlev eq general
+        $r->print('</div>');
     }
     $r->print('</form>');
     if ($numreclinks) {
@@ -4389,9 +4730,12 @@ sub parse_listdata_key {
 # @param {string} $caller - name of the calling sub (overview|newoverview)
 # @param {hash reference} $classlist - from loncoursedata::get_classlist
 # @param {boolean} $readonly - true if editing not allowed
+# @param {string} $parmlev - full|map
+# @param {hash reference} $hash_for_realm - keys: realm, values: numeric order  
+# @param {string} $pschp - selected map pc, or 'all'
 # @returns{integer} - number of $listdata parameters processed
 sub listdata {
-    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist,$readonly)=@_;
+    my ($r,$resourcedata,$listdata,$sortorder,$caller,$classlist,$readonly,$parmlev,$hash_for_realm,$pschp)=@_;
     
 # Start list output
 
@@ -4417,6 +4761,20 @@ sub listdata {
     foreach my $key (sort {
         my ($astudent,$ares,$apart,$aparm) = &parse_listdata_key($a,$listdata);
         my ($bstudent,$bres,$bpart,$bparm) = &parse_listdata_key($b,$listdata);
+        my ($aid,$bid);
+        if ($caller eq 'newoverview') {
+            if (ref($hash_for_realm) eq 'HASH') {
+                if (($parmlev eq 'map') && ($pschp eq 'all')) {
+                    my ($aurl) = ($ares =~ /^(.+\.(?:sequence|page))___\(all\)$/);
+                    my ($burl) = ($bres =~ /^(.+\.(?:sequence|page))___\(all\)$/);
+                    $aid = $hash_for_realm->{$aurl};
+                    $bid = $hash_for_realm->{$burl};
+                } elsif ($parmlev eq 'full') {
+                    $aid = $hash_for_realm->{$ares};
+                    $bid = $hash_for_realm->{$bres};
+                }
+            }
+        }
 
         # get the numerical order for the param
         $aparm=$keyorder{'parameter_0_'.$aparm};
@@ -4426,7 +4784,21 @@ sub listdata {
 
         if ($sortorder eq 'realmstudent') {
             if ($ares     ne $bres    ) {
-                $result = ($ares     cmp $bres);
+                if ($caller eq 'newoverview') {
+                    if (ref($hash_for_realm) eq 'HASH') {
+                        if (($parmlev eq 'map') && ($pschp eq 'all')) {
+                            $result = ($aid <=> $bid);
+                        } elsif ($parmlev eq 'full') {
+                            $result = ($aid <=> $bid);
+                        } else {
+                            $result = ($ares cmp $bres);
+                        }
+                    } else {
+                        $result = ($ares cmp $bres);
+                    }
+                } else {
+                    $result = ($ares cmp $bres);
+                }
             } elsif ($astudent ne $bstudent) {
                 $result = ($astudent cmp $bstudent);
             } elsif ($apart    ne $bpart   ) {
@@ -4436,7 +4808,21 @@ sub listdata {
             if      ($astudent ne $bstudent) {
                 $result = ($astudent cmp $bstudent);
             } elsif ($ares     ne $bres    ) {
-                $result = ($ares     cmp $bres);
+                if ($caller eq 'newoverview') {
+                    if (ref($hash_for_realm) eq 'HASH') {
+                        if (($parmlev eq 'map') && ($pschp eq 'all')) {
+                            $result = ($aid <=> $bid);
+                        } elsif ($parmlev eq 'full') {
+                            $result = ($aid <=> $bid);
+                        } else {
+                            $result = ($ares cmp $bres);
+                        }
+                    } else {
+                        $result = ($ares cmp $bres);
+                    }
+                } else {
+                    $result = ($ares cmp $bres);
+                }
             } elsif ($apart    ne $bpart   ) {
                 $result = ($apart    cmp $bpart);
             }
@@ -4465,6 +4851,7 @@ sub listdata {
                 ($thiskey=~/^$env{'request.course.id'}\.(?:(.+)\.)*([\w\s\-]+)\.(\w+)$/);
             my $section=&mt('All Students');
             $readonly = $readonlyall;
+            my $userscope;
             my $showval = $$resourcedata{$thiskey}; 
             if ($middle=~/^\[(.*)\]/) {
                 my $issection=$1;
@@ -4478,6 +4865,7 @@ sub listdata {
                         }
                     }
                     $section=&mt('User').": ".&Apache::loncommon::plainname($stuname,$studom);
+                    $userscope = 1;
                 } else {
                     if (($env{'request.course.sec'} ne '') && ($caller eq 'overview')) {
                         if (exists($grouphash{$issection})) {
@@ -4514,6 +4902,12 @@ sub listdata {
             }
             if ($is_map) {
                 my $leveltitle = &mt('Folder/Map');
+                my $title = &Apache::lonnet::gettitle($mapurl);
+                if (ref($hash_for_realm) eq 'HASH') {
+                    if ($hash_for_realm->{$mapurl} eq '1') {
+                        $title = &mt('Main Content');
+                    }
+                }
                 unless (($name eq 'hiddenresource') || ($name eq 'encrypturl')) {   
                     if ($caller eq 'newoverview') {
                         my $altkey = $thiskey;
@@ -4530,9 +4924,10 @@ sub listdata {
                         $is_recursive = 1;
                     }
                 }
-                $realm='<span class="LC_parm_scope_folder">'.$leveltitle.': '.&Apache::lonnet::gettitle($mapurl).' <br /><span class="LC_parm_folder">('.$mapurl.')</span></span>';
+                $realm='<span class="LC_parm_scope_folder">'.$leveltitle.': '.$title.' <br /><span class="LC_parm_folder">('.$mapurl.')</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: '.
@@ -4575,8 +4970,13 @@ sub listdata {
                 '<td><b>'.&mt($parmitem).
                 '</b></td>');
             unless ($readonly) {
+                my $disabled;
+                if (($name eq 'availablestudent') &&
+                    (($showval eq '') || ($userscope))) {
+                    $disabled = ' disabled="disabled"';
+                }
                 $r->print('<td><input type="checkbox" name="del_'.
-                        $thiskey.'" /></td>');
+                        $thiskey.'"'.$disabled.' /></td>');
             }
             $r->print('<td>');
             $foundkeys++;
@@ -4604,6 +5004,9 @@ sub listdata {
                 $r->print(&date_interval_selector($thiskey,$name,
                           $showval,$readonly));
             } elsif ($thistype =~ m/^string/) {
+                if ($name eq 'availablestudent') {
+                    $readonly = 1;
+                }
                 $r->print(&string_selector($thistype,$thiskey,
                           $showval,$name,$readonly));
             } else {
@@ -4646,13 +5049,17 @@ sub listdata {
 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$/) &&
@@ -4671,6 +5078,7 @@ sub get_date_interval_from_form {
             $seconds .= '_'.$env{'form.done_'.$key.'_proctorkey'};
         }
     }
+    return if (!$numnotnull);
     return $seconds;
 }
 
@@ -4758,19 +5166,33 @@ sub string_ip_selector {
 
 sub string_deeplink_selector {
     my ($thiskey, $showval, $readonly) = @_;
-    my (@components,%values,@current,%titles,%options,%optiontext,%defaults,%posslti);
-    @components = ('listing','scope','urls');
+    my (@components,%values,@current,%titles,%options,%optiontext,%defaults,
+        %selectnull,%domlti,%crslti,@possmenus);
+    @components = ('state','others','listing','scope','protect','menus','target');
     %titles = &Apache::lonlocal::texthash (
+                  state   => 'Access status',
+                  others  => 'Hide other resources',
                   listing => 'In Contents and/or Gradebook',
                   scope   => 'Access scope for link',
-                  urls    => 'Supported link types',
+                  protect => 'Link protection',
+                  menus   => 'Menu Items Displayed',
+                  target  => 'Embedded?',
               );
     %options = (
+                   state   => ['only','off','both'],
+                   others  => ['hide','unhide'],
                    listing => ['full','absent','grades','details','datestatus'],
                    scope   => ['res','map','rec'],
-                   urls    => ['any','only','key','lti'],
+                   protect => ['none','key','ltid','ltic'],
+                   menus   => ['std','colls'],
+                   target  => ['_self','_top'],
                );
     %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',
@@ -4779,50 +5201,98 @@ sub string_deeplink_selector {
                     res        => 'resource only',
                     map        => 'enclosing map/folder',
                     rec        => 'recursive map/folder',
-                    any        => 'regular + deep',
-                    only       => 'deep only',
-                    key        => 'deep with key',
-                    lti        => 'deep with LTI launch',
+                    none       => 'not in use',
+                    key        => 'key access',
+                    ltic       => 'LTI access (course)',
+                    ltid       => 'LTI access (domain)' ,
+                    std        => 'Standard (all menus)',
+                    colls      => 'Numbered collection',
+                    _self      => 'Embedded',
+                    _top       => 'Not embedded',
+                  );
+    %selectnull = &Apache::lonlocal::texthash (
+                    ltic => 'Select Launcher',
+                    ltid => 'Select Launcher', 
+                    colls => 'Select',
                   );
     if ($showval =~ /,/) {
+        %values=();
         @current = split(/,/,$showval);
-        ($values{'listing'}) = ($current[0] =~ /^(full|absent|grades|details|datestatus)$/);
-        ($values{'scope'}) = ($current[1] =~ /^(res|map|rec)$/);
-        ($values{'urls'}) = ($current[2] =~ /^(any|only|key:\w+|lti:\d+)$/);
+        ($values{'state'}) = ($current[0] =~ /^(only|off|both)$/);
+        ($values{'others'}) = ($current[1] =~ /^(hide|unhide)$/);
+        ($values{'listing'}) = ($current[2] =~ /^(full|absent|grades|details|datestatus)$/);
+        ($values{'scope'}) = ($current[3] =~ /^(res|map|rec)$/);
+        ($values{'protect'}) = ($current[4] =~ /^(key:[a-zA-Z\d_.!\@#\$%^&*()+=-]+|ltic:\d+|ltid:\d+)$/);
+        ($values{'menus'}) = ($current[5] =~ /^(\d+)$/);
+        ($values{'target'}) = ($current[6] =~ /^(_self|_top)$/);
     } else {
+        $defaults{'state'} = 'off',
+        $defaults{'others'} = 'unhide',
         $defaults{'listing'} = 'full';
         $defaults{'scope'} = 'res';
-        $defaults{'urls'} = 'any';
+        $defaults{'protect'} = 'none';
+        $defaults{'menus'} = '0';
+        $defaults{'target'} = '_top';
     }
     my $disabled;
     if ($readonly) {
         $disabled=' disabled="disabled"';
     }
-    my %lti = 
+    my %courselti =
+        &Apache::lonnet::get_course_lti($env{'course.'.$env{'request.course.id'}.'.num'},
+                                        $env{'course.'.$env{'request.course.id'}.'.domain'});
+    foreach my $item (keys(%courselti)) {
+        if (ref($courselti{$item}) eq 'HASH') {
+            $crslti{$item} = $courselti{$item}{'name'};
+        }
+    }
+    my %lti =
         &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
-                                        'provider');
+                                        'linkprot');
     foreach my $item (keys(%lti)) {
-        if (ref($lti{$item}) eq 'HASH') {
-            unless ($lti{$item}{'requser'}) {
-                $posslti{$item} = $lti{$item}{'consumer'};
+        if (($item =~ /^\d+$/) && (ref($lti{$item}) eq 'HASH')) {
+            $domlti{$item} = $lti{$item}{'name'};
+        }
+    }
+    if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
+        foreach my $item (split(/;/,$env{'course.'.$env{'request.course.id'}.'.menucollections'})) {
+            my ($num,$value) = split(/\%/,$item);
+            if ($num =~ /^\d+$/) {
+                push(@possmenus,$num);
             }
         }
     }
+
     my $output = '<input type="hidden" name="set_'.$thiskey.'" /><table><tr>';
-    foreach my $item ('listing','scope','urls') {
+    foreach my $item (@components) {
         $output .= '<th>'.$titles{$item}.'</th>';
     }
     $output .= '</tr><tr>';
     foreach my $item (@components) {
         $output .= '<td>';
-        if ($item eq 'urls') {
+        if (($item eq 'protect') || ($item eq 'menus')) {
             my $selected = $values{$item};
             foreach my $option (@{$options{$item}}) {
-                if ($option eq 'lti') {
-                    next unless (keys(%posslti));
+                if ($item eq 'protect') { 
+                    if ($option eq 'ltid') {
+                        next unless (keys(%domlti));
+                    } elsif ($option eq 'ltic') {
+                        next unless (keys(%crslti));
+                    }
+                } elsif (($item eq 'menus') && ($option eq 'colls')) {
+                    next unless (@possmenus);
                 }
                 my $checked;
-                if ($selected =~ /^\Q$option\E/) {
+                if ($item eq 'menus') {
+                    if (($selected =~ /^\d+$/) && (@possmenus) &&
+                        (grep(/^\Q$selected\E$/,@possmenus))) {
+                        if ($option eq 'colls') {
+                            $checked = ' checked="checked"';
+                        }
+                    } elsif (($option eq 'std') && ($selected == 0) && ($selected ne '')) {
+                        $checked = ' checked="checked"';
+                    }
+                } elsif ($selected =~ /^\Q$option\E/) {
                     $checked = ' checked="checked"';
                 }
                 my $onclick;
@@ -4833,7 +5303,7 @@ sub string_deeplink_selector {
                 $output .= '<span class="LC_nobreak"><label>'.
                            '<input type="radio" name="deeplink_'.$item.'_'.$thiskey.'" value="'.$option.'"'.$onclick.$disabled.$checked.' />'."\n".
                            $optiontext{$option}.'</label>';
-                if ($option eq 'key') {
+                if (($item eq 'protect') && ($option eq 'key')) {
                     my $visibility="hidden";
                     my $currkey;
                     if ($checked) {
@@ -4841,26 +5311,46 @@ sub string_deeplink_selector {
                         $currkey = (split(/\:/,$values{$item}))[1];
                     }
                     $output .= '&nbsp;'.
-                        '<input type="'.$visibility.'" name="deeplink_'.$option.'_'.$thiskey.'" id="deeplink_'.$option.'_'.$item.'_'.$thiskey.'" value="'.$currkey.'" size="6"'.$disabled.' />';
-                } elsif ($option eq 'lti') {
+                        '<input type="'.$visibility.'" name="deeplink_'.$option.'_'.$thiskey.'" id="deeplink_'.$option.'_'.$item.'_'.$thiskey.'" value="'.$currkey.'" size="10"'.$disabled.' />';
+                } elsif (($option eq 'ltic') || ($option eq 'ltid') || ($option eq 'colls')) {
                     my $display="none";
-                    my ($currlti,$blankcheck);
+                    my ($current,$blankcheck,@possibles);
                     if ($checked) {
                         $display = 'inline-block';
-                        $currlti = (split(/\:/,$values{$item}))[1];
+                        if (($option eq 'ltic') || ($option eq 'ltid'))  {
+                            $current = (split(/\:/,$selected))[1];
+                        } else {
+                            $current = $selected;
+                        }
                     } else {
                         $blankcheck = ' selected="selected"';
                     }
+                    if ($option eq 'ltid') {
+                        @possibles = keys(%domlti);
+                    } elsif ($option eq 'ltic') {
+                        @possibles = keys(%crslti); 
+                    } else {
+                        @possibles = @possmenus;
+                    }
                     $output .= '<div id="deeplinkdiv_'.$option.'_'.$item.'_'.$thiskey.'"'.
                                ' style="display: '.$display.'">&nbsp;<select name="'.
-                               'deeplink_'.$option.'_'.$thiskey.'"'.$disabled.'>'.
-                               '<option value=""'.$blankcheck.'>'.&mt('Select Provider').'</option>'."\n";
-                    foreach my $lti (sort { $a <=> $b } keys(%posslti)) {
+                               'deeplink_'.$option.'_'.$thiskey.'"'.$disabled.'>';
+                    if (@possibles > 1) {
+                        $output .= '<option value=""'.$blankcheck.'>'.$selectnull{$option}.
+                                   '</option>'."\n";
+                    }
+                    foreach my $poss (sort { $a <=> $b } @possibles) {
                         my $selected;
-                        if ($lti == $currlti) {
+                        if (($poss == $current) || (scalar(@possibles) ==1)) {
                             $selected = ' selected="selected"';
                         }
-                        $output .= '<option value="'.$lti.'"'.$selected.'>'.$posslti{$lti}.'</option>';
+                        my $shown = $poss;
+                        if ($option eq 'ltid') {
+                            $shown = $domlti{$poss};
+                        } elsif ($option eq 'ltic') {
+                            $shown = $crslti{$poss};
+                        }
+                        $output .= '<option value="'.$poss.'"'.$selected.'>'.$shown.'</option>';
                     }
                     $output .= '</select></div>';
                 }
@@ -4924,7 +5414,7 @@ my %strings =
              => [['_allowfrom_','Hostname(s), or IP(s) from which access is allowed'],
                  ['_denyfrom_','Hostname(s) or IP(s) from which access is disallowed']], 
      'string_deeplink'
-             => [['on','Set choices for link protection, resource listing, and access scope']],
+             => [['on','Set choices for link protection, resource listing, access scope, shown menu items, and embedding']],
     );
    
 
@@ -4935,7 +5425,7 @@ my %stringmatches = (
               => [['_allowfrom_','[^\!]+'],
                   ['_denyfrom_','\!']],
          'string_deeplink'
-              => [['on','^(full|absent|grades|details|datestatus)\,(res|map|rec)\,(any|only|key\:\w+|lti\:\d+)$']],
+              => [['on','^(only|off|both)\,(hide|unhide)\,(full|absent|grades|details|datestatus)\,(res|map|rec)\,(none|key\:\w+|ltic\:\d+|ltid\:\d+)\,(\d+|)\,_(self|top)$']],
     );
 
 my %stringtypes = (
@@ -5255,6 +5745,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);
@@ -5262,29 +5757,29 @@ sub date_interval_selector {
     if ($name eq 'interval') {
         unless ($skipval{'done'}) {
             my $checkedon = '';
+            my $checkedoff = '';
             my $checkedproc = '';
             my $currproctorkey = '';
             my $currprocdisplay = 'hidden';
             my $currdonetext = &mt('Done');
-            my $checkedoff = ' checked="checked"';
             if ($currval =~ /^(?:\d+)_done$/) {
                 $checkedon = ' checked="checked"';
-                $checkedoff = '';
             } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:$/) {
                 $currdonetext = $1;
                 $checkedon = ' checked="checked"';
-                $checkedoff = '';
             } elsif ($currval =~ /^(?:\d+)_done_proctor_(.+)$/) {
                 $currproctorkey = $1;
                 $checkedproc = ' checked="checked"';
-                $checkedoff = '';
                 $currprocdisplay = 'text';
             } elsif ($currval =~ /^(?:\d+)_done\:([^\:]+)\:_proctor_(.+)$/) {
                 $currdonetext = $1;
                 $currproctorkey = $2;
                 $checkedproc = ' checked="checked"';
-                $checkedoff = '';
                 $currprocdisplay = 'text';
+            } elsif ($currval ne '') {
+                $checkedoff = ' checked="checked"';
+            } else {
+                $currdonetext = '';
             }
             my $onclick = ' onclick="toggleSecret(this.form,'."'done_','$thiskey'".');"';
             my $disabled;
@@ -5301,7 +5796,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" id="done_'.$thiskey.'_buttontext" value="'.
+                       &HTML::Entities::encode($currdonetext,'"<>&').'"'.$disabled.' /></span>';
         }
     }
     unless ($readonly) {
@@ -5542,7 +6038,7 @@ ENDOVER
 
     &extractResourceInformation(\@ids, \%typep,\%keyp, \%allparms, \%allparts, \%allmaps,
                 \%mapp, \%symbp,\%maptitles,\%uris,
-                \%keyorder,\%defkeytype);
+                \%keyorder,\%defkeytype,$pssymb);
 
     if (grep {$_ eq 'all'} (@psprt)) {
         @psprt = keys(%allparts);
@@ -5554,10 +6050,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>');
@@ -5595,7 +6089,7 @@ ENDOVER
     $r->print('<div>');
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
-    &sortmenu($r,$sortorder);
+    &sortmenu($r,$sortorder,'newoverview');
     $r->print('</div></div>');
 
     $r->print('<p><input type="submit" name="dis" value="'.&mt('Display').'" /></p>');
@@ -5620,7 +6114,15 @@ ENDOVER
 
 # List data
 
-        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly);
+        my $hash_for_realm;
+        if (($parmlev eq 'map') && (keys(%allmaps))) {
+            %{$hash_for_realm} = reverse(%allmaps);
+        } elsif (($parmlev eq 'full') && (keys(%symbp))) {
+            for (my $i=0; $i<@ids; $i++) {
+                $hash_for_realm->{$symbp{$ids[$i]}} = $i;
+            }
+        }
+        &listdata($r,$resourcedata,$listdata,$sortorder,'newoverview',undef,$readonly,$parmlev,$hash_for_realm,$pschp);
     }
     $r->print(&tableend());
     unless ($readonly) {
@@ -5727,7 +6229,7 @@ sub overview {
 
     my $sortorder=$env{'form.sortorder'};
     unless ($sortorder) { $sortorder='realmstudent'; }
-    &sortmenu($r,$sortorder);
+    &sortmenu($r,$sortorder,'overview');
 
     my $submitbutton = '<input type="submit" value="'.&mt('Save').'" />';