--- loncom/publisher/lonupload.pm 2003/11/08 11:11:01 1.23
+++ loncom/publisher/lonupload.pm 2006/07/05 22:23:09 1.33
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# Handler to upload files into construction space
#
-# $Id: lonupload.pm,v 1.23 2003/11/08 11:11:01 albertel Exp $
+# $Id: lonupload.pm,v 1.33 2006/07/05 22:23:09 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,55 +37,54 @@ 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;
+use Apache::lonnet;
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.
-
+ # Put out the indicated message but only if DEBUG is true.
if ($DEBUG) {
- $log->debug($message);
+ my ($r,$message) = @_;
+ $r->log_reason($message);
}
}
sub upfile_store {
my $r=shift;
- my $fname=$ENV{'form.upfile.filename'};
+ my $fname=$env{'form.upfile.filename'};
$fname=~s/\W//g;
- chomp($ENV{'form.upfile'});
+ chomp($env{'form.upfile'});
- my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}.
+ 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'};
+ 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'}) {
+ my ($r,$fn,$uname,$udom,$mode)=@_;
+ my $action = '/adm/upload';
+ if ($mode eq 'testbank') {
+ $action = '/adm/testbank';
+ } elsif ($mode eq 'imsimport') {
+ $action = '/adm/imsimport';
+ }
+ $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.=$env{'form.upfile.filename'};
$fn=~s/^\///;
$fn=~s/(\/)+/\//g;
@@ -94,39 +93,55 @@ sub phaseone {
&Debug($r, "Filename for upload: $fn");
if (($fn) && ($fn!~/\/$/)) {
- $r->print('<form action="/adm/upload" method="post">'.
+ $r->print('<form action="'.$action.'" method="post" name="fileupload">'.
'<input type="hidden" name="phase" value="two" />'.
'<input type="hidden" name="datatoken" value="'.
&upfile_store.'" />'.
'<input type="hidden" name="uploaduname" value="'.$uname.
'" />'.&mt('Store uploaded file as ').
- "<tt>/priv/$uname/</tt>".
- '<input type="text" size="50" name="filename" value="'.$fn.
- '" /><br />'.
- '<input type="submit" value="'.&mt('Store').'" /></form>');
+ "<span class='LC_filename'>/priv/$uname/</span>".
+ '<input type="text" size="50" name="filename" value="'.$fn.
+ '" /><br />'.
+ '<br />'.&mt('Choose file type:').'
+<select name="filetype">
+ <option value="standard" selected>'.&mt('Regular file').'
+ <option value="testbank">'.&mt('Testbank file').'
+ <option value="imsimport">'.&mt('IMS package').'
+</select>'.&Apache::loncommon::help_open_topic("Uploading_File_Options").'
+<br />
+<br />
+');
+ $r->print('<input type="button" value="'.&mt('Store').'" onClick="javascript:verifyForm()"/></form>');
# Check for bad extension and warn user
if ($fn=~/\.(\w+)$/ &&
(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
- $r->print('<font color="red">'.&mt('The extension on this file,').
+ $r->print('<span class="LC_error">'.&mt('The extension on this file,').
' "'.$1.'"'.&mt(', is reserved internally by LON-CAPA.').
- ' <br />'.&mt('Please change the extension.').'</font>');
+ ' <br />'.&mt('Please change the extension.').'</span>');
} elsif($fn=~/\.(\w+)$/ &&
!defined(&Apache::loncommon::fileembstyle($1))) {
- $r->print('<font color="red">'.&mt('The extension on this file,').
+ $r->print('<span class="LC_error">'.&mt('The extension on this file,').
' "'.$1.'"'.&mt(', is not recognized by LON-CAPA.').
' <br />'.&mt('Please change the extension.').
- '</font>');
+ '</span>');
}
} else {
- $r->print('<font color="red">'.&mt('Illegal filename.').'</font>');
+ $r->print('<span class="LC_error">'.&mt('Illegal filename.').'</span>');
}
} else {
- $r->print('<font color="red">'.&mt('No upload file specified.').'</font>');
+ $r->print('<span class="LC_error">'.&mt('No upload file specified.').'</span>');
}
}
sub phasetwo {
- my ($r,$tfn,$uname,$udom)=@_;
+ my ($r,$tfn,$uname,$udom,$mode)=@_;
+ my $action = '/adm/upload';
+ my $returnflag = '';
+ if ($mode eq 'testbank') {
+ $action = '/adm/testbank';
+ } elsif ($mode eq 'imsimport') {
+ $action = '/adm/imsimport';
+ }
my $fn='/priv/'.$uname.'/'.$tfn;
$fn=~s/\/+/\//g;
&Debug($r, "Filename is ".$tfn);
@@ -137,14 +152,14 @@ sub phasetwo {
# 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);
+ $base = &HTML::Entities::encode($base,'<>&"');
my $url = $path."/".$base;
&Debug($r, "URL is now ".$url);
- my $datatoken=$ENV{'form.datatoken'};
+ my $datatoken=$env{'form.datatoken'};
if (($fn) && ($datatoken)) {
- if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) {
- $r->print('<form action="/adm/upload" method="post">'.
- &mt('File').' <tt>'.$fn.'</tt> '.
+ if ((-e $target) && ($env{'form.override'} ne 'Yes')) {
+ $r->print('<form action="'.$action.'" method="post">'.
+ &mt('File').' <span class="LC_filename">'.$fn.'</span> '.
&mt('exists. Overwrite?').' '.
'<input type="hidden" name="phase" value="two" />'.
'<input type="hidden" name="filename" value="'."$url".'" />'.
@@ -152,39 +167,46 @@ sub phasetwo {
'<input type="submit" name="override" value="'.&mt('Yes').'" /></form>');
} else {
my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp';
+ my $dirpath=$path.'/';
+ $dirpath=~s/\/+/\//g;
# Check for bad extension and disallow upload
if ($fn=~/\.(\w+)$/ &&
(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
- $r->print(&mt('File').' <tt>'.$fn.'</tt> '.
+ $r->print(&mt('File').' <span class="LC_filename">'.$fn.'</span> '.
&mt('could not be copied.').'<br />'.
- '<font color="red">'.
+ '<span class="LC_error">'.
&mt('The extension on this file is reserved internally by LON-CAPA.').
- '</font>');
- $r->print('<p><font size=+2><a href="'.$path.'">'.
+ '</span>');
+ $r->print('<br /><font size=+2><a href="'.$dirpath.'">'.
&mt('Back to Directory').'</a></font>');
} elsif ($fn=~/\.(\w+)$/ &&
!defined(&Apache::loncommon::fileembstyle($1))) {
- $r->print(&mt('File').' <tt>'.$fn.'</tt> '.
+ $r->print(&mt('File').' <span class="LC_filename">'.$fn.'</span> '.
&mt('could not be copied.').'<br />'.
- '<font color="red">'.
+ '<span class="LC_error">'.
&mt('The extension on this file is not recognized by LON-CAPA.').
- '</font>');
- $r->print('<br /><font size="+2"><a href="'.$path.'">'.
+ '</span>');
+ $r->print('<br /><font size="+2"><a href="'.$dirpath.'">'.
&mt('Back to Directory').'</a></font>');
} elsif (-d $target) {
- $r->print('File <tt>'.$fn.'</tt> could not be copied.<br />'.
- '<font color="red">'.
+ $r->print('File <span class="LC_filename">'.$fn.'</span> could not be copied.<br />'.
+ '<span class="LC_error">'.
&mt('The target is an existing directory.').
- '</font><br />');
- $r->print('<font size="+2"><a href="'.$path.'">'.
+ '</span><br />');
+ $r->print('<font size="+2"><a href="'.$dirpath.'">'.
&mt('Back to Directory').'</a></font>');
} elsif (copy($source,$target)) {
chmod(0660, $target); # Set permissions to rw-rw---.
- $r->print(&mt('File copied.'));
- $r->print('<br /><font size="+2"><a href="'.$url.'">'.
+ if ($mode eq 'testbank' || $mode eq 'imsimport') {
+ $r->print(&mt("Your file - $fn - was uploaded successfully")."<br /><br />");
+ $returnflag = 'ok';
+ } else {
+ $r->print(&mt('File copied.'));
+ $r->print('<br /><font size="+2"><a href="'.$url.'">'.
&mt('View file').'</a></font>');
- $r->print('<font size="+2"><a href="'.$path.'">'.
+ $r->print('<br /><font size="+2"><a href="'.$dirpath.'">'.
&mt('Back to Directory').'</a></font><br />');
+ }
} else {
$r->print('Failed to copy: '.$!);
$r->print('<br /><font size="+2"><a href="'.$path.'">'.
@@ -192,15 +214,16 @@ sub phasetwo {
}
}
} else {
- $r->print('<font size="+1" color="red">'.
+ $r->print('<span class="LC_error">'.
&mt('Please use browser "Back" button and pick a filename').
- '</font><br />>');
+ '</span><br />');
}
} else {
- $r->print('<font size=+1 color=red>'.
+ $r->print('<span class="LC_error">'.
&mt('Please use browser "Back" button and pick a filename').
- '</font><p>');
+ '</span><br />>');
}
+ return $returnflag;
}
# ---------------------------------------------------------------- Main Handler
@@ -210,35 +233,66 @@ sub handler {
my $uname;
my $udom;
+ my $javascript = '';
#
# phase two: re-attach user
#
- if ($ENV{'form.uploaduname'}) {
- $ENV{'form.filename'}='/priv/'.$ENV{'form.uploaduname'}.'/'.
- $ENV{'form.filename'};
+ if ($env{'form.uploaduname'}) {
+ $env{'form.filename'}='/priv/'.$env{'form.uploaduname'}.'/'.
+ $env{'form.filename'};
}
-#
+ unless ($env{'form.phase'} eq 'two') {
+ my %body_layout = ('rightmargin' => "0",
+ 'leftmargin' => "0",
+ 'marginwidth' => "0",
+ 'topmargin' => "0",
+ 'marginheight' => "0");
+ my $start_page =
+ &Apache::loncommon::start_page('Importing a Testbank file into LON-CAPA',
+ undef,
+ {'only_body' => 1,
+ 'add_entries' => \%body_layout,
+ 'js_ready' => 1,});
+ my $end_page =
+ &Apache::loncommon::end_page({'js_ready' => 1,});
+
+ $javascript = qq|
+function verifyForm() {
+ var mode = document.fileupload.filetype.options[document.fileupload.filetype.selectedIndex].value
+ if (mode == "testbank") {
+ document.fileupload.action = "/adm/testbank";
+ }
+ if (mode == "imsimport") {
+ document.fileupload.action = "/adm/imsimport";
+ }
+ if (mode == "standard") {
+ document.fileupload.action = "/adm/upload";
+ }
+ document.fileupload.submit();
+}
+ |;
+ }
($uname,$udom)=
- &Apache::loncacc::constructaccess($ENV{'form.filename'},
+ &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'}.
+ ' 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'};
+ if ($env{'form.filename'}) {
+ $fn=$env{'form.filename'};
$fn=~s/^http\:\/\/[^\/]+\///;
$fn=~s/^\///;
$fn=~s/(\~|priv\/)(\w+)//;
$fn=~s/\/+/\//g;
} else {
- $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+ $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
' unspecified filename for upload', $r->filename);
return HTTP_NOT_FOUND;
}
@@ -249,22 +303,24 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
+ $javascript = "<script type=\"text/javascript\">\n//<!--\n".
+ $javascript."\n// --></script>\n";
- $r->print(&Apache::loncommon::bodytag('Upload file to Construction Space'));
+ $r->print(&Apache::loncommon::start_page('Upload file to Construction Space',
+ $javascript));
- if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
+ if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
$r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.
&mt(' at ').$udom.'</font></h3>');
}
- if ($ENV{'form.phase'} eq 'two') {
+ if ($env{'form.phase'} eq 'two') {
&phasetwo($r,$fn,$uname,$udom);
} else {
&phaseone($r,$fn,$uname,$udom);
}
- $r->print('</body></html>');
+ $r->print(&Apache::loncommon::end_page());
return OK;
}