--- loncom/publisher/lonupload.pm	2011/11/07 13:38:45	1.53.2.1
+++ 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.53.2.1 2011/11/07 13:38:45 raeburn 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);
@@ -503,15 +503,13 @@ function verifyForm() {
 	return HTTP_NOT_ACCEPTABLE;
     }
     
-    my ($fn,$trailfile);
+    my $fn;
     if ($env{'form.filename'}) {
 	$fn=$env{'form.filename'};
 	$fn=~s/^https?\:\/\/[^\/]+\///;
 	$fn=~s/^\///;
 	$fn=~s{(~|priv/)($LONCAPA::username_re)}{};
 	$fn=~s/\/+/\//g;
-        $trailfile = "/home/$uname/public_html/".$trailfile;
-        $trailfile=~s{//+}{/}g;
     } else {
 	$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
 		       ' unspecified filename for upload', $r->filename); 
@@ -536,7 +534,7 @@ function verifyForm() {
                                              $javascript,
                                              {'bread_crumbs' => $brcrum,})
              .&Apache::loncommon::head_subbox(
-                &Apache::loncommon::CSTR_pageheader($trailfile))
+                &Apache::loncommon::CSTR_pageheader())
     );
   
     if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {