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

Little bugs (#595)

Browse Source
This commit is contained in:
Xavier Guimard 2016-04-04 08:39:26 +00:00
parent 8d1c669a3b
commit 33569f8c8c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Base.pm
View File

@ -16,7 +16,7 @@ has api => ( is => 'rw', isa => 'Str' );
sub init {
my ( $self, $args ) = @_;
eval { $self->api->init($self) };
if ( $@ and not $self->{protection} eq 'none' ) {
if ( $@ and not( $self->{protection} and $self->{protection} eq 'none' ) ) {
$self->error($@);
return 0;
}
@ -28,7 +28,8 @@ sub init {
return 0;
}
$self->portal( $self->api->tsv->{portal}->() );
my $rule = $self->{protection} || $self->api->localConfig->{protection} || '';
my $rule =
$self->{protection} || $self->api->localConfig->{protection} || '';
$self->rule(
$rule eq 'authenticate' ? 1 : $rule eq 'manager' ? '' : $rule );
return 1;

4
lemonldap-ng-handler/lib/Lemonldap/NG/Handler/PSGI/Router.pm
View File

@ -11,8 +11,8 @@ our $VERSION = '2.0.0';
sub init {
$_[0]->api('Lemonldap::NG::Handler::PSGI::API');
my $tmp = $_[0]->Lemonldap::NG::Common::PSGI::Router::init( $_[1] )
and $_[0]->Lemonldap::NG::Handler::PSGI::Base::init( $_[1] );
my $tmp = ( $_[0]->Lemonldap::NG::Common::PSGI::Router::init( $_[1] )
and $_[0]->Lemonldap::NG::Handler::PSGI::Base::init( $_[1] ) );
return $tmp;
}

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Init.pm
View File

@ -61,7 +61,7 @@ has forAuthUser => (
sub init {
my ( $self, $args ) = @_;
$args ||= {};
return 0 unless ( $self->SUPER::init( { conf => $args } ) );
return 0 unless ( $self->SUPER::init($args) );
$self->localConfig(
{ %{ HANDLER->confAcc->getLocalConf('portal') }, %$args } );