From 71663c0f5ac54ffee62237cf85eba4276a2b4b91 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Sat, 14 May 2016 18:05:38 +0000 Subject: [PATCH] Data::Dumper update --- .../lib/Lemonldap/NG/Manager/Attributes.pm | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm index e16aa8ff0..e3e7c586d 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm @@ -31,12 +31,12 @@ sub types { 'iso2unicode', 'groupMatch', 'encrypt' ); - push @cf, defined $$conf{'customFunctions'} + push @cf, defined $conf->{'customFunctions'} ? map( { my $f = $_; $f =~ s/\w+:://g; $f, $_; - } split( /\s+/, $$conf{'customFunctions'}, 0 ) ) + } split( /\s+/, $conf->{'customFunctions'}, 0 ) ) : (); foreach my $f (@cf) { $s = "sub $f {1} $s"; @@ -83,10 +83,10 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a- 'test' => sub { my ( $val, $conf ) = @_; return 1 - if defined $$conf{'macros'}{$val} or $val eq '_timezone'; + if defined $conf->{'macros'}{$val} or $val eq '_timezone'; foreach $_ ( keys %$conf ) { return 1 - if $_ =~ /exportedvars$/i and defined $$conf{$_}{$val}; + if $_ =~ /exportedvars$/i and defined $conf->{$_}{$val}; } return 1, "__unknownAttrOrMacro__: $val"; } @@ -221,7 +221,7 @@ m[^(?:(?:\-+\s*BEGIN\s+(?:PUBLIC\s+KEY|CERTIFICATE)\s*\-+\r?\n)?[a-zA-Z0-9/\+\r\ 'test' => sub { my $test = grep( { $_ eq $_[0]; } - map( { $$_{'k'}; } @{ $_[2]{'select'}; } ) ); + map( { $_->{'k'}; } @{ $_[2]{'select'}; } ) ); return $test ? 1 : ( 0, "Invalid value '$_[0]' for this select" ); @@ -803,12 +803,12 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0- 'iso2unicode', 'groupMatch', 'encrypt' ); - push @cf, defined $$conf{'customFunctions'} + push @cf, defined $conf->{'customFunctions'} ? map( { my $f = $_; $f =~ s/\w+:://g; $f, $_; - } split( /\s+/, $$conf{'customFunctions'}, 0 ) ) + } split( /\s+/, $conf->{'customFunctions'}, 0 ) ) : (); foreach my $f (@cf) { $s = "sub $f {1} $s"; @@ -887,12 +887,12 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0- 'iso2unicode', 'groupMatch', 'encrypt' ); - push @cf, defined $$conf{'customFunctions'} + push @cf, defined $conf->{'customFunctions'} ? map( { my $f = $_; $f =~ s/\w+:://g; $f, $_; - } split( /\s+/, $$conf{'customFunctions'}, 0 ) ) + } split( /\s+/, $conf->{'customFunctions'}, 0 ) ) : (); foreach my $f (@cf) { $s = "sub $f {1} $s"; @@ -917,12 +917,12 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0- 'iso2unicode', 'groupMatch', 'encrypt' ); - push @cf, defined $$conf{'customFunctions'} + push @cf, defined $conf->{'customFunctions'} ? map( { my $f = $_; $f =~ s/\w+:://g; $f, $_; - } split( /\s+/, $$conf{'customFunctions'}, 0 ) ) + } split( /\s+/, $conf->{'customFunctions'}, 0 ) ) : (); foreach my $f (@cf) { $s = "sub $f {1} $s"; @@ -1128,7 +1128,7 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0- 'default' => 'ldap://localhost', 'test' => sub { my $l = shift(); - my (@s) = split( /[\s,]+/, $l, 0 ); + my @s = split( /[\s,]+/, $l, 0 ); foreach my $s (@s) { return 0, qq[__badLdapUri__: "$s"] unless $s =~ @@ -1202,12 +1202,12 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0- 'iso2unicode', 'groupMatch', 'encrypt' ); - push @cf, defined $$conf{'customFunctions'} + push @cf, defined $conf->{'customFunctions'} ? map( { my $f = $_; $f =~ s/\w+:://g; $f, $_; - } split( /\s+/, $$conf{'customFunctions'}, 0 ) ) + } split( /\s+/, $conf->{'customFunctions'}, 0 ) ) : (); foreach my $f (@cf) { $s = "sub $f {1} $s"; @@ -1240,12 +1240,12 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0- 'iso2unicode', 'groupMatch', 'encrypt' ); - push @cf, defined $$conf{'customFunctions'} + push @cf, defined $conf->{'customFunctions'} ? map( { my $f = $_; $f =~ s/\w+:://g; $f, $_; - } split( /\s+/, $$conf{'customFunctions'}, 0 ) ) + } split( /\s+/, $conf->{'customFunctions'}, 0 ) ) : (); foreach my $f (@cf) { $s = "sub $f {1} $s"; @@ -1858,12 +1858,12 @@ qr/^(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-zA-Z0- 'iso2unicode', 'groupMatch', 'encrypt' ); - push @cf, defined $$conf{'customFunctions'} + push @cf, defined $conf->{'customFunctions'} ? map( { my $f = $_; $f =~ s/\w+:://g; $f, $_; - } split( /\s+/, $$conf{'customFunctions'}, 0 ) ) + } split( /\s+/, $conf->{'customFunctions'}, 0 ) ) : (); foreach my $f (@cf) { $s = "sub $f {1} $s";