--- loncom/interface/lonextresedit.pm	2023/05/22 21:10:55	1.31
+++ loncom/interface/lonextresedit.pm	2025/06/14 02:50:25	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: lonextresedit.pm,v 1.31 2023/05/22 21:10:55 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.37 2025/06/14 02:50:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -109,7 +109,7 @@ sub handler {
         %ltitools = (
                       dom => \%domtools,
                       crs => \%crstools,
-                    );  
+                    );
     }
     my $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript());
     my $pathitem = '<input type="hidden" name="folderpath" value="'.
@@ -309,12 +309,33 @@ 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'},$newhash{'desturl'},$newhash{'delay'}) = split(/:/,$args);
+    foreach my $item ('linktext','explanation','crslabel','crstitle','crsappend','backtourl','desturl','delay') {
         $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') {
+    my ($tooltype,$tool,$ltihash);
+    if ($toolhash{'id'} =~/^c(\d+)$/) {
+        $tool = $1;
+        $tooltype = 'crs';
+    } elsif ($toolhash{'id'} =~/^\d+$/) {
+        $tooltype = 'dom';
+        $tool = $toolhash{'id'};
+    }
+    if (($tool ne '') && ($tooltype ne '')) {
+        my %tools;
+        my %tooltypes = &Apache::loncommon::usable_exttools();
+        if ($tooltypes{$tooltype}) {
+            if ($tooltype eq 'dom') {
+                %tools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
+            } elsif ($tooltypes{'crs'}) {
+                %tools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer');
+            }
+            $ltihash = $tools{$tool};
+        }
+    }
+    foreach my $item ('target','width','height','linktext','explanation','crslabel','crstitle','crsappend','gradable','returnurl','backtourl','desturl','delay') {
         $newhash{$item} =~ s/^\s+//;
         $newhash{$item} =~ s/\s+$//;
         if (($item eq 'width') || ($item eq 'height') || ($item eq 'linktext') || ($item eq 'explanation')) {
@@ -329,6 +350,26 @@ sub update_exttool {
             unless ($newhash{$item} == 1) {
                 $newhash{$item} = '';
             }
+        } elsif ($item eq 'backtourl') {
+            unless ($newhash{'returnurl'} eq 'custom') {
+                $newhash{$item} = '';
+            }
+        } elsif ($item eq 'desturl') {
+            my $nocrsdest = 1;
+            if ((ref($ltihash) eq 'HASH') && (ref($ltihash->{'crsconf'}) eq 'HASH') &&
+                ($ltihash->{'crsconf'}->{'desturl'})) {
+                undef($nocrsdest);
+            }
+            if ($nocrsdest) {
+                $newhash{$item} = '';
+            }
+        } elsif ($item eq 'delay') {
+            if ($newhash{'desturl'} eq '') {
+                $newhash{$item} = '';
+	    }
+            unless ($newhash{$item} =~ /^(\d+\.?\d*)$/) {
+                $newhash{$item} = '';
+            }
         }
         if ($toolhash{$item} ne $newhash{$item}) {
             if (($item eq 'gradable') && (!$supplementalflag)) {
@@ -352,7 +393,7 @@ sub update_exttool {
                 }
             } else {
                 $toolhash{$item} = $newhash{$item};
-                $changed = 1; 
+                $changed = 1;
             }
         }
     }
@@ -395,17 +436,20 @@ sub extedit_form {
         $tabid = 'ee';
     }
     my ($formname,$formid,$toggle,$fieldsetid,$urlid,$subdivid,$dispdivstyle,$dimendivstyle,
-        $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,
-        $appendstyle,$gradablestyle,$subdivstyle,$legend,$urlelem,$toolelem,%toolattr);
+        $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,$providerstyle,
+        $appendstyle,$gradablestyle,$returnurlstyle,$subdivstyle,$desturlstyle,
+	$desturlinfostyle,$desturlfixedstyle,$legend,$urlelem,$toolelem,%toolattr);
     $formname = 'new'.$type;
     $toggle = $type;
     $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','provider','providerpath','customreturnurl',
+                                       'desturl','delay','providerdiv','desturldiv','desturlinfodiv',
+                                       'desturlfixeddiv','fixeddest','fixeddelay');
     $dispdivstyle = 'display:none';
     $dimendivstyle = 'display:none';
     $windivstyle = 'display:none';
@@ -413,8 +457,13 @@ sub extedit_form {
     $explanationstyle = 'display:none';
     $labelstyle = 'display:none';
     $titlestyle = 'display:none';
+    $providerstyle = 'display:none';
     $appendstyle = 'display:none';
     $gradablestyle = 'display:none';
+    $returnurlstyle = 'display:none';
+    $desturlstyle = 'display:none';
+    $desturlinfostyle = 'display:none';
+    $desturlfixedstyle = 'display:none';
     $subdivstyle = 'display:block';
     if ($supplementalflag) {
         $formname = 'newsupp'.$type;
@@ -425,7 +474,9 @@ sub extedit_form {
     }
     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,$path,$returnurl,$chkgrd,$chknogrd,%chkstate,
+        $chknoreturn,$chkreturndef,$chkreturncust,$customreturn,$backtourl,$desturl,$delay,
+	$chknodest,$chkdest);
     $fieldsetstyle = 'display: none;';
     $action = '/adm/coursedocs';
     my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
@@ -499,6 +550,7 @@ sub extedit_form {
         $urlelem = '<input type="text" size="'.$size.'" name="exturl" id="'.$urlid.'" value="'.$orig_url.'"'.$disabled.' />';
     } else {
         my $class = 'LC_nobreak';
+        my ($nocrsdest,$fixeddest,$fixeddelay,$showprovider,$provider,$scheme);
         if ($residx) {
             $class = 'LC_docs_ext_edit LC_nobreak'; 
             if ($orig_url =~ m{^/adm/$cdom/$cnum/(\d+)/ext\.tool$}) {
@@ -508,19 +560,14 @@ sub extedit_form {
                 if ($toolhash{'id'} =~/^c(\d+)$/) {
                     $tool = $1;
                     $tooltype = 'crs';
-                    if (ref($ltitools) eq 'HASH') {
-                        if (ref($ltitools->{'crs'}) eq 'HASH') {
-                            $ltihash = $ltitools->{'crs'}->{$tool};
-                        }
-                    }
                 } elsif ($toolhash{'id'} =~/^\d+$/) {
                     $tooltype = 'dom';
                     $tool = $toolhash{'id'};
-                    if (ref($ltitools) eq 'HASH') {
-                        if (ref($ltitools->{'dom'}) eq 'HASH') {
-                            $ltihash = $ltitools->{'dom'}->{$tool};
-                        }
-                    }     
+                }
+                if (($tool ne '') && ($tooltype ne '') && (ref($ltitools) eq 'HASH')) {
+                    if (ref($ltitools->{$tooltype}) eq 'HASH') {
+                        $ltihash = $ltitools->{$tooltype}->{$tool};
+                    }
                 }
                 if (($tool ne '') && (ref($ltihash) eq 'HASH')) {
                     my $tooltitle = $ltihash->{'title'};
@@ -529,10 +576,10 @@ sub extedit_form {
                     if ($icon) {
                         $image = '<img src="'.$icon.'" alt="'.$tooltitle.'" />';
                     }
-                    if ($ltihash->{'url'} =~ m{://}) {
-                        (my $prot,my $host,$providerurl) = ($ltihash->{'url'} =~ m{^([^/]+)://([^/]+)(|/.+)$});
+                    if ($ltihash->{'url'} =~ m{^https?\://}) {
+                        ($scheme,$provider,$path) = ($ltihash->{'url'} =~ m{^(https?\://)([^/]+)(|/.+)$});
                     } else {
-                        $providerurl = $ltihash->{'url'};
+                        $path = $ltihash->{'url'};
                     }
                     $tooltarget = $toolhash{'target'};
                     if ($tooltarget eq 'window') {
@@ -566,6 +613,7 @@ sub extedit_form {
                         if ($ltihash->{'crsconf'}->{'append'}) {
                             $crsappend = $toolhash{'crsappend'};
                             $appendstyle = 'display:inline';
+                            $showprovider = 1;
                         }
                         if ($ltihash->{'crsconf'}->{'target'}) {
                             $dispdivstyle = 'display:block';
@@ -576,9 +624,52 @@ 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';
+                            }
+                        }
+                        if ($ltihash->{'crsconf'}->{'desturl'}) {
+                            $desturl = $toolhash{'desturl'};
+			    $desturlstyle = 'display:inline';
+                            $delay = $toolhash{'delay'}; 
+                            $showprovider = 1;
+			    if ($desturl ne '') {
+                                $desturlinfostyle = 'display:inline';
+                                $chkdest = ' checked="checked"';
+				$chknodest = ''; 
+			    } else {
+				$desturlinfostyle = 'display:none';
+			        $chkdest = ''; 
+                                $chknodest = ' checked="checked"';
+			    } 
+			} else {
+                            $nocrsdest = 1;
+                        }
                     }
                     $toolelem = '<span class="LC_nobreak">'.$image.'&nbsp;'.$tooltitle.'</span><br />';
                     $gradablestyle = 'display:inline';
+                    if (($ltihash->{'desturl'}) && ($nocrsdest) && ($ltihash->{'defdest'} =~ m{^(https?\://|/)})) {
+                        $fixeddest = $ltihash->{'defdest'};
+                        if ($ltihash->{'defdelay'} =~ /^\d+\.?\d*$/) {
+                            $fixeddelay = $ltihash->{'defdelay'};
+                        }
+                        $desturlfixedstyle = 'display:inline-block';
+                        $showprovider = 1;
+                    }
+                    if (($showprovider) && ($provider ne '')) {
+                        $providerstyle = 'display:inline-block';
+                    }
                 }
             }
         } else {
@@ -631,7 +722,7 @@ sub extedit_form {
                     $exttypeofftext = &mt('No external tools defined in the domain are available for selection.');
                 } elsif (!$numcrstools && $numdomtools) {
                     $defcheck{'dom'} = ' checked="checked"';
-                    $subdivstyle = 'display:none';
+                    $subdivstyle = 'display:block';
                     $exttypeonsty = 'display:block';
                     my $firstoption = '<option value="" selected="selected">'.&mt('Select').'</option>';
                     $seloptions = &ordered_tooloptions($ltitools->{'dom'});
@@ -658,9 +749,49 @@ sub extedit_form {
             $crslabel = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'};
             $crstitle = $env{'course.'.$cdom.'_'.$cnum.'.description'};
             $crsappend = '';
+            $returnurl = '';
+            $backtourl = '';
+            $customreturn = 'hidden';
             $chknogrd = ' checked="checked"';
-        }
-        $toolelem .= '<div id="'.$toolattr{'dispdiv'}.'" style="'.$dispdivstyle.'">'.
+            $chknoreturn = '';
+            $chkreturndef = ' checked="checked"';
+            $chkreturncust = '';
+	    $chknodest = ' checked="checked"';
+	    $chkdest = '';
+        }
+        my $onclickreturl = ' onclick="updateReturnUrl('."this.form,'$toolattr{'customreturnurl'}','$toolattr{'returnurldiv'}','exttoolreturnurl'".');"';
+        my $onclickdest = ' onclick="updateDestUrl('."this.form,'$toolattr{'desturlinfodiv'}','$toolattr{'desturldiv'}','exttooldest'".');"';
+        $toolelem.= '<div id="'.$toolattr{'providerdiv'}.'" style="'.$providerstyle.'">'.
+                    '<span class="'.$class.'">'.&mt('Provider').':&nbsp;<span id="'.$toolattr{'provider'}.'">'.$scheme.$provider.'</span><br />'.
+                    '<span class="'.$class.'">'.&mt('Provider path').':&nbsp;<span id="'.$toolattr{'providerpath'}.'">'.$path.'</span>'."\n".
+                    '</div>'."\n".
+                    '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+                    '<div id="'.$toolattr{'crsappenddiv'}.'" style="'.$appendstyle.'">'.
+                    '<span class="'.$class.'">'.&mt('Append to LTI login URL').':</span><br />'.
+                    '<input type="text" id="'.$toolattr{'crsappend'}.'" size="30" name="exttoolappend" value="'.$crsappend.'"'.$disabled.' /></span>'.
+                    '</div>'."\n".
+                    '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+                    '<div id="'.$toolattr{'desturldiv'}.'" style="'.$desturlstyle.'">'.
+                    '<span class="'.$class.'">'.&mt('Post-login destination different from path').':&nbsp;'.
+                    '<label><input type="radio" name="exttooldest" value="0"'.$chknodest.$disabled.$onclickdest.' />'.
+                    &mt('No').'</label>'.('&nbsp;'x2).
+                    '<label><input type="radio" name="exttooldest" value="1"'.$chkdest.$disabled.$onclickdest.' />'.
+                    &mt('Yes').'</label>'.('&nbsp;'x2).
+                    '</span><br />'."\n".
+                    '<div id="'.$toolattr{'desturlinfodiv'}.'" style="'.$desturlinfostyle.'">'.
+                    '<span class="'.$class.'">'.
+                    '<input type="text" size="'.$size.'" name="exttooldesturl" value="'.$desturl.'"'.$disabled.' /></label></span><br />'.
+                    '<span class="'.$class.'"><label>'.&mt('Delay between login and redirect').
+                    ':<input type="text" size="3" name="exttooldelay" value="'.$delay.'"'.$disabled.' />&nbsp;s'.
+                    '</label></span></div></div>'."\n".
+                    '<div id="'.$toolattr{'desturlfixeddiv'}.'" style="'.$desturlfixedstyle.'">'.
+                    '<span class="'.$class.'">'.&mt('Destination after provider login').':&nbsp;'.
+                    '<br /><span id="'.$toolattr{'fixeddest'}.'">'.$fixeddest.'</span></span>'.
+                    '<br /><span class="'.$class.'">'.
+                    &mt('Post-login delay before redirect to destination').':&nbsp;<span id="'.$toolattr{'fixeddelay'}.'">'.$fixeddelay.'</span>&nbsp;s</span>'."\n".
+                    '<br /></div>'.
+                    '<div style="padding:0;clear:both;margin:0;border:0"></div>'.
+                    '<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,'.
                     "'$toolattr{dimendiv}','$toolattr{windiv}','$toolattr{dimenwidth}','$toolattr{dimenheight}',
@@ -674,58 +805,71 @@ sub extedit_form {
                     '<div id="'.$toolattr{'dimendiv'}.'" style="'.$dimendivstyle.'"><span class="'.$class.'">'.
                     &mt('Width').':&nbsp;<input type="text" size="4" id="'.$toolattr{'dimenwidth'}.'" name="exttoolwidth" value="'.$width.'"'.$disabled.' />'.('&nbsp;'x2).
                     &mt('Height').':&nbsp;<input type="text" size="4" id="'.$toolattr{'dimenheight'}.'" name="exttoolheight" value="'.$height.'"'.$disabled.' /></span>'."\n".
-                    '</div></div>';
-        $toolelem .= '<div id="'.$toolattr{'windiv'}.'" style="'.$windivstyle.'">'.
-                     '<div id="'.$toolattr{'linktextdiv'}.'" class="LC_left_float" style="'.$linktextstyle.'">'.
-                     '<span class="'.$class.'">'.&mt('Link Text').'</span><br /><input type="text" size="25" id="'.$toolattr{'linktext'}.
-                     '" name="exttoollinktext" value="'.$linktext.'"'.$disabled.' />'.
-                     '</div><div id="'.$toolattr{'explanationdiv'}.'" class="LC_left_float" style="'.$explanationstyle.'">'.
-                     '<span class="'.$class.'">'.&mt('Explanation').'</span><br />'.
-                     '<textarea rows="'.$rows.'" cols="'.$cols.'" id="'.$toolattr{'explanation'}.'" name="exttoolexplanation" '.$disabled.'>'.
-                     $explanation.'</textarea></div><div style="padding:0;clear:both;margin:0;border:0"></div>'.
-                     '</div>';
-        $toolelem .= '<div id="'.$toolattr{'crslabeldiv'}.'" style="'.$labelstyle.'">'.
+                    '</div></div>'.
+                    '<div id="'.$toolattr{'windiv'}.'" style="'.$windivstyle.'">'.
+                    '<div id="'.$toolattr{'linktextdiv'}.'" class="LC_left_float" style="'.$linktextstyle.'">'.
+                    '<span class="'.$class.'">'.&mt('Link Text').'</span><br /><input type="text" size="25" id="'.$toolattr{'linktext'}.
+                    '" name="exttoollinktext" value="'.$linktext.'"'.$disabled.' />'.
+                    '</div><div id="'.$toolattr{'explanationdiv'}.'" class="LC_left_float" style="'.$explanationstyle.'">'.
+                    '<span class="'.$class.'">'.&mt('Explanation').'</span><br />'.
+                    '<textarea rows="'.$rows.'" cols="'.$cols.'" id="'.$toolattr{'explanation'}.'" name="exttoolexplanation" '.$disabled.'>'.
+                    $explanation.'</textarea></div><div style="padding:0;clear:both;margin:0;border:0"></div>'.
+                    '</div>'.
+                    '<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 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>
 ";
     }
+    my $idattr;
+    unless ($subdivid eq '') {
+        $idattr = 'id="'.$subdivid.'"';
+    }
     $form = <<ENDFORM;
 <form action="$action" method="post" name="$formname" id="$formid">
 <fieldset id="$fieldsetid" style="$fieldsetstyle">
 $legend
 $active
 $chooser
-<div id="$subdivid" style="$subdivstyle">
+<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
@@ -823,7 +967,8 @@ sub extedit_javascript {
     my ($toolsjs,$exttoolnums,$exttooloptions);
     if (ref($toolsref) eq 'HASH') {
         $toolsjs = "        var ltitools = new Array();\n".
-                   "        var ltitoolsUrl = new Array();\n".
+	           "        var ltitoolsProvider = new Array();\n".
+                   "        var ltitoolsPath = new Array();\n".
                    "        var ltitoolsTarget = new Array();\n".
                    "        var ltitoolsWidth = new Array();\n".
                    "        var ltitoolsHeight = new Array();\n".
@@ -834,7 +979,11 @@ 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".
+                   "        var ltitoolsDestUrl = new Array();\n".
+                   "        var ltitoolsDefDest = new Array();\n".
+                   "        var ltitoolsDefDelay = new Array();\n";
         $exttoolnums = "        var ltitoolsnum = new Array();\n".
                        "        var tooloptval = new Array();\n".
                        "        var toolopttxt = new Array();\n";
@@ -843,7 +992,8 @@ sub extedit_javascript {
             if (ref($toolsref->{$type}) eq 'HASH') {
                 my $num = scalar(keys(%{$toolsref->{$type}}));
                 $toolsjs .= "        ltitools[$idx] = new Array($num);\n".
-                            "        ltitoolsUrl[$idx] = new Array($num);\n".
+                            "        ltitoolsProvider[$idx] = new Array($num);\n".
+                            "        ltitoolsPath[$idx] = new Array($num);\n".
                             "        ltitoolsTarget[$idx] = new Array($num);\n".
                             "        ltitoolsWidth[$idx] = new Array($num);\n".
                             "        ltitoolsHeight[$idx] = new Array($num);\n".
@@ -854,7 +1004,11 @@ 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".
+                            "        ltitoolsDestUrl[$idx] = new Array($num);\n".
+                            "        ltitoolsDefDest[$idx] = new Array($num);\n".
+                            "        ltitoolsDefDelay[$idx] = new Array($num);\n";
                 my $i=0;
                 foreach my $key (sort { $a <=> $b } keys(%{$toolsref->{$type}})) {
                     if (ref($toolsref->{$type}->{$key}) eq 'HASH') {
@@ -864,21 +1018,24 @@ sub extedit_javascript {
                             my $height = $toolsref->{$type}->{$key}->{'display'}->{'height'};
                             my $linkdef = $toolsref->{$type}->{$key}->{'display'}->{'linktext'};
                             my $explaindef = $toolsref->{$type}->{$key}->{'display'}->{'explanation'};
-                            my $providerurl;
-                            if ($toolsref->{$type}->{$key}->{'url'} =~ m{://}) {
-                                (my $prot,my $host,$providerurl) =
-                                    ($toolsref->{$type}->{$key}->{'url'} =~ m{^([^/]+)://([^/]+)(|/.+)$});
+                            my ($scheme,$provider,$path);
+                            if ($toolsref->{$type}->{$key}->{'url'} =~ m{^https?\://}) {
+                                ($scheme,$provider,$path) =
+                                    ($toolsref->{$type}->{$key}->{'url'} =~ m{^(https?\://)([^/]+)(|/.+)$});
                             } else {
-                                $providerurl = $toolsref->{$type}->{$key}->{'url'};
+                                $path = $toolsref->{$type}->{$key}->{'url'};
                             }
-                            $providerurl = &LONCAPA::map::qtunescape($providerurl);
+                            $scheme = &LONCAPA::map::qtunescape($scheme);
+                            $provider = &LONCAPA::map::qtunescape($provider);
+                            $path = &LONCAPA::map::qtunescape($path);
                             $toolsjs .= "        ltitools[$idx][$i] = '$key';\n".
                                         "        ltitoolsTarget[$idx][$i] = '$target';\n".
                                         "        ltitoolsWidth[$idx][$i] = '$width';\n".
                                         "        ltitoolsHeight[$idx][$i] = '$height';\n".
                                         "        ltitoolsLinkDef[$idx][$i] = '$linkdef';\n".
                                         "        ltitoolsExplainDef[$idx][$i] = '$explaindef';\n".
-                                        "        ltitoolsUrl[$idx][$i] = '$providerurl';\n";
+                                        "        ltitoolsProvider[$idx][$i] = '$scheme$provider';\n".
+                                        "        ltitoolsPath[$idx][$i] = '$path';\n";
                         }
                         if (ref($toolsref->{$type}->{$key}->{'crsconf'}) eq 'HASH') {
                             my $display = $toolsref->{$type}->{$key}->{'crsconf'}->{'target'};
@@ -893,7 +1050,15 @@ 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";
+                            my $desturl = $toolsref->{$type}->{$key}->{'crsconf'}->{'desturl'};
+                            $toolsjs .= "         ltitoolsDestUrl[$idx][$i] = '$desturl';\n";
+                        }
+                        my $defdest = $toolsref->{$type}->{$key}->{'defdest'};
+                        $toolsjs .= "         ltitoolsDefDest[$idx][$i] = '$defdest';\n";
+                        my $defdelay = $toolsref->{$type}->{$key}->{'defdelay'};
+                        $toolsjs .= "         ltitoolsDefDelay[$idx][$i] = '$defdelay';\n";
                     }
                     $i++;
                 }
@@ -1050,10 +1215,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; 
+            appendinput += '_'+residx;
+            customreturnurl += '_'+residx;
         }
         if (document.getElementById(labelinput)) {
             var crslabel = document.getElementById(labelinput).value;
@@ -1102,6 +1269,59 @@ 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 += '::';
+        }
+        var desturldiv = prefix+'tooldesturldiv';
+        if (residx > 0) {
+            desturldiv += '_'+residx;
+        }
+        if (document.getElementById(desturldiv)) {
+            if (document.getElementById(desturldiv).style.display == 'inline') {
+                if (extform.exttooldest.length) {
+                    for (var i=0; i<extform.exttooldest.length; i++) {
+                        if (extform.exttooldest[i].checked) {
+                            if (extform.exttooldest[i].value == '1') {
+                                var dest = extform.exttooldesturl.value;
+                                dest.trim();
+                                var delay = extform.exttooldelay.value;
+                                info += ':'+escape(dest)+':'+escape(delay);
+                            } else {
+                                info += '::';
+                            }
+                        }
+                    }
+                }
+            } else {
+                info += '::';
+            }
+        } else {
+            info += '::';
+        }
         info=escape(info);
         if (residx > 0) {
             eval("extform.importdetail.value=title+'='+info+'='+residx;extform.submit();");
@@ -1284,7 +1504,14 @@ function updateExttool(caller,form,suppl
     titlediv = prefix+'toolcrstitlediv';
     appenddiv = prefix+'toolcrsappenddiv';
     gradablediv = prefix+'toolgradablediv';
-    providerurl = prefix+'toolproviderurl';
+    returnurldiv = prefix+'toolreturnurldiv';
+    provider = prefix+'toolprovider';
+    providerpath = prefix+'toolproviderpath';
+    providerdiv = prefix+'toolproviderdiv';
+    desturldiv = prefix+'tooldesturldiv';
+    desturlfixeddiv = prefix+'tooldesturlfixeddiv';
+    fixeddest = prefix+'toolfixeddest';
+    fixeddelay = prefix+'toolfixeddelay';
     labelinput = prefix+'toolcrslabel';
     titleinput = prefix+'toolcrstitle';
     appendinput = prefix+'toolcrsappend';
@@ -1297,6 +1524,21 @@ function updateExttool(caller,form,suppl
         var toolpick = caller.options[caller.selectedIndex].value;
         $toolsjs
         if (toolpick == '') {
+            if (document.getElementById(providerdiv)) {
+                document.getElementById(providerdiv).style.display = 'none';
+            }
+            if (document.getElementById(desturldiv)) {
+                document.getElementById(desturldiv).style.display = 'none';
+            }
+            if (document.getElementById(desturlfixeddiv)) {
+                document.getElementById(desturlfixeddiv).style.display = 'none';
+            }
+            if (document.getElementById(fixeddest)) {
+                document.getElementById(fixeddest).innerHTML = '';
+            }
+            if (document.getElementById(fixeddelay)) {
+                document.getElementById(fixeddelay).innerHTML = '';
+            }
             if (document.getElementById(dispdiv)) {
                 document.getElementById(dispdiv).style.display = 'none';    
             }
@@ -1324,6 +1566,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'];
@@ -1342,6 +1587,56 @@ function updateExttool(caller,form,suppl
                 if (ltitools[i].length > 0) {
                     for (var j=0; j<ltitools[i].length; j++) {
                         if (ltitools[i][j] == toolpick) {
+                            if (document.getElementById(providerdiv)) {
+                                if ((ltitoolsDestUrl[i][j]) || (ltitoolsAppend[i][j]) || (ltitoolsDefDest[i][j])) {
+                                    document.getElementById(providerdiv).style.display = 'inline';
+                                    if (document.getElementById(provider)) {
+                                        if ((ltitoolsProvider[i][j] != '') && (ltitoolsProvider[i][j] != null)) {
+                                            document.getElementById(provider).innerHTML = ltitoolsProvider[i][j];
+                                        }
+                                    }
+                                    if (document.getElementById(providerpath)) {
+                                        if ((ltitoolsPath[i][j] != '') && (ltitoolsPath[i][j] != null)) {
+                                            document.getElementById(providerpath).innerHTML = ltitoolsPath[i][j];
+                                        }
+                                    }
+                                } else {
+                                    document.getElementById(providerdiv).style.display = 'none';
+                                    if (document.getElementById(provider)) {
+                                        document.getElementById(provider).innerHTML = '';
+                                    }
+                                    if (document.getElementById(providerpath)) {
+                                        document.getElementById(providerpath).innerHTML = '';
+                                    }
+                                }
+                            }
+                            if (document.getElementById(appenddiv)) {
+                                if (ltitoolsAppend[i][j]) {
+                                    document.getElementById(appenddiv).style.display = 'inline';
+                                } else {
+                                    document.getElementById(appenddiv).style.display = 'none';
+                                }
+                            }
+                            if (document.getElementById(desturldiv)) {
+                                if (ltitoolsDestUrl[i][j]) {
+                                    document.getElementById(desturldiv).style.display = 'inline';
+                                } else {
+                                    document.getElementById(desturldiv).style.display = 'none';
+                                }
+                            }
+                            if (document.getElementById(desturlfixeddiv)) {
+                                if ((!ltitoolsDestUrl[i][j]) && (ltitoolsDefDest[i][j])) {
+                                    document.getElementById(desturlfixeddiv).style.display = 'inline';
+                                } else {
+                                    document.getElementById(desturlfixeddiv).style.display = 'none';
+                                }
+                            }
+                            if (document.getElementById(fixeddest)) {
+                                document.getElementById(fixeddest).innerHTML = ltitoolsDefDest[i][j];
+                            }
+                            if (document.getElementById(fixeddelay)) {
+                                document.getElementById(fixeddelay).innerHTML = ltitoolsDefDelay[i][j];
+                            }
                             if (document.getElementById(dispdiv)) {
                                 if (ltitoolsDisplay[i][j]) {
                                     document.getElementById(dispdiv).style.display = 'block';
@@ -1360,7 +1655,7 @@ function updateExttool(caller,form,suppl
                                 if ((ltitoolsDisplay[i][j]) && (ltitoolsTarget[i][j] == 'window')) {
                                     dimen = 'block';
                                     dimenwidth = ltitoolsWidth[i][j];
-                                    dimenheight = ltitoolsHeight[i][j];                    
+                                    dimenheight = ltitoolsHeight[i][j];
                                 }
                                 if (document.getElementById(dimendiv)) {
                                     document.getElementById(dimendiv).style.display = dimen;
@@ -1387,7 +1682,7 @@ function updateExttool(caller,form,suppl
                                 }
                                 if (document.getElementById(linktextinput)) {
                                     if (ltitoolsLink[i][j]) {
-                                        document.getElementById(linktextinput).value = ltitoolsLinkDef[i][j]; 
+                                        document.getElementById(linktextinput).value = ltitoolsLinkDef[i][j];
                                     } else {
                                         document.getElementById(linktextinput).value = '';
                                     }
@@ -1421,26 +1716,18 @@ function updateExttool(caller,form,suppl
                                     document.getElementById(titlediv).style.display = 'none';
                                 }
                             }
-                            if (document.getElementById(appenddiv)) {
-                                if (ltitoolsAppend[i][j]) {
-                                    document.getElementById(appenddiv).style.display = 'inline';
-                                    if (document.getElementById(providerurl)) {
-                                        if ((ltitoolsUrl[i][j] != '') && (ltitoolsUrl[i][j] != null)) {
-                                            document.getElementById(providerurl).innerHTML = '&nbsp;('+ltitoolsUrl[i][j]+')<br />';
-                                        }
-                                    }
-                                } else {
-                                    document.getElementById(appenddiv).style.display = 'none';
-                                    if (document.getElementById(providerurl)) {
-                                        document.getElementById(providerurl).innerHTML = '';
-                                    }
-                                }
-                            }
                             if (document.getElementById(gradablediv)) {
                                 if (supplementalflag != 1) {
                                     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;
                         }
                     }
@@ -1450,6 +1737,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++) {
@@ -1489,6 +1800,30 @@ function updateTooldim(form,dimendiv,win
     }
 }
 
+function updateDestUrl(form,detailid,divid,radioname) {
+    if ((document.getElementById(detailid)) &&
+       (document.getElementById(divid))) {
+        if (document.getElementById(divid).style.display == 'inline') {
+            var radelem = form.elements[radioname];
+            var detaildisplay = 'none';
+            if (radelem.length) {
+                for (var i=0; i<radelem.length; i++) {
+                    if (radelem[i].checked) {
+                        if (radelem[i].value == '1') {
+                            detaildisplay = 'inline';
+                        } else {
+                            detaildisplay = 'none';
+                        }
+                        break;
+                    }
+                }
+            }
+            document.getElementById(detailid).style.display = detaildisplay;
+        }
+    }
+    return;
+}
+
 ENDJS
 
 }