Fix bad merge
This commit is contained in:
parent
557f458803
commit
afc3bc7029
|
@ -26,13 +26,6 @@ sub init {
|
||||||
# @return Lemonldap::NG::Portal constant
|
# @return Lemonldap::NG::Portal constant
|
||||||
sub extractFormInfo {
|
sub extractFormInfo {
|
||||||
my ( $self, $req ) = @_;
|
my ( $self, $req ) = @_;
|
||||||
|
|
||||||
# If this is the ajax query, allow response to contain HTML code
|
|
||||||
# to update the portal error message
|
|
||||||
if ( $req->wantJSON ) {
|
|
||||||
$req->wantErrorRender(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
my $field = $self->conf->{SSLVar};
|
my $field = $self->conf->{SSLVar};
|
||||||
if ( $req->env->{SSL_CLIENT_I_DN} ) {
|
if ( $req->env->{SSL_CLIENT_I_DN} ) {
|
||||||
$self->logger->debug(
|
$self->logger->debug(
|
||||||
|
@ -57,16 +50,6 @@ sub extractFormInfo {
|
||||||
return PE_BADCERTIFICATE;
|
return PE_BADCERTIFICATE;
|
||||||
}
|
}
|
||||||
elsif ( $self->conf->{sslByAjax} and not $req->param('nossl') ) {
|
elsif ( $self->conf->{sslByAjax} and not $req->param('nossl') ) {
|
||||||
|
|
||||||
# If this is the AJAX query
|
|
||||||
if ( $req->wantJSON ) {
|
|
||||||
return PE_CERTIFICATEREQUIRED;
|
|
||||||
}
|
|
||||||
|
|
||||||
$self->logger->debug( 'Append ' . $self->{Name} . ' init/script' );
|
|
||||||
$req->data->{customScript} .= $self->{AjaxInitScript};
|
|
||||||
$self->logger->debug(
|
|
||||||
"Send init/script -> " . $req->data->{customScript} );
|
|
||||||
$req->data->{waitingMessage} = 1;
|
$req->data->{waitingMessage} = 1;
|
||||||
return PE_FIRSTACCESS;
|
return PE_FIRSTACCESS;
|
||||||
}
|
}
|
||||||
|
@ -75,7 +58,6 @@ sub extractFormInfo {
|
||||||
$self->logger->debug( 'Append ' . $self->{Name} . ' init/script' );
|
$self->logger->debug( 'Append ' . $self->{Name} . ' init/script' );
|
||||||
$self->logger->debug(
|
$self->logger->debug(
|
||||||
"Send init/script -> " . $req->data->{customScript} );
|
"Send init/script -> " . $req->data->{customScript} );
|
||||||
return PE_BADCERTIFICATE;
|
|
||||||
}
|
}
|
||||||
$self->userLogger->warn('No certificate found');
|
$self->userLogger->warn('No certificate found');
|
||||||
return PE_CERTIFICATEREQUIRED;
|
return PE_CERTIFICATEREQUIRED;
|
||||||
|
@ -102,4 +84,4 @@ sub authLogout {
|
||||||
PE_OK;
|
PE_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
1;
|
1;
|
Loading…
Reference in New Issue
Block a user