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:
parent
1f3aaf3e9c
commit
b32d4e8f52
@ -31,18 +31,12 @@
|
|||||||
function stop() {
|
function stop() {
|
||||||
_go=0;
|
_go=0;
|
||||||
$('#timer').html("...");
|
$('#timer').html("...");
|
||||||
$('#form button[type=submit]').attr('disabled','');
|
|
||||||
}
|
}
|
||||||
function go() {
|
function go() {
|
||||||
if(_go) {
|
if(_go) {
|
||||||
if(isHiddenFormValueSet('HttpRedirect')){
|
|
||||||
url=$("#form").attr('action');
|
|
||||||
window.location=url;
|
|
||||||
}else{
|
|
||||||
$("#form").submit();
|
$("#form").submit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
function timer() {
|
function timer() {
|
||||||
var h=$('#timer').html();
|
var h=$('#timer').html();
|
||||||
i--;
|
i--;
|
||||||
@ -51,9 +45,6 @@
|
|||||||
window.setTimeout('timer()',1000);
|
window.setTimeout('timer()',1000);
|
||||||
}
|
}
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
if(isHiddenFormValueSet('HideSubmitButton')){
|
|
||||||
$('#form button[type=submit]').attr('disabled','disabled');
|
|
||||||
}
|
|
||||||
window.setTimeout('go()',10000);
|
window.setTimeout('go()',10000);
|
||||||
window.setTimeout('timer()',1000);
|
window.setTimeout('timer()',1000);
|
||||||
});
|
});
|
||||||
|
@ -29,18 +29,12 @@
|
|||||||
function stop() {
|
function stop() {
|
||||||
_go=0;
|
_go=0;
|
||||||
$('#timer').html("...");
|
$('#timer').html("...");
|
||||||
$('#form button[type=submit]').attr('disabled','');
|
|
||||||
}
|
}
|
||||||
function go() {
|
function go() {
|
||||||
if(_go) {
|
if(_go) {
|
||||||
if(isHiddenFormValueSet('HttpRedirect')){
|
|
||||||
url=$("#form").attr('action');
|
|
||||||
window.location=url;
|
|
||||||
}else{
|
|
||||||
$("#form").submit();
|
$("#form").submit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
function timer() {
|
function timer() {
|
||||||
var h=$('#timer').html();
|
var h=$('#timer').html();
|
||||||
i--;
|
i--;
|
||||||
@ -49,9 +43,6 @@
|
|||||||
window.setTimeout('timer()',1000);
|
window.setTimeout('timer()',1000);
|
||||||
}
|
}
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
if(isHiddenFormValueSet('HideSubmitButton')){
|
|
||||||
$('#form button[type=submit]').attr('disabled','disabled');
|
|
||||||
}
|
|
||||||
window.setTimeout('go()',10000);
|
window.setTimeout('go()',10000);
|
||||||
window.setTimeout('timer()',1000);
|
window.setTimeout('timer()',1000);
|
||||||
});
|
});
|
||||||
|
@ -598,7 +598,7 @@ sub issuerForUnAuthUser {
|
|||||||
|
|
||||||
# Check if relay parameter is present (mandatory)
|
# Check if relay parameter is present (mandatory)
|
||||||
my $relayID;
|
my $relayID;
|
||||||
unless ( $relayID = $self->param('relay') ) {
|
unless ( $relayID = $self->getHiddenFormValue('relay') ) {
|
||||||
$self->lmLog( "No relayID detected", 'error' );
|
$self->lmLog( "No relayID detected", 'error' );
|
||||||
return PE_ERROR;
|
return PE_ERROR;
|
||||||
}
|
}
|
||||||
@ -1843,8 +1843,8 @@ sub issuerForAuthUser {
|
|||||||
else {
|
else {
|
||||||
$self->{urldc} =
|
$self->{urldc} =
|
||||||
$self->{portal}
|
$self->{portal}
|
||||||
. '/saml/relaySingleLogoutTermination?relay='
|
. '/saml/relaySingleLogoutTermination';
|
||||||
. $relayID;
|
$self->setHiddenFormValue('relay', $relayID);
|
||||||
return PE_INFO;
|
return PE_INFO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2493,14 +2493,8 @@ sub sendLogoutRequestToServiceProviders {
|
|||||||
# End of information block to be displayed to the user.
|
# End of information block to be displayed to the user.
|
||||||
$info .= '</table>';
|
$info .= '</table>';
|
||||||
|
|
||||||
# Print some information to the user. The URL to be redirected should
|
# Print some information to the user.
|
||||||
# not be send via a form (because it does not work all time).
|
$self->info($info) if $providersCount;
|
||||||
if ($providersCount) {
|
|
||||||
$self->info($info);
|
|
||||||
$self->setHiddenFormValue( 'HttpRedirect', 'true' );
|
|
||||||
|
|
||||||
# $self->setHiddenFormValue( 'HideSubmitButton', 'true' );
|
|
||||||
}
|
|
||||||
|
|
||||||
return $providersCount;
|
return $providersCount;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user