loncom/publisher/lonupload.pm - diff

Return to lonupload.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonupload.pm between versions 1.24 and 1.36

version 1.24, 2003/11/08 11:13:50	version 1.36, 2008/01/15 16:04:38
Line 37 use File::Basename;	Line 37 use File::Basename;
use Apache::Constants qw(:common :http :methods);	use Apache::Constants qw(:common :http :methods);
use Apache::loncacc;	use Apache::loncacc;
use Apache::loncommon();	use Apache::loncommon();
use Apache::Log();
use Apache::lonnet;	use Apache::lonnet;
use HTML::Entities();	use HTML::Entities();
use Apache::lonlocal;	use Apache::lonlocal;
	use Apache::lonnet;
	use LONCAPA();

my $DEBUG=0;	my $DEBUG=0;

sub Debug {	sub Debug {
	# Put out the indicated message but only if DEBUG is true.
# 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) {	if ($DEBUG) {
$log->debug($message);	my ($r,$message) = @_;
	$r->log_reason($message);
}	}
}	}

sub upfile_store {	sub upfile_store {
my $r=shift;	my $r=shift;

my $fname=$ENV{'form.upfile.filename'};	my $fname=$env{'form.upfile.filename'};
$fname=~s/\W//g;	$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.'_'.$$;	'_upload_'.$fname.'_'.time.'_'.$$;
{	{
my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons').	my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons').
'/tmp/'.$datatoken.'.tmp');	'/tmp/'.$datatoken.'.tmp');
print $fh $ENV{'form.upfile'};	print $fh $env{'form.upfile'};
}	}
return $datatoken;	return $datatoken;
}	}


sub phaseone {	sub phaseone {
my ($r,$fn,$uname,$udom)=@_;	my ($r,$fn,$uname,$udom,$mode)=@_;
$ENV{'form.upfile.filename'}=~s/\\/\//g;	my $action = '/adm/upload';
$ENV{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/;	if ($mode eq 'testbank') {
if ($ENV{'form.upfile.filename'}) {	$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/\/[^\/]+$//;
$fn=~s/([^\/])$/$1\//;	$fn=~s/([^\/])$/$1\//;
$fn.=$ENV{'form.upfile.filename'};	$fn.=$env{'form.upfile.filename'};
$fn=~s/^\///;	$fn=~s/^\///;
$fn=~s/(\/)+/\//g;	$fn=~s/(\/)+/\//g;

Line 94 sub phaseone {	Line 94 sub phaseone {

&Debug($r, "Filename for upload: $fn");	&Debug($r, "Filename for upload: $fn");
if (($fn) && ($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="phase" value="two" />'.
'<input type="hidden" name="datatoken" value="'.	'<input type="hidden" name="datatoken" value="'.
&upfile_store.'" />'.	&upfile_store.'" />'.
'<input type="hidden" name="uploaduname" value="'.$uname.	'<input type="hidden" name="uploaduname" value="'.$uname.
'" />'.&mt('Store uploaded file as ').	'" />'.&mt('Save uploaded file as ').
"<tt>/priv/$uname/</tt>".	"<span class='LC_filename'>/priv/$uname/</span>".
'<input type="text" size="50" name="filename" value="'.$fn.	'<input type="text" size="50" name="filename" value="'.$fn.
'" /><br />'.	'" /><br />'.
'<input type="submit" value="'.&mt('Store').'" /></form>');	'<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('Save').'" onClick="javascript:verifyForm()"/></form>');
# Check for bad extension and warn user	# Check for bad extension and warn user
if ($fn=~/\.(\w+)$/ &&	if ($fn=~/\.(\w+)$/ &&
(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {	(&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.').	' "'.$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+)$/ &&	} elsif($fn=~/\.(\w+)$/ &&
!defined(&Apache::loncommon::fileembstyle($1))) {	!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.').	' "'.$1.'"'.&mt(', is not recognized by LON-CAPA.').
' <br />'.&mt('Please change the extension.').	' <br />'.&mt('Please change the extension.').
'</font>');	'</span>');
}	}
} else {	} else {
$r->print('<font color="red">'.&mt('Illegal filename.').'</font>');	$r->print('<span class="LC_error">'.&mt('Illegal filename.').'</span>');
}	}
} else {	} 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 {	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;	my $fn='/priv/'.$uname.'/'.$tfn;
$fn=~s/\/+/\//g;	$fn=~s/\/+/\//g;
&Debug($r, "Filename is ".$tfn);	&Debug($r, "Filename is ".$tfn);
Line 137 sub phasetwo {	Line 153 sub phasetwo {
# target is the full filesystem path of the destination file.	# target is the full filesystem path of the destination file.
my $base = &File::Basename::basename($fn);	my $base = &File::Basename::basename($fn);
my $path = &File::Basename::dirname($fn);	my $path = &File::Basename::dirname($fn);
$base = &HTML::Entities::encode($base);	$base = &HTML::Entities::encode($base,'<>&"');
my $url = $path."/".$base;	my $url = $path."/".$base;
&Debug($r, "URL is now ".$url);	&Debug($r, "URL is now ".$url);
my $datatoken=$ENV{'form.datatoken'};	my $datatoken=$env{'form.datatoken'};
if (($fn) && ($datatoken)) {	if (($fn) && ($datatoken)) {
if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) {	if ($env{'form.cancel'}) {
$r->print('<form action="/adm/upload" method="post">'.	my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp';
&mt('File').' <tt>'.$fn.'</tt> '.	my $dirpath=$path.'/';
&mt('exists. Overwrite?').' '.	$dirpath=~s/\/+/\//g;
	$r->print(&mt('Upload cancelled.').'<br /><font size="+2"><a href="'.$dirpath.'">'.
	&mt('Back to Directory').'</a></font>');
	} elsif ((-e $target) && (!$env{'form.override'})) {
	$r->print('<form action="'.$action.'" method="post">'.
	&mt('File [_1] exists. Overwrite?','<span class="LC_filename">'.$fn.'</span>').
'<input type="hidden" name="phase" value="two" />'.	'<input type="hidden" name="phase" value="two" />'.
'<input type="hidden" name="filename" value="'."$url".'" />'.	'<input type="hidden" name="filename" value="'."$url".'" />'.
'<input type="hidden" name="datatoken" value="'.$datatoken.'" />'.	'<input type="hidden" name="datatoken" value="'.$datatoken.'" />'.
'<input type="submit" name="override" value="'.&mt('Yes').'" /></form>');	'<input type="submit" name="override" value="'.&mt('Yes').'" />'.
} else {	'<input type="submit" name="cancel" value="'.&mt('Cancel').'" />'.
	'</form>');
	} else {
my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp';	my $source=$r->dir_config('lonDaemons').'/tmp/'.$datatoken.'.tmp';
	my $dirpath=$path.'/';
	$dirpath=~s/\/+/\//g;
# Check for bad extension and disallow upload	# Check for bad extension and disallow upload
if ($fn=~/\.(\w+)$/ &&	if ($fn=~/\.(\w+)$/ &&
(&Apache::loncommon::fileembstyle($1) eq 'hdn')) {	(&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 />'.	&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.').	&mt('The extension on this file is reserved internally by LON-CAPA.').
'</font>');	'</span>');
$r->print('<br /><font size=+2><a href="'.$path.'">'.	$r->print('<br /><font size=+2><a href="'.$dirpath.'">'.
&mt('Back to Directory').'</a></font>');	&mt('Back to Directory').'</a></font>');
} elsif ($fn=~/\.(\w+)$/ &&	} elsif ($fn=~/\.(\w+)$/ &&
!defined(&Apache::loncommon::fileembstyle($1))) {	!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 />'.	&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.').	&mt('The extension on this file is not recognized by LON-CAPA.').
'</font>');	'</span>');
$r->print('<br /><font size="+2"><a href="'.$path.'">'.	$r->print('<br /><font size="+2"><a href="'.$dirpath.'">'.
&mt('Back to Directory').'</a></font>');	&mt('Back to Directory').'</a></font>');
} elsif (-d $target) {	} elsif (-d $target) {
$r->print('File <tt>'.$fn.'</tt> could not be copied.<br />'.	$r->print('File <span class="LC_filename">'.$fn.'</span> could not be copied.<br />'.
'<font color="red">'.	'<span class="LC_error">'.
&mt('The target is an existing directory.').	&mt('The target is an existing directory.').
'</font><br />');	'</span><br />');
$r->print('<font size="+2"><a href="'.$path.'">'.	$r->print('<font size="+2"><a href="'.$dirpath.'">'.
&mt('Back to Directory').'</a></font>');	&mt('Back to Directory').'</a></font>');
} elsif (copy($source,$target)) {	} elsif (copy($source,$target)) {
chmod(0660, $target); # Set permissions to rw-rw---.	chmod(0660, $target); # Set permissions to rw-rw---.
$r->print(&mt('File copied.'));	if ($mode eq 'testbank' \|\| $mode eq 'imsimport') {
$r->print('<br /><font size="+2"><a href="'.$url.'">'.	$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>');	&mt('View file').'</a></font>');
$r->print('<br /><font size="+2"><a href="'.$path.'">'.	$r->print('<br /><font size="+2"><a href="'.$dirpath.'">'.
&mt('Back to Directory').'</a></font><br />');	&mt('Back to Directory').'</a></font><br />');
	}
} else {	} else {
$r->print('Failed to copy: '.$!);	$r->print('Failed to copy: '.$!);
$r->print('<br /><font size="+2"><a href="'.$path.'">'.	$r->print('<br /><font size="+2"><a href="'.$path.'">'.
Line 192 sub phasetwo {	Line 222 sub phasetwo {
}	}
}	}
} else {	} else {
$r->print('<font size="+1" color="red">'.	$r->print('<span class="LC_error">'.
&mt('Please use browser "Back" button and pick a filename').	&mt('Please use browser "Back" button and pick a filename').
'</font><br />');	'</span><br />');
}	}
} else {	} else {
$r->print('<font size=+1 color=red>'.	$r->print('<span class="LC_error">'.
&mt('Please use browser "Back" button and pick a filename').	&mt('Please use browser "Back" button and pick a filename').
'</font><br />>');	'</span><br />>');
}	}
	return $returnflag;
}	}

# ---------------------------------------------------------------- Main Handler	# ---------------------------------------------------------------- Main Handler
Line 210 sub handler {	Line 241 sub handler {

my $uname;	my $uname;
my $udom;	my $udom;
	my $javascript = '';
#	#
# phase two: re-attach user	# phase two: re-attach user
#	#
if ($ENV{'form.uploaduname'}) {	if ($env{'form.uploaduname'}) {
$ENV{'form.filename'}='/priv/'.$ENV{'form.uploaduname'}.'/'.	$env{'form.filename'}='/priv/'.$env{'form.uploaduname'}.'/'.
$ENV{'form.filename'};	$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)=	($uname,$udom)=
&Apache::loncacc::constructaccess($ENV{'form.filename'},	&Apache::loncacc::constructaccess($env{'form.filename'},
$r->dir_config('lonDefDomain'));	$r->dir_config('lonDefDomain'));
unless (($uname) && ($udom)) {	unless (($uname) && ($udom)) {
$r->log_reason($uname.' at '.$udom.	$r->log_reason($uname.' at '.$udom.
' trying to publish file '.$ENV{'form.filename'}.	' trying to publish file '.$env{'form.filename'}.
' - not authorized',	' - not authorized',
$r->filename);	$r->filename);
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}

my $fn;	my $fn;
if ($ENV{'form.filename'}) {	if ($env{'form.filename'}) {
$fn=$ENV{'form.filename'};	$fn=$env{'form.filename'};
$fn=~s/^http\:\/\/[^\/]+\///;	$fn=~s/^http\:\/\/[^\/]+\///;
$fn=~s/^\///;	$fn=~s/^\///;
$fn=~s/(\~\|priv\/)(\w+)//;	$fn=~s{(~\|priv/)($LONCAPA::username_re)}{};
$fn=~s/\/+/\//g;	$fn=~s/\/+/\//g;
} else {	} 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);	' unspecified filename for upload', $r->filename);
return HTTP_NOT_FOUND;	return HTTP_NOT_FOUND;
}	}
Line 249 sub handler {	Line 311 sub handler {
&Apache::loncommon::content_type($r,'text/html');	&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;	$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.	$r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.
&mt(' at ').$udom.'</font></h3>');	&mt(' at ').$udom.'</font></h3>');
}	}

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

$r->print('</body></html>');	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.24
changed lines
	Added in v.1.36