--- loncom/publisher/lonupload.pm	2010/12/14 16:26:04	1.52
+++ loncom/publisher/lonupload.pm	2011/10/23 23:46:07	1.54
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.52 2010/12/14 16:26:04 www Exp $
+# $Id: lonupload.pm,v 1.54 2011/10/23 23:46:07 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -256,7 +256,7 @@ sub phasetwo {
     &Debug($r, "Filename is ".$tfn);
     if ($tfn) {
 	&Debug($r, "Filename for tfn = ".$tfn);
-	my $target='/home/'.$uname.'/public_html'.$tfn;
+	my $target='/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$tfn;
 	&Debug($r, "target -> ".$target);
 #     target is the full filesystem path of the destination file.
 	my $base = &File::Basename::basename($fn);
@@ -407,8 +407,8 @@ sub phasethree {
     } elsif ($mode eq 'imsimport') {
         $action = '/adm/imsimport';
     }
-    my $dir_root = '/home/'.$uname.'/public_html';
-    my $url_root = '/priv/'.$uname;
+    my $dir_root = '/home/httpd/html/priv/'.$udom.'/'.$uname;
+    my $url_root = '/priv/'.$udom.'/'.$uname;
     my $path = &File::Basename::dirname($fn);
     my $filename = &HTML::Entities::encode($env{'form.filename'},'<>&"');
     my $state = &embedded_form_elems('modify_orightml',$filename,$mode).
@@ -444,8 +444,8 @@ sub phasefour {
         $action = '/adm/imsimport';
     }
     my $result;
-    my $dir_root = '/home/'.$uname.'/public_html';
-    my $url_root = '/priv/'.$uname;
+    my $dir_root = '/home/httpd/html/priv/'.$udom.'/'.$uname;
+    my $url_root = '/priv/'.$udom.'/'.$uname;
     my $path = &File::Basename::dirname($fn);
     $result .= &Apache::loncommon::modify_html_refs($mode,$path,
                               $uname,$udom,$dir_root);
@@ -547,7 +547,7 @@ function verifyForm() {
         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');
+        my ($output,$rtnflag) = &phasethree($r,$fn,$uname,$udom,'author');
         $r->print($output);
     } elsif ($env{'form.phase'} eq 'two') {
 	my ($output,$returnflag) = &phasetwo($r,$fn,$uname,$udom);