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

merging 6.6.5 changes

Browse source
This commit is contained in:
JT Smith 2005-07-25 19:03:14 +00:00
parent 87d2a6401e
commit 4b93aa1914
8 changed files with 74 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -78,6 +78,11 @@ sub definition {
fieldType=>"text",
defaultValue=>undef
},
cookieJarStorageId=>{
noFormPost=>1,
fieldType=>"hidden",
defaultValue=>undef
}
}
});
return $class->SUPER::definition($definition);
@ -302,7 +307,7 @@ sub view {
$var{content} = $1 || $var{content};
$var{"content.trailing"} = $2;
}
my $p = WebGUI::Asset::Wobject::HttpProxy::Parse->new($proxiedUrl, $var{content}, $self->getId,$self->get("rewriteUrls"));
my $p = WebGUI::Asset::Wobject::HttpProxy::Parse->new($proxiedUrl, $var{content}, $self->getId,$self->get("rewriteUrls"),$self->getUrl);
$var{content} = $p->filter; # Rewrite content. (let forms/links return to us).
$p->DESTROY;
@ -348,5 +353,18 @@ sub www_edit {
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("2","Asset_HttpProxy"));
}
#-------------------------------------------------------------------
sub www_view {
my $self = shift;
my $output = $self->view;
return WebGUI::Privilege::noAccess() unless $self->canView;
# this is s a stop gap. we need to do something here that deals with the real www_view and caching, etc.
if (WebGUI::HTTP::getMimeType() ne "text/html") {
return $output;
} else {
return $self->processStyle($output);
}
}
1;