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

Merge branch 'fix_warnings' into 'v2.0' 

Fix warnings (#2704)

See merge request lemonldap-ng/lemonldap-ng!253
This commit is contained in:
Yadd 2022-02-19 10:59:01 +00:00
parent ccf170ab06 5c7a69e57b
commit 4413850257
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,12 +88,12 @@ sub parseAnd {
my ( $r, $name ) = $obj->(@_);
# Case "string" (form type)
if ( $r & ~$r ) {
if ( $r && $r & ~$r ) {
$str{$r}++;
}
else {
return ( wantarray ? ( $r, $name ) : $r )
unless ( $r == PE_OK );
unless ( !$r || $r == PE_OK );
}
}
my $res = %str ? join( ',', keys %str ) : PE_OK;

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/Yubikey.pm
View File

@ -122,7 +122,7 @@ sub _findYubikey {
}
}
return $yubikey;
return $yubikey || '';
}

2
lemonldap-ng-portal/t/01-WebAuthn.t
View File

@ -80,7 +80,7 @@ ENDKEY
expectForm( $res, "", '/webauthn2fcheck', 'token', 'credential' );
my ($json) = $res->[2]->[0] =~
m#<script type="application/init">\s*({"request"[^<]*})\s*</script>#ms;
m#<script type="application/init">\s*(\{"request"[^<]*\})\s*</script>#ms;
ok( $json, "Found request object in JS data" );
$json = from_json($json);
my $request = $json->{request};