--- loncom/interface/lonextresedit.pm	2017/05/10 13:49:14	1.19
+++ 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.19 2017/05/10 13:49:14 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.37 2025/06/14 02:50:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -98,7 +98,18 @@ sub handler {
     }
     my %ltitools;
     if ($type eq 'tool') {
-        %ltitools = &Apache::lonnet::get_domain_ltitools($cdom);
+        my (%domtools,%crstools);
+        my %tooltypes = &Apache::loncommon::usable_exttools();
+        if ($tooltypes{'dom'}) {
+            %domtools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
+        }
+        if ($tooltypes{'crs'}) {
+            %crstools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer');
+        }
+        %ltitools = (
+                      dom => \%domtools,
+                      crs => \%crstools,
+                    );
     }
     my $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript());
     my $pathitem = '<input type="hidden" name="folderpath" value="'.
@@ -161,6 +172,9 @@ sub process_changes {
             $newurl = $1;
             $marker = $2;
             $args = $3;
+            if ((!$symb) && (!$supplementalflag)) {
+                $symb = "uploaded/$cdom/$cnum/$folder.$container"."___$newidx"."___adm/$cdom/$cnum/$marker/ext.tool";
+            }
         }
     }
     if ($supplementalflag) {
@@ -170,7 +184,7 @@ sub process_changes {
     }
     if ($folder && $container) {
         if ($env{'form.importdetail'}) {
-            my ($errtext,$fatal,$mismatchedid,@imports);
+            my ($errtext,$fatal,$mismatchedid,$needreload,$newgradable,@imports);
             if (!$supplementalflag) {
                 if (($oldidx) && ($oldidx != $newidx)) {
                     $mismatchedid = 1;
@@ -181,9 +195,27 @@ sub process_changes {
             } elsif (($newtitle eq $oldtitle) && ($newurl eq $oldurl)) {
                 if ($type eq 'tool') {
                     if ($args) {
-                        ($updated,$errormsg) = &update_exttool($marker,$cdom,$cnum,$args);
-                        unless ($updated) {
-                            $output = &mt('No change');      
+                        ($updated,$newgradable,$errormsg) = &update_exttool($marker,$cdom,$cnum,
+                                                                            $supplementalflag,$args);
+                        if ($updated) {
+                            if ($newgradable) {
+                                my $map = "/uploaded/$cdom/$cnum/$folder.$container";
+                                my ($errtext,$fatal) = &LONCAPA::map::mapread($map);
+                                if ($fatal) {
+                                    $errormsg = &mt('Update failed: [_1].',$errtext);
+                                } else {
+                                    &LONCAPA::map::storeparameter($residx,'parameter_0_gradable',
+                                                                  $newgradable,'string_yesno');
+                                    my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1,1);
+                                    if ($errtext) {
+                                        $errormsg = &mt('Update failed: [_1].',$errtext);
+                                    } else {
+                                        $needreload = 1;
+                                    }
+                                }
+                            }
+                        } else {
+                            $output = &mt('No change');
                         }
                     } else {
                         $output = &mt('No change');
@@ -202,13 +234,25 @@ sub process_changes {
                     my $ext = 'true';
                     if ($type eq 'tool') {
                         if ($args) {
-                            ($updated,$errormsg) = &update_exttool($marker,$cdom,$cnum,$args);
+                            ($updated,$newgradable,$errormsg) = &update_exttool($marker,$cdom,$cnum,
+                                                                                $supplementalflag,$args);
+                            if ($newgradable) {
+                                &LONCAPA::map::storeparameter($residx,'parameter_0_gradable',$newgradable,
+                                                              'string_yesno');
+                                $needreload = 1;
+                            }
                         }
                         $ext = 'false';
                     }
+                    my $dotimeupdate;
+                    unless ($supplementalflag) {
+                        if (($newgradable) || ($newurl ne $oldurl)) {
+                            $dotimeupdate = 1;
+                        }
+                    }
                     $LONCAPA::map::resources[$residx] =
                         join(':', ($savetitle,$saveurl,$ext,'normal','res'));
-                    my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1);
+                    my ($outtext,$errtext) = &LONCAPA::map::storemap($map,1,$dotimeupdate);
                     if ($errtext) {
                         $errormsg = &mt('Update failed: [_1].',$errtext);
                     } else {
@@ -230,19 +274,24 @@ sub process_changes {
                                     &Apache::lonnet::devalidate_title_cache($symb);
                                 }
                             }
-                        }
-                        my ($furl,$ferr) = 
-                            &Apache::lonuserstate::readmap("$cdom/$cnum");
-                        if ($ferr) {
-                            $errormsg = &mt('Reload failed: [_1].',$ferr);
-                        } else {
-                            unless ($supplementalflag) {
-                                &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum);
-                            }
+                            $needreload = 1;
                         }
                     }
                 }
             }
+            if ($needreload) {
+                my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
+                if ($ferr) {
+                    $errormsg = &mt('Reload failed: [_1].',$ferr);
+                } else {
+                    &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,
+                                                                   $cdom.'_'.$cnum);
+                }
+            }
+            if (($type eq 'tool') && ($newgradable)) {
+                my $uri = &Apache::lonnet::declutter($url);
+                &Apache::lonnet::devalidate_cache_new('meta',$uri);
+            }
         } else {
             $output = &mt('No change');
         }
@@ -257,16 +306,36 @@ sub process_changes {
 }
 
 sub update_exttool {
-    my ($marker,$cdom,$cnum,$args) = @_;
-    my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
-    my (%newhash,$changed,@deleted,$errormsg);
+    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'}) = split(/:/,$args);
-    foreach my $item ('linktext','explanation','crslabel','crstitle') {
+     $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') {
+    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')) {
@@ -277,8 +346,39 @@ sub update_exttool {
                     $newhash{$item} = '';
                 }
             }
+        } elsif ($item eq 'gradable') {
+            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)) {
+                if ($newhash{$item}) {
+                    $newgradable = 'yes';
+                } else {
+                    $newgradable = 'no';
+                }
+            }
             if ($newhash{$item} eq '') {
                 unless (($item eq 'target') ||
                         ((($item eq 'width') || ($item eq 'height')) &&
@@ -293,7 +393,7 @@ sub update_exttool {
                 }
             } else {
                 $toolhash{$item} = $newhash{$item};
-                $changed = 1; 
+                $changed = 1;
             }
         }
     }
@@ -306,7 +406,7 @@ sub update_exttool {
     if (@deleted) {
         &Apache::lonnet::del('exttool_'.$marker,\@deleted,$cdom,$cnum);
     }
-    return ($changed,$errormsg);
+    return ($changed,$newgradable,$errormsg);
 }
 
 sub extedit_form {
@@ -327,23 +427,29 @@ sub extedit_form {
         ti => 'Title',
         al => 'Add Link',
         at => 'Add Tool',
+        dd => 'Defined in domain',
+        dc => 'Defined in course',
     );
     my $tabid = 'aa';
     my $size = 60;
     if ($supplementalflag) {
         $tabid = 'ee';
     }
-    my ($formname,$formid,$toggle,$fieldsetid,$urlid,$dispdivstyle,$dimendivstyle,
-        $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,
-        $legend,$urlelem,$toolelem,%toolattr);
+    my ($formname,$formid,$toggle,$fieldsetid,$urlid,$subdivid,$dispdivstyle,$dimendivstyle,
+        $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,$providerstyle,
+        $appendstyle,$gradablestyle,$returnurlstyle,$subdivstyle,$desturlstyle,
+	$desturlinfostyle,$desturlfixedstyle,$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','crstitle','crslabel',
-                                       'windiv','linktextdiv','explanationdiv','linktext', 
-                                       'explanation');
+                                       'crstitlediv','crslabeldiv','crsappenddiv',
+                                       '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';
@@ -351,16 +457,26 @@ 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;
         $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,
-        $fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,
-        $linktext,$explanation,%chkstate);
+        $crsappend,$fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,
+        $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');
@@ -373,9 +489,9 @@ sub extedit_form {
             $rows = 10;
             $cols = 45;
             if ($type eq 'tool') {
-                $legend = $lt{'ee'};
-            } else {
                 $legend = $lt{'te'};
+            } else {
+                $legend = $lt{'ee'};
             }
             $legend = '<legend>'.$legend.'</legend>';
             if ($symb) {
@@ -392,7 +508,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"';
@@ -407,7 +523,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 {
@@ -434,89 +550,248 @@ 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$}) {
                 my $marker = $1;
                 my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
-                if ($toolhash{'id'}) {
-                    if (ref($ltitools) eq 'HASH') {
-                        if (keys(%{$ltitools})) {
-                            if (ref($ltitools->{$toolhash{'id'}}) eq 'HASH') {
-                                my $tooltitle = $ltitools->{$toolhash{'id'}}->{'title'};
-                                my $icon = $ltitools->{$toolhash{'id'}}->{'image'};
-                                my $image;
-                                if ($icon) {
-                                    $image = '<img src="'.$icon.'" alt="'.$tooltitle.'" />';
-                                }
-                                $tooltarget = $toolhash{'target'};
-                                if ($tooltarget eq 'window') {
-                                    $dimendivstyle = 'display:block';
-                                    $windivstyle = 'display:block';
-                                    $chkstate{'window'} = 'checked="checked" ';
-                                } elsif ($tooltarget eq 'tab') {
-                                    $windivstyle = 'display:block';
-                                    $chkstate{'tab'} = 'checked="checked" ';
-                                } else {
-                                    $chkstate{'iframe'} = 'checked="checked" ';
-                                }
-                                $width = $toolhash{'width'};
-                                $height = $toolhash{'height'};
-                                $linktext = $toolhash{'linktext'};
-                                $explanation = $toolhash{'explanation'};
-                                if (ref($ltitools->{$toolhash{'id'}}->{'crsconf'}) eq 'HASH') {
-                                    if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'title'}) {
-                                        $crstitle = $toolhash{'crstitle'};
-                                        $titlestyle = 'display:inline';
-                                    }
-                                    if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'label'}) {  
-                                        $crslabel = $toolhash{'crslabel'};
-                                        $labelstyle = 'display:inline';
-                                    }
-                                    if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'target'}) {
-                                        $dispdivstyle = 'display:block';
-                                    }
-                                    if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'linktext'}) {
-                                        $linktextstyle = 'padding:0;display:inline';
-                                    }
-                                    if ($ltitools->{$toolhash{'id'}}->{'crsconf'}->{'explanation'}) {
-                                        $explanationstyle = 'padding:0;display:inline';
-                                    }
-                                }
-                                $toolelem = '<span class="LC_nobreak">'.$image.'&nbsp;'.$tooltitle.'</span><br />';
+                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 '') && (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'};
+                    my $icon = $ltihash->{'image'};
+                    my $image;
+                    if ($icon) {
+                        $image = '<img src="'.$icon.'" alt="'.$tooltitle.'" />';
+                    }
+                    if ($ltihash->{'url'} =~ m{^https?\://}) {
+                        ($scheme,$provider,$path) = ($ltihash->{'url'} =~ m{^(https?\://)([^/]+)(|/.+)$});
+                    } else {
+                        $path = $ltihash->{'url'};
+                    }
+                    $tooltarget = $toolhash{'target'};
+                    if ($tooltarget eq 'window') {
+                        $dimendivstyle = 'display:block';
+                        $windivstyle = 'display:block';
+                        $chkstate{'window'} = 'checked="checked" ';
+                    } elsif ($tooltarget eq 'tab') {
+                        $windivstyle = 'display:block';
+                        $chkstate{'tab'} = 'checked="checked" ';
+                    } else {
+                        $chkstate{'iframe'} = 'checked="checked" ';
+                    }
+                    $width = $toolhash{'width'};
+                    $height = $toolhash{'height'};
+                    $linktext = $toolhash{'linktext'};
+                    $explanation = $toolhash{'explanation'};
+                    if ($toolhash{'gradable'}) {
+                        $chkgrd = ' checked="checked"';
+                    } else {
+                        $chknogrd = ' checked="checked"';
+                    }
+                    if (ref($ltihash->{'crsconf'}) eq 'HASH') {
+                        if ($ltihash->{'crsconf'}->{'title'}) {
+                            $crstitle = $toolhash{'crstitle'};
+                            $titlestyle = 'display:inline';
+                        }
+                        if ($ltihash->{'crsconf'}->{'label'}) {  
+                            $crslabel = $toolhash{'crslabel'};
+                            $labelstyle = 'display:inline';
+                        }
+                        if ($ltihash->{'crsconf'}->{'append'}) {
+                            $crsappend = $toolhash{'crsappend'};
+                            $appendstyle = 'display:inline';
+                            $showprovider = 1;
+                        }
+                        if ($ltihash->{'crsconf'}->{'target'}) {
+                            $dispdivstyle = 'display:block';
+                        }
+                        if ($ltihash->{'crsconf'}->{'linktext'}) {
+                            $linktextstyle = 'padding:0;display:inline';
+                        }
+                        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 {
-            $toolelem = '<span class="LC_docs_ext_edit">'."\n".
-                       '<select name="exttoolid" id="LC_exttoolid" onchange="javascript:updateExttool(this,'.
-                       'this.form,'."'$supplementalflag'".');"'.$disabled.'>'."\n".
-                       '<option value="" selected="selected">'.&mt('Select').'</option>';
-            my %bynum;
+            $subdivstyle = 'display:none';
+            my $toolradio = 'exttooltype';
+            my $exttypeon = 'LC_exttoolon';
+            my $exttypeoff = 'LC_exttooloff';
+            my $exttypeonsty = 'display:none';
+            my $exttypeoffsty = 'display:none';
+            my $exttypeofftext;
+            if ($supplementalflag) {
+                $toolradio = 'suppexttooltype';
+                $exttypeon = 'LC_exttoolonsupp';
+                $exttypeoff = 'LC_exttooloffsupp';
+            }
+            my ($numcrstools,$numdomtools,$typeclick,%defcheck,%typedesc);
+            %typedesc = (
+                          crs => 'Defined in course',
+                          dom => 'Defined in domain',
+                        );
+#FIXME need crstype
+            my $seloptions;
+            $subdivid = 'LC_addtool';
+            if ($supplementalflag) {
+                $subdivid = 'LC_addtoolsupp';
+            }
             if (ref($ltitools) eq 'HASH') {
-                foreach my $id (keys(%{$ltitools})) {
-                    if (ref($ltitools->{$id}) eq 'HASH') {
-                        my $order = $ltitools->{$id}->{'order'};
-                        $bynum{$order} = [$id,$ltitools->{$id}];
-                    }
+                if (ref($ltitools->{'crs'}) eq 'HASH') {
+                    $numcrstools = scalar(keys(%{$ltitools->{'crs'}}));
                 }
-            }
-            foreach my $item (sort { $a <=> $b } keys(%bynum)) {
-                if (ref($bynum{$item}) eq 'ARRAY') {
-                    if (ref($bynum{$item}->[1]) eq 'HASH') {
-                        my $tooltitle = $bynum{$item}->[1]->{'title'};
-                        my $icon =  $bynum{$item}->[1]->{'image'};
-                        $toolelem .= '<option value="'.$bynum{$item}->[0].'">'.$tooltitle.'</option>';
+                if (ref($ltitools->{'dom'}) eq 'HASH') {
+                    $numdomtools = scalar(keys(%{$ltitools->{'dom'}}));
+                }
+                if ($numcrstools || $numdomtools) {
+                    $typeclick = ' onclick="'.
+                        'javascript:updateExttoolSel(this.form,'."'$toolradio','$supplementalflag'".');"';
+                } else {
+                    $exttypeoffsty = 'display:block';
+                    $exttypeofftext = &mt('No external tools defined in either the domain or the course are available for selection.');
+                }
+                if ($numcrstools && !$numdomtools) {
+                    $defcheck{'crs'} = ' checked="checked"';
+                    $subdivstyle = 'display:block';
+                    $exttypeonsty = 'display:block';
+                    my $firstoption = '<option value="" selected="selected">'.&mt('Select').'</option>';
+                    $seloptions = &ordered_tooloptions($ltitools->{'crs'});
+                    if ($seloptions) {
+                        $seloptions = "$firstoption\n$seloptions";
                     }
+                    $exttypeofftext = &mt('No external tools defined in the domain are available for selection.');
+                } elsif (!$numcrstools && $numdomtools) {
+                    $defcheck{'dom'} = ' checked="checked"';
+                    $subdivstyle = 'display:block';
+                    $exttypeonsty = 'display:block';
+                    my $firstoption = '<option value="" selected="selected">'.&mt('Select').'</option>';
+                    $seloptions = &ordered_tooloptions($ltitools->{'dom'});
+                    if ($seloptions) {
+                        $seloptions = "$firstoption\n$seloptions";
+                    }
+#FIXME need crstype
+                    $exttypeofftext = &mt('No external tools defined in the course are available for selection.');
                 }
             }
-            $toolelem .= '</select></span><br />';
+            foreach my $type ('crs','dom') {
+                $toolelem .= '<span class="LC_nobreak"> <label>'.
+                             '<input type="radio" name="'.$toolradio.'" value="'.$type.'"'.$defcheck{$type}.
+                             $typeclick.$disabled.' />'.$typedesc{$type}.'</label></span> '."\n";
+            }
+            $toolelem .= '<div id="'.$exttypeon.'" style="'.$exttypeonsty.'">'.
+                         '<select name="exttoolid" onchange="javascript:updateExttool(this,'.
+                         'this.form,'."'$supplementalflag'".');"'.$disabled.'>'."\n".
+                         $seloptions.
+                         '</select><br /></div>'."\n".
+                         '<div id="'.$exttypeoff.'" style="'.$exttypeoffsty.'">'.
+                         $exttypeofftext.
+                         '<br /></div>'."\n";
             $crslabel = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'};
             $crstitle = $env{'course.'.$cdom.'_'.$cnum.'.description'};
-        }
-        $toolelem .= '<div id="'.$toolattr{'dispdiv'}.'" style="'.$dispdivstyle.'">'.
+            $crsappend = '';
+            $returnurl = '';
+            $backtourl = '';
+            $customreturn = 'hidden';
+            $chknogrd = ' checked="checked"';
+            $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}',
@@ -530,47 +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>'."\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><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>
+<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
@@ -587,6 +886,35 @@ ENDFORM
     }
 }
 
+sub ordered_tooloptions {
+    my ($toolsref) = @_;
+    my ($seloptions,@ids,@titles);
+    if (ref($toolsref) eq 'HASH') {
+        my %bynum;
+        foreach my $id (keys(%{$toolsref})) {
+            if (ref($toolsref->{$id}) eq 'HASH') {
+                my $order = $toolsref->{$id}->{'order'};
+                $bynum{$order} = [$id,$toolsref->{$id}];
+            }
+        }
+        foreach my $item (sort { $a <=> $b } keys(%bynum)) {
+            if (ref($bynum{$item}) eq 'ARRAY') {
+                if (ref($bynum{$item}->[1]) eq 'HASH') {
+                    my $tooltitle = $bynum{$item}->[1]->{'title'};
+                    push(@titles,$tooltitle);
+                    push(@ids,$bynum{$item}->[0]);
+                    $seloptions .= '<option value="'.$bynum{$item}->[0].'">'.$tooltitle.'</option>'."\n";
+                }
+            }
+        }
+    }
+    if (wantarray) {
+        return (\@ids,\@titles);
+    } else {
+        return $seloptions;
+    }
+}
+
 sub display_editor {
     my ($url,$folderpath,$symb,$idx,$type,$cdom,$cnum,$hostname) = @_;
     my ($residx,$supplementalflag,$title,$pathitem,$output,$js,$navmap);
@@ -602,9 +930,20 @@ sub display_editor {
         my $path = &Apache::loncommon::symb_to_docspath($symb,\$navmap);
         $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($path,'<>&"').'" />';
     }
-    my %ltitools;
+    my (%ltitools,%tooltypes);
     if ($type eq 'tool') {
-        %ltitools = &Apache::lonnet::get_domain_ltitools($cdom);
+        my (%domtools,%crstools);
+        %tooltypes = &Apache::loncommon::usable_exttools();
+        if ($tooltypes{'dom'}) {
+            %domtools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
+        }
+        if ($tooltypes{'crs'}) {
+            %crstools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer');
+        }
+        %ltitools = (
+                      dom => \%domtools,
+                      crs => \%crstools,
+                    );
     }
     $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript());
     my $args = { 'force_register' => $env{'form.register'} };
@@ -625,56 +964,133 @@ sub display_editor {
 
 sub extedit_javascript {
     my ($toolsref) = @_;
-    my $toolsjs;
+    my ($toolsjs,$exttoolnums,$exttooloptions);
     if (ref($toolsref) eq 'HASH') {
-        my $num = scalar(keys(%{$toolsref}));
-        $toolsjs = "        var ltitools = new Array($num);\n".
-                   "        var ltitoolsTarget = new Array($num);\n".
-                   "        var ltitoolsWidth = new Array($num);\n".
-                   "        var ltitoolsHeight = new Array($num);\n".
-                   "        var ltitoolsLinkDef = new Array($num);\n".
-                   "        var ltitoolsExplainDef = new Array($num);\n".
-                   "        var ltitoolsDisplay = new Array($num);\n".
-                   "        var ltitoolsLink = new Array($num);\n".
-                   "        var ltitoolsExplain = new Array($num);\n".
-                   "        var ltitoolsLabel = new Array($num);\n".
-                   "        var ltitoolsTitle = new Array($num);\n";
-        my $i = 0;
-        foreach my $key (sort { $a <=> $b } keys(%{$toolsref})) {
-            if (ref($toolsref->{$key}) eq 'HASH') {
-                if (ref($toolsref->{$key}->{'display'}) eq 'HASH') {
-                    my $target = $toolsref->{$key}->{'display'}->{'target'};
-                    my $width = $toolsref->{$key}->{'display'}->{'width'};
-                    my $height = $toolsref->{$key}->{'display'}->{'height'};
-                    my $linkdef = $toolsref->{$key}->{'display'}->{'linktext'};
-                    my $explaindef = $toolsref->{$key}->{'display'}->{'explanation'};
-                    $toolsjs .= '        ltitools['.$i.'] = '."'$key';\n".
-                                '        ltitoolsTarget['.$i.'] = '."'$target';\n".
-                                '        ltitoolsWidth['.$i.'] = '."'$width';\n".
-                                '        ltitoolsHeight['.$i.'] = '."'$height';\n".
-                                '        ltitoolsLinkDef['.$i.'] = '."'$linkdef';\n".
-                                '        ltitoolsExplainDef['.$i.'] = '."'$explaindef';\n";
-                }
-                if (ref($toolsref->{$key}->{'crsconf'}) eq 'HASH') {
-                    my $display = $toolsref->{$key}->{'crsconf'}->{'target'};
-                    $toolsjs .= '         ltitoolsDisplay['.$i.'] = '."'$display';\n";
-                    my $linktext = $toolsref->{$key}->{'crsconf'}->{'linktext'};
-                    $toolsjs .= '         ltitoolsLink['.$i.'] = '."'$linktext';\n";
-                    my $explanation = $toolsref->{$key}->{'crsconf'}->{'explanation'};
-                    $toolsjs .= '         ltitoolsExplain['.$i.'] = '."'$explanation';\n";
-                    my $label = $toolsref->{$key}->{'crsconf'}->{'label'};
-                    $toolsjs .= '         ltitoolsLabel['.$i.'] = '."'$label';\n";
-                    my $title = $toolsref->{$key}->{'crsconf'}->{'title'};
-                    $toolsjs .= '         ltitoolsTitle['.$i.'] = '."'$title';\n";
+        $toolsjs = "        var ltitools = 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".
+                   "        var ltitoolsLinkDef = new Array();\n".
+                   "        var ltitoolsExplainDef = new Array();\n".
+                   "        var ltitoolsDisplay = new Array();\n".
+                   "        var ltitoolsLink = new Array();\n".
+                   "        var ltitoolsExplain = new Array();\n".
+                   "        var ltitoolsLabel = new Array();\n".
+                   "        var ltitoolsTitle = 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";
+        my $idx = 0;
+        foreach my $type ('crs','dom') {
+            if (ref($toolsref->{$type}) eq 'HASH') {
+                my $num = scalar(keys(%{$toolsref->{$type}}));
+                $toolsjs .= "        ltitools[$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".
+                            "        ltitoolsLinkDef[$idx] = new Array($num);\n".
+                            "        ltitoolsExplainDef[$idx] = new Array($num);\n".
+                            "        ltitoolsDisplay[$idx] = new Array($num);\n".
+                            "        ltitoolsLink[$idx] = new Array($num);\n".
+                            "        ltitoolsExplain[$idx] = new Array($num);\n".
+                            "        ltitoolsLabel[$idx] = new Array($num);\n".
+                            "        ltitoolsTitle[$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') {
+                        if (ref($toolsref->{$type}->{$key}->{'display'}) eq 'HASH') {
+                            my $target = $toolsref->{$type}->{$key}->{'display'}->{'target'};
+                            my $width = $toolsref->{$type}->{$key}->{'display'}->{'width'};
+                            my $height = $toolsref->{$type}->{$key}->{'display'}->{'height'};
+                            my $linkdef = $toolsref->{$type}->{$key}->{'display'}->{'linktext'};
+                            my $explaindef = $toolsref->{$type}->{$key}->{'display'}->{'explanation'};
+                            my ($scheme,$provider,$path);
+                            if ($toolsref->{$type}->{$key}->{'url'} =~ m{^https?\://}) {
+                                ($scheme,$provider,$path) =
+                                    ($toolsref->{$type}->{$key}->{'url'} =~ m{^(https?\://)([^/]+)(|/.+)$});
+                            } else {
+                                $path = $toolsref->{$type}->{$key}->{'url'};
+                            }
+                            $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".
+                                        "        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'};
+                            $toolsjs .= "         ltitoolsDisplay[$idx][$i] = '$display';\n";
+                            my $linktext = $toolsref->{$type}->{$key}->{'crsconf'}->{'linktext'};
+                            $toolsjs .= "         ltitoolsLink[$idx][$i] = '$linktext';\n";
+                            my $explanation = $toolsref->{$type}->{$key}->{'crsconf'}->{'explanation'};
+                            $toolsjs .= "         ltitoolsExplain[$idx][$i] = '$explanation';\n";
+                            my $label = $toolsref->{$type}->{$key}->{'crsconf'}->{'label'};
+                            $toolsjs .= "         ltitoolsLabel[$idx][$i] = '$label';\n";
+                            my $title = $toolsref->{$type}->{$key}->{'crsconf'}->{'title'};
+                            $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++;
                 }
-                $i++;
+                my $firstoption = '<option value="" selected="selected">'.&mt('Select').'</option>';
+                my ($idsref,$titlesref) = &ordered_tooloptions($toolsref->{$type});
+                if ((ref($idsref) eq 'ARRAY') && (ref($titlesref) eq 'ARRAY')) {
+                    my $count = scalar(@{$idsref});
+                    $exttooloptions .= "        tooloptval[$idx] = new Array($count);\n".
+                                       "        toolopttxt[$idx] = new Array($count);\n";
+                    for (my $n=0; $n<@{$idsref}; $n++) {
+                        my $id = $idsref->[$n];
+                        my $text = $titlesref->[$n];
+                        $exttooloptions .= "         tooloptval[$idx][$n] = '$id';\n".
+                                           "         toolopttxt[$idx][$n] = '$text';\n";
+                    }
+                }
+                $exttoolnums .= "        ltitoolsnum[$idx] = $i;\n";
             }
+            $idx ++;
         }
     }
     my %js_lt = &Apache::lonlocal::texthash(
         invurl  => 'Invalid URL',
         titbl   => 'Title is blank',
         invtool => 'Please select an external tool',
+        mixfra  => 'Show preview in pop-up? (http in https page + no framing)',
+        mixonly => 'Show preview in pop-up? (http in https page)',
+        fraonly => 'Show preview in pop-up? (framing disallowed)',
+        nopopup => 'Pop-up blocked',
+        nopriv  => 'Insufficient privileges to use preview',
+        badurl  => 'URL is not: http://hostname/path or https://hostname/path',
+        sele    => 'Select',
     );
     &js_escape(\%js_lt);
 
@@ -713,17 +1129,29 @@ function setExternal(extform,residx,type
     } else {
         title = escape(title);
         var info = exttoolurl;
+        var prefix = '';
+        if (supplementalflag == 1) {
+           prefix = 'supp';
+        }
         if (residx == 0) {
             var toolid = parseInt(extform.exttoolid.options[extform.exttoolid.selectedIndex].value);
             if (isNaN(toolid)) {
                 alert("$js_lt{'invtool'}");
                 return;
             }
-            info += ':'+toolid;
-        }
-        var prefix = '';
-        if (supplementalflag == 1) {
-           prefix = 'supp';
+            var typeelem = extform.elements[prefix+'exttooltype'];
+            if (typeelem.length) {
+                for (var i=0; i<typeelem.length; i++) {
+                    if (typeelem[i].checked) {
+                        tooltype = typeelem[i].value;
+                    }
+                }
+            }
+            if (tooltype == 'crs') {
+                info += ':c'+toolid;
+            } else {
+                info += ':'+toolid;
+            }
         }
         var dispdiv = prefix+'tooldispdiv';
         var windiv = prefix+'toolwindiv';
@@ -786,9 +1214,13 @@ 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;
@@ -804,6 +1236,92 @@ function setExternal(extform,residx,type
         } else {
             info += ':';
         }
+        if (document.getElementById(appendinput)) {
+            var crsappend = document.getElementById(appendinput).value;
+            crsappend.trim();
+            info += ':'+escape(crsappend);
+        } else {
+            info += ':';
+        }
+        var gradablediv = prefix+'toolgradablediv';
+        if (residx > 0) {
+            gradablediv += '_'+residx;
+        }
+        if (document.getElementById(gradablediv)) {
+            if (document.getElementById(gradablediv).style.display == 'inline') {
+                if (extform.exttoolgradable.length) {
+                    for (var i=0; i<extform.exttoolgradable.length; i++) {
+                        if (extform.exttoolgradable[i].checked) {
+                            if (extform.exttoolgradable[i].value == '1') {
+                                info += ':1';
+                            } else {
+                                info += ':';
+                            }
+                            break;
+                        }
+                    }
+                } else {
+                    info += ':';
+                }
+            } else {
+                info += ':';
+            }
+        } 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();");
@@ -814,14 +1332,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;
@@ -832,17 +1350,147 @@ function extUrlPreview(caller,protocol)
         var url = document.getElementById(caller).value;
         if (regexp.test(url)) {
             var http_regex = /^http\:\/\//gi;
+            var mixed = 0;
+            var noiframe = 0;
+            var nopriv = 0;
+            var badurl = 0;
+            var name = "externalpreview";
             if ((protocol == 'https') && (http_regex.test(url))) {
-                window.open(url,"externalpreview","height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1");
-            } else {
-                openMyModal(url,500,400,'yes');
+                mixed = 1;
             }
+            var http = new XMLHttpRequest();
+            var lcurl = "/adm/exturlcheck";
+            var params = "exturl="+url;
+            http.open("POST",lcurl, true);
+            http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+            http.onreadystatechange = function() {
+                if (http.readyState == 4) {
+                    if (http.status == 200) {
+                        if (http.responseText.length > 0) {
+                            if (http.responseText == 1) {
+                                noiframe = 1;
+                            } else if (http.responseText == -1) {
+                                nopriv = 1;
+                            } else if (http.responseText == 0) {
+                                badurl = 1;
+                            }
+                        }
+                        openPreviewWindow(url,name,noiframe,mixed,nopriv,badurl);
+                    }
+                }
+            }
+            http.send(params);
         } else {
             alert("$js_lt{'invurl'}");
         }
     }
 }
 
+var previewLCWindow = null;
+function openPreviewWindow(url,name,noiframe,mixed,nopriv,badurl) {
+    if (previewLCWindow !=null) {
+        previewLCWindow.close();
+    }
+    if (badurl) {
+        alert("$js_lt{'badurl'}");
+    } else if (nopriv) {
+        alert("$js_lt{'nopriv'}");
+    } else if ((noiframe == 1) || (mixed == 1)) {
+        var encurl = encodeURI(url);
+        var msg;
+        if (mixed == 1) {
+            if (noiframe == 1) {
+                msg = "$js_lt{'mixfra'}";
+            } else {
+                msg = "$js_lt{'mixonly'}";
+            }
+        } else {
+            msg = "$js_lt{'fraonly'}";
+        }
+        if (confirm(msg)) {
+            previewLCWindow = window.open(url,name,"height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1");
+            if (previewLCWindow != null) {
+                previewLCWindow.focus();
+            } else {
+                alert("$js_lt{'nopopup'}");
+            }
+        }
+    } else {
+        openMyModal(url,500,400,'yes');
+    }
+}
+
+function updateExttoolSel(form,radioname,supplementalflag) {
+    var prefix = '';
+    var typepick;
+    var radelem = form.elements[radioname];
+    if (radelem.length) {
+        for (var i=0; i<radelem.length; i++) {
+            if (radelem[i].checked) {
+                if (radelem[i].value == 'crs') {
+                    typepick = 0;
+                } else if (radelem[i].value == 'dom') {
+                    typepick = 1;
+                }
+                break;
+            }
+        }
+    }
+    if (supplementalflag == 1) {
+        prefix = 'supp';
+    }
+    $exttoolnums
+    $exttooloptions
+    if ((typepick == 0) || (typepick == 1)) {
+        var selelem = form.elements['exttoolid'];
+        var i, numopts = selelem.options.length -1;
+        if (numopts >=0) {
+            for (i = numopts; i >= 0; i--) {
+                selelem.remove(i);
+            }
+        }
+        if (ltitoolsnum[typepick]) {
+            if ((Array.isArray(tooloptval[typepick])) && (Array.isArray(toolopttxt[typepick]))) {
+                var len = tooloptval[typepick].length;
+                if (len) {
+                    selelem.options[selelem.options.length] = new Option('$js_lt{sele}','',1,1);
+                    var j;
+                    for (j=0; j<len; j++) {
+                        selelem.options[selelem.options.length] = new Option(toolopttxt[typepick][j],tooloptval[typepick][j]);
+                    }
+                    selelem.selectedIndex = 0;
+                }
+            }
+            if (document.getElementById('LC_exttoolon'+prefix)) {
+                document.getElementById('LC_exttoolon'+prefix).style.display = 'block';
+            }
+            if (document.getElementById('LC_exttooloff'+prefix)) {
+                document.getElementById('LC_exttooloff'+prefix).style.display = 'none';
+            }
+            if (document.getElementById('LC_addtool'+prefix)) {
+                document.getElementById('LC_addtool'+prefix).style.display = 'block';
+            }
+        } else {
+            if (document.getElementById('LC_exttoolon'+prefix)) {
+                document.getElementById('LC_exttoolon'+prefix).style.display = 'none';
+            }
+            if (document.getElementById('LC_exttooloff'+prefix)) {
+                document.getElementById('LC_exttooloff'+prefix).style.display = 'block';
+            }
+            if (document.getElementById('LC_addtool'+prefix)) {
+                document.getElementById('LC_addtool'+prefix).style.display = 'none';
+            }
+        }
+        if (selelem.options.length == 0) {
+            selelem.options[selelem.options.length] = new Option('','');
+            selelem.selectedIndex = 0;
+        }
+        updateExttool(selelem,form,supplementalflag);
+        resize_scrollbox('contentscroll','1','1');
+    }
+    return;
+}
+
 function updateExttool(caller,form,supplementalflag) {
     var prefix = '';
     if (supplementalflag == 1) {
@@ -854,8 +1502,19 @@ function updateExttool(caller,form,suppl
     heightinput = prefix+'tooldimenheight';
     labeldiv = prefix+'toolcrslabeldiv';
     titlediv = prefix+'toolcrstitlediv';
+    appenddiv = prefix+'toolcrsappenddiv';
+    gradablediv = prefix+'toolgradablediv';
+    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';
     windiv = prefix+'toolwindiv';  
     linktextdiv = prefix+'toollinktextdiv';
     linktextinput = prefix+'toollinktext';
@@ -865,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';    
             }
@@ -886,95 +1560,205 @@ function updateExttool(caller,form,suppl
             if (document.getElementById(titlediv)) {
                 document.getElementById(titlediv).style.display = 'none';
             }
+            if (document.getElementById(appenddiv)) {
+                document.getElementById(appenddiv).style.display = 'none';
+            }
+            if (document.getElementById(gradablediv)) {
+                document.getElementById(gradablediv).style.display = 'none';
+            }
+            if (document.getElementById(returnurldiv)) {
+                document.getElementById(returnurldiv).style.display = 'none';
+            }
         } else {
-            if (ltitools.length > 0) {
-                for (var j=0; j<ltitools.length; j++) {
-                    if (ltitools[j] == toolpick) {
-                        if (document.getElementById(dispdiv)) {
-                            if (ltitoolsDisplay[j]) {
-                                document.getElementById(dispdiv).style.display = 'block';
-                                if (form.exttooltarget.length) {
-                                    for (var k=0; k<form.exttooltarget.length; k++) {
-                                        if (form.exttooltarget[k].value == ltitoolsTarget[j]) {
-                                            form.exttooltarget[k].checked = true;
-                                            break;
+            var tooltype = '';
+            var typeelem = form.elements[prefix+'exttooltype'];
+            if (typeelem.length) {
+                for (var i=0; i<typeelem.length; i++) {
+                    if (typeelem[i].checked) {
+                        tooltype = typeelem[i].value;
+                    }
+                }
+            }
+            if ((tooltype == 'crs') || (tooltype == 'dom')) {
+                var i = 0;
+                if (tooltype == 'dom') {
+                    i = 1;
+                }
+                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 = '';
+                                    }
                                 }
                             }
-                            var dimen = 'none';
-                            var dimenwidth = '';
-                            var dimenheight = '';
-                            if ((ltitoolsDisplay[j]) && (ltitoolsTarget[j] == 'window')) {
-                                dimen = 'block';
-                                dimenwidth = ltitoolsWidth[j];
-                                dimenheight = ltitoolsHeight[j];                    
-                            }
-                            if (document.getElementById(dimendiv)) {
-                                document.getElementById(dimendiv).style.display = dimen;
-                            }
-                            if (document.getElementById(widthinput)) {
-                                document.getElementById(widthinput).value = dimenwidth;
-                            }
-                            if (document.getElementById(heightinput)) {
-                                document.getElementById(heightinput).value = dimenheight;
-                            }
-                        }
-                        if (document.getElementById(windiv)) {
-                            if ((ltitoolsTarget[j] == 'window') || (ltitoolsTarget[j] == 'tab')) {
-                                document.getElementById(windiv).style.display = 'block';
-                            } else {
-                                document.getElementById(windiv).style.display = 'none';
+                            if (document.getElementById(appenddiv)) {
+                                if (ltitoolsAppend[i][j]) {
+                                    document.getElementById(appenddiv).style.display = 'inline';
+                                } else {
+                                    document.getElementById(appenddiv).style.display = 'none';
+                                }
                             }
-                            if (document.getElementById(linktextdiv)) {
-                                if (ltitoolsLink[j]) {
-                                    document.getElementById(linktextdiv).style.display = 'inline';
+                            if (document.getElementById(desturldiv)) {
+                                if (ltitoolsDestUrl[i][j]) {
+                                    document.getElementById(desturldiv).style.display = 'inline';
                                 } else {
-                                    document.getElementById(linktextdiv).style.display = 'none';
+                                    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';
+                                    if (form.exttooltarget.length) {
+                                        for (var k=0; k<form.exttooltarget.length; k++) {
+                                            if (form.exttooltarget[k].value == ltitoolsTarget[i][j]) {
+                                                form.exttooltarget[k].checked = true;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+                                var dimen = 'none';
+                                var dimenwidth = '';
+                                var dimenheight = '';
+                                if ((ltitoolsDisplay[i][j]) && (ltitoolsTarget[i][j] == 'window')) {
+                                    dimen = 'block';
+                                    dimenwidth = ltitoolsWidth[i][j];
+                                    dimenheight = ltitoolsHeight[i][j];
+                                }
+                                if (document.getElementById(dimendiv)) {
+                                    document.getElementById(dimendiv).style.display = dimen;
+                                }
+                                if (document.getElementById(widthinput)) {
+                                    document.getElementById(widthinput).value = dimenwidth;
+                                }
+                                if (document.getElementById(heightinput)) {
+                                    document.getElementById(heightinput).value = dimenheight;
+                                }
+                            }
+                            if (document.getElementById(windiv)) {
+                                if ((ltitoolsTarget[i][j] == 'window') || (ltitoolsTarget[i][j] == 'tab')) {
+                                    document.getElementById(windiv).style.display = 'block';
+                                } else {
+                                    document.getElementById(windiv).style.display = 'none';
+                                }
+                                if (document.getElementById(linktextdiv)) {
+                                    if (ltitoolsLink[i][j]) {
+                                        document.getElementById(linktextdiv).style.display = 'inline';
+                                    } else {
+                                        document.getElementById(linktextdiv).style.display = 'none';
+                                    }
+                                }
+                                if (document.getElementById(linktextinput)) {
+                                    if (ltitoolsLink[i][j]) {
+                                        document.getElementById(linktextinput).value = ltitoolsLinkDef[i][j];
+                                    } else {
+                                        document.getElementById(linktextinput).value = '';
+                                    }
+                                }
+                                if (document.getElementById(explanationdiv)) {
+                                    if (ltitoolsExplain[i][j]) {
+                                        document.getElementById(explanationdiv).style.display = 'inline';
+                                    } else {
+                                        document.getElementById(explanationdiv).style.display = 'none';
+                                    }
+                                }
+                                if (document.getElementById(explanationinput)) {
+                                    if (ltitoolsExplain[i][j]) {
+                                        document.getElementById(explanationinput).value = ltitoolsExplainDef[i][j];
+                                    } else {
+                                        document.getElementById(explananationinput).value = '';
+                                    }
                                 }
                             }
-                            if (document.getElementById(linktextinput)) {
-                                if (ltitoolsLink[j]) {
-                                    document.getElementById(linktextinput).value = ltitoolsLinkDef[j]; 
+                            if (document.getElementById(labeldiv)) {
+                                if (ltitoolsLabel[i][j]) {
+                                    document.getElementById(labeldiv).style.display = 'inline';
                                 } else {
-                                    document.getElementById(linktextinput).value = '';
+                                    document.getElementById(labeldiv).style.display = 'none';
                                 }
                             }
-                            if (document.getElementById(explanationdiv)) {
-                                if (ltitoolsExplain[j]) {
-                                    document.getElementById(explanationdiv).style.display = 'inline';
+                            if (document.getElementById(titlediv)) {
+                                if (ltitoolsTitle[i][j]) {
+                                    document.getElementById(titlediv).style.display = 'inline';
                                 } else {
-                                    document.getElementById(explanationdiv).style.display = 'none';
+                                    document.getElementById(titlediv).style.display = 'none';
+                                }
+                            }
+                            if (document.getElementById(gradablediv)) {
+                                if (supplementalflag != 1) {
+                                    document.getElementById(gradablediv).style.display = 'inline';
                                 }
                             }
-                            if (document.getElementById(explanationinput)) {
-                                if (ltitoolsExplain[j]) {
-                                    document.getElementById(explanationinput).value = ltitoolsExplainDef[j];
+                            if (document.getElementById(returnurldiv)) {
+                                if (ltitoolsReturnUrl[i][j]) {
+                                    document.getElementById(returnurldiv).style.display = 'inline';
                                 } else {
-                                    document.getElementById(explananationinput).value = '';
+                                    document.getElementById(returnurldiv).style.display = 'none';
                                 }
                             }
+                            break;
                         }
-                        if (document.getElementById(labeldiv)) {
-                            if (ltitoolsLabel[j]) {
-                                document.getElementById(labeldiv).style.display = 'inline';
-                            } else {
-                                document.getElementById(labeldiv).style.display = 'none';
-                            } 
-                        }
-                        if (document.getElementById(titlediv)) {
-                            if (ltitoolsTitle[j]) {
-                                document.getElementById(titlediv).style.display = 'inline';
-                            } else {
-                                document.getElementById(titlediv).style.display = 'none';
-                            }
+                    }
+                }
+            }
+        }
+    }
+}
+
+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) {
@@ -1016,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
 
 }