Commit 8936677d authored by Xavier Guimard's avatar Xavier Guimard

Avoid info() wrapper (#595)

parent 79e65f56
......@@ -109,8 +109,7 @@ sub authenticate {
# calculating remaining time before password expiration
my $remainingTime = $_pwdExpire - $timestamp;
$self->info(
$req,
$req->info(
'<h3 trspan="pwdWillExpire,'
. join(
',',
......
......@@ -881,7 +881,7 @@ sub extractFormInfo {
: ''
) . "<input type=\"hidden\" name=\"idp\" value=\"$idp\" />\n";
$self->p->info( $req, $html );
$req->info($html);
$req->datas->{login} = 1;
return PE_CONFIRM;
......
......@@ -222,11 +222,10 @@ sub run {
$self->lmLog( "Logout URL $logout_url will be displayed",
'debug' );
$self->info( $req,
$req->info(
'<h3 trmsg="back2CasUrl">The application you just logged out of has provided a link it would like you to follow</h3>'
);
$self->info( $req,
"<p><a href=\"$logout_url\">$logout_url</a></p>" );
$req->info("<p><a href=\"$logout_url\">$logout_url</a></p>");
$req->datas->{activeTimer} = 0;
return PE_CONFIRM;
......
......@@ -207,7 +207,7 @@ sub _openIDResponse {
# TODO
$req->info('<h3 trspan="openidExchange,$data->{trust_root}"></h3>');
$self->info( $req->datas->{_openIdTrustExtMsg} )
$req->info( $req->datas->{_openIdTrustExtMsg} )
if ( $req->datas->{_openIdTrustExtMsg} );
$self->lmLog( 'OpenID confirmation', 'debug' );
return PE_CONFIRM;
......
......@@ -887,7 +887,7 @@ sub run {
. ' marginheight="0" scrolling="no" class="hiddenFrame"'
. ' width="0" height="0" frameborder="0"></iframe>';
$self->info( $req,
$req->info(
'<h3 trspan="updateCdc">Update Common Domain Cookie</h3>'
. $cdc_iframe );
}
......
......@@ -162,7 +162,7 @@ sub loadPP {
# @return Lemonldap::NG portal error code
sub userBind {
my $self = shift;
my $req = shift;
my $req = shift;
if ( $self->{conf}->{ldapPpolicyControl} ) {
......@@ -207,16 +207,14 @@ sub userBind {
if ( $resp->grace_authentications_remaining ) {
# TODO
$self->{portal}->info( $req,
'<h3>'
$req->info( '<h3>'
. $resp->grace_authentications_remaining
. ' <span trmsg="ppGrace">authentications remaining, change your password!</span></h3>'
);
}
if ( $resp->time_before_expiration ) {
$self->{portal}->info( $req,
'<h3 trspan="authRemaining,'
$req->info( '<h3 trspan="authRemaining,'
. $self->convertSec( $resp->time_before_expiration )
. '"></h3>' );
}
......
......@@ -86,7 +86,7 @@ sub sregHook {
'notice'
);
$self->info( qq'<h3 trspan="openidRpns,$k"></h3>');
$req->info( qq'<h3 trspan="openidRpns,$k"></h3>');
return ( 0, {} );
}
}
......
......@@ -2677,7 +2677,7 @@ sub sendLogoutRequestToProviders {
$info .= '</table>';
# Print some information to the user.
$self->p->info( $req, $info ) if $providersCount;
$req->info($info) if $providersCount;
return $providersCount;
}
......
......@@ -166,7 +166,7 @@ sub deleteSession {
$self->lmLog( "Create iFrames to forward logout to services", 'debug' );
$self->info( $req, '<h3 trmsg="logoutFromOtherApp"></h3>' );
$req->info('<h3 trmsg="logoutFromOtherApp"></h3>');
foreach ( keys %{ $req->datas->{logoutServices} } ) {
my $logoutServiceName = $_;
......@@ -185,7 +185,7 @@ sub deleteSession {
. ' class="hiddenFrame" width="0" height="0"'
. ' frameborder="0"></iframe>';
$self->info( $req, $iframe );
$req->info($iframe);
}
# Redirect on logout page if no other target defined
......
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