--- rat/client/parameter.html	2022/05/27 17:58:03	1.64.2.5.2.2
+++ rat/client/parameter.html	2022/07/08 16:38:03	1.64.2.5.2.3
@@ -5,7 +5,7 @@
 The LearningOnline Network with CAPA
 Parameter Input Window
 //
-// $Id: parameter.html,v 1.64.2.5.2.2 2022/05/27 17:58:03 raeburn Exp $
+// $Id: parameter.html,v 1.64.2.5.2.3 2022/07/08 16:38:03 raeburn Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -396,8 +396,8 @@ 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)) {
+                    var keyval = sform.donebutton_proctorkey.value;
+                    if ((keyval == '') || (typeof(keyval) == 'undefined')) {  
                         alert('Please provide a key for a proctor to enter when a student uses the "Done" button.');
                         return;
                     }
@@ -417,6 +417,7 @@ function validateDeepLink() {
     svalue += sform.deeplinkacc.options[sform.deeplinkacc.selectedIndex].value+',';
     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) {
@@ -473,6 +474,30 @@ function validateDeepLink() {
     }
     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;
+            }
+        }
+    }
     assemble();
 }
 
@@ -522,6 +547,26 @@ function toggleDeepLink(caller) {
             }
         }
     }
+    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;
+            }
+        }
+    }
 }
 
 function calldeeplink(caller) {
@@ -1022,7 +1067,7 @@ function draw() {
         if (pscat=='ip') {
             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\*\-]+)$/;
@@ -1109,13 +1154,17 @@ function draw() {
        if (pscat=='deeplink') {
            var deeplinkvals = new Array();
            var linkprotectparts = new Array();
-           var ltikeyRegExp = /^(ltic|ltid|key):(\w+)$/;
+           var ltikeyRegExp = /^(ltic:\d+|ltid:\d+|key:[a-zA-Z\d_.!@#$%^&*()+=-]+)$/;
+           var linkexitparts = new Array();
+           var dlinkexitRegExp = /^(yes|url|no)(|:[^:,;'"]+)$/;
            var dlinkkeysty = 'hidden';
            var dlinkkeyval = '';
            var dlinklticdivsty = 'none';
            var dlinkltiddivsty = 'none';
            var dlinkmenusdivsty = 'none';
-           if ((svalue != '') && (svalue != null)) {
+           var dlinkexitdivsty = 'none';
+           var dlinkexittextval = '';
+           if ((svalue != '') && (typeof(svalue) != 'undefined')) {    
                deeplinkvals = svalue.split(',');
                if (ltikeyRegExp.test(deeplinkvals[4])) {
                    linkprotectparts = deeplinkvals[4].split(':');
@@ -1132,8 +1181,20 @@ function draw() {
                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 = ['off','unhide','full','res','','0'];
+               deeplinkvals = ['off','unhide','full','res','','0','_self','no'];
            }
            var deeplinkstate = new Array();
            deeplinkstate = ['only','off','both'];
@@ -1157,6 +1218,7 @@ function draw() {
            deeplinktarget = ['_self','_top'];
            var deeplinktargettxt = new Array();
            deeplinktargettxt = ['Embedded','Not embedded'];
+           var deeplinkexit = ['yes','url','no'];
            tablestart('Deep-linked items');
            choicewrite('<tr><td>Access status?</td><td>');
            choicewrite('<select name="deeplinkstate">');
@@ -1212,7 +1274,7 @@ function draw() {
            choicewrite('</span><br />');
 
            var possmenus = new Array();
-           if ((pextra != '') && (pextra != null)) {
+           if ((pextra != '') && (typeof(pextra) != 'undefined')) {
                var lticRegExp = /^ltic_/;
                var ltidRegExp = /^ltid_/;
                var menusRegExp = /^menus_/;
@@ -1348,6 +1410,27 @@ function draw() {
                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>');
        }
    }