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

Update for Moose accessors

Browse source
This commit is contained in:
Colin Kuskie 2010-02-11 19:31:47 -08:00
parent 03ccc7febb
commit 3b4dd658d1
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -148,7 +148,7 @@ sub processPropertiesFromFormPost {
$self->SUPER::processPropertiesFromFormPost; $self->SUPER::processPropertiesFromFormPost;
my $storage = $self->getStorageLocation(); my $storage = $self->getStorageLocation();
my $file = $self->get("filename"); my $file = $self->filename;
#return undef unless $file; #return undef unless $file;
my $i18n = WebGUI::International->new($self->session, 'Asset_ZipArchive'); my $i18n = WebGUI::International->new($self->session, 'Asset_ZipArchive');
@ -166,7 +166,7 @@ sub processPropertiesFromFormPost {
return undef; return undef;
} }
unless ($self->unzip($storage,$self->get("filename"))) { unless ($self->unzip($storage,$self->filename)) {
$self->session->errorHandler->warn($i18n->get("unzip_error")); $self->session->errorHandler->warn($i18n->get("unzip_error"));
} }
} }
@ -184,7 +184,7 @@ used to show the file to administrators.
sub view { sub view {
my $self = shift; my $self = shift;
my $cache = $self->session->cache; my $cache = $self->session->cache;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) { if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
my $out = eval{$cache->get("view_".$self->getId)}; my $out = eval{$cache->get("view_".$self->getId)};
return $out if $out; return $out if $out;
} }
@ -196,19 +196,19 @@ sub view {
} }
$self->session->scratch->delete("za_error"); $self->session->scratch->delete("za_error");
my $storage = $self->getStorageLocation; my $storage = $self->getStorageLocation;
if($self->get("filename") ne "") { if($self->filename ne "") {
$var{fileUrl} = $storage->getUrl($self->get("showPage")); $var{fileUrl} = $storage->getUrl($self->showPage);
$var{fileIcon} = $storage->getFileIconUrl($self->get("showPage")); $var{fileIcon} = $storage->getFileIconUrl($self->showPage);
} }
unless($self->get("showPage")) { unless($self->showPage) {
$var{pageError} = "true"; $var{pageError} = "true";
} }
my $i18n = WebGUI::International->new($self->session,"Asset_ZipArchive"); my $i18n = WebGUI::International->new($self->session,"Asset_ZipArchive");
$var{noInitialPage} = $i18n->get('noInitialPage'); $var{noInitialPage} = $i18n->get('noInitialPage');
$var{noFileSpecified} = $i18n->get('noFileSpecified'); $var{noFileSpecified} = $i18n->get('noFileSpecified');
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate}); my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) { if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
eval{$cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"))}; eval{$cache->set("view_".$self->getId, $out, $self->cacheTimeout)};
} }
return $out; return $out;
} }
@ -246,7 +246,7 @@ sub www_view {
if ($self->session->var->isAdminOn) { if ($self->session->var->isAdminOn) {
return $self->session->asset($self->getContainer)->www_view; return $self->session->asset($self->getContainer)->www_view;
} }
$self->session->http->setRedirect($self->getFileUrl($self->getValue("showPage"))); $self->session->http->setRedirect($self->getFileUrl($self->showPage));
return "1"; return "1";
} }