some http header changes

lib/WebGUI/Asset/Wobject/Article.pm

@@ -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;

lib/WebGUI/Asset/Wobject/Collaboration.pm

@@ -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(@_);
 }
 
 

lib/WebGUI/Asset/Wobject/EventsCalendar.pm

@@ -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;

lib/WebGUI/Asset/Wobject/Folder.pm

@@ -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;
 

lib/WebGUI/Asset/Wobject/Layout.pm

@@ -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";	
 	}

lib/WebGUI/Asset/Wobject/Matrix.pm

@@ -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;

lib/WebGUI/Asset/Wobject/MessageBoard.pm

@@ -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;
 
 

lib/WebGUI/Asset/Wobject/MultiSearch.pm

@@ -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;

lib/WebGUI/Asset/Wobject/Product.pm

@@ -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;
 

lib/WebGUI/Asset/Wobject/SQLReport.pm

@@ -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;
 

lib/WebGUI/Asset/Wobject/SyndicatedContent.pm

@@ -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()