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

Ignore error when loading SAML module in AuthChoice (#618)

Browse Source
This commit is contained in:
Clément Oudot 2013-10-01 12:50:48 +00:00
parent ebcb10fe69
commit b7af9ae92c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Simple.pm
View File

@ -473,19 +473,20 @@ sub new {
return $self;
}
##@method boolean loadModule(string module)
##@method boolean loadModule(string module, boolean ignoreError)
# Load a module into portal namespace
# @param module module name
# @param ignoreError set to 1 if error should not appear in logs
# @return boolean
sub loadModule {
my ( $self, $module ) = splice @_;
my ( $self, $module, $ignoreError ) = splice @_;
return 1 unless $module;
# Load module test
eval "require $module";
if ($@) {
$self->lmLog( "$module load error: $@", 'error' );
$self->lmLog( "$module load error: $@", 'error' ) unless $ignoreError;
return 0;
}

4
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/_Choice.pm
View File

@ -8,7 +8,7 @@ package Lemonldap::NG::Portal::_Choice;
use Lemonldap::NG::Portal::Simple;
our $VERSION = '1.2.0';
our $VERSION = '1.3.0';
## @cmethod Lemonldap::NG::Portal::_Choice new(Lemonldap::NG::Portal::Simple portal)
# Constructor
@ -41,7 +41,7 @@ sub new {
my $samlModule = 'Lemonldap::NG::Portal::AuthSAML';
my $samlForce = 0;
eval {
$portal->loadModule($samlModule);
$portal->loadModule( $samlModule, 1 );
$authForce = $samlModule . '::authForce';
$samlForce = $portal->$authForce;
};