some http header changes

This commit is contained in:
JT Smith 2006-04-18 14:22:42 +00:00
parent 4a3dab3ddb
commit e8c073b9df
23 changed files with 206 additions and 54 deletions

View file

@ -319,6 +319,7 @@ sub www_edit {
sub www_view {
my $self = shift;
return $self->session->privilege->insufficient() unless ($self->canView);
$self->session->http->setCacheControl($self->get("visitorCacheTimeout")) if ($self->session->user->userId eq "1");
return $self->session->style->process($self->view,$self->getParent->getValue("styleTemplateId"));
}

View file

@ -1021,7 +1021,8 @@ sub www_view {
return $self->session->privilege->noAccess() unless $self->canView;
my $check = $self->checkView;
return $check if (defined $check);
$self->session->http->getHeader;
$self->session->http->setCacheControl($self->get("visitorCacheTimeout")) if ($self->session->user->userId eq "1");
$self->session->http->sendHeader;
$self->prepareView;
my $style = $self->getParent->processStyle("~~~");
my ($head, $foot) = split("~~~",$style);

View file

@ -18,7 +18,6 @@ use strict;
use WebGUI::Asset;
use WebGUI::Asset::Template;
use WebGUI::Macro;
use HTTP::Date;
our @ISA = qw(WebGUI::Asset);
@ -203,12 +202,7 @@ 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")));
}
$self->session->http->setCacheControl($self->get("cacheTimeout"));
return $self->view(1);
}

View file

@ -537,7 +537,7 @@ sub www_view {
my $self = shift;
my $check = $self->checkView;
return $check if (defined $check);
$self->session->http->getHeader;
$self->session->http->sendHeader;
$self->prepareView;
my $style = $self->processStyle("~~~");
my ($head, $foot) = split("~~~",$style);

View file

@ -371,6 +371,19 @@ sub www_deleteFile {
return $self->www_edit;
}
#-------------------------------------------------------------------
=head2 www_view ()
See WebGUI::Asset::Wobject::www_view() for details.
=cut
sub www_view {
my $self = shift;
$self->session->http->setCacheControl($self->get("cacheTimeout"));
$self->SUPER::www_view(@_);
}
1;

View file

@ -1179,7 +1179,8 @@ sub _xml_encode {
sub www_view {
my $self = shift;
my $disableCache = ($self->session->form->process("sortBy") ne "");
return $self->SUPER::www_view($disableCache);
$self->session->http->setCacheControl($self->get("visitorCacheTimeout")) if ($self->session->user->userId eq "1" && !$disableCache);
return $self->SUPER::www_view(@_);
}

View file

@ -509,6 +509,20 @@ sub view {
}
#-------------------------------------------------------------------
=head2 www_view ()
See WebGUI::Asset::Wobject::www_view() for details.
=cut
sub www_view {
my $self = shift;
$self->session->http->setCacheControl($self->get("visitorCacheTimeout")) if ($self->session->user->userId eq "1");
$self->SUPER::www_view(@_);
}
1;

View file

@ -219,6 +219,20 @@ sub view {
}
#-------------------------------------------------------------------
=head2 www_view ()
See WebGUI::Asset::Wobject::www_view() for details.
=cut
sub www_view {
my $self = shift;
$self->session->http->setCacheControl($self->get("visitorCacheTimeout")) if ($self->session->user->userId eq "1");
$self->SUPER::www_view(@_);
}
1;

View file

@ -286,7 +286,7 @@ sub www_view {
my $ad = $adSpace->displayImpression if (defined $adSpace);
$out =~ s/\Q$code/$ad/ges;
}
$self->session->http->getHeader;
$self->session->http->sendHeader;
$self->session->output->print($out, 1);
return "chunked";
}

View file

@ -1075,6 +1075,20 @@ sub view {
return $out;
}
#-------------------------------------------------------------------
=head2 www_view ()
See WebGUI::Asset::Wobject::www_view() for details.
=cut
sub www_view {
my $self = shift;
$self->session->http->setCacheControl($self->get("visitorCacheTimeout")) if ($self->session->user->userId eq "1");
$self->SUPER::www_view(@_);
}
#-------------------------------------------------------------------
sub www_viewDetail {
my $self = shift;

View file

@ -163,6 +163,20 @@ sub view {
return $out;
}
#-------------------------------------------------------------------
=head2 www_view ()
See WebGUI::Asset::Wobject::www_view() for details.
=cut
sub www_view {
my $self = shift;
$self->session->http->setCacheControl($self->get("visitorCacheTimeout")) if ($self->session->user->userId eq "1");
$self->SUPER::www_view(@_);
}
1;

View file

@ -140,4 +140,18 @@ sub view {
}
#-------------------------------------------------------------------
=head2 www_view ()
See WebGUI::Asset::Wobject::www_view() for details.
=cut
sub www_view {
my $self = shift;
$self->session->http->setCacheControl($self->get("cacheTimeout"));
$self->SUPER::www_view(@_);
}
1;

View file

@ -913,5 +913,19 @@ sub view {
return $out;
}
#-------------------------------------------------------------------
=head2 www_view ()
See WebGUI::Asset::Wobject::www_view() for details.
=cut
sub www_view {
my $self = shift;
$self->session->http->setCacheControl($self->get("cacheTimeout"));
$self->SUPER::www_view(@_);
}
1;

View file

@ -326,7 +326,7 @@ sub view {
#use Data::Dumper; return '<pre>'.Dumper($var).'</pre>';
my $out = $self->processTemplate($var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
WebGUI::Cache->new($self->session,"view_".$self->getId)->set($out,$self->get("visitorCacheTimeout"));
WebGUI::Cache->new($self->session,"view_".$self->getId)->set($out,$self->get("cacheTimeout"));
}
return $out;
}
@ -491,5 +491,20 @@ sub _processQuery {
}
return \%var;
}
#-------------------------------------------------------------------
=head2 www_view ()
See WebGUI::Asset::Wobject::www_view() for details.
=cut
sub www_view {
my $self = shift;
$self->session->http->setCacheControl($self->get("cacheTimeout"));
$self->SUPER::www_view(@_);
}
1;

View file

@ -619,6 +619,20 @@ sub _createRSSURLs{
}
#-------------------------------------------------------------------
=head2 www_view ()
See WebGUI::Asset::Wobject::www_view() for details.
=cut
sub www_view {
my $self = shift;
$self->session->http->setCacheControl($self->get("cacheTimeout"));
$self->SUPER::www_view(@_);
}
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
=head2 www_viewRSS090()