--- loncom/interface/lonextresedit.pm	2023/07/11 23:17:40	1.8.2.4.4.3
+++ loncom/interface/lonextresedit.pm	2025/03/15 01:03:33	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: lonextresedit.pm,v 1.8.2.4.4.3 2023/07/11 23:17:40 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.36 2025/03/15 01:03:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -284,10 +284,8 @@ sub process_changes {
                 if ($ferr) {
                     $errormsg = &mt('Reload failed: [_1].',$ferr);
                 } else {
-                    unless ($supplementalflag) {
-                        &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,
-                                                                       $cdom.'_'.$cnum);
-                    }
+                    &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,
+                                                                   $cdom.'_'.$cnum);
                 }
             }
             if (($type eq 'tool') && ($newgradable)) {
@@ -311,12 +309,13 @@ sub update_exttool {
     my ($marker,$cdom,$cnum,$supplementalflag,$args) = @_;
     my (%newhash,$changed,$newgradable,@deleted,$errormsg);
     ($newhash{'target'},$newhash{'width'},$newhash{'height'},$newhash{'linktext'},$newhash{'explanation'},
-     $newhash{'crslabel'},$newhash{'crstitle'},$newhash{'crsappend'},$newhash{'gradable'}) = split(/:/,$args);
-    foreach my $item ('linktext','explanation','crslabel','crstitle','crsappend') {
+     $newhash{'crslabel'},$newhash{'crstitle'},$newhash{'crsappend'},$newhash{'gradable'},
+     $newhash{'returnurl'},$newhash{'backtourl'}) = split(/:/,$args);
+    foreach my $item ('linktext','explanation','crslabel','crstitle','crsappend','backtourl') {
         $newhash{$item} = &unescape($newhash{$item});
     }
     my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
-    foreach my $item ('target','width','height','linktext','explanation','crslabel','crstitle','crsappend','gradable') {
+    foreach my $item ('target','width','height','linktext','explanation','crslabel','crstitle','crsappend','gradable','returnurl','backtourl') {
         $newhash{$item} =~ s/^\s+//;
         $newhash{$item} =~ s/\s+$//;
         if (($item eq 'width') || ($item eq 'height') || ($item eq 'linktext') || ($item eq 'explanation')) {
@@ -331,6 +330,10 @@ sub update_exttool {
             unless ($newhash{$item} == 1) {
                 $newhash{$item} = '';
             }
+        } elsif ($item eq 'backtourl') {
+            unless ($newhash{'returnurl'} eq 'custom') {
+                $newhash{$item} = '';
+            }
         }
         if ($toolhash{$item} ne $newhash{$item}) {
             if (($item eq 'gradable') && (!$supplementalflag)) {
@@ -354,7 +357,7 @@ sub update_exttool {
                 }
             } else {
                 $toolhash{$item} = $newhash{$item};
-                $changed = 1; 
+                $changed = 1;
             }
         }
     }
@@ -398,16 +401,17 @@ sub extedit_form {
     }
     my ($formname,$formid,$toggle,$fieldsetid,$urlid,$subdivid,$dispdivstyle,$dimendivstyle,
         $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,
-        $appendstyle,$gradablestyle,$subdivstyle,$legend,$urlelem,$toolelem,%toolattr);
+        $appendstyle,$gradablestyle,$returnurlstyle,$subdivstyle,$legend,$urlelem,
+        $toolelem,%toolattr);
     $formname = 'new'.$type;
     $toggle = $type;
-    $fieldsetid = 'upload'.$type.'form';
+    $fieldsetid = 'external'.$type.'form';
     $urlid = $type.'url';
     map { $toolattr{$_} = $type.$_; } ('dispdiv','dimendiv','dimenwidth','dimenheight',
                                        'crstitlediv','crslabeldiv','crsappenddiv',
-                                       'gradablediv','crstitle','crslabel','crsappend',
-                                       'windiv','linktextdiv','explanationdiv',
-                                       'linktext','explanation','providerurl');
+                                       'gradablediv','returnurldiv','crstitle','crslabel',
+                                       'crsappend','windiv','linktextdiv','explanationdiv',
+                                       'linktext','explanation','providerurl','customreturnurl');
     $dispdivstyle = 'display:none';
     $dimendivstyle = 'display:none';
     $windivstyle = 'display:none';
@@ -417,17 +421,19 @@ sub extedit_form {
     $titlestyle = 'display:none';
     $appendstyle = 'display:none';
     $gradablestyle = 'display:none';
+    $returnurlstyle = 'display:none';
     $subdivstyle = 'display:block';
     if ($supplementalflag) {
         $formname = 'newsupp'.$type;
         $toggle = 'supp'.$type;
-        $fieldsetid = 'uploadsupp'.$type.'form';
+        $fieldsetid = 'externalsupp'.$type.'form';
         $urlid = 'supp'.$type.'url';
         map { $toolattr{$_} = 'supp'.$toolattr{$_}; } (keys(%toolattr));
     }
     my ($link,$legend,$active,$srcclass,$extsrc,$preview,$title,$save,$crstitle,$crslabel,
         $crsappend,$fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,
-        $linktext,$explanation,$providerurl,$chkgrd,$chknogrd,%chkstate);
+        $linktext,$explanation,$providerurl,$returnurl,$chkgrd,$chknogrd,%chkstate,
+        $chknoreturn,$chkreturndef,$chkreturncust,$customreturn,$backtourl);
     $fieldsetstyle = 'display: none;';
     $action = '/adm/coursedocs';
     my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
@@ -459,7 +465,7 @@ sub extedit_form {
             $active = '<input type="hidden" name="active" value="'.$tabid.'" />';
         }
         $formname = 'edit'.$type.'_'.$residx;
-        $fieldsetid = 'upload'.$type.$residx;
+        $fieldsetid = 'external'.$type.$residx;
         $urlid = $type.'url_'.$residx;
         map { $toolattr{$_} .= '_'.$residx; } (keys(%toolattr));
         $srcclass = ' class="LC_nobreak"';
@@ -474,7 +480,7 @@ sub extedit_form {
         if ($type eq 'tool') {
             $link = $lt{'et'};
         }
-        $link = '<a class="LC_menubuttons_link" href="javascript:toggleUpload('."'$toggle'".');">'.$link.'</a>'.$helpitem;
+        $link = '<a class="LC_menubuttons_link" href="javascript:toggleExternal('."'$toggle'".');">'.$link.'</a>'.$helpitem;
         if ($type eq 'tool') {
             $legend = $lt{'te'};
         } else {
@@ -578,6 +584,21 @@ sub extedit_form {
                         if ($ltihash->{'crsconf'}->{'explanation'}) {
                             $explanationstyle = 'padding:0;display:inline';
                         }
+                        if ($ltihash->{'crsconf'}->{'returnurl'}) {
+                            $returnurl = $toolhash{'returnurl'};
+                            $returnurlstyle = 'display:inline';
+                            $backtourl = $toolhash{'backtourl'};
+                            if ($returnurl eq 'none') {
+                                $chknoreturn = ' checked="checked"';
+                                $customreturn = 'hidden';
+                            } elsif (($returnurl eq 'custom') && ($backtourl ne '')) {
+                                $chkreturncust = ' checked="checked"';
+                                $customreturn = 'text';
+                            } else {
+                                $chkreturndef = ' checked="checked"';
+                                $customreturn = 'hidden';
+                            }
+                        }
                     }
                     $toolelem = '<span class="LC_nobreak">'.$image.'&nbsp;'.$tooltitle.'</span><br />';
                     $gradablestyle = 'display:inline';
@@ -660,8 +681,15 @@ sub extedit_form {
             $crslabel = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'};
             $crstitle = $env{'course.'.$cdom.'_'.$cnum.'.description'};
             $crsappend = '';
+            $returnurl = '';
+            $backtourl = '';
+            $customreturn = 'hidden';
             $chknogrd = ' checked="checked"';
+            $chknoreturn = '';
+            $chkreturndef = ' checked="checked"';
+            $chkreturncust = '';
         }
+        my $onclickreturl = ' onclick="updateReturnUrl('."this.form,'$toolattr{'customreturnurl'}','$toolattr{'returnurldiv'}','exttoolreturnurl'".');"';
         $toolelem .= '<div id="'.$toolattr{'dispdiv'}.'" style="'.$dispdivstyle.'">'.
                     '<span class="'.$class.'">'.&mt('Display target:').'&nbsp;'.
                     '<label><input type="radio" name="exttooltarget" value="iframe" '.$chkstate{'iframe'}.'onclick="updateTooldim(this.form,'.
@@ -689,30 +717,42 @@ sub extedit_form {
         $toolelem .= '<div id="'.$toolattr{'crslabeldiv'}.'" style="'.$labelstyle.'">'.
                     '<span class="'.$class.'">'.&mt('Course label:').'&nbsp;'.
                     '<input type="text" id="'.$toolattr{'crslabel'}.'" name="exttoollabel" value="'.$crslabel.'"'.$disabled.' /></span><br />'.
-                    '</div>'.
+                    '</div>'."\n".
                     '<div id="'.$toolattr{'crstitlediv'}.'" style="'.$titlestyle.'">'.
                     '<span class="'.$class.'">'.&mt('Course title:').'&nbsp;'.
                     '<input type="text" id="'.$toolattr{'crstitle'}.'" name="exttooltitle" value="'.$crstitle.'"'.$disabled.' /></span><br />'.
-                    '</div>'.
+                    '</div>'."\n".
                     '<div id="'.$toolattr{'crsappenddiv'}.'" style="'.$appendstyle.'">'.
                     '<span class="'.$class.'">'.&mt('Append to URL[_1]',
                     '<span id="'.$toolattr{'providerurl'}.'">&nbsp;('.$providerurl.')<br /></span>').
                     '<input type="text" id="'.$toolattr{'crsappend'}.'" size="30" name="exttoolappend" value="'.$crsappend.'"'.$disabled.' /></span><br />'.
-                    '</div>'.
+                    '</div>'."\n".
                     '<div id="'.$toolattr{'gradablediv'}.'" style="'.$gradablestyle.'">'.
                     '<span class="'.$class.'">'.&mt('Gradable').'&nbsp;'.
                     '<label><input type="radio" name="exttoolgradable" value="1"'.$chkgrd.$disabled.
                     ' />'.&mt('Yes').'</label>'.('&nbsp;'x2).
                     '<label><input type="radio" name="exttoolgradable" value="0"'.$chknogrd.$disabled.
-                    ' />'.&mt('No').'</label></span></div>';
+                    ' />'.&mt('No').'</label></span><br /></div>'."\n".
+                    '<div id="'.$toolattr{'returnurldiv'}.'" style="'.$returnurlstyle.'">'.
+                    '<span class="'.$class.'">'.&mt('Include return URL').':&nbsp;'.
+                    '<label><input type="radio" name="exttoolreturnurl" value="none"'.$chknoreturn.$disabled.$onclickreturl.' />'.
+                    &mt('No').'</label>'.('&nbsp;'x2).
+                    '<label><input type="radio" name="exttoolreturnurl" value="default"'.$chkreturndef.$disabled.$onclickreturl.' />'.
+                    &mt('Yes, default URL').'</label>'.('&nbsp;'x2).
+                    '<label><input type="radio" name="exttoolreturnurl" value="custom"'.$chkreturncust.$disabled.$onclickreturl.' />'.
+                    &mt('Yes, specify URL').'</label></span><br />'."\n".
+                    '<input type="'.$customreturn.'" id="'.$toolattr{'customreturnurl'}.'" size="35" name="exttoolbacktourl" value="'.$backtourl.'"'.$disabled.' />'.
+                    '</div>'."\n";
     }
     my $chooser = $toolelem;
     if ($type eq 'ext') {
         $chooser = "
 <div>
 <span$srcclass>
+<label>
 $extsrc
 $urlelem
+</label>
 $preview
 </span>
 </div>
@@ -730,8 +770,10 @@ $active
 $chooser
 <div $idattr style="$subdivstyle">
 <span$srcclass>
+<label>
 $title
 <input type="text" size="$size" name="exttitle" value="$orig_title" $disabled />
+</label>
 <input type="hidden" name="importdetail" value="" />
 $pathitem
 $hiddenelem
@@ -840,7 +882,8 @@ sub extedit_javascript {
                    "        var ltitoolsExplain = new Array();\n".
                    "        var ltitoolsLabel = new Array();\n".
                    "        var ltitoolsTitle = new Array();\n".
-                   "        var ltitoolsAppend = new Array();\n";
+                   "        var ltitoolsAppend = new Array();\n".
+                   "        var ltitoolsReturnUrl = new Array();\n";
         $exttoolnums = "        var ltitoolsnum = new Array();\n".
                        "        var tooloptval = new Array();\n".
                        "        var toolopttxt = new Array();\n";
@@ -860,7 +903,8 @@ sub extedit_javascript {
                             "        ltitoolsExplain[$idx] = new Array($num);\n".
                             "        ltitoolsLabel[$idx] = new Array($num);\n".
                             "        ltitoolsTitle[$idx] = new Array($num);\n".
-                            "        ltitoolsAppend[$idx] = new Array($num);\n";
+                            "        ltitoolsAppend[$idx] = new Array($num);\n".
+                            "        ltitoolsReturnUrl[$idx] = new Array($num);\n";
                 my $i=0;
                 foreach my $key (sort { $a <=> $b } keys(%{$toolsref->{$type}})) {
                     if (ref($toolsref->{$type}->{$key}) eq 'HASH') {
@@ -899,6 +943,8 @@ sub extedit_javascript {
                             $toolsjs .= "         ltitoolsTitle[$idx][$i] = '$title';\n";
                             my $append = $toolsref->{$type}->{$key}->{'crsconf'}->{'append'};
                             $toolsjs .= "         ltitoolsAppend[$idx][$i] = '$append';\n";
+                            my $returnurl = $toolsref->{$type}->{$key}->{'crsconf'}->{'returnurl'};
+                            $toolsjs .= "         ltitoolsReturnUrl[$idx][$i] = '$returnurl';\n";
                         }
                     }
                     $i++;
@@ -1056,10 +1102,12 @@ function setExternal(extform,residx,type
         var labelinput = prefix+'toolcrslabel';
         var titleinput = prefix+'toolcrstitle';
         var appendinput = prefix+'toolcrsappend';
+        var customreturnurl = prefix+'customreturnurl';
         if (residx > 0) {
             labelinput += '_'+residx;
             titleinput += '_'+residx;
             appendinput += '_'+residx;
+            customreturnurl += '_'+residx;
         }
         if (document.getElementById(labelinput)) {
             var crslabel = document.getElementById(labelinput).value;
@@ -1108,6 +1156,33 @@ function setExternal(extform,residx,type
         } else {
             info += ':';
         }
+        var returnurldiv = prefix+'toolreturnurldiv';
+        if (residx > 0) {
+            returnurldiv += '_'+residx;
+        }
+        if (document.getElementById(returnurldiv)) {
+            if (document.getElementById(returnurldiv).style.display == 'inline') {
+                if (extform.exttoolreturnurl.length) {
+                    for (var i=0; i<extform.exttoolreturnurl.length; i++) {
+                        if (extform.exttoolreturnurl[i].checked) {
+                            if (extform.exttoolreturnurl[i].value == 'custom') {
+                                var backtourl = extform.exttoolbacktourl.value;
+                                backtourl.trim();
+                                info += ':custom:'+escape(backtourl);
+                            } else if (extform.exttoolreturnurl[i].value == 'default') {
+                                info += ':default:';
+                            } else {
+                                info += ':none:';
+                            }
+                        }
+                    }
+                }
+            } else {
+                info += '::';
+            }
+        } else {
+            info += '::';
+        }
         info=escape(info);
         if (residx > 0) {
             eval("extform.importdetail.value=title+'='+info+'='+residx;extform.submit();");
@@ -1118,14 +1193,14 @@ function setExternal(extform,residx,type
 }
 
 function editext(residx,type) {
-    if (document.getElementById('upload'+type+residx)) {
-        var curr = document.getElementById('upload'+type+residx).style.display;
+    if (document.getElementById('external'+type+residx)) {
+        var curr = document.getElementById('external'+type+residx).style.display;
         if (curr == 'none') {
             disp = 'block';
         } else {
             disp = 'none';
         }
-        document.getElementById('upload'+type+residx).style.display=disp;
+        document.getElementById('external'+type+residx).style.display=disp;
     }
     resize_scrollbox('contentscroll','1','1');
     return;
@@ -1290,6 +1365,7 @@ function updateExttool(caller,form,suppl
     titlediv = prefix+'toolcrstitlediv';
     appenddiv = prefix+'toolcrsappenddiv';
     gradablediv = prefix+'toolgradablediv';
+    returnurldiv = prefix+'toolreturnurldiv';
     providerurl = prefix+'toolproviderurl';
     labelinput = prefix+'toolcrslabel';
     titleinput = prefix+'toolcrstitle';
@@ -1330,6 +1406,9 @@ function updateExttool(caller,form,suppl
             if (document.getElementById(gradablediv)) {
                 document.getElementById(gradablediv).style.display = 'none';
             }
+            if (document.getElementById(returnurldiv)) {
+                document.getElementById(returnurldiv).style.display = 'none';
+            }
         } else {
             var tooltype = '';
             var typeelem = form.elements[prefix+'exttooltype'];
@@ -1447,6 +1526,13 @@ function updateExttool(caller,form,suppl
                                     document.getElementById(gradablediv).style.display = 'inline';
                                 }
                             }
+                            if (document.getElementById(returnurldiv)) {
+                                if (ltitoolsReturnUrl[i][j]) {
+                                    document.getElementById(returnurldiv).style.display = 'inline';
+                                } else {
+                                    document.getElementById(returnurldiv).style.display = 'none';
+                                }
+                            }
                             break;
                         }
                     }
@@ -1456,6 +1542,30 @@ function updateExttool(caller,form,suppl
     }
 }
 
+function updateReturnUrl(form,typeid,divid,radioname) {
+    if ((document.getElementById(typeid)) &&
+       (document.getElementById(divid))) {
+        if (document.getElementById(divid).style.display == 'inline') {
+            var radelem = form.elements[radioname];
+            var inputtype = 'hidden';
+            if (radelem.length) {
+                for (var i=0; i<radelem.length; i++) {
+                    if (radelem[i].checked) {
+                        if (radelem[i].value == 'custom') {
+                            inputtype = 'text';
+                        } else {
+                            inputtype = 'hidden';
+                        }
+                        break;
+                    }
+                }
+            }
+            document.getElementById(typeid).type = inputtype;
+        }
+    }
+    return;
+}
+
 function updateTooldim(form,dimendiv,windiv,widthinput,heightinput,linkinput,explaininput) {
     if (form.exttooltarget.length) {
         for (var i=0; i<form.exttooltarget.length; i++) {