oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make it possible to have multiple, logically-ORed LDAP recursion filters in

Browse source 
LDAP links and groups.
This commit is contained in:
Drake 2006-10-10 22:31:11 +00:00
parent f1b62f54d0
commit 950c1e2306
5 changed files with 33 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/WebGUI/LDAPLink.pm
View file

@ -270,7 +270,13 @@ sub recurseProperty {
my $recurseFilter = $_[5] || $self->get->{ldapGlobalRecursiveFilter};
return unless($ldap && $base && $property);
#Prevent infinate recursion
if (length $recurseFilter) {
$recurseFilter =~ s/\A\n*//; $recurseFilter =~ s/\n*\z//;
$recurseFilter = (join '|', map{quotemeta} grep{/\S/} split /\n/, $recurseFilter);
$recurseFilter = length($recurseFilter)? qr/$recurseFilter/ : undef;
}
#Prevent infinite recursion
$count++;
return if $count == 99;
@ -294,8 +300,8 @@ sub recurseProperty {
$properties = $entry->get_value($recProperty,asref => 1);
}
foreach my $prop (@{$properties}) {
next if ($recurseFilter && $prop =~ m/$recurseFilter/ig);
$self->recurseProperty($prop,$array,$property,$recProperty,$count,$recurseFilter);
next if $recurseFilter and $prop =~ m/$recurseFilter/i;
$self->recurseProperty($prop,$array,$property,$recProperty,$count,$recurseFilter);
}
}
}