--- loncom/interface/lonextresedit.pm	2017/05/08 14:20:20	1.18
+++ loncom/interface/lonextresedit.pm	2017/12/15 16:33:51	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: lonextresedit.pm,v 1.18 2017/05/08 14:20:20 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.22 2017/12/15 16:33:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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="'.
@@ -261,25 +261,32 @@ sub update_exttool {
     my %toolhash=&Apache::lonnet::dump('exttool_'.$marker,$cdom,$cnum);
     my (%newhash,$changed,@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'}) = 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') {
         $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} = '';
+                }
             }
         }
         if ($toolhash{$item} ne $newhash{$item}) {
             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;
@@ -328,15 +335,16 @@ sub extedit_form {
     }
     my ($formname,$formid,$toggle,$fieldsetid,$urlid,$dispdivstyle,$dimendivstyle,
         $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,
-        $legend,$urlelem,$toolelem,%toolattr);
+        $appendstyle,$legend,$urlelem,$toolelem,%toolattr);
     $formname = 'new'.$type;
     $toggle = $type;
     $fieldsetid = 'upload'.$type.'form';
     $urlid = $type.'url';
     map { $toolattr{$_} = $type.$_; } ('dispdiv','dimendiv','dimenwidth','dimenheight',
-                                       'crstitlediv','crslabeldiv','crstitle','crslabel',
-                                       'windiv','linktextdiv','explanationdiv','linktext', 
-                                       'explanation');
+                                       'crstitlediv','crslabeldiv','crsappenddiv',
+                                       'crstitle','crslabel','crsappend','windiv',
+                                       'linktextdiv','explanationdiv','linktext',
+                                       'explanation','providerurl'); 
     $dispdivstyle = 'display:none';
     $dimendivstyle = 'display:none';
     $windivstyle = 'display:none';
@@ -344,6 +352,7 @@ sub extedit_form {
     $explanationstyle = 'display:none';
     $labelstyle = 'display:none';
     $titlestyle = 'display:none';
+    $appendstyle = 'display:none';
     if ($supplementalflag) {
         $formname = 'newsupp'.$type;
         $toggle = 'supp'.$type;
@@ -352,8 +361,8 @@ sub extedit_form {
         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,%chkstate);
     $fieldsetstyle = 'display: none;';
     $action = '/adm/coursedocs';
     my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
@@ -442,11 +451,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" ';
                                 }
@@ -463,6 +480,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';
                                     }
@@ -505,12 +526,16 @@ sub extedit_form {
             $toolelem .= '</select></span><br />';
             $crslabel = $env{'course.'.$cdom.'_'.$cnum.'.internal.coursecode'};
             $crstitle = $env{'course.'.$cdom.'_'.$cnum.'.description'};
+            $crsappend = '';
         }
         $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,6 +559,11 @@ 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 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>';
     }
     my $chooser = $toolelem;
@@ -591,7 +621,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 +646,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".
@@ -626,6 +657,7 @@ sub extedit_javascript {
                    "        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') {
@@ -635,12 +667,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 +693,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++;
             }
         }
@@ -729,6 +772,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 +816,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 +836,13 @@ function setExternal(extform,residx,type
         } else {
             info += ':';
         }
+        if (document.getElementById(appendinput)) {
+            var crsappend = document.getElementById(appendinput).value;
+            crsappend.trim();
+            info += ':'+escape(crsappend);
+        } else {
+            info += ':';
+        }
         info=escape(info);
         if (residx > 0) {
             eval("extform.importdetail.value=title+'='+info+'='+residx;extform.submit();");
@@ -839,8 +893,11 @@ function updateExttool(caller,form,suppl
     heightinput = prefix+'tooldimenheight';
     labeldiv = prefix+'toolcrslabeldiv';
     titlediv = prefix+'toolcrstitlediv';
+    appenddiv = prefix+'toolcrsappenddiv';
+    providerurl = prefix+'toolproviderurl';
     labelinput = prefix+'toolcrslabel';
     titleinput = prefix+'toolcrstitle';
+    appendinput = prefix+'toolcrsappend';
     windiv = prefix+'toolwindiv';  
     linktextdiv = prefix+'toollinktextdiv';
     linktextinput = prefix+'toollinktext';
@@ -871,6 +928,9 @@ 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';
+            }
         } else {
             if (ltitools.length > 0) {
                 for (var j=0; j<ltitools.length; j++) {
@@ -906,7 +966,7 @@ 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';
@@ -954,6 +1014,21 @@ 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 = '';
+                                }
+                            }
+                        }
                         break;
                     }
                 }
@@ -972,17 +1047,21 @@ function updateTooldim(form,dimendiv,win
                     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)) {