param("maxAttachments").";"
+ .$url->page("op=formHelper;class=Attachments;sub=delete;maxAttachments=".$form->param("maxAttachments")
+ .";maxImageSize=".$form->param("maxImageSize").";thumbnailSize=".$form->param("thumbnailSize").";"
.$attachmentsList.";assetId=".$assetId.";name=".$form->param("name")).'" class="deleteAttachment">X
';
if ($asset->isa("WebGUI::Asset::File::Image")) {
@@ -257,31 +275,31 @@ sub www_upload {
my $storage = WebGUI::Storage::Image->createTemp($session);
my $filename = $storage->addFileFromFormPost("attachment");
my $tempspace = WebGUI::Asset->getTempspace($session);
+ my $asset = "";
+
+ # prevent malicious visitors from being able to publish children things they've published to tempsace
+ my $owner = ($session->user->userId eq "1") ? "3" : $session->user->userId;
+
+ my %properties = (
+ title => $filename,
+ url => "attachments/".$filename,
+ filename => $filename,
+ ownerUserId => $owner,
+ groupIdEdit => "3",
+ groupIdView => "7",
+ );
if ($storage->isImage($filename)) {
- my $image = $tempspace->addChild({
- title => $filename,
- url => "attachments/".$filename,
- className => "WebGUI::Asset::File::Image",
- filename => $filename,
- templateId => "PBtmpl0000000000000088",
- });
- $image->getStorageLocation->addFileFromFilesystem($storage->getPath($filename));
- $image->generateThumbnail();
- $image->setSize;
- push(@assetIds, $image->getId);
+ $properties{className} = "WebGUI::Asset::File::Image";
+ $properties{templateId} = "PBtmpl0000000000000088";
}
else {
- my $file = $tempspace->addChild({
- title => $filename,
- url => "attachments/".$filename,
- className => "WebGUI::Asset::File",
- filename => $filename,
- templateId => "PBtmpl0000000000000024",
- });
- $file->getStorageLocation->addFileFromFilesystem($storage->getPath($filename));
- $file->setSize;
- push(@assetIds, $file->getId);
+ $properties{className} = "WebGUI::Asset::File";
+ $properties{templateId} = "PBtmpl0000000000000024";
}
+ $asset = $tempspace->addChild(\%properties);
+ $asset->getStorageLocation->addFileFromFilesystem($storage->getPath($filename));
+ $asset->applyConstraints;
+ push(@assetIds, $asset->getId);
if ($session->setting->get("autoRequestCommit")) {
WebGUI::VersionTag->getWorking($session)->requestCommit;
}
diff --git a/lib/WebGUI/Setup.pm b/lib/WebGUI/Setup.pm
index f092fee33..65a9b33e1 100644
--- a/lib/WebGUI/Setup.pm
+++ b/lib/WebGUI/Setup.pm
@@ -478,7 +478,7 @@ a:visited { color: '.$form->get("visitedLinkColor").'; }
# commit the working tag
my $working = WebGUI::VersionTag->getWorking($session);
- $working->set({title=>"Initial Site Setup"});
+ $working->set({name=>"Initial Site Setup"});
$working->commit;
# remove init state
diff --git a/lib/WebGUI/Workflow/Activity/CleanTempStorage.pm b/lib/WebGUI/Workflow/Activity/CleanTempStorage.pm
index 3db0186a7..9bae195b9 100644
--- a/lib/WebGUI/Workflow/Activity/CleanTempStorage.pm
+++ b/lib/WebGUI/Workflow/Activity/CleanTempStorage.pm
@@ -19,6 +19,7 @@ use strict;
use base 'WebGUI::Workflow::Activity';
use File::Path;
use File::stat;
+use WebGUI::Asset;
=head1 NAME
@@ -102,7 +103,27 @@ See WebGUI::Workflow::Activity::execute() for details.
sub execute {
my $self = shift;
- $self->recurseFileSystem($self->session->config->get("uploadsPath")."/temp");
+ my $start = time();
+
+ # kill temporary assets
+ my $tempspace = WebGUI::Asset->getTempspace($self->session);
+ my $children = $tempspace->getLineage(["children"], {
+ returnObjects => 1,
+ statesToInclude => [qw(trash clipboard published)],
+ statusToInclude => [qw(pending archived approved)],
+ });
+ foreach my $asset (@{$children}) {
+ if (time() - $asset->get("revisionDate") > $self->get("storageTimeout")) {
+ unless ($asset->purge) {
+ return $self->ERROR;
+ }
+ }
+ # taking too long, give up
+ return $self->WAITING if (time() - $start > 50);
+ }
+
+ # kill temporary files
+ return $self->recurseFileSystem($start, $self->session->config->get("uploadsPath")."/temp");
}
@@ -120,20 +141,27 @@ The starting path.
sub recurseFileSystem {
my $self = shift;
+ my $start = shift;
my $path = shift;
- my (@filelist, $file);
- if (opendir(DIR,$path)) {
- @filelist = readdir(DIR);
- closedir(DIR);
- foreach $file (@filelist) {
- unless ($file eq "." || $file eq "..") {
- $self->recurseFileSystem($path."/".$file);
- if ($self->checkFileAge($path."/".$file)) {
- rmtree($path."/".$file);
- }
- }
+ my (@filelist, $file);
+ if (opendir(DIR,$path)) {
+ @filelist = readdir(DIR);
+ closedir(DIR);
+ foreach $file (@filelist) {
+ unless ($file eq "." || $file eq "..") {
+ # taking too long, time to abort
+ return $self->WAITING if (time() - $start > 50);
+
+ # must search for children
+ $self->recurseFileSystem($start, $path."/".$file);
+
+ # if it's old enough, let's kill it
+ if ($self->checkFileAge($path."/".$file)) {
+ rmtree($path."/".$file);
}
+ }
}
+ }
return $self->COMPLETE;
}