--- loncom/interface/lonextresedit.pm	2017/04/25 22:18:59	1.16
+++ loncom/interface/lonextresedit.pm	2022/09/09 14:24:30	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: lonextresedit.pm,v 1.16 2017/04/25 22:18:59 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.30 2022/09/09 14:24:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,7 +60,7 @@ sub handler {
         $symb,$type);
     if (($env{'form.folderpath'} =~ /^supplemental/) && ($env{'form.suppurl'})) {
         $supplementalflag = 1;
-        if (&unescape($env{'form.suppurl'}) =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}) {
+        if (&unescape($env{'form.suppurl'}) =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) {
             $type = 'tool';
         }
     }
@@ -79,7 +79,7 @@ sub handler {
             if ($symb ne $env{'form.symb'}) {
                 $env{'form.symb'} = $symb;
             }
-            if ($url =~ m{/adm/$cdom/$cnum/\d+/exttools?$}) {
+            if ($url =~ m{/adm/$cdom/$cnum/\d+/ext\.tool$}) {
                 $type = 'tool';
             }
         }
@@ -98,7 +98,7 @@ sub handler {
     }
     my %ltitools;
     if ($type eq 'tool') {
-        %ltitools = &Apache::lonnet::get_domain_ltitools($cdom);
+        %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
     }
     my $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript());
     my $pathitem = '<input type="hidden" name="folderpath" value="'.
@@ -146,7 +146,7 @@ sub process_changes {
         $oldtitle = &unescape($env{'form.title'});
         $container = 'sequence';
         $supplementalflag = 1;
-        if ($oldurl =~ m{^/adm/$cdom/$cnum/\d+/exttools?$}) {
+        if ($oldurl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) {
             $type = 'tool';
         } else {
             $type = 'ext';
@@ -157,10 +157,13 @@ sub process_changes {
     if ($env{'form.importdetail'}) {
         ($newtitle,$newurl,$newidx) =
             map {&unescape($_)} split(/\=/,$env{'form.importdetail'});
-        if ($newurl =~ m{^(/adm/$cdom/$cnum/(\d+)/exttools?)\:?(.*)$}) {
+        if ($newurl =~ m{^(/adm/$cdom/$cnum/(\d+)/ext\.tool)\:?(.*)$}) {
             $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 +173,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 +184,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 +223,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 +263,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,29 +295,46 @@ 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'}) = split(/:/,$args);
+    foreach my $item ('linktext','explanation','crslabel','crstitle','crsappend') {
         $newhash{$item} = &unescape($newhash{$item});
     }
     my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
-    foreach my $item ('target','width','height','linktext','explanation','crslabel','crstitle') {
+    foreach my $item ('target','width','height','linktext','explanation','crslabel','crstitle','crsappend','gradable') {
         $newhash{$item} =~ s/^\s+//;
         $newhash{$item} =~ s/\s+$//;
         if (($item eq 'width') || ($item eq 'height') || ($item eq 'linktext') || ($item eq 'explanation')) {
             if ($newhash{'target'} eq 'iframe') {
                 $newhash{$item} = '';
+            } elsif ($newhash{'target'} eq 'tab') {
+                if (($item eq 'width') || ($item eq 'height')) {
+                    $newhash{$item} = '';
+                }
+            }
+        } elsif ($item eq 'gradable') {
+            unless ($newhash{$item} == 1) {
+                $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') || ($item eq 'linktext') || ($item eq 'explanation')) &&
+                        ((($item eq 'width') || ($item eq 'height')) &&
                          (($newhash{'target'} eq 'window') || 
-                          (($newhash{'target'} eq '') && ($toolhash{'target'} eq 'window'))))) {
+                          (($newhash{'target'} eq '') && ($toolhash{'target'} eq 'window')))) ||
+                        ((($item eq 'linktext') || ($item eq 'explanation')) &&
+                         ((($newhash{'target'} =~ /^(window|tab)$/)) ||
+                         (($newhash{'target'} eq '') && ($toolhash{'target'} =~ /^(window|tab)$/))))) {
                     delete($toolhash{$item});
                     push(@deleted,$item);
                     $changed = 1;
@@ -299,7 +354,7 @@ sub update_exttool {
     if (@deleted) {
         &Apache::lonnet::del('exttool_'.$marker,\@deleted,$cdom,$cnum);
     }
-    return ($changed,$errormsg);
+    return ($changed,$newgradable,$errormsg);
 }
 
 sub extedit_form {
@@ -328,15 +383,16 @@ sub extedit_form {
     }
     my ($formname,$formid,$toggle,$fieldsetid,$urlid,$dispdivstyle,$dimendivstyle,
         $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,
-        $legend,$urlelem,$toolelem,%toolattr);
+        $appendstyle,$gradablestyle,$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','crstitle','crslabel','crsappend',
+                                       'windiv','linktextdiv','explanationdiv',
+                                       'linktext','explanation','providerurl');
     $dispdivstyle = 'display:none';
     $dimendivstyle = 'display:none';
     $windivstyle = 'display:none';
@@ -344,16 +400,18 @@ sub extedit_form {
     $explanationstyle = 'display:none';
     $labelstyle = 'display:none';
     $titlestyle = 'display:none';
+    $appendstyle = 'display:none';
+    $gradablestyle = 'display:none';
     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,$providerurl,$chkgrd,$chknogrd,%chkstate);
     $fieldsetstyle = 'display: none;';
     $action = '/adm/coursedocs';
     my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
@@ -366,9 +424,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) {
@@ -385,7 +443,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"';
@@ -400,7 +458,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 {
@@ -418,7 +476,7 @@ sub extedit_form {
         } else {
             $orig_title = $lt{'et'};
             $save = $lt{'at'};
-            $orig_url = "/adm/$cdom/$cnum/new/exttool"; 
+            $orig_url = "/adm/$cdom/$cnum/new/ext\.tool"; 
         }
         $pathitem .= '<br />';
     }
@@ -429,7 +487,7 @@ sub extedit_form {
         my $class = 'LC_nobreak';
         if ($residx) {
             $class = 'LC_docs_ext_edit LC_nobreak'; 
-            if ($orig_url =~ m{^/adm/$cdom/$cnum/(\d+)/exttools?$}) {
+            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'}) {
@@ -442,11 +500,19 @@ sub extedit_form {
                                 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" ';
                                 }
@@ -454,6 +520,11 @@ sub extedit_form {
                                 $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'};
@@ -463,6 +534,10 @@ sub extedit_form {
                                         $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';
                                     }
@@ -474,6 +549,7 @@ sub extedit_form {
                                     }
                                 }
                                 $toolelem = '<span class="LC_nobreak">'.$image.'&nbsp;'.$tooltitle.'</span><br />';
+                                $gradablestyle = 'display:inline';
                             }
                         }
                     }
@@ -505,12 +581,17 @@ sub extedit_form {
             $toolelem .= '</select></span><br />';
             $crslabel = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'};
             $crstitle = $env{'course.'.$cdom.'_'.$cnum.'.description'};
+            $crsappend = '';
+            $chknogrd = ' checked="checked"';
         }
         $toolelem .= '<div id="'.$toolattr{'dispdiv'}.'" style="'.$dispdivstyle.'">'.
                     '<span class="'.$class.'">'.&mt('Display target:').'&nbsp;'.
                     '<label><input type="radio" name="exttooltarget" value="iframe" '.$chkstate{'iframe'}.'onclick="updateTooldim(this.form,'.
                     "'$toolattr{dimendiv}','$toolattr{windiv}','$toolattr{dimenwidth}','$toolattr{dimenheight}',
                     '$toolattr{linktext}','$toolattr{explanation}'".');"'.$disabled.' />'.&mt('iframe').'</label>'.('&nbsp;'x2).
+                    '<label><input type="radio" name="exttooltarget" value="tab" '.$chkstate{'tab'}.'onclick="updateTooldim(this.form,'.
+                    "'$toolattr{dimendiv}','$toolattr{windiv}','$toolattr{dimenwidth}','$toolattr{dimenheight}',
+                    '$toolattr{linktext}','$toolattr{explanation}'".');"'.$disabled.' />'.&mt('tab').'</label>'.('&nbsp;'x2).
                     '<label><input type="radio" name="exttooltarget" value="window" '.$chkstate{'window'}.'onclick="updateTooldim(this.form,'.
                     "'$toolattr{dimendiv}','$toolattr{windiv}','$toolattr{dimenwidth}','$toolattr{dimenheight}',
                     '$toolattr{linktext}','$toolattr{explanation}'".');"'.$disabled.' />'.&mt('window').'</label></span>'.
@@ -534,7 +615,18 @@ sub extedit_form {
                     '<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>'.
+                    '<div id="'.$toolattr{'crsappenddiv'}.'" style="'.$appendstyle.'">'.
+                    '<span class="'.$class.'">'.&mt('Append to URL[_1]',
+                    '<span id="'.$toolattr{'providerurl'}.'">&nbsp;('.$providerurl.')<br /></span>').
+                    '<input type="text" id="'.$toolattr{'crsappend'}.'" size="30" name="exttoolappend" value="'.$crsappend.'"'.$disabled.' /></span><br />'.
+                    '</div>'.
+                    '<div id="'.$toolattr{'gradablediv'}.'" style="'.$gradablestyle.'">'.
+                    '<span class="'.$class.'">'.&mt('Gradable').'&nbsp;'.
+                    '<label><input type="radio" name="exttoolgradable" value="1"'.$chkgrd.$disabled.
+                    ' />'.&mt('Yes').'</label>'.('&nbsp;'x2).
+                    '<label><input type="radio" name="exttoolgradable" value="0"'.$chknogrd.$disabled.
+                    ' />'.&mt('No').'</label></span></div>';
     }
     my $chooser = $toolelem;
     if ($type eq 'ext') {
@@ -591,7 +683,7 @@ sub display_editor {
     }
     my %ltitools;
     if ($type eq 'tool') {
-        %ltitools = &Apache::lonnet::get_domain_ltitools($cdom);
+        %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer');
     }
     $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript());
     my $args = { 'force_register' => $env{'form.register'} };
@@ -616,6 +708,7 @@ sub extedit_javascript {
     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".
@@ -625,7 +718,8 @@ sub extedit_javascript {
                    "        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 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') {
@@ -635,12 +729,20 @@ sub extedit_javascript {
                     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'};
+                    }
+                    $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";
+                                '        ltitoolsExplainDef['.$i.'] = '."'$explaindef';\n".
+                                '        ltitoolsUrl['.$i.'] = '."'$providerurl';\n";
                 }
                 if (ref($toolsref->{$key}->{'crsconf'}) eq 'HASH') {
                     my $display = $toolsref->{$key}->{'crsconf'}->{'target'};
@@ -653,7 +755,10 @@ sub extedit_javascript {
                     $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++;
             }
         }
@@ -662,6 +767,12 @@ sub extedit_javascript {
         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',
     );
     &js_escape(\%js_lt);
 
@@ -729,6 +840,8 @@ function setExternal(extform,residx,type
                                 var height = extform.exttoolheight.value;
                                 height.trim();
                                 info += ':window:'+width+':'+height;
+                            } else if (extform.exttooltarget[i].value == 'tab') {
+                                info += ':tab::';
                             } else {
                                 info += ':iframe::';
                             }
@@ -771,9 +884,11 @@ function setExternal(extform,residx,type
         }
         var labelinput = prefix+'toolcrslabel';
         var titleinput = prefix+'toolcrstitle';
+        var appendinput = prefix+'toolcrsappend';
         if (residx > 0) {
             labelinput += '_'+residx;
             titleinput += '_'+residx;
+            appendinput += '_'+residx; 
         }
         if (document.getElementById(labelinput)) {
             var crslabel = document.getElementById(labelinput).value;
@@ -789,6 +904,39 @@ 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 += ':';
+        }
         info=escape(info);
         if (residx > 0) {
             eval("extform.importdetail.value=title+'='+info+'='+residx;extform.submit();");
@@ -799,14 +947,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;
@@ -817,17 +965,76 @@ 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 updateExttool(caller,form,supplementalflag) {
     var prefix = '';
     if (supplementalflag == 1) {
@@ -839,8 +1046,12 @@ function updateExttool(caller,form,suppl
     heightinput = prefix+'tooldimenheight';
     labeldiv = prefix+'toolcrslabeldiv';
     titlediv = prefix+'toolcrstitlediv';
+    appenddiv = prefix+'toolcrsappenddiv';
+    gradablediv = prefix+'toolgradablediv';
+    providerurl = prefix+'toolproviderurl';
     labelinput = prefix+'toolcrslabel';
     titleinput = prefix+'toolcrstitle';
+    appendinput = prefix+'toolcrsappend';
     windiv = prefix+'toolwindiv';  
     linktextdiv = prefix+'toollinktextdiv';
     linktextinput = prefix+'toollinktext';
@@ -871,6 +1082,12 @@ 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';
+            }
         } else {
             if (ltitools.length > 0) {
                 for (var j=0; j<ltitools.length; j++) {
@@ -906,34 +1123,34 @@ function updateExttool(caller,form,suppl
                             }
                         }
                         if (document.getElementById(windiv)) {
-                            if (ltitoolsTarget[j] == 'window') {
+                            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]) && (ltitoolsTarget[j] == 'window')) {
+                                if (ltitoolsLink[j]) {
                                     document.getElementById(linktextdiv).style.display = 'inline';
                                 } else {
                                     document.getElementById(linktextdiv).style.display = 'none';
                                 }
                             }
                             if (document.getElementById(linktextinput)) {
-                                if ((ltitoolsLink[j]) && (ltitoolsTarget[j] == 'window')) {
+                                if (ltitoolsLink[j]) {
                                     document.getElementById(linktextinput).value = ltitoolsLinkDef[j]; 
                                 } else {
                                     document.getElementById(linktextinput).value = '';
                                 }
                             }
                             if (document.getElementById(explanationdiv)) {
-                                if ((ltitoolsExplain[j]) && (ltitoolsTarget[j] == 'window')) {
+                                if (ltitoolsExplain[j]) {
                                     document.getElementById(explanationdiv).style.display = 'inline';
                                 } else {
                                     document.getElementById(explanationdiv).style.display = 'none';
                                 }
                             }
                             if (document.getElementById(explanationinput)) {
-                                if ((ltitoolsExplain[j]) && (ltitoolsTarget[j] == 'window')) {
+                                if (ltitoolsExplain[j]) {
                                     document.getElementById(explanationinput).value = ltitoolsExplainDef[j];
                                 } else {
                                     document.getElementById(explananationinput).value = '';
@@ -954,6 +1171,26 @@ function updateExttool(caller,form,suppl
                                 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 />';
+                                    }
+                                }
+                            } 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';
+                            }
+                        }
                         break;
                     }
                 }
@@ -967,22 +1204,26 @@ function updateTooldim(form,dimendiv,win
         for (var i=0; i<form.exttooltarget.length; i++) {
             if (form.exttooltarget[i].checked) {
                 var dimen = 'none';
-                var linkconf = 'none'; 
+                var linkconf = 'none';
                 if (form.exttooltarget[i].value == 'window') {
                     dimen = 'block';
                     linkconf = 'block';
                 } else {
-                    if (document.getElementById(widthinput)) {
-                        document.getElementById(widthinput).value = '';
-                    }
-                    if (document.getElementById(heightinput)) {
-                        document.getElementById(heightinput).value = '';
-                    }
-                    if (document.getElementById(linkinput)) {
-                        document.getElementById(linkinput).value = '';
-                    }
-                    if (document.getElementById(explaininput)) {
-                        document.getElementById(explaininput).value = '';
+                    if (form.exttooltarget[i].value == 'tab') {
+                        linkconf = 'block';
+                    } else {
+                        if (document.getElementById(widthinput)) {
+                            document.getElementById(widthinput).value = '';
+                        }
+                        if (document.getElementById(heightinput)) {
+                            document.getElementById(heightinput).value = '';
+                        }
+                        if (document.getElementById(linkinput)) {
+                            document.getElementById(linkinput).value = '';
+                        }
+                        if (document.getElementById(explaininput)) {
+                            document.getElementById(explaininput).value = '';
+                        }
                     }
                 }
                 if (document.getElementById(dimendiv)) {
@@ -990,7 +1231,7 @@ function updateTooldim(form,dimendiv,win
                 }
                 if (document.getElementById(windiv)) {
                     document.getElementById(windiv).style.display = linkconf;
-                }  
+                }
                 break;
             }
         }