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

fixed bugs with new chunking system

Browse source
This commit is contained in:
JT Smith 2006-03-29 21:49:56 +00:00
parent 5a7fedc731
commit c355601249
2 changed files with 33 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

62
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -810,7 +810,6 @@ sub view {
$var->{"collaboration.url"} = $self->getThread->getParent->getUrl;
$var->{'collaboration.title'} = $self->getParent->get("title");
$var->{'collaboration.description'} = $self->getParent->get("description");
return $self->processTemplate($var,undef,$self->{_viewTemplate});
}
@ -948,39 +947,44 @@ sub www_unsubscribe {
}
#-------------------------------------------------------------------
=head2 www_view ( )
Renders self->view based upon current style, subject to timeouts. Returns Privilege::noAccess() if canView is False.
=cut
sub www_view {
my $self = shift;
my $self = shift;
my $postId = shift;
return $self->session->privilege->noAccess() unless $self->canView;
my $cache;
my $output;
my $useCache = (
$self->session->form->process("op") eq "" &&
$self->session->form->process("func") eq "" &&
$self->session->form->process("layout") eq "" &&
(
( $self->getParent->get("cacheTimeout") > 10 && $self->session->user->userId ne '1') ||
( $self->getParent->get("cacheTimeoutVisitor") > 10 && $self->session->user->userId eq '1')
) &&
not $self->session->var->get("adminOn")
);
if ($useCache) {
$cache = WebGUI::Cache->new($self->session,"cspost_".($postId||$self->getId)."_".$self->session->user->userId."_".$self->session->scratch->get("discussionLayout")."_".$self->session->form->process("pn"));
$output = $cache->get;
}
unless ($output) {
$output = $self->getParent->processStyle($self->view);
my $ttl;
if ($self->session->user->userId eq '1') {
$ttl = $self->getParent->get("cacheTimeoutVisitor");
} else {
$ttl = $self->getParent->get("cacheTimeout");
}
$cache->set($output, $ttl) if ($useCache);
}
return $output;
unless ($self->canView) {
if ($self->get("state") eq "published") { # no privileges, make em log in
return $self->session->privilege->noAccess();
} elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^trash/) { # show em trash
$self->session->http->setRedirect($self->getUrl("func=manageTrash"));
return undef;
} elsif ($self->session->var->get("adminOn") && $self->get("state") =~ /^clipboard/) { # show em clipboard
$self->session->http->setRedirect($self->getUrl("func=manageClipboard"));
return undef;
} else { # tell em it doesn't exist anymore
$self->session->http->setStatus("410");
return WebGUI::Asset->getNotFound($self->session)->www_view;
}
}
# must find a way to do this next line better
$self->session->http->setCookie("wgSession",$self->session->var->{_var}{sessionId}) unless $self->session->var->{_var}{sessionId} eq $self->session->http->getCookies->{"wgSession"};
$self->session->http->getHeader;
$self->prepareView;
my $style = $self->getParent->processStyle("~~~");
my ($head, $foot) = split("~~~",$style);
$self->session->output->print($head);
$self->session->output->print($self->view);
$self->session->output->print($foot);
return "chunked";
}
1;

42
lib/WebGUI/Asset/Wobject.pm
View file

@ -588,11 +588,6 @@ sub www_view {
return WebGUI::Asset->getNotFound($self->session)->www_view;
}
}
# causes problems with the wre so it's commented out
# if ($self->get("encryptPage") && $self->session->env->get("HTTPS") ne "on") {
# $self->session->http->setRedirect($self->getUrl);
# return "";
# }
$self->logView();
# must find a way to do this next line better
$self->session->http->setCookie("wgSession",$self->session->var->{_var}{sessionId}) unless $self->session->var->{_var}{sessionId} eq $self->session->http->getCookies->{"wgSession"};
@ -606,42 +601,5 @@ sub www_view {
return "chunked";
}
#-------------------------------------------------------------------
=head2 www_view ( [ disableCache ] )
Renders self->view based upon current style, subject to timeouts. Returns Privilege::noAccess() if canView is False.
=cut
sub www_viewOld {
my $self = shift;
my $disableCache = shift;
my $cache;
my $output;
my $useCache = (
$self->session->form->process("op") eq "" && $self->session->form->process("pn") eq ""
&& (
( $self->get("cacheTimeout") > 10 && $self->session->user->userId ne '1')
|| ( $self->get("cacheTimeoutVisitor") > 10 && $self->session->user->userId eq '1')
)
&& !( $self->session->var->get("adminOn") || $disableCache)
);
if ($useCache) {
$cache = WebGUI::Cache->new($self->session,"wobject_".$self->getId."_".$self->session->user->userId);
$output = $cache->get;
}
unless ($output) {
$output = $self->processStyle($self->view);
my $ttl;
if ($self->session->user->userId eq '1') {
$ttl = $self->get("cacheTimeoutVisitor");
} else {
$ttl = $self->get("cacheTimeout");
}
$cache->set($output, $ttl) if ($useCache && !$self->session->http->isRedirect());
}
return $output;
}
1;