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

rfe: Process Macros in HTTP Proxy's URL

Browse source
This commit is contained in:
JT Smith 2008-09-16 15:26:49 +00:00
parent 8419d42739
commit 7a1136dd89
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -1,5 +1,6 @@
7.6.0
- rfe: Town Hall: Menu title in search results
- rfe: Process Macros in HTTP Proxy's URL
- rewrite macro parser, improving speed and making parameter parsing more sane
- Made the charset metatag the highest thing in the head block.
- fixed: AssetProxy allows proxying content in the trash or clipboard

11
lib/WebGUI/Asset/Wobject/HttpProxy.pm
View file

@ -21,6 +21,7 @@ use WebGUI::Storage;
use WebGUI::Asset::Wobject;
use WebGUI::Asset::Wobject::HttpProxy::Parse;
use WebGUI::Cache;
use WebGUI::Macro;
use Apache2::Upload;
our @ISA = qw(WebGUI::Asset::Wobject);
@ -238,8 +239,9 @@ sub view {
my $redirect = 0;
my $response;
my $header;
my $proxiedUrl;
my $proxiedUrl = $self->get("proxiedUrl");
WebGUI::Macro::process($self->session,\$proxiedUrl);
my $i18n = WebGUI::International->new($self->session, 'Asset_HttpProxy');
### Set up a cookie jar
@ -251,9 +253,7 @@ sub view {
### Find the URL we're proxying
if ($self->session->form->param("func")!~/editSave/i) { # Ignore ?func=editSave
$proxiedUrl = $self->session->form->process("FormAction") || $self->session->form->process("proxiedUrl") || $self->get("proxiedUrl") ;
} else {
$proxiedUrl = $self->get("proxiedUrl");
$proxiedUrl = $self->session->form->process("FormAction") || $self->session->form->process("proxiedUrl") || $proxiedUrl ;
}
return $self->processTemplate({},$self->get("templateId"))
@ -270,7 +270,6 @@ sub view {
$var{content} = $cacheContent->get;
}
# Unless we have cached content
unless ($var{content}) {