--- loncom/interface/portfolio.pm	2010/10/29 23:22:43	1.229
+++ loncom/interface/portfolio.pm	2010/11/28 00:04:05	1.231
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.229 2010/10/29 23:22:43 raeburn Exp $
+# $Id: portfolio.pm,v 1.231 2010/11/28 00:04:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1964,7 +1964,7 @@ sub upload {
 	return;
     }
 
-    my (%allfiles,%codebase,$mode);
+    my (%allfiles,%codebase,$mode,$mimetype);
     if ($env{'form.'.$formname.'.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
         if ($env{'form.parserflag'}) {
 	    $mode = 'parse';
@@ -1974,10 +1974,12 @@ sub upload {
     if ($state eq 'existingfile') {
         $context = $state;
     }
+    my $subdir = $port_path.$env{'form.currentpath'};
+    $subdir =~ s{(/)$}{};
     my ($result,$timestamp) =
-	&Apache::lonnet::userfileupload($formname,$context,
-					$port_path.$env{'form.currentpath'},
-					$mode,\%allfiles,\%codebase);
+	&Apache::lonnet::userfileupload($formname,$context,$subdir,
+					$mode,\%allfiles,\%codebase,undef,undef,
+                                        undef,undef,undef,undef,\$mimetype);
     if ($state eq 'existingfile') {
         my $group_elem;
         my $rootdir = $r->dir_config('lonDaemons').'/tmp/overwrites';
@@ -1998,44 +2000,56 @@ sub upload {
                                                    conf => 'Are you sure you want to overwrite an existing file?',
                                                    cont => 'Continue',
                                                  );
+            my $parserflag;
+            my $hidden = &hidden_elems();
+            if ($mode eq 'parse') {
+                $parserflag = '<input type="hidden" name="parserflag" value="1" />';
+            }
             $r->print(<<"END");
 <script type="text/javascript">
 // <![CDATA[
 function confirmOverwrite() {
-    if (confirm('$lt{'conf'}')) {
-        document.existingfile.action.value = "process_overwrite";
-    } else {
-        if (document.existingfile.overwrite.length) {
-            for (var i=0; i<document.existingfile.overwrite.length; i++) { 
-                if (document.existingfile.overwrite[i].value == "0") { 
-                    document.existingfile.overwrite[i].checked = true;
+    var chosen;
+    if (document.existingfile.overwrite.length) {
+        for (var i=0; i<document.existingfile.overwrite.length; i++) {
+            if (document.existingfile.overwrite[i].checked) {
+                chosen = document.existingfile.overwrite[i].value;
+            }
+        }
+    }
+    if (chosen == 1) {
+        if (confirm('$lt{'conf'}')) {
+            document.existingfile.action.value = "process_overwrite";
+            return true;
+        } else {
+            document.existingfile.action.value = "cancel_overwrite";
+            if (document.existingfile.overwrite.length) {
+                for (var i=0; i<document.existingfile.overwrite.length; i++) {
+                    if (document.existingfile.overwrite[i].value == "0") {
+                        document.existingfile.overwrite[i].checked = true;
+                    }
                 }
             }
+            return false;
         }
+    } else {
         document.existingfile.action.value = "cancel_overwrite";
+        return true;
     }
-    document.existingfile.submit();
-    return;
-}
-function cancelOverwrite() {
-    document.existingfile.action.value = "cancel_overwrite";
-    document.existingfile.submit();
 }
 // ]]>
 </script>
 $msg
-<br /><div class="LC_warning"><form method="post" action="$url" name="existingfile">
+<br /><div class="LC_warning"><form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();">
 <span class="LC_nobreak">$lt{'over'}
-<label><input type="radio" name="overwrite" value="1" onclick="javascript:confirmOverwrite();" />
+<label><input type="radio" name="overwrite" value="1" />
 $lt{'yes'}</label>&nbsp;
-<label><input type="radio" name="overwrite" value="0" onclick="javascript:cancelOverwrite()" />$lt{'no'}</label></span>
+<label><input type="radio" name="overwrite" value="0" checked="checked" />$lt{'no'}</label></span>
 <input type="hidden" name="action" value="cancel_overwrite" />
-<input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
 <input type="hidden" name="filename" value="$showfname" />
-<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
-<input type="hidden" name="mode" value="$mode" />
 <input type="hidden" name="timestamp" value="$timestamp" />
-<input type="hidden" name="showversions" value="$env{'form.showversions'}" /> 
+$hidden
+$parserflag
 $group_elem
 <br /><br />
 <input type="submit" name="process" value="$lt{'cont'}" />
@@ -2051,36 +2065,59 @@ END
                   ,$result,&display_file(undef,$fname)).'</span><br />');
 	$r->print(&done('Back',$url));
     } else {
-	if (%allfiles) {
-            if (!&suppress_embed_prompt()) {
-                &print_dependency_form($r,$url,\%allfiles,\%codebase);
+        if (!&suppress_embed_prompt()) {
+            if ($mimetype eq 'text/html') {
+	        if (keys(%allfiles) > 0) {
+                    &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
+                    return;
+	        } else {
+                    $r->print('<p>'.&mt('Completed upload of the file.').'<br />'.
+                              &mt('No embedded items identified.').'</p>');
+                }
             }
-	} else {
-	    $r->print(&done(undef,$url));
-	}
+        }
+	$r->print(&done(undef,$url));
     }
+    return;
 }
 
-sub print_dependency_form {
-    my ($r,$url,$allfiles,$codebase) = @_;
-    my $state = <<STATE;
-    <input type="hidden" name="action"      value="upload_embedded" />
-    <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
-    <input type="hidden" name="fieldname"   value="$env{'form.fieldname'}" />
-    <input type="hidden" name="mode"        value="$env{'form.mode'}" />
-STATE
-    if ($env{'form.group'} ne '') {
-        $state .= '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />'."\n";
+sub hidden_elems {
+    my $contelem;
+    if ($env{'form.mode'} eq 'selectfile') {
+        $contelem = '<input type="hidden" name="continue" value="true" />';
     }
-    my $embedded = &Apache::loncommon::ask_for_embedded_content($url,$state,$allfiles,$codebase,
+    return <<END;
+<input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+<input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
+<input type="hidden" name="mode" value="$env{'form.mode'}" />
+<input type="hidden" name="showversions" value="$env{'form.showversions'}" />
+$contelem
+END
+}
+
+sub print_dependency_form {
+    my ($r,$url,$allfiles,$codebase,$result) = @_;
+    my $container = &HTML::Entities::encode($result,'<>"&');
+    my $state = &embedded_form_elems($container);
+    my ($embedded,$num,$pathchg) = &Apache::loncommon::ask_for_embedded_content($url,$state,$allfiles,$codebase,
                                   {'error_on_invalid_names'   => 1,
                                    'ignore_remote_references' => 1,});
     if ($embedded) {
-        $r->print('<h2>'.&mt("Reference Warning").'</h2>'.
-                  '<p>'.&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.").'</p>'.
-                  '<p>'.&mt("Please select the locations from which the referenced files are to be uploaded.").'</p>'.
-                  $embedded.
-                  '<p>Or '.&done('Return to directory',$url).'</p>');
+        if ($num || $pathchg) {
+            $r->print('<h3>'.&mt("Reference Warning").'</h3>');
+        } else {
+            $r->print('<h3>'.&mt("Reference Information").'</h3>');
+        }
+        if ($num) {
+            $r->print('<p>'.&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.").'</p>'.
+                      '<p>'.&mt("Please select the locations from which the referenced files are to be uploaded.").'</p>'.
+                       $embedded.
+                       '<p>'.&mt('or').'</p>'.&done('Return to directory',$url));
+        } else {
+            $r->print('<p>'.&mt("Completed upload of the file. This file contained references to other files.").'</p>'.
+                      $embedded.
+                      '<p>'.&done('Return to directory',$url).'</p>');
+        }
     } else {
         $r->print(&done(undef,$url));
     }
@@ -2092,11 +2129,13 @@ sub overwrite {
     my $formname = 'existingfile';
     my $port_path = &get_port_path();
     my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
-    my (%allfiles,%codebase,$mode);
-    $mode = $env{'form.mode'};
-    if ($mode eq 'parse') {
-        if ($fname !~ /\.s?html?$/i) {
-            undef($mode);
+    my (%allfiles,%codebase,$mode,$mimetype);
+    my $mode;
+    unless (&suppress_embed_prompt()) {
+        if ($env{'form.parserflag'}) {
+            if ($fname =~ /\.s?html?$/i) {
+                $mode = 'parse';
+            }
         }
     }
     if ($fname eq '') {
@@ -2107,28 +2146,56 @@ sub overwrite {
         return;
     }
     $env{'form.'.$formname.'.filename'} = $fname;
+    my $subdir = $port_path.$env{'form.currentpath'};
+    $subdir =~ s{(/)$}{};
     my $result=
-        &Apache::lonnet::userfileupload($formname,'overwrite',
-                                        $port_path.$env{'form.currentpath'},
-                                        $mode,\%allfiles,\%codebase);
+        &Apache::lonnet::userfileupload($formname,'overwrite',$subdir,$mode,
+                                        \%allfiles,\%codebase,undef,undef,undef,
+                                        undef,undef,undef,\$mimetype);
     if ($result !~ m|^/uploaded/|) {
         $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to overwrite [_2].'
                   ,$result,&display_file(undef,$fname)).'</span><br />');
-        $r->print(&done('Back',$url));
+        $r->print(&after_overwrite(&mt('Back'),$url));
     } else {
-        if (%allfiles) {
-            if (!&suppress_embed_prompt()) {
-                &print_dependency_form($r,$url,\%allfiles,\%codebase);
-            } else {
-                $r->print(&done(undef,$url));
+        if ($mode eq 'parse') {
+            if ($mimetype eq 'text/html') {
+                if (keys(%allfiles) > 0) {
+                    &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
+                    return;
+                } else {
+                    $r->print('<p>'.&mt('Overwriting completed.').'<br />'.
+                              &mt('No embedded items identified.').'</p>');
+                }
             }
-        } else {
-            $r->print(&done(undef,$url));
         }
+        $r->print(&after_overwrite(undef,$url));
     }
     return;
 }
 
+sub after_overwrite {
+    my ($text,$url) = @_;
+    my $group_elem;
+    if (defined($env{'form.group'})) {
+        $group_elem = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />';
+        if (defined($env{'form.ref'})) {
+            $group_elem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />'."\n";
+        }
+    }
+    if ($text eq '') {
+        $text = &mt('Done');
+    }
+    my $hidden = &hidden_elems();
+    return <<END;
+
+<h3><a href="javascript:document.overwritedone.submit();">$text</a></h3>
+<form name="overwritedone" method="post" action="$url" />
+$hidden
+$group_elem
+</form>
+END
+}
+
 sub lock_info {
     my ($r,$url,$group) = @_;
     my ($uname,$udom) = &get_name_dom($group);
@@ -2377,6 +2444,19 @@ sub suppress_embed_prompt {
     return $suppress_prompt;
 }
 
+sub embedded_form_elems {
+    my ($container) = @_;
+    my $state = <<STATE;
+    <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
+    <input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
+    <input type="hidden" name="mode" value="$env{'form.mode'}" />
+    <input type="hidden" name="container" value="$container" />
+STATE
+    if ($env{'form.group'} ne '') {
+        $state .= '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />'."\n";
+    }
+    return $state;
+}
 
 sub handler {
     # this handles file management
@@ -2523,10 +2603,20 @@ sub handler {
             my $getpropath = 1;
             my $current_disk_usage = 
                 &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
-	    $r->print(
+            my $container = &HTML::Entities::encode($env{'form.container'},'<>&"');
+            my $state = &embedded_form_elems($container).
+                        '<input type="hidden" name="action" value="modify_orightml" />';
+	    my ($result,$flag) =
                 &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom,
-                    $group,$portfolio_root,$group,$disk_quota,$current_disk_usage));
-            $r->print(&done(undef,$url));
+                    $group,$portfolio_root,$group,$disk_quota,$current_disk_usage,$state,$url);
+            $r->print($result.&done('Return to directory',$url));
+        } else {
+            &missing_priv($r,$url,'upload');
+        }
+    } elsif ($env{'form.action'} eq 'modify_orightml') {
+        if ($can_upload) {
+            $r->print(&Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,$udom,$group,$portfolio_root,$group));
+            $r->print(&done('Return to directory',$url));
         } else {
             &missing_priv($r,$url,'upload');
         }
@@ -2601,8 +2691,9 @@ sub handler {
                 my $formname = 'existingfile';
                 my $fname = &Apache::lonnet::clean_filename($env{'form.filename'});
                 $env{'form.'.$formname.'.filename'} = $fname;
-                &Apache::lonnet::userfileupload($formname,'canceloverwrite',
-                                                $port_path.$env{'form.currentpath'});
+                my $subdir = $port_path.$env{'form.currentpath'};
+                $subdir =~ s{(/)$}{};
+                &Apache::lonnet::userfileupload($formname,'canceloverwrite',$subdir);
             }
         }
 	my $current_path='/';