--- loncom/publisher/loncfile.pm 2011/10/22 23:09:44 1.108 +++ loncom/publisher/loncfile.pm 2011/10/23 01:27:34 1.109 @@ -9,7 +9,7 @@ # and displays a page showing the results of the action. # # -# $Id: loncfile.pm,v 1.108 2011/10/22 23:09:44 www Exp $ +# $Id: loncfile.pm,v 1.109 2011/10/23 01:27:34 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -272,8 +272,7 @@ sub exists { $creating ||= 'file'; my $published=$construct; - $published=~ - s{^/home/$user/public_html/}{/home/httpd/html/res/$domain/$user/}; + $published=~s{^/home/httpd/html/priv/}{/home/httpd/html/res/}; my ($type,$result); if ( -d $construct ) { return ('error','

'.&mt('Error: destination for operation is an existing directory.').'

'); @@ -347,7 +346,7 @@ sub checksuffix { } sub cleanDest { - my ($request,$dest,$subdir,$fn,$uname)=@_; + my ($request,$dest,$subdir,$fn,$uname,$udom)=@_; #remove bad characters my $foundbad=0; my $error=''; @@ -362,7 +361,7 @@ sub cleanDest { } if ($dest=~m|/|) { my ($newpath)=($dest=~m|(.*)/|); - ($newpath,$error)=&relativeDest($fn,$newpath,$uname); + ($newpath,$error)=&relativeDest($fn,$newpath,$uname,$udom); if (! -d "$newpath") { $request->print('

' .&mt("You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested file name." @@ -391,11 +390,11 @@ sub cleanDest { } sub relativeDest { - my ($fn,$newfilename,$uname)=@_; + my ($fn,$newfilename,$uname,$udom)=@_; my $error = ''; if ($newfilename=~/^\//) { # absolute, simply add path - $newfilename='/home/'.$uname.'/public_html/'; + $newfilename='/home/httpd/html/res/'.$udom.'/'.$uname.'/'; } else { my $dir=$fn; $dir=~s/\/[^\/]+$//; @@ -952,9 +951,9 @@ sub phaseone { my $doingdir=0; if ($env{'form.action'} eq 'newdir') { $doingdir=1; } my ($newfilename,$error) = - &cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname); + &cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname,$udom); unless ($error) { - ($newfilename,$error)=&relativeDest($fn,$newfilename,$uname); + ($newfilename,$error)=&relativeDest($fn,$newfilename,$uname,$udom); } if ($error) { my $dirlist;