Commit e29a65e9 authored by Clément OUDOT's avatar Clément OUDOT
Browse files

Disable timer on IDP list (#141)

parent 67810543
......@@ -68,6 +68,7 @@ if ( $portal->process() ) {
SKIN => $skin,
URL => $portal->{urldc},
HIDDEN_INPUTS => $portal->buildHiddenForm(),
ACTIVE_TIMER => $portal->{activeTimer},
);
}
......@@ -136,6 +137,7 @@ elsif ( $portal->{error} == PE_CONFIRM ) {
MSG => $portal->info(),
SKIN => $skin,
HIDDEN_INPUTS => $portal->buildHiddenForm(),
ACTIVE_TIMER => $portal->{activeTimer},
);
}
......@@ -149,6 +151,7 @@ elsif ( my $info = $portal->info() ) {
SKIN => $skin,
URL => $portal->{urldc},
HIDDEN_INPUTS => $portal->buildHiddenForm(),
ACTIVE_TIMER => $portal->{activeTimer},
);
}
......
......@@ -45,8 +45,16 @@
window.setTimeout('timer()',1000);
}
$(document).ready(function(){
// Check if timer should be activated (true by default)
var activeTimer = true;
if (!<TMPL_VAR NAME="ACTIVE_TIMER">) {activeTimer = false;}
if (activeTimer) {
window.setTimeout('go()',5000);
window.setTimeout('timer()',1000);
} else {
stop();
}
});
</script>
......
......@@ -45,8 +45,16 @@
window.setTimeout('timer()',1000);
}
$(document).ready(function(){
// Check if timer should be activated (true by default)
var activeTimer = true;
if (!<TMPL_VAR NAME="ACTIVE_TIMER">) {activeTimer = false;}
if (activeTimer) {
window.setTimeout('go()',10000);
window.setTimeout('timer()',1000);
} else {
stop();
}
});
</script>
......
......@@ -43,8 +43,16 @@
window.setTimeout('timer()',1000);
}
$(document).ready(function(){
// Check if timer should be activated (true by default)
var activeTimer = true;
if (!<TMPL_VAR NAME="ACTIVE_TIMER">) {activeTimer = false;}
if (activeTimer) {
window.setTimeout('go()',5000);
window.setTimeout('timer()',1000);
} else {
stop();
}
});
</script>
......
......@@ -43,8 +43,16 @@
window.setTimeout('timer()',1000);
}
$(document).ready(function(){
// Check if timer should be activated (true by default)
var activeTimer = true;
if (!<TMPL_VAR NAME="ACTIVE_TIMER">) {activeTimer = false;}
if (activeTimer) {
window.setTimeout('go()',10000);
window.setTimeout('timer()',1000);
} else {
stop();
}
});
</script>
......
......@@ -796,7 +796,7 @@ sub extractFormInfo {
foreach ( keys %{ $self->{_idpList} } ) {
$html .=
'<tr><td><input type="radio" name="idp" onclick="stop()" value="'
'<tr><td><input type="radio" name="idp" value="'
. $_
. '" /></td><td>'
. $self->{_idpList}->{$_}->{name}
......@@ -821,6 +821,9 @@ sub extractFormInfo {
$self->info($html);
# Timer not active on IDP list
$self->{activeTimer} = 0;
# Delete existing IDP resolution cookie
push @{ $self->{cookie} },
$self->cookie(
......
......@@ -366,6 +366,7 @@ sub setDefaultValues {
$self->{mailUrl} ||= $self->{portal} . "/mail.pl";
$self->{issuerDB} ||= 'Null';
$self->{multiValuesSeparator} ||= '; ';
$self->{activeTimer} = 1 unless ( defined( $self->{activeTimer} ) );
# Set default userDB and passwordDB to DBI if authentication is DBI
if ( $self->{authentication} =~ /DBI/i ) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment