version 1.61, 2012/10/29 17:38:55
|
version 1.64, 2013/07/03 05:03:19
|
Line 161 sub upfile_store {
|
Line 161 sub upfile_store {
|
} |
} |
|
|
sub phaseone { |
sub phaseone { |
my ($r,$fn,$mode)=@_; |
my ($r,$fn,$mode,$uname,$udom)=@_; |
my $action = '/adm/upload'; |
my $action = '/adm/upload'; |
if ($mode eq 'testbank') { |
if ($mode eq 'testbank') { |
$action = '/adm/testbank'; |
$action = '/adm/testbank'; |
Line 173 sub phaseone {
|
Line 173 sub phaseone {
|
$env{'form.upfile.filename'}=~s/\\/\//g; |
$env{'form.upfile.filename'}=~s/\\/\//g; |
$env{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/; |
$env{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/; |
if (!$env{'form.upfile.filename'}) { |
if (!$env{'form.upfile.filename'}) { |
$r->print('<p class="LC_warning">'.&mt('No upload file specified.').'</p>'); |
$r->print('<p class="LC_warning">'.&mt('No upload file specified.').'</p>'. |
|
&earlyout($fn,$uname,$udom)); |
return; |
return; |
} |
} |
|
|
Line 187 sub phaseone {
|
Line 188 sub phaseone {
|
$r->print('<p class="LC_warning">'.&mt('Illegal filename.').'</p>'); |
$r->print('<p class="LC_warning">'.&mt('Illegal filename.').'</p>'); |
return; |
return; |
} |
} |
|
# Check if quota exceeded |
|
my $filesize = length($env{'form.upfile'}); |
|
if (!$filesize) { |
|
$r->print('<p class="LC_warning">'. |
|
&mt('Unable to upload [_1]. (size = [_2] bytes)', |
|
'<span class="LC_filename">'.$env{'form.upfile.filename'}.'</span>', |
|
$filesize).'<br />'. |
|
&mt('Either the file you attempted to upload was empty, or your web browser was unable to read its contents.').'<br />'. |
|
'</p>'. |
|
&earlyout($fn,$uname,$udom)); |
|
return; |
|
} |
|
$filesize = int($filesize/1000); #expressed in kb |
|
my $authorspace = $Apache::lonnet::perlvar{'lonDocRoot'}."/priv/$udom/$uname"; |
|
my $output = &Apache::loncommon::excess_filesize_authorspace($uname,$udom,$authorspace, |
|
$env{'form.upfile.filename'},$filesize,'upload'); |
|
if ($output) { |
|
$r->print($output.&earlyout($fn,$uname,$udom)); |
|
return; |
|
} |
|
|
# Split part that I can change from the part that I cannot change |
# Split part that I can change from the part that I cannot change |
my ($fn1,$fn2)=($fn=~/^(\/priv\/[^\/]+\/[^\/]+\/)(.*)$/); |
my ($fn1,$fn2)=($fn=~/^(\/priv\/[^\/]+\/[^\/]+\/)(.*)$/); |
# Display additional options for upload |
# Display additional options for upload |
Line 457 sub phasefour {
|
Line 479 sub phasefour {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub earlyout { |
|
my ($fn,$uname,$udom) = @_; |
|
if ($fn =~ m{^(/priv/$udom/$uname(?:.*)/)[^/]*}) { |
|
return &Apache::lonhtmlcommon::actionbox( |
|
['<a href="'.$1.'">'.&mt('Return to Directory').'</a>']); |
|
} |
|
return; |
|
} |
|
|
# ---------------------------------------------------------------- Main Handler |
# ---------------------------------------------------------------- Main Handler |
sub handler { |
sub handler { |
|
|
Line 518 ENDJS
|
Line 549 ENDJS
|
|
|
# Breadcrumbs |
# Breadcrumbs |
my $brcrum = [{'href' => &Apache::loncommon::authorspace($fn), |
my $brcrum = [{'href' => &Apache::loncommon::authorspace($fn), |
'text' => 'Construction Space'}, |
'text' => 'Authoring Space'}, |
{'href' => '/adm/upload', |
{'href' => '/adm/upload', |
'text' => 'Upload file to Construction Space'}]; |
'text' => 'Upload file to Authoring Space'}]; |
$r->print(&Apache::loncommon::start_page('Upload file to Construction Space', |
$r->print(&Apache::loncommon::start_page('Upload file to Authoring Space', |
$javascript, |
$javascript, |
{'bread_crumbs' => $brcrum,}) |
{'bread_crumbs' => $brcrum,}) |
.&Apache::loncommon::head_subbox( |
.&Apache::loncommon::head_subbox( |
Line 544 ENDJS
|
Line 575 ENDJS
|
my ($output,$returnflag) = &phasetwo($r,$fn); |
my ($output,$returnflag) = &phasetwo($r,$fn); |
$r->print($output); |
$r->print($output); |
} else { |
} else { |
&phaseone($r,$fn); |
&phaseone($r,$fn,undef,$uname,$udom); |
} |
} |
|
|
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |