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

Combination: clarify result values (#2660)

Browse Source
This commit is contained in:
Yadd 2022-02-02 18:38:07 +01:00
parent 27df15774d
commit bf463b82af
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lemonldap-ng-common/lib/Lemonldap/NG/Common/Combination/Parser.pm
View File

@ -92,10 +92,12 @@ sub parseAnd {
$str{$r}++; $str{$r}++;
} }
else { else {
return ( $r, $name ) unless ( $r == PE_OK ); return ( wantarray ? ( $r, $name ) : $r )
unless ( $r == PE_OK );
} }
} }
return ( ( %str ? join( ',', keys %str ) : PE_OK ), $expr ); my $res = %str ? join( ',', keys %str ) : PE_OK;
return wantarray ? ( $res, $expr ) : $res;
}; };
} }
return \@res; return \@res;
@ -135,7 +137,8 @@ sub parseMod {
my ($m) = @mods; my ($m) = @mods;
return sub { return sub {
my $sub = shift; my $sub = shift;
return ( $m->$sub(@_), $expr ); my $res = $m->$sub(@_);
return wantarray ? ( $res, $expr ) : $res;
}; };
} }
return sub { return sub {
@ -149,10 +152,12 @@ sub parseMod {
$str{$res}++; $str{$res}++;
} }
else { else {
return ( $res, $list[$i] ) unless ( $res == PE_OK ); return ( wantarray ? ( $res, $list[$i] ) : $res )
unless ( $res == PE_OK );
} }
} }
return ( ( %str ? join( ',', keys %str ) : PE_OK ), $expr ); my $res = %str ? join( ',', keys %str ) : PE_OK;
return wantarray ? ( $res, $expr ) : $res;
}; };
} }

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

@ -131,7 +131,7 @@ sub getDisplayType {
$req->data->{dataKeep}->{combinationTry}, $req->data->{dataKeep}->{combinationTry},
$req->data->{combinationStack} $req->data->{combinationStack}
); );
my ( $res, $name ) = $stack->[$nb]->[0]->( 'getDisplayType', @_ ); my $res = $stack->[$nb]->[0]->( 'getDisplayType', @_ );
return $res; return $res;
} }
@ -293,7 +293,7 @@ sub stop {
#or $res == PE_FORMEMPTY #or $res == PE_FORMEMPTY
); );
my ( $ret, $name ); my ( $ret, $name );
( $ret, $name ) = $mod->( 'can', 'stop' ); $ret = $mod->( 'can', 'stop' );
if ($ret) { if ($ret) {
eval { ( $ret, $name ) = $mod->( 'stop', $res ) }; eval { ( $ret, $name ) = $mod->( 'stop', $res ) };
if ($@) { if ($@) {