Remove HttpRedirect and HttpDisableSubmit options in info.tpl, and use hidden fields to store URL parameters, for form GET to work (#115)

This commit is contained in:
Clément Oudot 2010-06-23 14:03:18 +00:00
parent 1f3aaf3e9c
commit b32d4e8f52
4 changed files with 5 additions and 29 deletions

View File

@ -31,18 +31,12 @@
function stop() {
_go=0;
$('#timer').html("...");
$('#form button[type=submit]').attr('disabled','');
}
function go() {
if(_go) {
if(isHiddenFormValueSet('HttpRedirect')){
url=$("#form").attr('action');
window.location=url;
}else{
$("#form").submit();
}
}
}
function timer() {
var h=$('#timer').html();
i--;
@ -51,9 +45,6 @@
window.setTimeout('timer()',1000);
}
$(document).ready(function(){
if(isHiddenFormValueSet('HideSubmitButton')){
$('#form button[type=submit]').attr('disabled','disabled');
}
window.setTimeout('go()',10000);
window.setTimeout('timer()',1000);
});

View File

@ -29,18 +29,12 @@
function stop() {
_go=0;
$('#timer').html("...");
$('#form button[type=submit]').attr('disabled','');
}
function go() {
if(_go) {
if(isHiddenFormValueSet('HttpRedirect')){
url=$("#form").attr('action');
window.location=url;
}else{
$("#form").submit();
}
}
}
function timer() {
var h=$('#timer').html();
i--;
@ -49,9 +43,6 @@
window.setTimeout('timer()',1000);
}
$(document).ready(function(){
if(isHiddenFormValueSet('HideSubmitButton')){
$('#form button[type=submit]').attr('disabled','disabled');
}
window.setTimeout('go()',10000);
window.setTimeout('timer()',1000);
});

View File

@ -598,7 +598,7 @@ sub issuerForUnAuthUser {
# Check if relay parameter is present (mandatory)
my $relayID;
unless ( $relayID = $self->param('relay') ) {
unless ( $relayID = $self->getHiddenFormValue('relay') ) {
$self->lmLog( "No relayID detected", 'error' );
return PE_ERROR;
}
@ -1843,8 +1843,8 @@ sub issuerForAuthUser {
else {
$self->{urldc} =
$self->{portal}
. '/saml/relaySingleLogoutTermination?relay='
. $relayID;
. '/saml/relaySingleLogoutTermination';
$self->setHiddenFormValue('relay', $relayID);
return PE_INFO;
}

View File

@ -2493,14 +2493,8 @@ sub sendLogoutRequestToServiceProviders {
# End of information block to be displayed to the user.
$info .= '</table>';
# Print some information to the user. The URL to be redirected should
# not be send via a form (because it does not work all time).
if ($providersCount) {
$self->info($info);
$self->setHiddenFormValue( 'HttpRedirect', 'true' );
# $self->setHiddenFormValue( 'HideSubmitButton', 'true' );
}
# Print some information to the user.
$self->info($info) if $providersCount;
return $providersCount;