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

fixed redirect bugs in file, image, and zip archive

Browse source 
added cache control headers to style
added cache control headers to snippet
added server side caching to snippet
This commit is contained in:
JT Smith 2006-04-15 16:07:04 +00:00
parent 404749e32b
commit da9c26d72c
7 changed files with 45 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/File/Image.pm
View file

@ -319,7 +319,7 @@ sub www_view {
}
my $storage = $self->getStorageLocation;
$self->session->http->setRedirect($storage->getUrl($self->get("filename")));
return "";
return "1";
}

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

@ -309,7 +309,7 @@ sub www_view {
return $self->getContainer->www_view;
}
$self->session->http->setRedirect($self->getFileUrl($self->getValue("showPage")));
return "";
return "1";
}

28
lib/WebGUI/Asset/Snippet.pm
View file

@ -18,6 +18,7 @@ use strict;
use WebGUI::Asset;
use WebGUI::Asset::Template;
use WebGUI::Macro;
use HTTP::Date;
our @ISA = qw(WebGUI::Asset);
@ -71,6 +72,14 @@ sub definition {
fieldType=>'codearea',
defaultValue=>undef
},
cacheTimeout => {
tab => "display",
fieldType => "interval",
defaultValue => 3600,
uiLevel => 8,
label => $i18n->get("cache timeout"),
hoverHelp => $i18n->get("cache timeout help")
},
processAsTemplate=>{
fieldType=>'yesNo',
defaultValue=>0
@ -157,11 +166,20 @@ sub indexContent {
sub view {
my $self = shift;
my $calledAsWebMethod = shift;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
my $out = WebGUI::Cache->new($self->session,"view_".$calledAsWebMethod."_".$self->getId)->get;
return $out if $out;
}
my $output = $self->get("snippet");
WebGUI::Macro::process($self->session,\$output);
$output = $self->getToolbar.$output if ($self->session->var->get("adminOn") && !$calledAsWebMethod);
return $output unless ($self->getValue("processAsTemplate"));
return WebGUI::Asset::Template->processRaw($self->session, $output);
unless ($self->getValue("processAsTemplate")) {
$output = WebGUI::Asset::Template->processRaw($self->session, $output);
}
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
WebGUI::Cache->new($self->session,"view_".$calledAsWebMethod."_".$self->getId)->set($output,$self->get("cacheTimeout"));
}
return $output;
}
#-------------------------------------------------------------------
@ -185,6 +203,12 @@ sub www_view {
my $self = shift;
my $mimeType=$self->getValue('mimeType');
$self->session->http->setMimeType($mimeType || 'text/html');
my $request = $self->session->request;
if (defined $request && $request->protocol =~ /(\d\.\d)/ && $1 >= 1.1){
$request->header_out('Cache-Control', "max-age=" . $self->get("cacheTimeout"));
} elsif (defined $request) {
$request->header_out('Expires', HTTP::Date::time2str(time + $self->get("cacheTimeout")));
}
return $self->view(1);
}