--- loncom/interface/lonextresedit.pm	2012/11/27 23:34:41	1.1
+++ loncom/interface/lonextresedit.pm	2017/03/14 21:09:20	1.8.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: lonextresedit.pm,v 1.1 2012/11/27 23:34:41 raeburn Exp $
+# $Id: lonextresedit.pm,v 1.8.2.2 2017/03/14 21:09:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,10 +57,11 @@ sub handler {
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     my $chome = $env{'course.'.$env{'request.course.id'}.'.home'};
     my ($supplementalflag,$updated,$output,$errormsg,$residx,$url,$title,$symb);
-    if ((($env{'form.folderpath'} =~ /^supplemental/) && ($env{'form.suppurl'})) ||
-        ($env{'form.symb'} =~ /^uploaded/)) {
-        $supplementalflag = 1;        
-        ($updated,$output,$errormsg,$residx,$url,$title,$symb) = 
+    if (($env{'form.folderpath'} =~ /^supplemental/) && ($env{'form.suppurl'})) {
+        $supplementalflag = 1;
+    }
+    if (($supplementalflag) || ($env{'form.symb'} =~ /^uploaded/)) {
+        ($updated,$output,$errormsg,$residx,$url,$title,$symb) =
             &process_changes($supplementalflag,$cdom,$cnum,$chome);
         if ($supplementalflag) {
             if ($url ne $env{'form.suppurl'}) {
@@ -69,6 +70,7 @@ sub handler {
             if ($title ne $env{'form.title'}) {
                 $env{'form.title'} = $title;
             }
+            $env{'form.idx'} = $residx;
         } else {
             if ($symb ne $env{'form.symb'}) {
                 $env{'form.symb'} = $symb;
@@ -99,20 +101,14 @@ sub handler {
 sub process_changes {
     my ($supplementalflag,$cdom,$cnum,$chome) = @_;
     my ($folder,$container,$output,$errormsg,$updated,$symb,$oldidx,$oldurl,
-        $oldtitle,$residx,$newurl,$newtitle);
+        $oldtitle,$newidx,$newurl,$newtitle,$residx,$url,$title);
     if ($env{'form.symb'}) {
         $symb = $env{'form.symb'};
-        (my $map,$oldidx,my $url)=&Apache::lonnet::decode_symb($symb);
+        (my $map,$oldidx,$oldurl)=&Apache::lonnet::decode_symb($symb);
         if ($map =~ m{^uploaded/$cdom/$cnum/(default(_\d+|))\.(sequence|page)$}) {
             $folder = $1;
             $container = $3;
         }
-        if ($url =~ m{^ext/(.+)$}) {
-            $oldurl = $1;
-            if ($oldurl !~ m{^https://}) {
-                $oldurl = 'http://'.$oldurl;
-            }
-        }
         $oldtitle = &Apache::lonnet::gettitle($env{'form.symb'});
     } elsif ($env{'form.folderpath'}) {
         $folder = &unescape( (split('&',$env{'form.folderpath'}))[-2] );
@@ -121,18 +117,33 @@ sub process_changes {
         $container = 'sequence';
         $supplementalflag = 1;
     }
+    if ($oldurl =~ m{^ext/(.+)$}) {
+        my $external = $1; 
+        if ($external =~ m{^https://}) {
+            $oldurl = $external;
+        } else {
+            $oldurl = 'http://'.$oldurl;
+        }
+    }
+    $url = $oldurl;
+    $title = $oldtitle;
+    if ($env{'form.importdetail'}) {
+        ($newtitle,$newurl,$newidx) =
+            map {&unescape($_)} split(/\=/,$env{'form.importdetail'});
+    }
+    if ($supplementalflag) {
+        $residx = $newidx;
+    } else {
+        $residx = $oldidx;
+    }
     if ($folder && $container) {
         if ($env{'form.importdetail'}) {
-            my ($errtext,$fatal,$mismatchedid);
-            ($newtitle,$newurl, $residx) =
-                map {&unescape($_)} split(/\=/,$env{'form.importdetail'});
-            if (!$supplementalflag && $oldidx) {
-               if ($oldidx != $residx) {
-                   $mismatchedid = 1;
-                   $residx = $oldidx;
-               }
+            my ($errtext,$fatal,$mismatchedid,@imports);
+            if (!$supplementalflag) {
+                if (($oldidx) && ($oldidx != $newidx)) {
+                    $mismatchedid = 1;
+                }
             }
-            my @imports;
             if ($mismatchedid) {
                 $errormsg = 'Wrong item identifier';
             } elsif (($newtitle eq $oldtitle) && ($newurl eq $oldurl)) {
@@ -152,9 +163,15 @@ sub process_changes {
                         $errormsg = &mt('Update failed: [_1].',$errtext);
                     } else {
                         $updated = 1;
+                        $title = $newtitle;
+                        if ($newurl ne $oldurl) {
+                            $url = $newurl;
+                            $newurl =~ s{^http://}{};
+                            $newurl = "ext/$newurl";
+                        }
                         if (!$supplementalflag) {
                             if ($newurl ne $oldurl) {
-                                $symb = &Apache::lonnet::encode_symb($map,$residx,"ext/$newurl");
+                                $symb = &Apache::lonnet::encode_symb($map,$residx,$newurl);
                             } else {
                                 $symb = $env{'form.symb'};
                                 if ($symb) {
@@ -162,12 +179,14 @@ sub process_changes {
                                 }
                             }
                         }
-                        my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
+                        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);
+                            unless ($supplementalflag) {
+                                &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum);
+                            }
                         }
                     }
                 }
@@ -178,15 +197,11 @@ sub process_changes {
     } else {
         $errormsg = &mt('Information about current external resource is incomplete.');
     }
-    if ($updated) {
-        return ($updated,$output,$errormsg,$residx,$newurl,$newtitle,$symb);
-    } else {
-        return ($updated,$output,$errormsg,$residx,$oldurl,$oldtitle,$symb);
-    }
+    return ($updated,$output,$errormsg,$residx,$url,$title,$symb);
 }
 
 sub extedit_form {
-    my ($supplementalflag,$residx,$orig_url,$orig_title,$pathitem,$helpitem,$caller,$symb) = @_;
+    my ($supplementalflag,$residx,$orig_url,$orig_title,$pathitem,$helpitem,$caller,$symb,$disabled) = @_;
     my %lt = &Apache::lonlocal::texthash(
         ex => 'External Resource',
         ed => 'Edit',
@@ -211,9 +226,10 @@ sub extedit_form {
         $urlid = 'suppexturl';
     }
     my ($link,$legend,$active,$srcclass,$extsrc,$preview,$title,$save,
-        $fieldsetstyle,$action,$hiddenelem);
+        $fieldsetstyle,$action,$hiddenelem,$form);
     $fieldsetstyle = 'display: none;';
     $action = '/adm/coursedocs';
+    my $protocol = ($ENV{'SERVER_PORT'} == 443?'https':'http');
     if ($residx) {
         if ($caller eq 'direct') {
             $fieldsetstyle = 'display: block;';
@@ -228,16 +244,16 @@ sub extedit_form {
                               &HTML::Entities::encode(&escape($orig_title),'<>&"').'" />';
             }
         } else {        
-            $link = '<a class="LC_docs_ext_edit" href="javascript:editext('."'$residx'".');">'.$lt{'ed'}.'</a>';
+            $link = '<a class="LC_docs_ext_edit" href="javascript:editext('."'$residx'".');">'.$lt{'ed'}.'</a>&nbsp;'."\n";
             $size = 40;
-            $active = '<input type="hidden" name="active" value="'.$tabid.'" />'; 
+            $active = '<input type="hidden" name="active" value="'.$tabid.'" />';
         }
         $formname = "editext_$residx";
         $fieldsetid = "uploadext$residx";
         $urlid = "exturl_$residx";
         $srcclass = ' class="LC_nobreak"';
         $extsrc = '<span class="LC_docs_ext_edit">'.$lt{'ul'}.'&nbsp;</span>';
-        $preview = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:extUrlPreview('."'$urlid'".');">'.$lt{'pr'}.'</a>';
+        $preview = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:extUrlPreview('."'$urlid','$protocol'".');">'.$lt{'pr'}.'</a>';
         $title = '<span class="LC_docs_ext_edit">'.$lt{'ti'}.'&nbsp;</span>';
         $save = $lt{'sv'};
     } else {
@@ -248,39 +264,42 @@ sub extedit_form {
         $residx = 0;
         $orig_url = 'http://';
         $orig_title = $lt{'ex'};
-        $preview = '<input type="button" name="view" value="'.$lt{'pr'}.'" onclick="javascript:extUrlPreview('."'$urlid'".');" />';
+        $preview = '<input type="button" name="view" value="'.$lt{'pr'}.'" onclick="javascript:extUrlPreview('."'$urlid','$protocol'".');"'.$disabled.' />';
         $save = $lt{'al'};
         $pathitem .= '<br />';
     }
-    return <<ENDFORM
-$link
+    $form = <<ENDFORM;
 <form action="$action" method="post" name="$formname">
-<fieldset id="$fieldsetid" style="$fieldsetstyle" />
+<fieldset id="$fieldsetid" style="$fieldsetstyle">
 $legend
 $active
 <span$srcclass>
 $extsrc
-<input type="text" size="$size" name="exturl" id="$urlid" value="$orig_url" />
+<input type="text" size="$size" name="exturl" id="$urlid" value="$orig_url" $disabled />
 $preview
 </span> 
 <br />
 <span$srcclass>
 $title
-<input type="text" size="$size" name="exttitle" value="$orig_title" />
+<input type="text" size="$size" name="exttitle" value="$orig_title" $disabled />
 <input type="hidden" name="importdetail" value="" />
 $pathitem
 $hiddenelem
-<input type="button" value="$save" onclick="javascript:setExternal(this.form,'$residx');" />
+<input type="button" value="$save" onclick="javascript:setExternal(this.form,'$residx');" $disabled />
 </span>
 </fieldset>
 </form>
 ENDFORM
-
+    if (wantarray) {
+        return ($link,$form);
+    } else {
+        return $link.$form;
+    }
 }
 
 sub display_editor {
     my ($url,$folderpath,$symb,$idx) = @_;
-    my ($residx,$supplementalflag,$title,$pathitem,$output);
+    my ($residx,$supplementalflag,$title,$pathitem,$output,$js,$navmap);
     if ($folderpath =~ /^supplemental/) {
         $supplementalflag = 1;
         $residx = $idx;
@@ -290,14 +309,10 @@ sub display_editor {
         (my $map,$residx,my $res) =
             &Apache::lonnet::decode_symb($symb);
         $title = &Apache::lonnet::gettitle($symb);
-        my $path = &Apache::lonnet::getdocspath($symb);
-        if ($map =~ /\.page$/) {
-            $pathitem = '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($path,'<>&"').'" />';
-        } else {
-            $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($path,'<>&"').'" />';
-        }
+        my $path = &Apache::loncommon::symb_to_docspath($symb,\$navmap);
+        $pathitem = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($path,'<>&"').'" />';
     }
-    my $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript());
+    $js = &Apache::lonhtmlcommon::scripttag(&extedit_javascript());
     my $args = { 'force_register' => $env{'form.register'} };
     return &Apache::loncommon::start_page('External Resource Editor',$js,$args).
            '<div class="LC_left_float">'.
@@ -307,10 +322,11 @@ sub display_editor {
 }
 
 sub extedit_javascript {
-    my %lt = &Apache::lonlocal::texthash(
+    my %js_lt = &Apache::lonlocal::texthash(
         invurl  => 'Invalid URL',
         titbl   => 'Title is blank',
     );
+    &js_escape(\%js_lt);
 
     my $urlregexp = <<'ENDREGEXP';
 /^([a-z]([a-z]|\d|\+|-|\.)*):(\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?((\[(|(v[\da-f]{1,}\.(([a-z]|\d|-|\.|_|~)|[!\$&'\(\)\*\+,;=]|:)+))\])|((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=])*)(:\d*)?)(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*|(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)|((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)){0})(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
@@ -326,19 +342,20 @@ function setExternal(extform,residx) {
         String.prototype.trim = function() {return this.replace(\/^\\s+|\\s+$\/g, "");};    }
     var url=extform.exturl.value;
     if (title == null || title.trim()=="") {
-        alert("$lt{'titbl'}");
+        alert("$js_lt{'titbl'}");
         extform.exttitle.focus();
         return;
     }
     if (regexp.test(url)) {
         url = escape(url);
+        title = escape(title);
         if (residx > 0) {
             eval("extform.importdetail.value=title+'='+url+'='+residx;extform.submit();");
         } else {
             eval("extform.importdetail.value=title+'='+url;extform.submit();");
         }
     } else {
-        alert("$lt{'invurl'}");
+        alert("$js_lt{'invurl'}");
         extform.exturl.focus();
         return;
     }
@@ -358,13 +375,18 @@ function editext(residx) {
     return;
 }
 
-function extUrlPreview(caller) {
+function extUrlPreview(caller,protocol) {
     if (document.getElementById(caller)) {
         var url = document.getElementById(caller).value;
         if (regexp.test(url)) {
-            openMyModal(url,500,400,'yes');
+            var http_regex = /^http\:\/\//gi;
+            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');
+            }
         } else {
-            alert("$lt{'invurl'}");
+            alert("$js_lt{'invurl'}");
         }
     }
 }