--- loncom/publisher/lonupload.pm 2002/08/08 02:30:39 1.12
+++ loncom/publisher/lonupload.pm 2011/10/31 01:28:47 1.56
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# Handler to upload files into construction space
#
-# $Id: lonupload.pm,v 1.12 2002/08/08 02:30:39 foxr Exp $
+# $Id: lonupload.pm,v 1.56 2011/10/31 01:28:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,239 +26,8 @@
#
# 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;
-
-use strict;
-use Apache::File;
-use File::Copy;
-use Apache::Constants qw(:common :http :methods);
-use Apache::loncacc;
-use Apache::loncommon();
-use Apache::Log();
-
-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;
-
- my $fname=$ENV{'form.upfile.filename'};
- $fname=~s/\W//g;
-
- chop($ENV{'form.upfile'});
-
- my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
- '_upload_'.$fname.'_'.time.'_'.$$;
- {
- my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons').
- '/tmp/'.$datatoken.'.tmp');
- print $fh $ENV{'form.upfile'};
- }
- return $datatoken;
-}
-
-
-sub phaseone {
- my ($r,$fn,$uname,$udom)=@_;
- $ENV{'form.upfile.filename'}=~s/\\/\//g;
- $ENV{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/;
- if ($ENV{'form.upfile.filename'}) {
- $fn=~s/\/[^\/]+$//;
- $fn=~s/([^\/])$/$1\//;
- $fn.=$ENV{'form.upfile.filename'};
- $fn=~s/^\///;
- $fn=~s/(\/)+/\//g;
- $fn=~s/%20/ /g;
- &Debug($r, "Filename for upload: $fn");
- if (($fn) && ($fn!~/\/$/)) {
- $r->print(
- '');
- # 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. ');
- } elsif($fn=~/\.(\w+)$/ &&
- !defined(&Apache::loncommon::fileembstyle($1))) {
- $r->print(
- ''.
- 'The extension on this file, "'.$1.
- '", is not recognized by LON-CAPA. ');
- }
- } else {
- $r->print('Illegal filename. ');
- }
- } else {
- $r->print('No upload file specified. ');
- }
-}
-
-sub phasetwo {
- my ($r,$fn,$uname,$udom)=@_;
- if ($fn=~/^\/priv\/$uname\//) {
- my $tfn=$fn;
- $tfn=~s/^\/(\~|priv)\/(\w+)//;
- my $target='/home/'.$uname.'/public_html'.$tfn;
- my $datatoken=$ENV{'form.datatoken'};
- if (($fn) && ($datatoken)) {
- if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) {
- $r->print(
- '');
- } else {
- my $source=$r->dir_config('lonDaemons').
- '/tmp/'.$datatoken.'.tmp';
- # Check for bad extension and disallow upload
- if ($fn=~/\.(\w+)$/ &&
- (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
- $r->print(
- 'File '.$fn.' could not be copied.'.
- 'The extension on this file is reserved internally by LON-CAPA.'.
- ' ');
- } elsif ($fn=~/\.(\w+)$/ &&
- !defined(&Apache::loncommon::fileembstyle($1))) {
- $r->print(
- 'File '.$fn.' could not be copied.'.
- 'The extension on this file is not recognized by LON-CAPA.'.
- ' ');
- } elsif (copy($source,$target)) {
- chmod(0660, $target); # Set permissions to rw-rw---.
- $r->print('File copied.');
- $r->print('View file Please pick a filename
');
- &phaseone($r,$fn,$uname,$udom);
- }
- } else {
- $r->print(
- 'Please pick a filename
');
- &phaseone($r,$fn,$uname,$udom);
- }
-}
-
-# ---------------------------------------------------------------- Main Handler
-sub handler {
-
- my $r=shift;
-
- my $uname;
- my $udom;
-
- ($uname,$udom)=
- &Apache::loncacc::constructaccess(
- $ENV{'form.filename'},$r->dir_config('lonDefDomain'));
- unless (($uname) && ($udom)) {
- $r->log_reason($uname.' at '.$udom.
- ' trying to publish file '.$ENV{'form.filename'}.
- ' - not authorized',
- $r->filename);
- return HTTP_NOT_ACCEPTABLE;
- }
-
- my $fn;
-
- if ($ENV{'form.filename'}) {
- $fn=$ENV{'form.filename'};
- $fn=~s/^http\:\/\/[^\/]+\/(\~|priv\/)(\w+)//;
- } else {
- $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
- ' unspecified filename for upload', $r->filename);
- return HTTP_NOT_FOUND;
- }
-
-# ----------------------------------------------------------- Start page output
-
-
- $r->content_type('text/html');
- $r->send_http_header;
-
- $r->print('
LON-CAPA Construction Space ');
-
- $r->print(
- 'Upload file to Construction Space ');
-
- if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
- $r->print('Co-Author: '.$uname.' at '.$udom.
- ' '.&mt('No upload file specified.').'
');
+ return;
+ }
+
+ # Append the name of the uploaded file
+ $fn.=$env{'form.upfile.filename'};
+ $fn=~s/(\/)+/\//g;
+
+ # Check for illegal filename
+ &Debug($r, "Filename for upload: $fn");
+ if (!(($fn) && ($fn!~/\/$/))) {
+ $r->print(''.&mt('Illegal filename.').'
');
+ return;
+ }
+# Split part that I can change from the part that I cannot change
+ my ($fn1,$fn2)=($fn=~/^(\/priv\/[^\/]+\/[^\/]+\/)(.*)$/);
+ # Display additional options for upload
+ # and upload button
+ $r->print(
+ ''
+ );
+
+ # Check for bad extension and warn user
+ if ($fn=~/\.(\w+)$/ &&
+ (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
+ $r->print(''
+ .&mt('The extension on this file, [_1], is reserved internally by LON-CAPA.',
+ ''.$1.' ')
+ .'
');
+ } elsif($fn=~/\.(\w+)$/ &&
+ !defined(&Apache::loncommon::fileembstyle($1))) {
+ $r->print(''
+ .&mt('The extension on this file, [_1], is not recognized by LON-CAPA.',
+ ''.$1.' ')
+ .'
');
+ }
+}
+
+sub phasetwo {
+ my ($r,$fn,$uname,$udom,$mode)=@_;
+
+ my $output;
+ my $action = '/adm/upload';
+ my $returnflag = '';
+ if ($mode eq 'testbank') {
+ $action = '/adm/testbank';
+ } elsif ($mode eq 'imsimport') {
+ $action = '/adm/imsimport';
+ }
+ $fn=~s/\/+/\//g;
+ if ($fn) {
+ my $target='/home/httpd/html/'.$fn;
+ &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 ($env{'form.cancel'}) {
+ my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp';
+ my $dirpath=$path.'/';
+ $dirpath=~s/\/+/\//g;
+ $output .= ''.&mt('Upload cancelled.').'
'
+ .''.
+ &mt('Back to Directory').'
';
+ } elsif ((-e $target) && (!$env{'form.override'})) {
+ $output .= '';
+ } else {
+ my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp';
+ my $dirpath=$path.'/';
+ $dirpath=~s/\/+/\//g;
+ # Check for bad extension and disallow upload
+ my $result;
+ ($result,$returnflag) = &check_extension($fn,$mode,$source,$target,$action,$dirpath,$url);
+ $output .= $result;
+ }
+ } else {
+ $output .= ''.
+ &mt('Please use browser "Back" button and pick a filename').
+ ' '.
+ &mt('Please use browser "Back" button and pick a filename').
+ ' '.
+ &mt('File [_1] could not be copied.',
+ ''.$fn.' ').
+ '
';
+ } elsif ($fn=~/\.(\w+)$/ &&
+ !defined(&Apache::loncommon::fileembstyle($1))) {
+ $result .= ''.
+ &mt('File [_1] could not be copied.',
+ ''.$fn.' ').
+ '
';
+ } elsif (-d $target) {
+ $result .= ''.
+ &mt('File [_1] could not be copied.',
+ ''.$fn.' ').
+ '
';
+ } elsif (copy($source,$target)) {
+ chmod(0660, $target); # Set permissions to rw-rw---.
+ if ($mode eq 'testbank' || $mode eq 'imsimport') {
+ $returnflag = 'ok';
+ $result .= ''
+ .&mt('Your file - [_1] - was uploaded successfully.',
+ ''.$fn.'')
+ .'
';
+ } else {
+ $result .= ''
+ .&mt('File copied.')
+ .'
';
+ }
+ # Check for embedded objects.
+ my (%allfiles,%codebase);
+ my ($text,$header,$css,$js);
+ if (($mode ne 'imsimport') && ($target =~ /\.(htm|html|shtml)$/i)) {
+ my (%allfiles,%codebase);
+ &Apache::lonnet::extract_embedded_items($target,\%allfiles,\%codebase);
+ if (keys(%allfiles) > 0) {
+ my ($currentpath) = ($url =~ m{^(.+)/[^/]+$});
+ my $state = &embedded_form_elems('upload_embedded',$url,$mode);
+ my ($embedded,$num,$pathchg) =
+ &Apache::loncommon::ask_for_embedded_content($action,$state,\%allfiles,
+ \%codebase,
+ {'error_on_invalid_names' => 1,
+ 'ignore_remote_references' => 1,
+ 'current_path' => $currentpath});
+ if ($embedded) {
+ $result .= ''.&mt('Reference Warning').' ';
+ if ($num) {
+ $result .= ''.&mt('Completed upload of the file.').' '.&mt('This file contained references to other files.').'
'.
+ ''.&mt('Please select the locations from which the referenced files are to be uploaded.').'
'.
+ $embedded;
+ if ($mode eq 'testbank') {
+ $returnflag = 'embedded';
+ $result .= ''.&mt('Or [_1]continue[_2] the testbank import without these files.','',' ').'
';
+ }
+ } else {
+ $result .= ''.&mt('Completed upload of the file.').'
'.$embedded;
+ if ($pathchg) {
+ if ($mode eq 'testbank') {
+ $returnflag = 'embedded';
+ $result .= ''.&mt('Or [_1]continue[_2] the testbank import without modifying the references(s).','',' ').'
';
+ }
+ }
+ }
+ }
+ }
+ }
+ if (($mode ne 'imsimport') && ($mode ne 'testbank')) {
+ $result .= ''.
+ &mt('View file').' ';
+ }
+ } else {
+ $result .= &mt('Failed to copy: [_1].',$!);
+ }
+ if ($mode ne 'imsimport' && $mode ne 'testbank') {
+ $result .= ''.
+ &mt('Back to Directory').' '
+ .&mt('Co-Author [_1]',$uname.':'.$udom)
+ .'
'
+ );
+ }
+ if ($env{'form.phase'} eq 'four') {
+ my $output = &phasefour($r,$fn,$uname,$udom,'author');
+ $r->print($output);
+ } elsif ($env{'form.phase'} eq 'three') {
+ my ($output,$rtnflag) = &phasethree($r,$fn,$uname,$udom,'author');
+ $r->print($output);
+ } elsif ($env{'form.phase'} eq 'two') {
+ my ($output,$returnflag) = &phasetwo($r,$fn,$uname,$udom);
+ $r->print($output);
+ } else {
+ &phaseone($r,$fn,$uname,$udom);
+ }
+
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+}
+
+1;
+__END__
+
+
');
-
-
- $r->print('