--- loncom/publisher/lonupload.pm 2003/06/23 21:56:31 1.16 +++ loncom/publisher/lonupload.pm 2003/11/08 10:58:30 1.21 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # Handler to upload files into construction space # -# $Id: lonupload.pm,v 1.16 2003/06/23 21:56:31 albertel Exp $ +# $Id: lonupload.pm,v 1.21 2003/11/08 10:58:30 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,25 +26,6 @@ # # http://www.lon-capa.org/ # -# (Handler to retrieve an old version of a file -# -# (Publication Handler -# -# (TeX Content Handler -# -# YEAR=2000 -# 05/29/00,05/30,10/11 Gerd Kortemeyer) -# -# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer -# YEAR=2001 -# 03/23 Guy Albertelli -# 03/24,03/29 Gerd Kortemeyer) -# -# 03/31,04/03 Gerd Kortemeyer) -# -# 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer -# 11/29 Matthew Hall -# ### package Apache::lonupload; @@ -59,6 +40,7 @@ use Apache::loncommon(); use Apache::Log(); use Apache::lonnet; use HTML::Entities(); +use Apache::lonlocal; my $DEBUG=0; @@ -83,7 +65,7 @@ sub upfile_store { my $fname=$ENV{'form.upfile.filename'}; $fname=~s/\W//g; - chop($ENV{'form.upfile'}); + chomp($ENV{'form.upfile'}); my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}. '_upload_'.$fname.'_'.time.'_'.$$; @@ -116,43 +98,42 @@ sub phaseone { '
'. ''. ''. - 'Store uploaded file as '. - '
'. - '
'); + ''. + &mt('Store uploaded file as ')."/priv/$uname/". + '
'. + ''); # Check for bad extension and warn user if ($fn=~/\.(\w+)$/ && (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { $r->print( ''. - 'The extension on this file, "'.$1. - '", is reserved internally by LON-CAPA.
'. - 'Please change the extension.'. + &mt('The extension on this file,').' "'.$1. + '"'.&mt(', is reserved internally by LON-CAPA.').'
'. + &mt('Please change the extension.'). ''); } elsif($fn=~/\.(\w+)$/ && !defined(&Apache::loncommon::fileembstyle($1))) { $r->print( ''. - 'The extension on this file, "'.$1. - '", is not recognized by LON-CAPA.
'. - 'Please change the extension.'. + &mt('The extension on this file,').' "'.$1. + '"'.&mt(', is not recognized by LON-CAPA.').'
'. + &mt('Please change the extension.'). ''); } } else { - $r->print('Illegal filename.'); + $r->print(''.&mt('Illegal filename.').''); } } else { - $r->print('No upload file specified.'); + $r->print(''.&mt('No upload file specified.').''); } } sub phasetwo { - my ($r,$fn,$uname,$udom)=@_; - &Debug($r, "Filename is ".$fn); - if ($fn=~/^\/priv\/$uname\//) { - &Debug($r, "Filename after priv substitution: ".$fn); - my $tfn=$fn; - $tfn=~s/^\/(\~|priv)\/(\w+)//; + my ($r,$tfn,$uname,$udom)=@_; + my $fn='/priv/'.$uname.'/'.$tfn; + $fn=~s/\/+/\//g; + &Debug($r, "Filename is ".$tfn); + if ($tfn) { &Debug($r, "Filename for tfn = ".$tfn); my $target='/home/'.$uname.'/public_html'.$tfn; &Debug($r, "target -> ".$target); @@ -167,11 +148,11 @@ sub phasetwo { if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) { $r->print( '
'. - 'File '.$fn.' exists. Overwrite? '. + &mt('File').' '.$fn.' '.&mt('exists. Overwrite?').' '. ''. ''. ''. - '
'); + ''); } else { my $source=$r->dir_config('lonDaemons'). '/tmp/'.$datatoken.'.tmp'; @@ -179,37 +160,50 @@ sub phasetwo { if ($fn=~/\.(\w+)$/ && (&Apache::loncommon::fileembstyle($1) eq 'hdn')) { $r->print( - 'File '.$fn.' could not be copied.
'. + &mt('File').' '.$fn.' '.&mt('could not be copied.').'
'. ''. - 'The extension on this file is reserved internally by LON-CAPA.'. + &mt('The extension on this file is reserved internally by LON-CAPA.'). ''); + $r->print('

'.&mt('Back to Directory').''); } elsif ($fn=~/\.(\w+)$/ && !defined(&Apache::loncommon::fileembstyle($1))) { $r->print( + &mt('File').' '.$fn.' '.&mt('could not be copied.').'
'. + ''. + &mt('The extension on this file is not recognized by LON-CAPA.'). + ''); + $r->print('

'.&mt('Back to Directory').''); + } elsif (-d $target) { + $r->print( 'File '.$fn.' could not be copied.
'. ''. - 'The extension on this file is not recognized by LON-CAPA.'. + &mt('The target is an existing directory.'). ''); + $r->print('

'.&mt('Back to Directory').''); } elsif (copy($source,$target)) { chmod(0660, $target); # Set permissions to rw-rw---. - $r->print('File copied.'); + $r->print(&mt('File copied.')); $r->print('

View file'); + '">'.&mt('View file').''); $r->print('

Back to Directory'); + '">'.&mt('Back to Directory').''); } else { $r->print('Failed to copy: '.$!); + $r->print('

'.&mt('Back to Directory').''); } } } else { $r->print( - 'Please pick a filename

'); - &phaseone($r,$fn,$uname,$udom); + ''. +&mt('Please use browser "Back" button and pick a filename').'

'); } } else { $r->print( - 'Please pick a filename

'); - &phaseone($r,$fn,$uname,$udom); + ''.&mt('Please use browser "Back" button and pick a filename').'

'); } } @@ -220,6 +214,14 @@ sub handler { my $uname; my $udom; +# +# phase two: re-attach user +# + if ($ENV{'form.uploaduname'}) { + $ENV{'form.filename'}='/priv/'.$ENV{'form.uploaduname'}.'/'. + $ENV{'form.filename'}; + } +# ($uname,$udom)= &Apache::loncacc::constructaccess( @@ -233,10 +235,12 @@ sub handler { } my $fn; - if ($ENV{'form.filename'}) { $fn=$ENV{'form.filename'}; - $fn=~s/^http\:\/\/[^\/]+\/(\~|priv\/)(\w+)//; + $fn=~s/^http\:\/\/[^\/]+\///; + $fn=~s/^\///; + $fn=~s/(\~|priv\/)(\w+)//; + $fn=~s/\/+/\//g; } else { $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. ' unspecified filename for upload', $r->filename); @@ -246,23 +250,18 @@ sub handler { # ----------------------------------------------------------- Start page output - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print('LON-CAPA Construction Space'); - $r->print( - ''); - - - $r->print('

Upload file to Construction Space

'); + $r->print(&Apache::loncommon::bodytag('Upload file to Construction Space')); if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { - $r->print('

Co-Author: '.$uname.' at '.$udom. - '

'); + $r->print('

'.&mt('Co-Author').': '.$uname. + &mt(' at ').$udom.'

'); } - if ($ENV{'form.phase'} eq 'two') { &phasetwo($r,$fn,$uname,$udom); } else {