version 1.100.2.1, 2009/08/13 09:45:52
|
version 1.111, 2011/10/24 22:39:21
|
Line 161 sub URLToPath {
|
Line 161 sub URLToPath {
|
$Url=~ s/\/+/\//g; |
$Url=~ s/\/+/\//g; |
$Url=~ s/^https?\:\/\/[^\/]+//; |
$Url=~ s/^https?\:\/\/[^\/]+//; |
$Url=~ s/^\///; |
$Url=~ s/^\///; |
$Url=~ s/(\~|priv\/)($match_username)\//\/home\/$2\/public_html\//; |
$Url='/home/httpd/html/'.$Url; |
&Debug($r, "Returning $Url \n"); |
&Debug($r, "Returning $Url \n"); |
return $Url; |
return $Url; |
} |
} |
|
|
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 187 sub display {
|
Line 189 sub display {
|
sub obsolete_unpub { |
sub obsolete_unpub { |
my ($user,$domain,$construct)=@_; |
my ($user,$domain,$construct)=@_; |
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\//; |
|
if (-e $published) { |
if (-e $published) { |
if (&Apache::lonnet::metadata($published,'obsolete')) { |
if (&Apache::lonnet::metadata($published,'obsolete')) { |
return 1; |
return 1; |
Line 270 sub exists {
|
Line 271 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 345 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 360 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." |
,'<span class="LC_filename">'.&display($newpath).'</span>') |
,&display($newpath)) |
.'</span></p>'); |
.'</span></p>'); |
$dest=~s|.*/||; |
$dest=~s|.*/||; |
} |
} |
} |
} |
if ($dest =~ /\.(\d+)\.(\w+)$/){ |
if ($dest =~ /\.(\d+)\.(\w+)$/){ |
$request->print('<p><span class="LC_warning">' |
$request->print('<p><span class="LC_warning">' |
.&mt('Bad filename [_1]','<span class="LC_filename">'.&display($dest).'</span>') |
.&mt('Bad filename [_1]',&display($dest)) |
.'<br />' |
.'<br />' |
.&mt('[_1](name).(number).(extension)[_2] not allowed.','<tt>','</tt>') |
.&mt('[_1](name).(number).(extension)[_2] not allowed.','<tt>','</tt>') |
.'<br />' |
.'<br />' |
Line 384 sub cleanDest {
|
Line 385 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 403 sub relativeDest {
|
while ($newfilename=~m:/\.\./:) { |
while ($newfilename=~m:/\.\./:) { |
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/.. |
} |
} |
return $newfilename; |
my ($authorname,$authordom)=&Apache::loncacc::constructaccess($newfilename); |
|
unless (($authorname) && ($authordom)) { |
|
my $otherdir = &display($newfilename); |
|
$error = &mt('Access denied to [_1]',$otherdir); |
|
} |
|
return ($newfilename,$error); |
} |
} |
|
|
=pod |
=pod |
Line 552 sub Rename1 {
|
Line 559 sub Rename1 {
|
$request->print('<input type="hidden" name="newfilename" value="' |
$request->print('<input type="hidden" name="newfilename" value="' |
.$newfilename.'" />' |
.$newfilename.'" />' |
.'<p>' |
.'<p>' |
.&mt($action.' [_1] to [_2]?' |
.&mt($action.' [_1] to [_2]?', |
,&display($fn),&display($newfilename)) |
&display($fn), |
|
&display($newfilename)) |
.'</p>' |
.'</p>' |
); |
); |
&CloseForm1($request, $fn); |
&CloseForm1($request, $fn); |
Line 563 sub Rename1 {
|
Line 571 sub Rename1 {
|
} |
} |
} else { |
} else { |
$request->print('<p class="LC_error">' |
$request->print('<p class="LC_error">' |
.&mt('No such file: [_1]' |
.&mt('No such file: [_1]', |
,'<span class="LC_filename">'.&display($fn).'</span>') |
&display($fn)) |
.'</p></form>' |
.'</p></form>' |
); |
); |
return; |
return; |
Line 625 sub Delete1 {
|
Line 633 sub Delete1 {
|
} |
} |
} |
} |
$request->print('<p>' |
$request->print('<p>' |
.&mt('Delete [_1]?' |
.&mt('Delete [_1]?', |
,'<span class="LC_filename">'.&display($fn).'</span>') |
&display($fn)) |
.'</p>' |
.'</p>' |
); |
); |
&CloseForm1($request, $fn); |
&CloseForm1($request, $fn); |
} else { |
} else { |
$request->print('<p class="LC_error">' |
$request->print('<p class="LC_error">' |
.&mt('No such file: [_1]' |
.&mt('No such file: [_1]', |
,'<span class="LC_filename">'.&display($fn).'</span>') |
&display($fn)) |
.'</p></form>' |
.'</p></form>' |
); |
); |
} |
} |
Line 689 sub Copy1 {
|
Line 697 sub Copy1 {
|
$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>'); |
$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>'); |
return; |
return; |
} |
} |
$request->print('<input type="hidden" name="newfilename" value="' |
$request->print( |
.$newfilename.'" />' |
'<input type="hidden" name="newfilename"' |
.'<p>' |
.' value="'.$newfilename.'" />' |
.&mt('Copy [_1] to [_2]?' |
.'<p>' |
,'<span class="LC_filename">'.&display($fn).'</span>' |
.&mt('Copy [_1] to [_2]?', |
,'<span class="LC_filename">'.&display($newfilename).'</span>') |
&display($fn), |
.'</p>' |
&display($newfilename)) |
|
.'</p>' |
); |
); |
&CloseForm1($request, $fn); |
&CloseForm1($request, $fn); |
} else { |
} else { |
$request->print('<p class="LC_error">' |
$request->print('<p class="LC_error">' |
.&mt('No such file: [_1]' |
.&mt('No such file: [_1]', |
,'<span class="LC_filename">'.&display($fn).'</span>') |
&display($fn)) |
.'</p></form>' |
.'</p></form>' |
); |
); |
} |
} |
Line 754 sub NewDir1 {
|
Line 763 sub NewDir1 {
|
if ($type eq 'error') { |
if ($type eq 'error') { |
$request->print('</form>'); |
$request->print('</form>'); |
} else { |
} else { |
if ($mode eq 'testbank') { |
if (($mode eq 'testbank') || ($mode eq 'imsimport')) { |
$request->print('<input type="hidden" name="callingmode" value="testbank" />'); |
$request->print('<input type="hidden" name="callingmode" value="'.$mode.'" />'."\n". |
} elsif ($mode eq 'imsimport') { |
'<input type="hidden" name="inhibitmenu" value="yes" />'); |
$request->print('<input type="hidden" name="callingmode" value="imsimport" />'); |
|
} |
} |
$request->print('<input type="hidden" name="newfilename" value="' |
$request->print('<input type="hidden" name="newfilename" value="' |
.$newfilename.'" />' |
.$newfilename.'" />' |
.'<p>' |
.'<p>' |
.&mt('Make new directory [_1]?' |
.&mt('Make new directory [_1]?', |
,'<span class="LC_filename">'.&display($newfilename).'</span>') |
&display($newfilename)) |
.'</p>' |
.'</p>' |
); |
); |
&CloseForm1($request, $fn); |
&CloseForm1($request, $fn); |
Line 776 sub Decompress1 {
|
Line 784 sub Decompress1 {
|
if( -e $fn) { |
if( -e $fn) { |
$request->print('<input type="hidden" name="newfilename" value="'.$fn.'" />'); |
$request->print('<input type="hidden" name="newfilename" value="'.$fn.'" />'); |
$request->print('<p>' |
$request->print('<p>' |
.&mt('Decompress [_1]?' |
.&mt('Decompress [_1]?', |
,'<span class="LC_filename">'.&display($fn).'</span>') |
&display($fn)) |
.'</p>' |
.'</p>' |
); |
); |
&CloseForm1($request, $fn); |
&CloseForm1($request, $fn); |
} else { |
} else { |
$request->print('<p class="LC_error">' |
$request->print('<p class="LC_error">' |
.&mt('No such file: [_1]' |
.&mt('No such file: [_1]', |
,'<span class="LC_filename">'.&display($fn).'</span>') |
&display($fn)) |
.'</p></form>' |
.'</p></form>' |
); |
); |
} |
} |
Line 855 sub NewFile1 {
|
Line 863 sub NewFile1 {
|
$extension = $1; |
$extension = $1; |
} |
} |
|
|
my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty library js css txt); |
my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty task library js css txt); |
if (($extension eq '') || (!grep(/^\Q$extension\E/,@okexts))) { |
if (($extension eq '') || (!grep(/^\Q$extension\E/,@okexts))) { |
my $validexts = '.'.join(', .',@okexts); |
my $validexts = '.'.join(', .',@okexts); |
$request->print('<p class="LC_warning">'. |
$request->print('<p class="LC_warning">'. |
Line 935 sub phaseone {
|
Line 943 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 1069 sub Rename2 {
|
Line 1092 sub Rename2 {
|
unlink $tmp2; |
unlink $tmp2; |
} |
} |
} else { |
} else { |
$request->print('<p>' |
$request->print( |
.&mt('No such file: [_1]' |
'<p>' |
,'<span class="LC_filename">'.&display($oldfile).'</span>') |
.&mt('No such file: [_1]', |
.'</p></form>' |
&display($oldfile)) |
|
.'</p></form>' |
); |
); |
return 0; |
return 0; |
} |
} |
Line 1414 sub handler {
|
Line 1438 sub handler {
|
my $uname; |
my $uname; |
my $udom; |
my $udom; |
|
|
($uname,$udom)= |
($uname,$udom)=&Apache::loncacc::constructaccess($fn); |
&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain')); |
|
&Debug($r, |
&Debug($r, |
"loncfile::handler constructaccess uname = $uname domain = $udom"); |
"loncfile::handler constructaccess uname = $uname domain = $udom"); |
unless (($uname) && ($udom)) { |
unless (($uname) && ($udom)) { |
Line 1446 function writeDone() {
|
Line 1469 function writeDone() {
|
$loaditem{'onload'} = "writeDone()"; |
$loaditem{'onload'} = "writeDone()"; |
} |
} |
|
|
|
# Breadcrumbs |
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
|
&Apache::lonhtmlcommon::add_breadcrumb({ |
|
'text' => 'Construction Space', |
|
'href' => &Apache::loncommon::authorspace(), |
|
}); |
|
&Apache::lonhtmlcommon::add_breadcrumb({ |
|
'text' => 'File Operation', |
|
'title' => 'Construction Space File Operation', |
|
'href' => '', |
|
}); |
|
|
$r->print(&Apache::loncommon::start_page('Construction Space File Operation', |
$r->print(&Apache::loncommon::start_page('Construction Space File Operation', |
$js, |
$js, |
{'add_entries' => \%loaditem,})); |
{'add_entries' => \%loaditem,}) |
|
.&Apache::lonhtmlcommon::breadcrumbs() |
|
.&Apache::loncommon::head_subbox( |
|
&Apache::loncommon::CSTR_pageheader()) |
|
); |
|
|
$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>' |
); |
); |