--- loncom/publisher/lonupload.pm	2010/10/27 01:04:15	1.50
+++ loncom/publisher/lonupload.pm	2010/11/28 00:04:10	1.51
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.50 2010/10/27 01:04:15 raeburn Exp $
+# $Id: lonupload.pm,v 1.51 2010/11/28 00:04:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,7 +70,7 @@ Start page output
 
 =item *
 
-output relevant interface phase (phaseone or phasetwo or phasethree)
+output relevant interface phase (phaseone, phasetwo, phasethree or phasefour)
 
 =item *
 
@@ -99,6 +99,11 @@ as overwriting an existing file).
 Interface for handling secondary uploads of embedded objects
 in an html file.
 
+=item phasefour()
+
+Interface for handling optional renaming of links to embedded
+objects. 
+
 =item upfile_store()
 
 Store contents of uploaded file into temporary space.  Invoked
@@ -351,25 +356,32 @@ sub check_extension {
             &Apache::lonnet::extract_embedded_items($target,\%allfiles,\%codebase);
             if (keys(%allfiles) > 0) {
                 my ($currentpath) = ($url =~ m{^(.+)/[^/]+$});
-                my $state = <<STATE;
-    <input type="hidden" name="action"      value="upload_embedded" />
-    <input type="hidden" name="mode"        value="$mode" />
-    <input type="hidden" name="phase"       value="three" />
-    <input type="hidden" name="filename" value="$url" />
-STATE
-                my $embedded = &Apache::loncommon::ask_for_embedded_content($action,$state,\%allfiles,\%codebase,
-                                      {'error_on_invalid_names'   => 1,
-                                       'ignore_remote_references' => 1,
-                                       'current_path'             => $currentpath});
+                my $state = &embedded_form_elems('upload_embedded',$url,$mode);
+                my ($embedded,$num,$pathchg) = 
+                    &Apache::loncommon::ask_for_embedded_content($action,$state,\%allfiles,
+                                                                 \%codebase,
+                                                                 {'error_on_invalid_names'   => 1,
+                                                                  'ignore_remote_references' => 1,
+                                                                  'current_path'             => $currentpath});
                 if ($embedded) {
-                    $result .= '<h3>'.&mt('Reference Warning').'</h3>'.
-                               '<p>'.&mt('Completed upload of the file. This file contained references to other files.').'</p>'.
-                               '<p>'.&mt('Please select the locations from which the referenced files are to be uploaded.').'</p>'.
-                               $embedded;
-                }
-                if ($mode eq 'testbank') {
-                    $returnflag = 'embedded';
-                    $result .=  '<p>'.&mt('Or [_1]continue[_2] the testbank import without these files','<a href="javascript:document.testbankForm.submit();">','</a>').'</p>';
+                    $result .= '<h3>'.&mt('Reference Warning').'</h3>';
+                    if ($num) {
+                        $result .= '<p>'.&mt('Completed upload of the file.').' '.&mt('This file contained references to other files.').'</p>'.
+                                   '<p>'.&mt('Please select the locations from which the referenced files are to be uploaded.').'</p>'.
+                                   $embedded;
+                        if ($mode eq 'testbank') {
+                            $returnflag = 'embedded';
+                            $result .=  '<p>'.&mt('Or [_1]continue[_2] the testbank import without these files.','<a href="javascript:document.testbankForm.submit();">','</a>').'</p>';
+                        }
+                    } else {
+                        $result .= '<p>'.&mt('Completed upload of the file.').'</p>'.$embedded;
+                        if ($pathchg) {
+                            if ($mode eq 'testbank') {
+                                $returnflag = 'embedded';
+                                $result .=  '<p>'.&mt('Or [_1]continue[_2] the testbank import without modifying the references(s).','<a href="javascript:document.testbankForm.submit();">','</a>').'</p>';
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -389,18 +401,59 @@ STATE
 
 sub phasethree {
     my ($r,$fn,$uname,$udom,$mode) = @_;
+    my $action = '/adm/upload'; 
+    if ($mode eq 'testbank') {
+        $action = '/adm/testbank';
+    } elsif ($mode eq 'imsimport') {
+        $action = '/adm/imsimport';
+    }
+    my $dir_root = '/home/'.$uname.'/public_html';
+    my $url_root = '/priv/'.$uname;
+    my $path = &File::Basename::dirname($fn);
+    my $filename = &HTML::Entities::encode($env{'form.filename'},'<>&"');
+    my $state = &embedded_form_elems('modify_orightml',$filename,$mode).
+                '<input type="hidden" name="phase" value="four" />';
+    my ($result,$returnflag) = 
+        &Apache::loncommon::upload_embedded($mode,$path,$uname,$udom,
+                                            $dir_root,$url_root,undef,
+                                            undef,undef,$state,$action);
+    if ($mode ne 'imsimport' && $mode ne 'testbank') {
+        $result .= '<br /><h3><a href="'.$url_root.$fn.'">'.
+                  &mt('View main file').'</a></h3>'.
+                  '<h3><a href="'.$url_root.$path.'">'.
+                  &mt('Back to Directory').'</a></h3><br />';
+    }
+    return ($result,$returnflag);
+}
+
+sub embedded_form_elems {
+    my ($action,$filename,$mode) = @_;
+    return <<STATE;
+    <input type="hidden" name="action" value="$action" />
+    <input type="hidden" name="mode" value="$mode" />
+    <input type="hidden" name="filename" value="$filename" />
+STATE
+}
+
+sub phasefour {
+    my ($r,$fn,$uname,$udom,$mode) = @_;
+    my $action = '/adm/upload';
+    if ($mode eq 'testbank') {
+        $action = '/adm/testbank';
+    } elsif ($mode eq 'imsimport') {
+        $action = '/adm/imsimport';
+    }
     my $result;
     my $dir_root = '/home/'.$uname.'/public_html';
     my $url_root = '/priv/'.$uname;
-    my $base = &File::Basename::basename($fn);
     my $path = &File::Basename::dirname($fn);
-    $result = &Apache::loncommon::upload_embedded($mode,$path,$uname,$udom,
-                                                  $dir_root,$url_root);
+    $result .= &Apache::loncommon::modify_html_refs($mode,$path,
+                              $uname,$udom,$dir_root);
     if ($mode ne 'imsimport' && $mode ne 'testbank') {
-        $result = '<br /><font size="+2"><a href="'.$url_root.$fn.'">'.
-                  &mt('View main file').'</a></font>'.
-                  '<br /><font size="+2"><a href="'.$url_root.$path.'">'.
-                  &mt('Back to Directory').'</a></font><br />';
+        $result .= '<br /><h3><a href="'.$url_root.$fn.'">'.
+                  &mt('View main file').'</a></h3>'.
+                  '<h3><a href="'.$url_root.$path.'">'.
+                  &mt('Back to Directory').'</a></h3><br />';
     }
     return $result;
 }
@@ -490,8 +543,10 @@ function verifyForm() {
                  .'</p>'
         );
     }
-
-    if ($env{'form.phase'} eq 'three') {
+    if ($env{'form.phase'} eq 'four') {
+        my $output = &phasefour($r,$fn,$uname,$udom,'author');
+        $r->print($output);
+    } elsif ($env{'form.phase'} eq 'three') {
         my $output = &phasethree($r,$fn,$uname,$udom,'author');
         $r->print($output);
     } elsif ($env{'form.phase'} eq 'two') {