--- loncom/interface/lonextresedit.pm	2018/07/04 13:55:27	1.26
+++ loncom/interface/lonextresedit.pm	2023/07/12 00:05:02	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: lonextresedit.pm,v 1.26 2018/07/04 13:55:27 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.34 2023/07/12 00:05:02 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_lti($cdom,'consumer');
+        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="'.
@@ -375,15 +386,17 @@ 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,
+    my ($formname,$formid,$toggle,$fieldsetid,$urlid,$subdivid,$dispdivstyle,$dimendivstyle,
         $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,
-        $appendstyle,$gradablestyle,$legend,$urlelem,$toolelem,%toolattr);
+        $appendstyle,$gradablestyle,$subdivstyle,$legend,$urlelem,$toolelem,%toolattr);
     $formname = 'new'.$type;
     $toggle = $type;
     $fieldsetid = 'external'.$type.'form';
@@ -402,6 +415,7 @@ sub extedit_form {
     $titlestyle = 'display:none';
     $appendstyle = 'display:none';
     $gradablestyle = 'display:none';
+    $subdivstyle = 'display:block';
     if ($supplementalflag) {
         $formname = 'newsupp'.$type;
         $toggle = 'supp'.$type;
@@ -424,9 +438,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) {
@@ -490,95 +504,157 @@ sub extedit_form {
             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'}) {
+                my ($tooltype,$tool,$ltihash);
+                if ($toolhash{'id'} =~/^c(\d+)$/) {
+                    $tool = $1;
+                    $tooltype = 'crs';
                     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.'" />';
-                                }
-                                if ($ltitools->{$toolhash{'id'}}->{'url'} =~ m{://}) {
-                                    (my $prot,my $host,$providerurl) = ($ltitools->{$toolhash{'id'}}->{'url'} =~ m{^([^/]+)://([^/]+)(|/.+)$});
-                                } else {
-                                    $providerurl = $ltitools->{$toolhash{'id'}}->{'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($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'}->{'append'}) {
-                                        $crsappend = $toolhash{'crsappend'};
-                                        $appendstyle = '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 />';
-                                $gradablestyle = 'display:inline';
-                            }
+                        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 '') && (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{://}) {
+                        (my $prot,my $host,$providerurl) = ($ltihash->{'url'} =~ m{^([^/]+)://([^/]+)(|/.+)$});
+                    } else {
+                        $providerurl = $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';
+                        }
+                        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';
+                        }
+                    }
+                    $toolelem = '<span class="LC_nobreak">'.$image.'&nbsp;'.$tooltitle.'</span><br />';
+                    $gradablestyle = 'display:inline';
                 }
             }
         } 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'};
             $crsappend = '';
@@ -640,13 +716,17 @@ $preview
 </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>
 $title
 <input type="text" size="$size" name="exttitle" value="$orig_title" $disabled />
@@ -666,6 +746,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);
@@ -681,9 +790,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_lti($cdom,'consumer');
+        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'} };
@@ -704,69 +824,112 @@ 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 ltitoolsUrl = 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".
-                   "        var ltitoolsAppend = 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'};
-                    my $providerurl;
-                    if ($toolsref->{$key}->{'url'} =~ m{://}) {
-                        (my $prot,my $host,$providerurl) = ($toolsref->{$key}->{'url'} =~ m{^([^/]+)://([^/]+)(|/.+)$});
-                    } else {
-                        $providerurl = $toolsref->{$key}->{'url'};
+        $toolsjs = "        var ltitools = new Array();\n".
+                   "        var ltitoolsUrl = 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";
+        $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".
+                            "        ltitoolsUrl[$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";
+                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 $providerurl;
+                            if ($toolsref->{$type}->{$key}->{'url'} =~ m{://}) {
+                                (my $prot,my $host,$providerurl) =
+                                    ($toolsref->{$type}->{$key}->{'url'} =~ m{^([^/]+)://([^/]+)(|/.+)$});
+                            } else {
+                                $providerurl = $toolsref->{$type}->{$key}->{'url'};
+                            }
+                            $providerurl = &LONCAPA::map::qtunescape($providerurl);
+                            $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";
+                        }
+                        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";
+                        }
                     }
-                    $providerurl = &LONCAPA::map::qtunescape($providerurl);
-                    $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".
-                                '        ltitoolsUrl['.$i.'] = '."'$providerurl';\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";
-                    my $append = $toolsref->{$key}->{'crsconf'}->{'append'};
-                    $toolsjs .= '         ltitoolsAppend['.$i.'] = '."'$append';\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);
 
@@ -805,17 +968,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';
@@ -882,7 +1057,7 @@ function setExternal(extform,residx,type
         if (residx > 0) {
             labelinput += '_'+residx;
             titleinput += '_'+residx;
-            appendinput += '_'+residx; 
+            appendinput += '_'+residx;
         }
         if (document.getElementById(labelinput)) {
             var crslabel = document.getElementById(labelinput).value;
@@ -941,14 +1116,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;
@@ -959,17 +1134,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) {
@@ -1024,109 +1329,124 @@ function updateExttool(caller,form,suppl
                 document.getElementById(gradablediv).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(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[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(linktextdiv)) {
-                                if (ltitoolsLink[j]) {
-                                    document.getElementById(linktextdiv).style.display = 'inline';
-                                } else {
-                                    document.getElementById(linktextdiv).style.display = 'none';
+                                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(linktextinput)) {
-                                if (ltitoolsLink[j]) {
-                                    document.getElementById(linktextinput).value = ltitoolsLinkDef[j]; 
+                            if (document.getElementById(windiv)) {
+                                if ((ltitoolsTarget[i][j] == 'window') || (ltitoolsTarget[i][j] == 'tab')) {
+                                    document.getElementById(windiv).style.display = 'block';
                                 } else {
-                                    document.getElementById(linktextinput).value = '';
+                                    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(explanationdiv)) {
-                                if (ltitoolsExplain[j]) {
-                                    document.getElementById(explanationdiv).style.display = 'inline';
+                            if (document.getElementById(labeldiv)) {
+                                if (ltitoolsLabel[i][j]) {
+                                    document.getElementById(labeldiv).style.display = 'inline';
                                 } else {
-                                    document.getElementById(explanationdiv).style.display = 'none';
+                                    document.getElementById(labeldiv).style.display = 'none';
                                 }
                             }
-                            if (document.getElementById(explanationinput)) {
-                                if (ltitoolsExplain[j]) {
-                                    document.getElementById(explanationinput).value = ltitoolsExplainDef[j];
+                            if (document.getElementById(titlediv)) {
+                                if (ltitoolsTitle[i][j]) {
+                                    document.getElementById(titlediv).style.display = 'inline';
                                 } else {
-                                    document.getElementById(explananationinput).value = '';
+                                    document.getElementById(titlediv).style.display = 'none';
                                 }
                             }
-                        }
-                        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';
-                            }
-                        }
-                        if (document.getElementById(appenddiv)) {
-                            if (ltitoolsAppend[j]) {
-                                document.getElementById(appenddiv).style.display = 'inline';
-                                if (document.getElementById(providerurl)) {
-                                    if ((ltitoolsUrl[j] != '') && (ltitoolsUrl[j] != null)) {
-                                        document.getElementById(providerurl).innerHTML = '&nbsp;('+ltitoolsUrl[j]+')<br />';
+                            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 = '';
                                     }
-                                }
-                            } 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(gradablediv)) {
+                                if (supplementalflag != 1) {
+                                    document.getElementById(gradablediv).style.display = 'inline';
+                                }
                             }
+                            break;
                         }
-                        break;
                     }
                 }
             }