--- loncom/publisher/lonupload.pm 2002/08/05 02:22:56 1.11 +++ loncom/publisher/lonupload.pm 2003/09/22 15:39:53 1.20 @@ -1,7 +1,8 @@ + # The LearningOnline Network with CAPA # Handler to upload files into construction space # -# $Id: lonupload.pm,v 1.11 2002/08/05 02:22:56 foxr Exp $ +# $Id: lonupload.pm,v 1.20 2003/09/22 15:39:53 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,26 +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 -# 12/16 Scott Harrison -# ### package Apache::lonupload; @@ -52,9 +33,31 @@ package Apache::lonupload; use strict; use Apache::File; use File::Copy; +use File::Basename; use Apache::Constants qw(:common :http :methods); use Apache::loncacc; use Apache::loncommon(); +use Apache::Log(); +use Apache::lonnet; +use HTML::Entities(); +use Apache::lonlocal; + +my $DEBUG=0; + +sub Debug { + + # Marshall the parameters. + + my $r = shift; + my $log = $r->log; + my $message = shift; + + # Put out the indicated message butonly if DEBUG is false. + + if ($DEBUG) { + $log->debug($message); + } +} sub upfile_store { my $r=shift; @@ -62,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.'_'.$$; @@ -86,57 +89,70 @@ sub phaseone { $fn=~s/^\///; $fn=~s/(\/)+/\//g; +# Fn is the full path to the destination filename. +# + + &Debug($r, "Filename for upload: $fn"); if (($fn) && ($fn!~/\/$/)) { $r->print( '
'. ''. ''. - 'Store uploaded file as '. - '
'. - '
'); + ''. + &mt('Store uploaded file as '). + '
'. + ''); # 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)=@_; - if ($fn=~/^\/priv\/$uname\//) { - 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); +# target is the full filesystem path of the destination file. + my $base = &File::Basename::basename($fn); + my $path = &File::Basename::dirname($fn); + $base = &HTML::Entities::encode($base); + my $url = $path."/".$base; + &Debug($r, "URL is now ".$url); my $datatoken=$ENV{'form.datatoken'}; if (($fn) && ($datatoken)) { 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'; @@ -144,35 +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('

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

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

'.&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').'

'); } } @@ -183,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( @@ -196,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); @@ -209,19 +250,16 @@ 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. '

'); }