|
version 1.104, 2010/11/27 23:20:46
|
version 1.109, 2011/10/23 01:27:34
|
|
Line 168 sub URLToPath {
|
Line 168 sub URLToPath {
|
| |
|
| sub url { |
sub url { |
| my $fn=shift; |
my $fn=shift; |
| $fn=~s/^\/home\/($match_username)\/public\_html/\/priv\/$1/; |
$fn=~s/^\/home\/httpd\/html//; |
| |
$fn=~s/\/\.\//\//g; |
| $fn=&HTML::Entities::encode($fn,'<>"&'); |
$fn=&HTML::Entities::encode($fn,'<>"&'); |
| return $fn; |
return $fn; |
| } |
} |
| |
|
| sub display { |
sub display { |
| my $fn=shift; |
my $fn=shift; |
| $fn=~s-^/home/($match_username)/public_html-/priv/$1-; |
$fn=~s/^\/home\/httpd\/html//; |
| |
$fn=~s/\/\.\//\//g; |
| return '<span class="LC_filename">'.$fn.'</span>'; |
return '<span class="LC_filename">'.$fn.'</span>'; |
| } |
} |
| |
|
|
Line 270 sub exists {
|
Line 272 sub exists {
|
| $creating ||= 'file'; |
$creating ||= 'file'; |
| |
|
| my $published=$construct; |
my $published=$construct; |
| $published=~ |
$published=~s{^/home/httpd/html/priv/}{/home/httpd/html/res/}; |
| s{^/home/$user/public_html/}{/home/httpd/html/res/$domain/$user/}; |
|
| my ($type,$result); |
my ($type,$result); |
| if ( -d $construct ) { |
if ( -d $construct ) { |
| return ('error','<p><span class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</span></p>'); |
return ('error','<p><span class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</span></p>'); |
|
Line 345 sub checksuffix {
|
Line 346 sub checksuffix {
|
| } |
} |
| |
|
| sub cleanDest { |
sub cleanDest { |
| my ($request,$dest,$subdir,$fn,$uname)=@_; |
my ($request,$dest,$subdir,$fn,$uname,$udom)=@_; |
| #remove bad characters |
#remove bad characters |
| my $foundbad=0; |
my $foundbad=0; |
| |
my $error=''; |
| if ($subdir && $dest =~/\./) { |
if ($subdir && $dest =~/\./) { |
| $foundbad=1; |
$foundbad=1; |
| $dest=~s/\.//g; |
$dest=~s/\.//g; |
|
Line 359 sub cleanDest {
|
Line 361 sub cleanDest {
|
| } |
} |
| if ($dest=~m|/|) { |
if ($dest=~m|/|) { |
| my ($newpath)=($dest=~m|(.*)/|); |
my ($newpath)=($dest=~m|(.*)/|); |
| $newpath=&relativeDest($fn,$newpath,$uname); |
($newpath,$error)=&relativeDest($fn,$newpath,$uname,$udom); |
| if (! -d "$newpath") { |
if (! -d "$newpath") { |
| $request->print('<p><span class="LC_warning">' |
$request->print('<p><span class="LC_warning">' |
| .&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." |
.&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." |
|
Line 384 sub cleanDest {
|
Line 386 sub cleanDest {
|
| .'</span></p>' |
.'</span></p>' |
| ); |
); |
| } |
} |
| return $dest; |
return ($dest,$error); |
| } |
} |
| |
|
| sub relativeDest { |
sub relativeDest { |
| my ($fn,$newfilename,$uname)=@_; |
my ($fn,$newfilename,$uname,$udom)=@_; |
| |
my $error = ''; |
| if ($newfilename=~/^\//) { |
if ($newfilename=~/^\//) { |
| # absolute, simply add path |
# absolute, simply add path |
| $newfilename='/home/'.$uname.'/public_html/'; |
$newfilename='/home/httpd/html/res/'.$udom.'/'.$uname.'/'; |
| } else { |
} else { |
| my $dir=$fn; |
my $dir=$fn; |
| $dir=~s/\/[^\/]+$//; |
$dir=~s/\/[^\/]+$//; |
|
Line 401 sub relativeDest {
|
Line 404 sub relativeDest {
|
| while ($newfilename=~m:/\.\./:) { |
while ($newfilename=~m:/\.\./:) { |
| $newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
| } |
} |
| return $newfilename; |
if ($newfilename =~ m{^/home/($match_username)/(?:public\_html|priv)/}) { |
| |
my $otheruname = $1; |
| |
unless ($otheruname eq $uname) { |
| |
my ($authorname,$authordom)= |
| |
&Apache::loncacc::constructaccess($newfilename,$env{'request.role.domain'}); |
| |
unless (($authorname eq $otheruname) && ($authordom ne '')) { |
| |
my $otherdir = &display($newfilename); |
| |
$error = &mt('Access denied to [_1]',$otherdir); |
| |
} |
| |
} |
| |
} |
| |
return ($newfilename,$error); |
| } |
} |
| |
|
| =pod |
=pod |
|
Line 936 sub phaseone {
|
Line 950 sub phaseone {
|
| |
|
| my $doingdir=0; |
my $doingdir=0; |
| if ($env{'form.action'} eq 'newdir') { $doingdir=1; } |
if ($env{'form.action'} eq 'newdir') { $doingdir=1; } |
| my $newfilename=&cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname); |
my ($newfilename,$error) = |
| $newfilename=&relativeDest($fn,$newfilename,$uname); |
&cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname,$udom); |
| |
unless ($error) { |
| |
($newfilename,$error)=&relativeDest($fn,$newfilename,$uname,$udom); |
| |
} |
| |
if ($error) { |
| |
my $dirlist; |
| |
if ($fn=~m{^(.*/)[^/]+$}) { |
| |
$dirlist=$1; |
| |
} else { |
| |
$dirlist=$fn; |
| |
} |
| |
$r->print('<div class="LC_error">'.$error.'</div>'. |
| |
'<h3><a href="'.&url($dirlist).'">'.&mt('Return to Directory'). |
| |
'</a></h3>'); |
| |
return; |
| |
} |
| $r->print('<form action="/adm/cfile" method="post">'. |
$r->print('<form action="/adm/cfile" method="post">'. |
| '<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'. |
'<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'. |
| '<input type="hidden" name="phase" value="two" />'. |
'<input type="hidden" name="phase" value="two" />'. |
|
Line 1471 function writeDone() {
|
Line 1500 function writeDone() {
|
| $r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>'); |
$r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>'); |
| |
|
| if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
| $r->print('<p class="LC_warning">' |
$r->print('<p class="LC_info">' |
| .&mt('Co-Author [_1]',$uname.':'.$udom) |
.&mt('Co-Author [_1]',$uname.':'.$udom) |
| .'</p>' |
.'</p>' |
| ); |
); |
![[BACK]](/icons/back.gif){kind=icon}
Return to loncfile.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / publisher