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

Fixed a bug with WebGUI::Session::Url::page where, if preventProxyCache

Browse source 
was enabled a noCache param was always added to the URL.  In some
cases it would add 2 noCache params.

To fix this, I added a skipPreventProxyCache param to the gateway method,
and page just passes $pairs and $skipPreventProxyCache to gateway.

Added tests to Url.t to test gateway, page, makeAbsolute and urlize
to bring its coverage up to 100%.

Added tests to Stow.t to bring it's coverage up to 100% as well.
This commit is contained in:
Colin Kuskie 2006-09-30 17:23:44 +00:00
parent b1a5c46fcb
commit d995ff09fe
3 changed files with 87 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

29
lib/WebGUI/Session/Url.pm
View file

@ -158,15 +158,22 @@ Name value pairs to add to the URL in the form of:
name1=value1;name2=value2;name3=value3
=head3 skipPreventProxyCache
If preventing proxy caching is enabled in the settings, then if
skipPreventProxyCache is a 1 will override that and prevent the
noCache param from being added to the URL.
=cut
sub gateway {
my $self = shift;
my $pageUrl = shift;
my $pairs = shift;
my $skipPreventProxyCache = shift;
my $url = $self->session->config->get("gateway").'/'.$pageUrl;
$url =~ s/\/+/\//g;
if ($self->session->setting->get("preventProxyCache") == 1) {
if ($self->session->setting->get("preventProxyCache") == 1 and !$skipPreventProxyCache) {
$url = $self->append($url,"noCache=".randint(0,1000).','.$self->session->datetime->time());
}
if ($pairs) {
@ -267,7 +274,8 @@ The base URL to use. This defaults to current page url.
sub makeAbsolute {
my $self = shift;
my $url = shift;
my $baseURL = shift || $self->page();
my $baseURL = shift;
$baseURL = $self->page() unless $baseURL;
return URI->new_abs($url,$baseURL);
}
@ -326,9 +334,10 @@ If set to "1" we'll use the full site URL rather than the script (gateway) URL.
=head3 skipPreventProxyCache
If preventing proxy caching is enabled in the settings, then if skipPreventProxyCache
is a 1 it will prevent the code that prevents proxy caching. If that doesn't make
your head hurt then you'll understand the rest of wG just fine.
If preventing proxy caching is enabled in the settings, then if
skipPreventProxyCache is a 1 it will prevent the code that prevents
proxy caching from being added. If that doesn't make your head hurt
then you'll understand the rest of wG just fine.
=cut
@ -341,13 +350,9 @@ sub page {
if ($useFullUrl) {
$url = $self->getSiteURL();
}
$url .= $self->gateway($self->session->asset ? $self->session->asset->get("url") : $self->getRequestedUrl);
if ($self->session->setting->get("preventProxyCache") == 1 && !$skipPreventProxyCache) {
$url = $self->append($url,"noCache=".randint(0,1000).','.$self->session->datetime->time());
}
if ($pairs) {
$url = $self->append($url,$pairs);
}
my $path = $self->session->asset ? $self->session->asset->get("url") : $self->getRequestedUrl;
$url .= $self->gateway($path, $pairs, $skipPreventProxyCache);
return $url;
}