oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed various bugs with new date/time and added new Apache2::Upload functionality to Storage.

Browse source
This commit is contained in:
Matthew Wilson 2005-11-04 05:57:48 +00:00
parent fec3edd516
commit f3e5107811
2 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/Wobject.pm
View file

@ -14,7 +14,7 @@ package WebGUI::Asset::Wobject;
=cut
use CGI::Util qw(rearrange);
#use CGI::Util qw(rearrange);
use DBI;
use strict qw(subs vars);
use Tie::IxHash;

55
lib/WebGUI/Storage.pm
View file

@ -27,6 +27,8 @@ use WebGUI::Id;
use WebGUI::Session;
use WebGUI::URL;
use WebGUI::Utility;
use Apache2::Request;
use Apache2::Upload;
=head1 NAME
@ -199,35 +201,34 @@ sub addFileFromFormPost {
return "" if (WebGUI::HTTP::getStatus() =~ /^413/);
my $filename;
my $attachmentCount = 1;
foreach my $tempPath ($session{req}->upload($formVariableName)) {
last if $attachmentCount > $attachmentLimit;
if ($tempPath =~ /([^\/\\]+)$/) {
$filename = $1;
} else {
$filename = $tempPath;
}
my $type = $self->getFileExtension($filename);
if (isIn($type, qw(pl perl sh cgi php asp))) { # make us safe from malicious uploads
$filename =~ s/\./\_/g;
$filename .= ".txt";
}
$filename = WebGUI::URL::makeCompliant($filename);
foreach my $upload ($session{req}->upload($formVariableName)) {
last if $attachmentCount > $attachmentLimit;
my $tempPath = $upload->tempname();
$filename = $upload->filename();
next unless $filename;
my $type = $self->getFileExtension($filename);
if (isIn($type, qw(pl perl sh cgi php asp))) { # make us safe from malicious uploads
$filename =~ s/\./\_/g;
$filename .= ".txt";
}
$filename = WebGUI::URL::makeCompliant($filename);
my $bytesread;
my $file = FileHandle->new(">".$self->getPath($filename));
$attachmentCount++;
if (defined $file) {
my $file = FileHandle->new(">".$self->getPath($filename));
$attachmentCount++;
if (defined $file) {
my $buffer;
binmode $file;
while ($bytesread=read($tempPath,$buffer,1024)) {
print $file $buffer;
}
close($file);
} else {
$self->_addError("Couldn't open file ".$self->getPath($filename)." for writing due to error: ".$!);
return undef;
}
}
return $filename;
my $sourcefh = $upload->fh;
binmode $file;
while ($bytesread=read($sourcefh,$buffer,1024)) {
print $file $buffer;
}
close($file);
} else {
$self->_addError("Couldn't open file ".$self->getPath($filename)." for writing due to error: ".$!);
return undef;
}
}
return $filename;
}