dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't display login form on error if user authenticated (#595)

Browse Source
This commit is contained in:
Xavier Guimard 2017-02-19 07:17:37 +00:00
parent aecacbe6da
commit fa0fe980a2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Display.pm
View File

@ -141,14 +141,17 @@ sub display {
); );
} }
# 2.2 Case : display menu # 2.2 Case : display menu (with error or not)
elsif ( $req->error == PE_OK ) { elsif ( $req->error == PE_OK or ( $req->userData and %{ $req->userData } ) )
{
$skinfile = 'menu'; $skinfile = 'menu';
#utf8::decode($auth_user); #utf8::decode($auth_user);
%templateParams = ( %templateParams = (
AUTH_ERROR => $req->error,
AUTH_ERROR_TYPE => $req->error_type,
AUTH_USER => $req->{sessionInfo}->{ $self->conf->{portalUserAttr} }, AUTH_USER => $req->{sessionInfo}->{ $self->conf->{portalUserAttr} },
NEWWINDOW => $self->conf->{portalOpenLinkInNewWindow}, NEWWINDOW => $self->conf->{portalOpenLinkInNewWindow},
LOGOUT_URL => $self->conf->{portal} . "?logout=1", LOGOUT_URL => $self->conf->{portal} . "?logout=1",
@ -158,7 +161,7 @@ sub display {
); );
} }
# 3 Authentication has been refused OR this is the first access # 3 Authentication has been refused OR first access
else { else {
$skinfile = 'login'; $skinfile = 'login';
my $login = $self->userId($req); my $login = $self->userId($req);
@ -271,8 +274,10 @@ sub display {
%templateParams = ( %templateParams = (
%templateParams, %templateParams,
DISPLAY_FORM => $displayType =~ /\bstandardform\b/ ? 1 : 0, DISPLAY_FORM => $displayType =~ /\bstandardform\b/ ? 1 : 0,
DISPLAY_OPENID_FORM => $displayType =~ /\bopenidform\b/ ? 1 : 0, DISPLAY_OPENID_FORM => $displayType =~ /\bopenidform\b/ ? 1
DISPLAY_YUBIKEY_FORM => $displayType =~ /\byubikeyform\b/ ? 1 : 0,
DISPLAY_YUBIKEY_FORM => $displayType =~ /\byubikeyform\b/
? 1
: 0, : 0,
DISPLAY_LOGO_FORM => $displayType eq "logo" ? 1 : 0, DISPLAY_LOGO_FORM => $displayType eq "logo" ? 1 : 0,
module => $displayType eq "logo" module => $displayType eq "logo"