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

Avoid warnings with some Perl versions

Browse Source
This commit is contained in:
Xavier Guimard 2015-06-11 18:34:07 +00:00
parent 7b996f1cb1
commit 9e75b3a406
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/ConfParser.pm
View File

@ -463,7 +463,7 @@ sub defaultValue {
sub testNewConf {
my $self = shift;
return $self->_unitTest( $self->newConf, '' ) and $self->_globalTest();
return $self->_unitTest( $self->newConf(), '' ) and $self->_globalTest();
}
sub _unitTest {
@ -476,7 +476,7 @@ sub _unitTest {
# Check if key exists
unless ( $attr = $attrs->{$key} ) {
push $self->errors, { message => "__unknownKey__: $key" };
push @{ $self->errors }, { message => "__unknownKey__: $key" };
next;
}
if ( $key =~ $simpleHashKeys ) {
@ -496,19 +496,19 @@ sub _unitTest {
if ( $ref eq 'CODE' ) {
my ( $r, $w ) = $test->( $conf->{$key}, $conf, $attr );
unless ($r) {
push $self->errors,
push @{ $self->errors },
{ message => "$key: " . ( $w ? $w : $msg ) };
$res = 0;
}
elsif ($w) {
push $self->warnings, { message => "$key: $w" };
push @{ $self->warnings }, { message => "$key: $w" };
}
}
elsif ( $ref eq 'Regexp' ) {
die "msgFail undefined for type \"$attr->{type}\""
unless ( defined $msg );
unless ( $conf->{$key} =~ $test ) {
push $self->errors,
push @{ $self->errors },
{ message => "$key: $msg ($conf->{$key})" };
}
}
@ -536,20 +536,20 @@ sub _globalTest {
eval {
( $res, $msg ) = $sub->();
if ( $res == -1 ) {
push $self->needConfirm, { message => $msg };
push @{ $self->needConfirm }, { message => $msg };
}
elsif ($res) {
if ($msg) {
push $self->warnings, { message => $msg };
push @{ $self->warnings }, { message => $msg };
}
}
else {
$result = 0;
push $self->errors, { message => $msg };
push @{ $self->errors }, { message => $msg };
}
};
if ($@) {
push $self->warnings, "Test $name failed: $@";
push @{ $self->warnings }, "Test $name failed: $@";
$self->lmLog( "Test $name failed: $@", 'error' );
}
}

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Notifications.pm
View File

@ -231,7 +231,7 @@ sub notification {
);
}
return $self->sendJSONresponse( $req,
{ result => 1, count => 1, notifications => [ values $n ] } );
{ result => 1, count => 1, notifications => [ values %$n ] } );
}
else {
return $self->sendJSONresponse( $req,