--- loncom/interface/lonextresedit.pm	2017/11/30 01:52:14	1.20
+++ loncom/interface/lonextresedit.pm	2019/05/02 23:09:39	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: lonextresedit.pm,v 1.20 2017/11/30 01:52:14 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.29 2019/05/02 23:09:39 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="'.
@@ -161,6 +161,9 @@ sub process_changes {
             $newurl = $1;
             $marker = $2;
             $args = $3;
+            if ((!$symb) && (!$supplementalflag)) {
+                $symb = "uploaded/$cdom/$cnum/$folder.$container"."___$newidx"."___adm/$cdom/$cnum/$marker/ext.tool";
+            }
         }
     }
     if ($supplementalflag) {
@@ -170,7 +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,16 +295,15 @@ 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'},$newhash{'crsappend'}) = split(/:/,$args);
+     $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','crsappend') {
+    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')) {
@@ -277,8 +314,19 @@ sub update_exttool {
                     $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')) &&
@@ -306,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 {
@@ -335,16 +383,16 @@ sub extedit_form {
     }
     my ($formname,$formid,$toggle,$fieldsetid,$urlid,$dispdivstyle,$dimendivstyle,
         $windivstyle,$linktextstyle,$explanationstyle,$labelstyle,$titlestyle,
-        $appendstyle,$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','crsappenddiv',
-                                       'crstitle','crslabel','crsappend','windiv',
-                                       'linktextdiv','explanationdiv','linktext',
-                                       'explanation','providerurl'); 
+                                       'gradablediv','crstitle','crslabel','crsappend',
+                                       'windiv','linktextdiv','explanationdiv',
+                                       'linktext','explanation','providerurl');
     $dispdivstyle = 'display:none';
     $dimendivstyle = 'display:none';
     $windivstyle = 'display:none';
@@ -353,16 +401,17 @@ sub extedit_form {
     $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,
         $crsappend,$fieldsetstyle,$action,$hiddenelem,$form,$width,$height,$tooltarget,
-        $linktext,$explanation,$providerurl,%chkstate);
+        $linktext,$explanation,$providerurl,$chkgrd,$chknogrd,%chkstate);
     $fieldsetstyle = 'display: none;';
     $action = '/adm/coursedocs';
     my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
@@ -394,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"';
@@ -409,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 {
@@ -471,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'};
@@ -495,6 +549,7 @@ sub extedit_form {
                                     }
                                 }
                                 $toolelem = '<span class="LC_nobreak">'.$image.'&nbsp;'.$tooltitle.'</span><br />';
+                                $gradablestyle = 'display:inline';
                             }
                         }
                     }
@@ -527,6 +582,7 @@ sub extedit_form {
             $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;'.
@@ -563,8 +619,14 @@ sub extedit_form {
                     '<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="20" name="exttoolappend" value="'.$crsappend.'"'.$disabled.' /></span><br />'.
-                    '</div>';
+                    '<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') {
@@ -621,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'} };
@@ -656,7 +718,7 @@ 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})) {
@@ -673,6 +735,7 @@ sub extedit_javascript {
                     } else {
                         $providerurl = $toolsref->{$key}->{'url'};
                     }
+                    $providerurl = &LONCAPA::map::qtunescape($providerurl);
                     $toolsjs .= '        ltitools['.$i.'] = '."'$key';\n".
                                 '        ltitoolsTarget['.$i.'] = '."'$target';\n".
                                 '        ltitoolsWidth['.$i.'] = '."'$width';\n".
@@ -704,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);
 
@@ -842,6 +911,32 @@ function setExternal(extform,residx,type
         } 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();");
@@ -852,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;
@@ -870,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) {
@@ -893,6 +1047,7 @@ function updateExttool(caller,form,suppl
     labeldiv = prefix+'toolcrslabeldiv';
     titlediv = prefix+'toolcrstitlediv';
     appenddiv = prefix+'toolcrsappenddiv';
+    gradablediv = prefix+'toolgradablediv';
     providerurl = prefix+'toolproviderurl';
     labelinput = prefix+'toolcrslabel';
     titleinput = prefix+'toolcrstitle';
@@ -930,6 +1085,9 @@ function updateExttool(caller,form,suppl
             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++) {
@@ -1018,16 +1176,21 @@ function updateExttool(caller,form,suppl
                                 document.getElementById(appenddiv).style.display = 'inline';
                                 if (document.getElementById(providerurl)) {
                                     if ((ltitoolsUrl[j] != '') && (ltitoolsUrl[j] != null)) {
-                                        document.getElementById(providerurl).innerHTML.value = '&nbsp;('+ltitoolsUrl[j]+')<br />';
+                                        document.getElementById(providerurl).innerHTML = '&nbsp;('+ltitoolsUrl[j]+')<br />';
                                     }
                                 }
                             } else {
                                 document.getElementById(appenddiv).style.display = 'none';
                                 if (document.getElementById(providerurl)) {
-                                    document.getElementById(providerurl).innerHTML.value = '';
+                                    document.getElementById(providerurl).innerHTML = '';
                                 }
                             }
                         }
+                        if (document.getElementById(gradablediv)) {
+                            if (supplementalflag != 1) {
+                                document.getElementById(gradablediv).style.display = 'inline';
+                            }
+                        }
                         break;
                     }
                 }