--- loncom/interface/lonparmset.pm	2021/06/12 22:06:32	1.600
+++ loncom/interface/lonparmset.pm	2021/08/04 19:59:10	1.601
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.600 2021/06/12 22:06:32 raeburn Exp $
+# $Id: lonparmset.pm,v 1.601 2021/08/04 19:59:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1245,9 +1245,10 @@ function validateParms() {
     var ipallowRegExp = /^setipallow_/;
     var ipdenyRegExp = /^setipdeny_/; 
     var deeplinkRegExp = /^deeplink_/;
-    var dlListScopeRegExp = /^deeplink_(listing|scope)_/; 
-    var dlLinkUrlsRegExp = /^deeplink_urls_/;
-    var dlLtiRegExp = /^deeplink_lti_/;
+    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_/;
@@ -1314,9 +1315,9 @@ function validateParms() {
                             }
                             document.parmform.elements['set_'+identifier].value += possdeeplink;
                         }
-                    } else if (dlLinkUrlsRegExp.test(name)) {
+                    } else if (dlLinkProtectRegExp.test(name)) {
                         if (document.parmform.elements[i].checked) {
-                            var identifier =  name.replace(dlLinkUrlsRegExp,'');
+                            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) {
@@ -1324,25 +1325,41 @@ function validateParms() {
                             }
                             document.parmform.elements['set_'+identifier].value += posslinkurl;
                         }
-                    } else if (dlLtiRegExp.test(name)) {
-                        var identifier = name.replace(dlLtiRegExp,'');
-                        if (isRadioSet('deeplink_urls_'+identifier,'lti')) {
-                            var posslti = document.parmform.elements[i].value;
-                            posslti = posslti.replace(/\D+/g,'');
-                            if (posslti.length) {
+                    } 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) {
-                                    posslti = ':'+posslti;
+                                    possltid = ':'+possltid;
                                 }
-                                document.parmform.elements['set_'+identifier].value += posslti;
+                                document.parmform.elements['set_'+identifier].value += possltid;
                             } else {
                                 document.parmform.elements['set_'+identifier].value = '';
-                                alert("A link type of 'deep with LTI launch' was selected but no LTI launcher was selected.\nPlease select one, or choose a different supported link type.");
+                                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_urls_'+identifier,'key')) {
+                        if (isRadioSet('deeplink_protect_'+identifier,'key')) {
                             var posskey = document.parmform.elements[i].value;
                             posskey = posskey.replace(/^\s+|\s+$/g,'');
                             var origlength = posskey.length;
@@ -1478,32 +1495,44 @@ function toggleDeepLink(form,item,key) {
         if (document.getElementById('deeplink_key_'+item+'_'+key)) {
             keybox = document.getElementById('deeplink_key_'+item+'_'+key);
         }
-        var divoption;
-        if (item == 'urls') {
-            divoption = 'lti'
+        var divoptions = new Array();
+        if (item == 'protect') {
+            divoptions = ['ltic','ltid'];
         } else {
             if (item == 'menus') {
-                divoption = 'colls';
+                divoptions = ['colls'];
             }
         }
-        var seldiv;
-        if (document.getElementById('deeplinkdiv_'+divoption+'_'+item+'_'+key)) {
-            seldiv = document.getElementById('deeplinkdiv_'+divoption+'_'+item+'_'+key);
+        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 == divoption) {
-                    seldiv.style.display = 'inline-block';
-                    if (item == 'urls') {
-                        keybox.type = 'hidden';
-                        keybox.value = '';
-                    }
-                } else {
-                    if (seldiv != '') {
-                        seldiv.style.display = 'none';
-                        form['deeplink_'+divoption+'_'+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 (item == 'urls') {
+                    if (item == 'protect') {
                         if (radios[i].value == 'key') {
                             keybox.type = 'text';
                         } else {
@@ -1704,23 +1733,37 @@ 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'};
+        if (keys(%lti)) {
+            foreach my $item (sort { $a <=> $b }  (keys(%lti))) {
+                if (ref($lti{$item}) eq 'HASH') {
+                    unless ($lti{$item}{'requser'}) {
+                        $domltistr .= $item.':'.&escape(&escape($lti{$item}{'consumer'})).',';
+                    }
                 }
             }
+            $domltistr =~ s/,$//;
+            if ($domltistr) {
+                $extra = 'ltid_'.$domltistr;
+            }
         }
-        if (keys(%posslti)) {
-            $extra = 'lti_';
-            foreach my $lti (sort { $a <=> $b } keys(%posslti)) {
-                $extra .= $lti.':'.&escape(&escape($posslti{$lti})).',';
+        my %courselti = &Apache::lonnet::get_course_lti($cnum,$cdom);
+        if (keys(%courselti)) {
+            foreach my $item (sort { $a <=> $b } keys(%courselti)) {
+                if (($item =~ /^\d+$/) && (ref($courselti{$item}) eq 'HASH')) {
+                    $crsltistr .= $item.':'.&escape(&escape($courselti{$item}{'name'})).',';
+                }
+            }
+            $crsltistr =~ s/,$//;
+            if ($crsltistr) {
+                if ($extra) {
+                    $extra .= '&';
+                }
+                $extra .= 'ltic_'.$crsltistr;
             }
-            $extra =~ s/,$//;
         }
         if ($env{'course.'.$env{'request.course.id'}.'.menucollections'}) {
             my @colls;
@@ -4982,21 +5025,30 @@ sub string_ip_selector {
 sub string_deeplink_selector {
     my ($thiskey, $showval, $readonly) = @_;
     my (@components,%values,@current,%titles,%options,%optiontext,%defaults,
-        %selectnull,%posslti,@possmenus);
-    @components = ('listing','scope','urls','menus');
+        %selectnull,%domlti,%crslti,@possmenus);
+    @components = ('state','others','listing','scope','protect','menus');
     %titles = &Apache::lonlocal::texthash (
+                  state   => 'Access status',
+                  others  => 'Hide other resources',
                   listing => 'In Contents and/or Gradebook',
                   scope   => 'Access scope for link',
-                  urls    => 'Supported link types',
+                  protect => 'Link protection',
                   menus   => 'Menu Items Displayed',
               );
     %options = (
+                   state   => ['only','off','both'],
+                   others  => ['hide','unhide'],
                    listing => ['full','absent','grades','details','datestatus'],
                    scope   => ['res','map','rec'],
-                   urls    => ['any','only','key','lti'],
+                   protect => ['none','key','ltid','ltic'],
                    menus   => ['std','colls'],
                );
     %optiontext = &Apache::lonlocal::texthash (
+                    only       => 'deep only',
+                    off        => 'deeplink off',
+                    both       => 'regular + deep',
+                    hide       => 'Hidden',
+                    unhide     => 'Unhidden',
                     full       => 'Listed (linked) in both',
                     absent     => 'Not listed',
                     grades     => 'Listed in grades only',
@@ -5005,41 +5057,54 @@ sub string_deeplink_selector {
                     res        => 'resource only',
                     map        => 'enclosing map/folder',
                     rec        => 'recursive map/folder',
-                    any        => 'regular + deep',
-                    only       => 'deep only',
-                    key        => 'deep with key',
-                    lti        => 'deep with LTI launch',
+                    none       => 'not in use',
+                    key        => 'key access',
+                    ltic       => 'LTI access (course)',
+                    ltid       => 'LTI access (domain)' ,
                     std        => 'Standard (all menus)',
                     colls      => 'Numbered collection',
                   );
     %selectnull = &Apache::lonlocal::texthash (
-                    lti => 'Select Provider',
+                    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:[a-zA-Z\d_.!\@#\$%^&*()+=-]+|lti:\d+)$/);
-        ($values{'menus'}) = ($current[3] =~ /^(\d+)$/);
+        ($values{'state'}) = ($current[0] =~ /^(only|off|both)$/);
+        ($values{'others'}) = ($current[1] =~ /^(hide|unhide)$/);
+        ($values{'listing'}) = ($current[2] =~ /^(full|absent|grades|details|datestatus)$/);
+        ($values{'scope'}) = ($current[3] =~ /^(res|map|rec)$/);
+        ($values{'protect'}) = ($current[4] =~ /^(key:[a-zA-Z\d_.!\@#\$%^&*()+=-]+|ltic:\d+|ltid:\d+)$/);
+        ($values{'menus'}) = ($current[5] =~ /^(\d+)$/);
     } else {
+        $defaults{'state'} = 'off',
+        $defaults{'others'} = 'unhide',
         $defaults{'listing'} = 'full';
         $defaults{'scope'} = 'res';
-        $defaults{'urls'} = 'any';
+        $defaults{'protect'} = 'none';
         $defaults{'menus'} = '0';
     }
     my $disabled;
     if ($readonly) {
         $disabled=' disabled="disabled"';
     }
-    my %lti = 
+    my %courselti =
+        &Apache::lonnet::get_course_lti($env{'course.'.$env{'request.course.id'}.'.num'},
+                                        $env{'course.'.$env{'request.course.id'}.'.domain'});
+    foreach my $item (keys(%courselti)) {
+        if (ref($courselti{$item}) eq 'HASH') {
+            $crslti{$item} = $courselti{$item}{'name'};
+        }
+    }
+    my %lti =
         &Apache::lonnet::get_domain_lti($env{'course.'.$env{'request.course.id'}.'.domain'},
                                         'provider');
     foreach my $item (keys(%lti)) {
         if (ref($lti{$item}) eq 'HASH') {
             unless ($lti{$item}{'requser'}) {
-                $posslti{$item} = $lti{$item}{'consumer'};
+                $domlti{$item} = $lti{$item}{'consumer'};
             }
         }
     }
@@ -5059,11 +5124,15 @@ sub string_deeplink_selector {
     $output .= '</tr><tr>';
     foreach my $item (@components) {
         $output .= '<td>';
-        if (($item eq 'urls') || ($item eq 'menus')) {
+        if (($item eq 'protect') || ($item eq 'menus')) {
             my $selected = $values{$item};
             foreach my $option (@{$options{$item}}) {
-                if (($item eq 'urls') && ($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);
                 }
@@ -5088,7 +5157,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 (($item eq 'urls') && ($option eq 'key')) {
+                if (($item eq 'protect') && ($option eq 'key')) {
                     my $visibility="hidden";
                     my $currkey;
                     if ($checked) {
@@ -5097,12 +5166,12 @@ sub string_deeplink_selector {
                     }
                     $output .= '&nbsp;'.
                         '<input type="'.$visibility.'" name="deeplink_'.$option.'_'.$thiskey.'" id="deeplink_'.$option.'_'.$item.'_'.$thiskey.'" value="'.$currkey.'" size="10"'.$disabled.' />';
-                } elsif (($option eq 'lti') || ($option eq 'colls')) {
+                } 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 'lti') {
+                        if (($option eq 'ltic') || ($option eq 'ltid'))  {
                             $current = (split(/\:/,$selected))[1];
                         } else {
                             $current = $selected;
@@ -5110,8 +5179,10 @@ sub string_deeplink_selector {
                     } else {
                         $blankcheck = ' selected="selected"';
                     }
-                    if ($option eq 'lti') {
-                        @possibles = keys(%posslti);
+                    if ($option eq 'ltid') {
+                        @possibles = keys(%domlti);
+                    } elsif ($option eq 'ltic') {
+                        @possibles = keys(%crslti); 
                     } else {
                         @possibles = @possmenus;
                     }
@@ -5128,8 +5199,10 @@ sub string_deeplink_selector {
                             $selected = ' selected="selected"';
                         }
                         my $shown = $poss;
-                        if ($option eq 'lti') {
-                            $shown = $posslti{$poss};
+                        if ($option eq 'ltid') {
+                            $shown = $domlti{$poss};
+                        } elsif ($option eq 'ltic') {
+                            $shown = $crslti{$poss};
                         }
                         $output .= '<option value="'.$poss.'"'.$selected.'>'.$shown.'</option>';
                     }