--- rat/client/parameter.html	2020/06/03 12:58:32	1.83
+++ rat/client/parameter.html	2022/05/24 16:23:04	1.87
@@ -5,7 +5,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.83 2020/06/03 12:58:32 raeburn Exp $
+// $Id: parameter.html,v 1.87 2022/05/24 16:23:04 raeburn Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -45,6 +45,7 @@ var pextravaltwo='';
 var preturn='';
 var pcode='';
 var pscat='';
+var psmap='';
 var pmarker='';
 var pmodal='';
 var pname='';
@@ -402,7 +403,7 @@ function validateInterval() {
                 if (sform.donebutton[i].value == '_done_proctor') {
                     if ((sform.donebutton_proctorkey.value == '') || 
                         (sform.donebutton_proctorkey.value == null)) {
-                        alert('Please provide a key for a proctor to enter when a student uses the "Done" button.');
+                        alert('Please enter a key for a proctor to enter when a student uses the "Done" button.');
                         return;
                     }
                 }
@@ -415,55 +416,111 @@ function validateInterval() {
 
 function validateDeepLink() {
     var sform=choices.document.forms.sch;
-    svalue = sform.deeplinklisted.options[sform.deeplinklisted.selectedIndex].value+',';
+    svalue = sform.deeplinkstate.options[sform.deeplinkstate.selectedIndex].value+',';
+    svalue += sform.deeplinkothers.options[sform.deeplinkothers.selectedIndex].value+','; 
+    svalue += sform.deeplinklisted.options[sform.deeplinklisted.selectedIndex].value+',';
     svalue += sform.deeplinkacc.options[sform.deeplinkacc.selectedIndex].value+',';
-    if (sform.deeplinktypes.length) {
-        for (var i=0; i<sform.deeplinktypes.length; i++) {
-            if (sform.deeplinktypes[i].checked) {
-                svalue += sform.deeplinktypes[i].value;
-                if (sform.deeplinktypes[i].value == 'key') {
+    var keyRegExp = /^[a-zA-Z\d_.!@#$%^&*()+=-]+$/;
+    var numRegExp = /^\d+$/;
+    if (sform.deeplinkprotect.length) {
+        for (var i=0; i<sform.deeplinkprotect.length; i++) {
+            if (sform.deeplinkprotect[i].checked) {
+                svalue += sform.deeplinkprotect[i].value;
+                if (sform.deeplinkprotect[i].value == 'key') {
                     var posskey = sform.deeplinkkey.value;
                     posskey = posskey.replace(/^\s+|\s+$/g,'');
-                    var keyRegExp = /^\w+$/;
                     if (keyRegExp.test(posskey)) {
                         svalue += ':'+posskey;
+                    } else {
+                        alert('Please enter a value for the key containing one or more of: a-zA-Z0-9_.!@#$%^&*()+=-\n'+
+                              'or choose a different supported link type.');
+                        return; 
                     }
-                } else if (sform.deeplinktypes[i].value == 'lti') {
-                    var posslti = sform.linkposslti.options[sform.linkposslti.selectedIndex].value;
-                    if (posslti != '' && posslti != null) {
-                        svalue += ':'+posslti;
+                } else if (sform.deeplinkprotect[i].value == 'ltic') {
+                    var possltic = sform.linkpossltic.options[sform.linkpossltic.selectedIndex].value;
+                    if ((numRegExp.test(possltic)) && (possltic > 0)) {
+                        svalue += ':'+possltic;
+                    } else {
+                        alert('Please select an LTI launcher, or choose a different supported link type.');
+                        return;
+                    }
+                } else if (sform.deeplinkprotect[i].value == 'ltid') {
+                    var possltid = sform.linkpossltid.options[sform.linkpossltid.selectedIndex].value;
+                    if ((numRegExp.test(possltid)) && (possltid > 0)) {
+                        svalue += ':'+possltid;
+                    } else {
+                        alert('Please select an LTI launcher, or choose a different supported link type.');
+                        return;
                     }
                 }
                 break;
             }
         }
     }
+    svalue += ',';
+    if (sform.deeplinkmenus.length) {
+        for (var i=0; i<sform.deeplinkmenus.length; i++) {
+            if (sform.deeplinkmenus[i].checked) {
+                if (sform.deeplinkmenus[i].value == 'std') {
+                    svalue += '0';
+                } else if (sform.deeplinkmenus[i].value == 'collnum') {
+                    var posscoll = sform.linkpossmenu.options[sform.linkpossmenu.selectedIndex].value;
+                    if ((numRegExp.test(posscoll)) && (posscoll > 0)) { 
+                        svalue += posscoll;
+                    } else {
+                        alert("Please select either a numbered collection or check 'Standard (all menus)'.");
+                        return;
+                    }
+                }
+                break;
+            }
+        }
+    }
+    svalue += ',';
+    svalue += sform.deeplinktarget.options[sform.deeplinktarget.selectedIndex].value;
     assemble();
 }
 
-function toggleDeepLink() {
+function toggleDeepLink(caller) {
     var sform=choices.document.forms.sch;
-    if (sform.deeplinktypes.length) {
+    if ((caller == 'protect') && (sform.deeplinkprotect.length)) {
         var frame = window.frames["choices"];
-        for (var i=0; i<sform.deeplinktypes.length; i++) {
-            if (sform.deeplinktypes[i].checked) {
-                if (sform.deeplinktypes[i].value == 'key') {
-                    if (frame.document.getElementById('deeplinkkey')) {
+        for (var i=0; i<sform.deeplinkprotect.length; i++) {
+            if (sform.deeplinkprotect[i].checked) {
+                if (frame.document.getElementById('deeplinkkey')) {
+                    if (sform.deeplinkprotect[i].value == 'key') {
                         frame.document.getElementById('deeplinkkey').type='text';
+                    } else {
+                        frame.document.getElementById('deeplinkkey').type='hidden';
                     }
-                    if (frame.document.getElementById('deeplinkltidiv')) {
-                        frame.document.getElementById('deeplinkltidiv').style.display='none';
+                }
+                if (frame.document.getElementById('deeplinklticdiv')) {
+                    if (sform.deeplinkprotect[i].value == 'ltic') {
+                        frame.document.getElementById('deeplinklticdiv').style.display='block';
+                    } else {
+                        frame.document.getElementById('deeplinklticdiv').style.display='none';
                     }
-                } else {
-                    if (frame.document.getElementById('deeplinkkey')) {
-                        frame.document.getElementById('deeplinkkey').type='hidden';
+                }
+                if (frame.document.getElementById('deeplinkltiddiv')) {
+                    if (sform.deeplinkprotect[i].value == 'ltid') {
+                        frame.document.getElementById('deeplinkltiddiv').style.display='block';
+                    } else {
+                        frame.document.getElementById('deeplinkltiddiv').style.display='none';
                     }
-                    if (frame.document.getElementById('deeplinkltidiv')) {
-                        if (sform.deeplinktypes[i].value == 'lti') {
-                            frame.document.getElementById('deeplinkltidiv').style.display='inline-block';
-                        } else {
-                            frame.document.getElementById('deeplinkltidiv').style.display='none';
-                        }
+                }
+                break;
+            }
+        }
+    }
+    if ((caller == 'menus') && (sform.deeplinkmenus.length)) {
+        var frame = window.frames["choices"];
+        for (var i=0; i<sform.deeplinkmenus.length; i++) {
+            if (sform.deeplinkmenus[i].checked) {
+                if (frame.document.getElementById('deeplinkmenusdiv')) {
+                    if (sform.deeplinkmenus[i].value == 'collnum') {
+                        frame.document.getElementById('deeplinkmenusdiv').style.display='inline-block';
+                    } else {
+                        frame.document.getElementById('deeplinkmenusdiv').style.display='none';
                     }
                 }
                 break;
@@ -472,8 +529,8 @@ function toggleDeepLink() {
     }
 }
 
-function calldeeplink() {
-    return 'onclick="parent.toggleDeepLink()"';
+function calldeeplink(caller) {
+    return 'onclick="parent.toggleDeepLink(\''+caller+'\')"';
 }
 
 function integereval() {
@@ -1124,26 +1181,41 @@ function draw() {
        }
        if (pscat=='deeplink') {
            var deeplinkvals = new Array();
-           var linktypeparts = new Array();
-           var ltikeyRegExp = /^(lti|key):(\w+)$/;
+           var linkprotectparts = new Array();
+           var ltikeyRegExp = /^(ltic|ltid|key):(\w+)$/;
            var dlinkkeysty = 'hidden';
-           var dlinkltidivsty = 'none';
            var dlinkkeyval = '';
+           var dlinklticdivsty = 'none';
+           var dlinkltiddivsty = 'none';
+           var dlinkmenusdivsty = 'none';
            if ((svalue != '') && (svalue != null)) {
                deeplinkvals = svalue.split(',');
-               if (ltikeyRegExp.test(deeplinkvals[2])) {
-                   linktypeparts = deeplinkvals[2].split(':');
-                   deeplinkvals[2] = linktypeparts[0];
-                   if (linktypeparts[0] == 'key') {
+               if (ltikeyRegExp.test(deeplinkvals[4])) {
+                   linkprotectparts = deeplinkvals[4].split(':');
+                   deeplinkvals[4] = linkprotectparts[0];
+                   if (linkprotectparts[0] == 'key') {
                        dlinkkeysty = 'text';
-                       dlinkkeyval = linktypeparts[1];
-                   } else if (linktypeparts[0] == 'lti') {
-                       dlinkltidivsty = 'inline-block';
+                       dlinkkeyval = linkprotectparts[1];
+                   } else if (linkprotectparts[0] == 'ltic') {
+                       dlinklticdivsty = 'block';
+                   } else if (linkprotectparts[0] == 'ltid') {
+                       dlinkltiddivsty = 'block';
                    }
                }
+               if (deeplinkvals[5] >= 1) {
+                   dlinkmenusdivsty = 'inline-block';
+               }
            } else {
-               deeplinkvals = ['full','res','any'];
+               deeplinkvals = ['off','unhide','full','res','','0'];
            }
+           var deeplinkstate = new Array();
+           deeplinkstate = ['only','off','both'];
+           var deeplinkstatetxt = new Array();
+           deeplinkstatetxt = ['deep only','deeplink off','regular + deep'];
+           var deeplinkothers = new Array();
+           deeplinkothers = ['hide','unhide'];
+           var deeplinkotherstxt = new Array();
+           deeplinkotherstxt = ['Hidden','Unhidden'];
            var deeplinklisting = new Array();
            deeplinklisting = ['full','absent','grades','details','datestatus'];
            var deeplinklisttxt = new Array();
@@ -1152,91 +1224,203 @@ function draw() {
            deeplinkscopes = ['res','map','rec'];
            var deeplinkscopetxt = new Array();
            deeplinkscopetxt = ['resource only','enclosing map/folder','recursive map/folder'];
-           var deeplinkurls = new Array();
-           deeplinkurls = ['any','only','key','lti'];
+           var deeplinkprotect = new Array();
+           deeplinkprotect = ['none','key','ltic','ltid'];
+           var deeplinktarget = new Array();
+           deeplinktarget = ['_self','_top'];
+           var deeplinktargettxt = new Array();
+           deeplinktargettxt = ['Embedded','Not embedded'];
            tablestart('Deep-linked items');
-           choicewrite('<tr><td>In Contents or Gradebook?</td><td>');
+           choicewrite('<tr><td>Access status?</td><td>');
+           choicewrite('<select name="deeplinkstate">');
+           for (var i=0; i<deeplinkstate.length; i++) {
+               choicewrite('<option value="'+deeplinkstate[i]+'"');
+               if (deeplinkvals[0] == deeplinkstate[i]) {
+                   choicewrite(' selected="selected"');
+               }
+               choicewrite('>'+deeplinkstatetxt[i]+'</option>');
+           }
+           choicewrite('</select></td></tr>');
+           choicewrite('<tr><td>Hide other resources?</td><td>');
+           choicewrite('<select name="deeplinkothers">');
+           for (var i=0; i<deeplinkothers.length; i++) {
+               choicewrite('<option value="'+deeplinkothers[i]+'"');
+               if (deeplinkvals[1] == deeplinkothers[i]) {
+                   choicewrite(' selected="selected"');
+               }
+               choicewrite('>'+deeplinkotherstxt[i]+'</option>');
+           }
+           choicewrite('</select></td></tr>');
+           choicewrite('<tr><td>In Contents + Gradebook?</td><td>');
            choicewrite('<select name="deeplinklisted">');
            for (var i=0; i<deeplinklisting.length; i++) {
                choicewrite('<option value="'+deeplinklisting[i]+'"');
-               if (deeplinkvals[0] == deeplinklisting[i]) {
+               if (deeplinkvals[2] == deeplinklisting[i]) {
                    choicewrite(' selected="selected"');
                }
                choicewrite('>'+deeplinklisttxt[i]+'</option>');
            }
            choicewrite('</select></td></tr>');
-           choicewrite('<tr><td>Access scope via deep-link</td><td>');
+           choicewrite('<tr><td>Access scope for link</td><td>');
            choicewrite('<select name="deeplinkacc">');
            for (var i=0; i<deeplinkscopes.length; i++) {
                choicewrite('<option value="'+deeplinkscopes[i]+'"');
-               if (deeplinkvals[1] == deeplinkscopes[i]) {
+               if (deeplinkvals[3] == deeplinkscopes[i]) {
                    choicewrite(' selected="selected"');
                }
                choicewrite('>'+deeplinkscopetxt[i]+'</option>');
            }
            choicewrite('</select></td></tr>');
-           choicewrite('<tr><td>Supported Link Types</td><td>');
-           choicewrite('<span style="white-space: nowrap;"><label>');
-           choicewrite('<input name="deeplinktypes" value="any"'+
-                  ' type="radio" '+calldeeplink());
-           if (deeplinkvals[2]=='any') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> regular + deep</label></span><br />');
-           choicewrite('<span style="white-space: nowrap;"><label>');
-           choicewrite('<input name="deeplinktypes" value="only"'+
-                  ' type="radio" '+calldeeplink());
-           if (deeplinkvals[2]=='only') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> deep only</label></span><br />');
+           choicewrite('<tr><td>Link protection</td><td>');
            choicewrite('<span style="white-space: nowrap;"><label>');
-           choicewrite('<input name="deeplinktypes" value="key"'+
-                  ' type="radio" '+calldeeplink());
-           if (deeplinkvals[2]=='key') { choicewrite(' checked="checked"'); }
-           choicewrite(' /> deep with key</label>');
-           choicewrite('<input type="'+dlinkkeysty+'" name="deeplinkkey" id="deeplinkkey" value="'+dlinkkeyval+'" size="6" />');
+           choicewrite('<input name="deeplinkprotect" value="none"'+
+                  ' type="radio" '+calldeeplink('protect'));
+           if (deeplinkvals[4]=='none') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> not in use</label>');
+           choicewrite('<input name="deeplinkprotect" value="key"'+
+                  ' type="radio" '+calldeeplink('protect'));
+           if (deeplinkvals[4]=='key') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> key access</label>');
+           choicewrite('<input type="'+dlinkkeysty+'" name="deeplinkkey" id="deeplinkkey" value="'+dlinkkeyval+'" size="10" />');
            choicewrite('</span><br />');
+
+           var possmenus = new Array();
            if ((pextra != '') && (pextra != null)) {
-               var ltiRegExp = /^lti_/;
-               if (ltiRegExp.test(pextra)) {
-                   pextra = pextra.replace(ltiRegExp,'');
-                   var posslti = pextra.split(',');
-                   if (posslti.length >= 1) {
-                       var ltinums = new Array();
-                       var ltititles = new Array();
-                       for (var i=0; i<posslti.length; i++) {
-                           var entries = posslti[i].split(':');
-                           ltinums[i] = entries[0];
-                           ltititles[i] = decodeURI(entries[1]);
-                       }
-                       if (ltinums.length) {
-                           choicewrite('<span style="white-space: nowrap;"><label>');
-                           choicewrite('<input name="deeplinktypes" value="lti"'+
-                                       ' type="radio" '+calldeeplink());
-                           if (deeplinkvals[2]=='lti') { choicewrite(' checked="checked"'); }
-                           choicewrite(' /> deep with LTI launch</label>');
-                           choicewrite('<div id="deeplinkltidiv" style="display:'+dlinkltidivsty+'">');
-                           choicewrite('<select name="linkposslti">');
-                           var sel='';
-                           if (deeplinkvals[2]!='lti') {
-                               sel = ' selected="selected"';
+               var lticRegExp = /^ltic_/;
+               var ltidRegExp = /^ltid_/;
+               var menusRegExp = /^menus_/;
+               var extras = pextra.split('&');
+               for (var i=0; i<extras.length; i++) {
+                   if (lticRegExp.test(extras[i])) {
+                       extras[i] = extras[i].replace(lticRegExp,'');
+                       var possltic = extras[i].split(',');
+                       if (possltic.length >= 1) {
+                           var lticnums = new Array();
+                           var ltictitles = new Array();
+                           for (var j=0; j<possltic.length; j++) {
+                               var entries = possltic[j].split(':');
+                               lticnums[j] = entries[0];
+                               ltictitles[j] = decodeURIComponent(entries[1]);
                            }
-                           if (ltinums.length > 1) {
-                               choicewrite('<option value=""'+sel+'>Please select</option>');
+                           if (lticnums.length) {
+                               choicewrite('<span style="white-space: nowrap;"><label>');
+                               choicewrite('<input name="deeplinkprotect" value="ltic"'+
+                                           ' type="radio" '+calldeeplink('protect'));
+                               if (deeplinkvals[4]=='ltic') { choicewrite(' checked="checked"'); }
+                               choicewrite(' /> course LTI launch</label>');
+                               choicewrite('<div id="deeplinklticdiv" style="display:'+dlinklticdivsty+'">');
+                               choicewrite('<select name="linkpossltic">');
+                               var sel='';
+                               if (deeplinkvals[4]!='ltic') {
+                                   sel = ' selected="selected"';
+                               }
+                               if (lticnums.length > 1) {
+                                   choicewrite('<option value=""'+sel+'>Select</option>');
+                               }
+                               for (var j=0; j<lticnums.length; j++) {
+                                   sel = '';
+                                   if (deeplinkvals[4]=='ltic') {
+                                       if (linkprotectparts.length) {
+                                           if (lticnums[j] == linkprotectparts[1]) {
+                                               sel = ' selected="selected"';
+                                           }
+                                       }
+                                   }
+                                   choicewrite('<option value="'+lticnums[j]+'"'+sel+'>'+ltictitles[j]+'</option>');
+                               }
+                               choicewrite('</select></div></span><br />');
                            }
-                           for (var i=0; i<ltinums.length; i++) {
-                               sel = '';
-                               if (deeplinkvals[2]=='lti') {
-                                   if (linktypeparts.length) {
-                                       if (ltinums[i] == linktypeparts[1]) {
-                                           sel = ' selected="selected"';
+                       }
+                   } else if (ltidRegExp.test(extras[i])) {
+                       extras[i] = extras[i].replace(ltidRegExp,'');
+                       var possltid = extras[i].split(',');
+                       if (possltid.length >= 1) {
+                           var ltidnums = new Array();
+                           var ltidtitles = new Array();
+                           for (var j=0; j<possltid.length; j++) {
+                               var entries = possltid[j].split(':');
+                               ltidnums[j] = entries[0];
+                               ltidtitles[j] = decodeURIComponent(entries[1]);
+                           }
+                           if (ltidnums.length) {
+                               choicewrite('<span style="white-space: nowrap;"><label>');
+                               choicewrite('<input name="deeplinkprotect" value="ltid"'+
+                                           ' type="radio" '+calldeeplink('protect'));
+                               if (deeplinkvals[4]=='ltid') { choicewrite(' checked="checked"'); }
+                               choicewrite(' />domain LTI launch</label>');
+                               choicewrite('<div id="deeplinkltiddiv" style="display:'+dlinkltiddivsty+'">');
+                               choicewrite('<select name="linkpossltid">');
+                               var sel='';
+                               if (deeplinkvals[4]!='ltid') {
+                                   sel = ' selected="selected"';
+                               }
+                               if (ltidnums.length > 1) {
+                                   choicewrite('<option value=""'+sel+'>Select</option>');
+                               }
+                               for (var j=0; j<ltidnums.length; j++) {
+                                   sel = '';
+                                   if (deeplinkvals[4]=='ltid') {
+                                       if (linkprotectparts.length) {
+                                           if (ltidnums[j] == linkprotectparts[1]) {
+                                               sel = ' selected="selected"';
+                                           }
                                        }
                                    }
+                                   choicewrite('<option value="'+ltidnums[j]+'"'+sel+'>'+ltidtitles[j]+'</option>');
                                }
-                               choicewrite('<option value="'+ltinums[i]+'"'+sel+'>'+ltititles[i]+'</option>');
+                               choicewrite('</select></div></span><br />');
                            }
-                           choicewrite('</select></div></span><br />');
                        }
+
+                   } else if (menusRegExp.test(extras[i])) {
+                       extras[i] = extras[i].replace(menusRegExp,'');
+                       possmenus = extras[i].split(',');
+                   }
+               }
+           }
+           choicewrite('<tr><td>Menu Items Displayed</td><td>');
+           choicewrite('<span style="white-space: nowrap;"><label>');
+           choicewrite('<input name="deeplinkmenus" value="std"'+
+                       ' type="radio" '+calldeeplink('menus'));
+           if (deeplinkvals[5] == 0) {
+               choicewrite(' checked="checked"');
+           }
+           choicewrite(' /> Standard (all menus)</label></span><br />');
+           if (possmenus.length >= 1) {  
+               choicewrite('<span style="white-space: nowrap;"><label>');
+               choicewrite('<input name="deeplinkmenus" value="collnum"'+
+                           ' type="radio" '+calldeeplink('menus'));
+               if (deeplinkvals[5] > 0) { choicewrite(' checked="checked"'); }
+               choicewrite(' /> Numbered collection</label>');
+               choicewrite('<div id="deeplinkmenusdiv" style="display:'+dlinkmenusdivsty+'">');
+               choicewrite('<select name="linkpossmenu">');
+               var sel='';
+               if (deeplinkvals[5] == 0) {
+                   sel = ' selected="selected"';
+               }
+               if (possmenus.length > 1) {
+                   choicewrite('<option value=""'+sel+'>Select</option>');
+               }
+               for (var i=0; i<possmenus.length; i++) {
+                   sel = '';
+                   if (deeplinkvals[5] == possmenus[i]) {
+                       sel = ' selected="selected"';
                    }
+                   choicewrite('<option value="'+possmenus[i]+'"'+sel+'>'+possmenus[i]+'</option>');
+               }
+               choicewrite('</select></div></span><br />');
+           }
+           choicewrite('</td></tr>');
+           choicewrite('<tr><td>Embedded?</td><td>');
+           choicewrite('<select name="deeplinktarget">');
+           for (var i=0; i<deeplinktarget.length; i++) {
+               choicewrite('<option value="'+deeplinktarget[i]+'"');
+               if (deeplinkvals[6] == deeplinktarget[i]) {
+                   choicewrite(' selected="selected"');
                }
+               choicewrite('>'+deeplinktargettxt[i]+'</option>');
            }
+           choicewrite('</select>');
            choicewrite('</td></tr></table>');
        }
    }
@@ -1414,6 +1598,7 @@ function init() {
           }
       }
   }
+  psmap = ismap;
 
 
   if (ptype=='date' && pscat == 'interval') {
@@ -1628,6 +1813,13 @@ function init() {
  
   selwrite('</body></html>');
   this.window.selector.document.close();
+  if (pscat == 'deeplink') {
+      if (psmap==1) {
+          document.getElementById("LCparampopup").rows="100,*";
+      } else {  
+          document.getElementById("LCparampopup").rows="60,*";
+      }
+  }
   draw();
  
 }
@@ -1636,7 +1828,7 @@ function init() {
 </script>
 </head>
 
-<frameset rows="125,*" onload="init();">
+<frameset id="LCparampopup" rows="125,*" onload="init();">
 <frame name="selector" src="empty.html" />
 <frame name="choices" src="empty.html" />
 </frameset>