--- rat/client/parameter.html	2020/06/03 12:38:01	1.82
+++ rat/client/parameter.html	2025/06/30 20:29:06	1.97
@@ -5,7 +5,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.82 2020/06/03 12:38:01 raeburn Exp $
+// $Id: parameter.html,v 1.97 2025/06/30 20:29:06 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='';
@@ -95,6 +96,8 @@ function choicestart() {
   choicewrite('}');
   choicewrite('table.LC_parmsel_table {font-size: 90%;}');
   choicewrite('table.LC_parmsel_table tr td { padding: 5px; border: 1px solid #C8C8C8;}');
+  choicewrite('fieldset.LC_grace { display:inline; }');
+  choicewrite('fieldset.LC_grace > legend { font-weight: normal; }');
   choicewrite('-->');
   choicewrite('</style>');
   choicewrite('</head>');
@@ -246,11 +249,22 @@ function month() {
 }
 
 
-function intminute() {
-   var thisminutes=cmins;
+function intminute(mins) {
+    var thisminutes;
+    if ((typeof mins === 'number') && (!isNaN(mins))) {
+        thisminutes=mins;
+    } else {
+        thisminutes=cmins;
+    }
     var i;
     var result = '';
-    result += '<select name="minutes" onchange="parent.intcalc();">';
+    var funcname = '';
+    if (pscat == 'grace') {
+        funcname = 'parent.gracestringeval()';
+    } else {
+        funcname = 'parent.intcalc()';
+    }
+    result += '<select name="minutes" onchange="'+funcname+';">';
     for (i=0;i<=59;i++) {
         result += '<option value="'+i+'"';
         if (i==thisminutes) {
@@ -262,11 +276,22 @@ function intminute() {
     return result;
 } 
 
-function inthour() {
-   var thishours=chours;
+function inthour(hours) {
+    var thishours;
+    if ((typeof hours === 'number') && (!isNaN(hours))) {
+        thishours=hours;
+    } else {
+        thishours=chours;
+    }
     var i;
     var result = '';
-    result += '<select name="hours" onchange="parent.intcalc();">';
+    var funcname = '';
+    if (pscat == 'grace') {
+        funcname = 'parent.gracestringeval()';
+    } else {
+        funcname = 'parent.intcalc()';
+    }
+    result += '<select name="hours" onchange="'+funcname+';">';
     for (i=0;i<=23;i++) {
         result += '<option value="'+i+'"';
         if (i==thishours) {
@@ -278,11 +303,22 @@ function inthour() {
     return result;
 }
 
-function intsecond() {
-    var thisseconds=csecs;
+function intsecond(secs) {
+    var thisseconds;
+    if ((typeof secs === 'number') && (!isNaN(secs))) {
+        thisseconds=secs;
+    } else {
+        thisseconds=csecs;
+    }
     var i;
     var result = '';
-    result += '<select name="seconds" onchange="parent.intcalc();">';
+    var funcname = '';
+    if (pscat == 'grace') {
+        funcname = 'parent.gracestringeval()';
+    } else {
+        funcname = 'parent.intcalc()';
+    }
+    result += '<select name="seconds" onchange="'+funcname+';">';
     for (i=0;i<=59;i++) {
         result += '<option value="'+i+'"';
         if (i==thisseconds) {
@@ -292,15 +328,51 @@ function intsecond() {
     }
     result += '</select>';
     return result;
-} 
+}
 
+function intweek(weeks) {
+    var thisweek;
+    if ((typeof weeks === 'number') && (!isNaN(weeks))) {
+        thisweek=weeks;
+    }
+    var i;
+    var result ='';
+    var funcname = '';
+    if (pscat == 'grace') {
+        funcname = 'parent.gracestringeval()';
+    }
+    result += '<select name="weeks" onchange="'+funcname+';">';
+    for (i=0;i<=52;i++) {
+        result += '<option value="'+i+'"';
+        if (i==thisweek) {
+            result += ' selected="selected"';
+        }
+        result += '>'+i+'</option>';
+    }
+    result += '</select>';
+    return result;
+}
 
-function intday() {
-   var thisdate=cdays;
+function intday(days) {
+    var thisdate;
+    var maxallowed;
+    if ((typeof days === 'number') && (!isNaN(days))) {
+        thisdate=days;
+    } else {
+        thisdate=cdays;
+    }
     var i;
     var result ='';
-    result += '<select name="date" onchange="parent.intcalc();">';
-    for (i=0;i<=31;i++) {
+    var funcname = '';
+    if (pscat == 'grace') {
+        funcname = 'parent.gracestringeval()';
+        maxallowed = 6;
+    } else {
+        funcname = 'parent.intcalc()';
+        maxallowed = 31;
+    }
+    result += '<select name="date" onchange="'+funcname+';">';
+    for (i=0;i<=maxallowed;i++) {
         result += '<option value="'+i+'"';
         if (i==thisdate) {
             result += ' selected="selected"';
@@ -400,9 +472,9 @@ function validateInterval() {
         for (var i=0; i<sform.donebutton.length; i++) {
             if (sform.donebutton[i].checked) {
                 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.');
+                    var keyval = sform.donebutton_proctorkey.value;
+                    if ((keyval == '') || (typeof(keyval) == 'undefined')) {
+                        alert('Please enter a key for a proctor to enter when a student uses the "Done" button.');
                         return;
                     }
                 }
@@ -415,23 +487,87 @@ 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+$/;
+    var exitTextRegExp = /^[^'":;,]+$/;
+    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;
+    svalue += ',';
+    if (sform.deeplinkexit.length) {
+        for (var i=0; i<sform.deeplinkexit.length; i++) {
+            if (sform.deeplinkexit[i].checked) {
+                if (sform.deeplinkexit[i].value == 'no') {
+                    svalue += sform.deeplinkexit[i].value;
+                } else {
+                    var exittext = sform.deeplinkexittext.value;
+                    exittext = exittext.replace(/^\s+|\s+$/g,'');
+                    if ((exittext.length) && (exitTextRegExp.test(exittext))) {
+                        svalue += sform.deeplinkexit[i].value;
+                        if (exittext !== 'Exit Tool') {
+                            svalue += ':'+exittext;
+                        }
+                    } else {
+                        alert('Please enter the button text. Disallowed characters are ;,":\'\n'+
+                              'or check "not in use" option for "Exit Tool Link"');
+                        return;
                     }
                 }
                 break;
@@ -441,29 +577,66 @@ function validateDeepLink() {
     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;
+            }
+        }
+    }
+    if ((caller == 'exit') && (sform.deeplinkexit.length)) {
+        var frame = window.frames["choices"];
+        for (var i=0; i<sform.deeplinkexit.length; i++) {
+            if (sform.deeplinkexit[i].checked) {
+                if (frame.document.getElementById('deeplinkexitdiv')) {
+                    if (sform.deeplinkexit[i].value == 'no') {
+                        frame.document.getElementById('deeplinkexitdiv').style.display='none';
+                        sform.deeplinkexittext.value = '';
+                    } else {
+                        frame.document.getElementById('deeplinkexitdiv').style.display='inline-block';
+                        if (sform.deeplinkexittext.value == '') {
+                            sform.deeplinkexittext.value = 'Exit Tool';
                         }
+                        frame.document.getElementById('deeplinkexitdiv').scrollIntoView();
                     }
                 }
                 break;
@@ -472,8 +645,8 @@ function toggleDeepLink() {
     }
 }
 
-function calldeeplink() {
-    return 'onclick="parent.toggleDeepLink()"';
+function calldeeplink(caller) {
+    return 'onclick="parent.toggleDeepLink(\''+caller+'\')"';
 }
 
 function integereval() {
@@ -540,29 +713,156 @@ function addIpRule(iptype) {
     var frame = window.frames["choices"];
     if (frame.document.getElementById('LC_string_ipacc_inner_'+iptype)) {
         var innerDiv = frame.document.getElementById('LC_string_ipacc_inner_'+iptype);
-        var count = innerDiv.childNodes.length 
         var ipDiv = frame.document.createElement('div');
-        ipDiv.innerHTML = '<input type="text" size="10" name="setip'+iptype+'" onblur="parent.ipstringeval();" />'+
-                          '<a href="#" onclick="parent.removeIpRule(\''+iptype+'\',\''+count+'\')">Remove</a>';
-        frame.document.getElementById('LC_string_ipacc_inner_'+iptype).appendChild(ipDiv);
+        ipDiv.innerHTML = '<input type="text" size="12" name="setip'+iptype+'" onblur="parent.ipstringeval();" />'+"\n"+
+                          '<a href="#" onclick="parent.removeIpRule(this,\''+iptype+'\');return false;">Remove</a>';
+        innerDiv.appendChild(ipDiv);
     }
-    return false;
+    return;
 }
 
-function removeIpRule(iptype,num) {
+function removeIpRule(caller,iptype) {
     var frame = window.frames["choices"];
     if (frame.document.getElementById('LC_string_ipacc_inner_'+iptype)) {
         var innerDiv = frame.document.getElementById('LC_string_ipacc_inner_'+iptype);
-        for (var i=0; i<innerDiv.childNodes.length; i++) {
-            if (i==num) {
-                innerDiv.removeChild(innerDiv.childNodes[i]);
-                ipstringeval();
-                break;
+        var divToRemove = caller.closest('div');
+        if (divToRemove) {
+            innerDiv.removeChild(divToRemove);
+            ipstringeval();
+        }
+    }
+    return;
+}
+
+function gracestringeval() {
+    var items = choices.document.getElementsByName('setgrace');
+    if (items.length) {
+        if (items.length > 0) {
+            svalue = '';
+            for (var i=0; i<items.length; i++) {
+                var graceDiv = items[i].closest('div');
+                var timeSels = graceDiv.getElementsByTagName("select");
+                var total = 0;
+                if (timeSels.length) {
+                    for (var j=0; j<timeSels.length; j++) {
+                        var sname = timeSels[j].getAttribute('name');
+                        var poss = parseInt(timeSels[j].options[timeSels[j].selectedIndex].value);
+                        if (sname == 'weeks') {
+                            if ((poss > 0) && (poss <= 52)) {
+                                total += (poss * 604800);
+                            }
+                        } else if (sname == 'date') {
+                            if ((poss > 0) && (poss < 7)) {
+                                total += (poss * 86400);
+                            }
+                        } else if (sname == 'hours') {
+                            if ((poss > 0) && (poss < 24)) {
+                                total += (poss * 3600);
+                            }
+                        } else if (sname == 'minutes') {
+                            if ((poss > 0) && (poss < 60)) {
+                                total += (poss * 60);
+                            }
+                        }
+                    }
+                }
+                var inputElems = graceDiv.getElementsByTagName("input");
+                var frac = '';
+                var grad = '';
+                if (inputElems.length) {
+                    for (var j=0; j<inputElems.length; j++) {
+                        var iname = inputElems[j].getAttribute('name');
+                        if (iname == 'frac') {
+                            var ival = inputElems[j].value;
+                            ival.trim();
+                            var poss = parseFloat(ival);
+                            if ((typeof poss === 'number') && (!isNaN(poss))) {
+                                if ((poss => 0) && (poss <= 1)) {
+                                    frac = poss;
+                                }
+                            }
+                        } else if (iname == 'grad') {
+                            if (inputElems[j].checked) {
+                                grad = 1;
+                            } else {
+                                grad = 0;
+                            }
+                        }
+                    }
+                }
+                if (svalue === '') {
+                    svalue = total+':'+frac+':'+grad;
+                } else {
+                    svalue += ','+total+':'+frac+':'+grad;
+                }
             }
         }
     }
 }
 
+function graceitem(current) {
+    var gweeks = 0;
+    var gdays = 0;
+    var ghours = 0;
+    var gmins = 0;
+    var gsecs = 0;
+    var gfrac = '';
+    var checktext = '';
+    var patternGrace = /^\d+:(0|1).?\d*:(0|1)$/;
+    if ((current != '') && (current != 'undefined') && (patternGrace.test(current))) {
+        var graceItems = new Array;
+        graceItems = current.split(':');
+        gsecs=graceItems[0];
+        gweeks=Math.floor(gsecs/604800);
+        gsecs -= gweeks*604800;
+        gdays=Math.floor(gsecs/86400);
+        gsecs -= gdays*86400;
+        ghours=Math.floor(gsecs/3600);
+        gsecs -= ghours*3600;
+        gmins=Math.floor(gsecs/60);
+        gsecs -= gmins*60;
+        gfrac = graceItems[1];
+        if (graceItems[2] == 1) {
+            checktext = ' checked="checked"';
+        }
+    }
+    return '<input type="hidden" name="setgrace" value="" />'+
+           '<fieldset class="LC_grace"><legend>Time past due</legend>'+
+           '<span style="white-space:nowrap">'+intweek(gweeks)+' weeks </span>'+
+           '<span style="white-space:nowrap">'+intday(gdays)+' days </span><br />'+
+           '<span style="white-space:nowrap">'+inthour(ghours)+' hours </span>'+
+           '<span style="white-space:nowrap">'+intminute(gmins)+' mins </span>'+
+           '</fieldset><fieldset class="LC_grace"><legend>Partial Credit</legend>'+
+           '<input type="text" size="3" name="frac" value="'+gfrac+'" onblur="parent.gracestringeval();" />'+
+           '&nbsp;&nbsp;<label><input type="checkbox" value="1" name="grad"'+checktext+' onclick="parent.gracestringeval();" />'+
+           'gradual</label></fieldset>'+
+           '<a href="#" onclick="parent.removeGrace(this);return false;">Remove</a><hr />';
+}
+
+function addGrace() {
+    var frame = window.frames["choices"];
+    if (frame.document.getElementById('LC_string_grace_inner')) {
+        var innerDiv = frame.document.getElementById('LC_string_grace_inner');
+        var graceDiv = frame.document.createElement('div');
+        graceDiv.innerHTML = graceitem();
+        innerDiv.appendChild(graceDiv);
+    }
+    return;
+}
+
+function removeGrace(caller) {
+    var frame = window.frames["choices"];
+    if (frame.document.getElementById('LC_string_grace_inner')) {
+        var innerDiv = frame.document.getElementById('LC_string_grace_inner');
+        var divToRemove = caller.closest('div');
+        if (divToRemove) {
+            innerDiv.removeChild(divToRemove);
+            gracestringeval();
+        }
+    }
+    return;
+}
+
 function radiostringeval(newval) {
    svalue=newval;
    draw();
@@ -579,7 +879,8 @@ function lenienteval(newval) {
         }
         var patternRelWeight = /^\-?[\d.]+$/;
         var sform=choices.document.forms.sch;
-        if ((sform.lenientrelwt.length != 'undefined')  && (sform.lenientrelwt.length) != 'null') {
+        var relwtlength = sform.lenientrelwt.length;
+        if ((relwtlength != '') && (typeof(relwtlength) != 'undefined')) {
             for (var i=0; i<sform.lenientrelwt.length; i++) {
                 var relweight = sform.lenientrelwt[i].value;
                 relweight = relweight.replace(/^\s+|\s+$/g,'');
@@ -653,6 +954,8 @@ function draw() {
    if (ptype=='string') {
       if (pscat == 'ip') {
           choicewrite(' action="javascript:ipstringeval();"');
+      } else if (pscat == 'grace') {
+          choicewrite(' action="javascript:gracestringeval();"');
       } else {
           choicewrite(' action="javascript:stringeval();"');
       }
@@ -870,7 +1173,7 @@ function draw() {
    }
 
    if (ptype=='string') {
-        if ((pscat=='any') || (pscat=='') || (pscat=='default') ||  
+        if ((pscat=='any') || (pscat=='') || (pscat=='default') || 
             (typeof(pscat)=='undefined')) {
            tablestart('Text');
            choicewrite('<tr><td>Value:</td><td colspan="2">');
@@ -1035,15 +1338,27 @@ function draw() {
            if (svalue=='no') { choicewrite(' checked="checked"'); }
            choicewrite(' /> No</label><br />');
         }
+        if (pscat=='tex') {
+           tablestart('TeX file display');
+           choicewrite('<tr><td>Value:</td><td colspan="2">');
+           choicewrite('<label><input name="stringval" value="tth"'+
+                  ' type="radio" '+callradiostringeval('tth'));
+           if (svalue=='tth') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> tth (TeX to HTML)</label><br />');
+           choicewrite('<label><input name="stringval" value="mathjax"'+
+                  ' type="radio" '+callradiostringeval('mathjax'));
+           if (svalue=='mathjax') { choicewrite(' checked="checked"'); }
+           choicewrite(' /> MathJax</label><br />');
+        }
         if (pscat=='ip') {
-            var currallow = new Array; 
+            var currallow = new Array;
             var currdeny = new Array;
-            if ((svalue != '') && (svalue != null)) {
+            if ((svalue != '') && (typeof(svalue) != 'undefined')) {
                 var patternComma = /,/;
                 var patternAllow = /^([\[\]a-zA-Z\.\d\*\-]+)$/;
                 var patternDeny = /^\!([\[\]a-zA-Z\.\d\*\-]+)$/;
                 var current = new Array;
-                if (patternComma.test(svalue)) {  
+                if (patternComma.test(svalue)) {
                     current = svalue.split(',');
                 } else {
                     current = [svalue];
@@ -1055,7 +1370,7 @@ function draw() {
                     } else {
                         if (patternAllow.test(current[i])) {
                             currallow.push(current[i]);
-                        } 
+                        }
                     }
                 }
             }
@@ -1067,20 +1382,20 @@ function draw() {
             }
             var curripaccess = [currallow,currdeny];
             tablestart('IP Number/Name');
-            choicewrite('<tr><th>Allow from</th><th>Deny from</th></tr><tr>');
+            choicewrite('<tr><th>Allow from</th><th>Deny from</th></tr><tr>'+"\n");
             var acctypes = ['allow','deny'];
             for (var i=0; i<acctypes.length; i++) {
-                choicewrite('<td valign="top">'+
-                            '<div class="LC_string_ipacc_wrap" id="LC_string_ipacc_'+acctypes[i]+'">'+
-                            '<div class="LC_string_ipacc_inner" id="LC_string_ipacc_inner_'+acctypes[i]+'">');
+                choicewrite(['<td valign="top">',
+                             '<div>',
+                             '<div id="LC_string_ipacc_inner_'+acctypes[i]+'">'].join("\n"));
                 for (var j=0; j<curripaccess[i].length; j++) {
-                    choicewrite('<div><input type="text" size="10" name="setip'+acctypes[i]+'" value="'+curripaccess[i][j]+'" onblur="parent.ipstringeval();" />');
-                    choicewrite('<a href="#" onclick="parent.removeIpRule(\''+acctypes[i]+'\',\''+j+'\')">Remove</a>');
-                    choicewrite('</div>');
+                    choicewrite(['<div><input type="text" size="12" name="setip'+acctypes[i]+'" value="'+curripaccess[i][j]+'" onblur="parent.ipstringeval();" />',
+                                 '<a href="#" onclick="parent.removeIpRule(this,\''+acctypes[i]+'\');return false;">Remove</a>',
+                                 '</div>'].join("\n"));
                 }
-                choicewrite('</div><button onclick="parent.addIpRule(\''+acctypes[i]+'\');">Add item</button>');
+                choicewrite('</div><button onclick="parent.addIpRule(\''+acctypes[i]+'\');return false;">Add item</button>'+"\n");
             }
-            choicewrite('</div></td></tr></table>');
+            choicewrite('</div></td></tr></table>'+"\n");
         }
         if (pscat=='fileext') {
             tablestart('Allowed File Extensions');
@@ -1124,26 +1439,57 @@ 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:\d+|ltid:\d+|key:[a-zA-Z\d_.!@#$%^&*()+=-]+)$/;
+           var linkexitparts = new Array();
+           var dlinkexitRegExp = /^(yes|url|no)(|:[^:,;'"]+)$/;
            var dlinkkeysty = 'hidden';
-           var dlinkltidivsty = 'none';
            var dlinkkeyval = '';
-           if ((svalue != '') && (svalue != null)) {
+           var dlinklticdivsty = 'none';
+           var dlinkltiddivsty = 'none';
+           var dlinkmenusdivsty = 'none';
+           var dlinkexitdivsty = 'none';
+           var dlinkexittextval = '';
+           if ((svalue != '') && (typeof(svalue) != 'undefined')) {
                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';
+               }
+               if (dlinkexitRegExp.test(deeplinkvals[7])) {
+                   linkexitparts = deeplinkvals[7].split(':');
+                   deeplinkvals[7] = linkexitparts[0];
+                   if (deeplinkvals[7] != 'no') {
+                       dlinkexitdivsty = 'inline-block'; 
+                       if (!linkexitparts[1]) {
+                           dlinkexittextval = 'Exit Tool';
+                       } else {
+                           dlinkexittextval = linkexitparts[1];
+                       }
                    }
                }
            } else {
-               deeplinkvals = ['full','res','any'];
+               deeplinkvals = ['off','unhide','full','res','','0','_self','no'];
            }
+           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,93 +1498,256 @@ 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'];
+           var deeplinkexit = ['yes','url','no'];
            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 />');
-           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 possmenus = new Array();
+           if ((pextra != '') && (typeof(pextra) != 'undefined')) {
+               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 (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 />');
                            }
-                           if (ltinums.length > 1) {
-                               choicewrite('<option value=""'+sel+'>Please select</option>');
+                       }
+                   } 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]);
                            }
-                           for (var i=0; i<ltinums.length; i++) {
-                               sel = '';
-                               if (deeplinkvals[2]=='lti') {
-                                   if (linktypeparts.length) {
-                                       if (ltinums[i] == linktypeparts[1]) {
-                                           sel = ' selected="selected"';
+                           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>');
+           choicewrite('<tr><td>Exit Button?</td><td>');
+           choicewrite('<span style="white-space: nowrap;"><label>');
+           choicewrite('<input name="deeplinkexit" value="no"'+
+                  ' type="radio" '+calldeeplink('exit'));
+           if (deeplinkvals[7]=='no') { choicewrite(' checked="checked"'); }
+           choicewrite(' />not in use</label></span><br />');
+           choicewrite('<span style="white-space: nowrap;"><label>');
+           choicewrite('<input name="deeplinkexit" value="yes"'+
+                  ' type="radio" '+calldeeplink('exit'));
+           if (deeplinkvals[7]=='yes') { choicewrite(' checked="checked"'); }
+           choicewrite(' />in use, no redirect</label></span> ');
+           choicewrite('<span style="white-space: nowrap;"><label>');
+           choicewrite('<input name="deeplinkexit" value="url"'+
+                  ' type="radio" '+calldeeplink('exit'));
+           if (deeplinkvals[7]=='url') { choicewrite(' checked="checked"'); }
+           choicewrite(' />in use, redirect to URL</label></span><br />');
+           choicewrite('<div id="deeplinkexitdiv" style="display:'+dlinkexitdivsty+'">');
+           choicewrite('<br /><span style="white-space: nowrap;">Button text:&nbsp;');
+           choicewrite('<input type="text" name="deeplinkexittext" id="deeplinkexittext" value="'+dlinkexittextval+'" size="10" />');
+           choicewrite('</span></div>');
            choicewrite('</td></tr></table>');
        }
+       if (pscat=='grace') {
+           tablestart('Grace period after due date');
+           choicewrite('<tr><td colspan="3" valign="top">'+
+                       '<div id="LC_string_grace_wrap">'+
+                       '<div id="LC_string_grace_inner">');
+           if ((svalue != '') && (typeof(svalue) != 'undefined')) {
+               var patternComma = /,/;
+               var patternGrace = /^\d+:(0|1).?\d*:(0|1)$/;
+               var current = new Array;
+               if (patternComma.test(svalue)) {
+                   current = svalue.split(',');
+               } else {
+                   current = [svalue];
+               } 
+               for (var i=0; i<current.length; i++) {
+                   if (patternGrace.test(current[i])) {
+                       choicewrite('<div>');
+                       choicewrite(graceitem(current[i]));
+                       choicewrite('</div>');
+                   }
+               }
+           } else {
+               choicewrite('<div>');
+               choicewrite(graceitem());
+               choicewrite('</div>');
+           }
+           choicewrite('</div><button onclick="parent.addGrace();return false;">Add another?</button>');
+           choicewrite('</div></td></tr></table>');
+       }
    }
 
    if (ptype=='color') {
@@ -1414,6 +1923,7 @@ function init() {
           }
       }
   }
+  psmap = ismap;
 
 
   if (ptype=='date' && pscat == 'interval') {
@@ -1566,6 +2076,8 @@ function init() {
      else if (pscat == 'fileext')      { sopt('fileext','File Extension'); }
      else if (pscat == 'useslots')     { sopt('useslots','Slots control access'); }
      else if (pscat == 'deeplink')     { sopt('deeplink','Deep-linked items'); }
+     else if (pscat == 'tex')          { sopt('texdisplay','TeX File Display'); }
+     else if (pscat == 'grace')        { sopt('grace','Grace period'); }
      else { pscat = 'any'; }
      if (pscat != 'deeplink') { sopt('any','String Value'); }
   }
@@ -1588,7 +2100,7 @@ function init() {
           if (precursive != 1) {
               selwrite('checked="checked" ');
           }
-          selwrite('onclick="parent.recursechange();" />No</label>'); 
+          selwrite('onclick="parent.recursechange();" />No</label>');
           selwrite('</form><br />');
       }
   }
@@ -1628,15 +2140,29 @@ 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,*";
+      }
+  }
+  if (pscat == 'grace')  {
+      if (psmap==1) {
+          document.getElementById("LCparampopup").rows="105,*";
+      } else {
+          document.getElementById("LCparampopup").rows="65,*";
+      }
+  }
   draw();
-  
+ 
 }
 
 // ]]>
 </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>