From 45b5d6ea5bb76594ef510bad61fcf8d3cf3d3278 Mon Sep 17 00:00:00 2001
From: Frank Dillon <frank@plainblack.com>
Date: Wed, 12 Jul 2006 20:29:14 +0000
Subject: [PATCH] adding recursive group filter for cases where the LDAP group
 property and recursive property are the same.

---
 lib/WebGUI/Operation/Group.pm    | 7 +++++++
 lib/WebGUI/Operation/LDAPLink.pm | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 2d80472dc..907333863 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -407,6 +407,12 @@ sub www_editGroup {
 		   -hoverHelp=>$i18n->get("LDAPLink_ldapRecursiveProperty","AuthLDAP"),
 		   -value=>$g->ldapRecursiveProperty
 	    );
+	$f->text(
+	       -name=>"ldapRecursiveFilter",
+		   -label=>$i18n->get("LDAPLink_ldapRecursiveFilter","AuthLDAP"),
+		   -hoverHelp=>$i18n->get("LDAPLink_ldapRecursiveFilterDescription","AuthLDAP"),
+		   -value=>$g->ldapRecursiveFilter
+	    );
 	$f->interval(
 		-name=>"groupCacheTimeout",
 		-label=>$i18n->get(1004), 
@@ -442,6 +448,7 @@ sub www_editGroupSave {
 	$g->ldapGroup($session->form->text("ldapGroup"));
 	$g->ldapGroupProperty($session->form->text("ldapGroupProperty"));
 	$g->ldapRecursiveProperty($session->form->text("ldapRecursiveProperty"));
+	$g->ldapRecursiveFilter($session->form->text("ldapRecursiveFilter"));
 	return www_listGroups($session);
 }
 
diff --git a/lib/WebGUI/Operation/LDAPLink.pm b/lib/WebGUI/Operation/LDAPLink.pm
index 411c03daa..f23e179bc 100644
--- a/lib/WebGUI/Operation/LDAPLink.pm
+++ b/lib/WebGUI/Operation/LDAPLink.pm
@@ -250,6 +250,12 @@ sub www_editLDAPLink {
 		-label => $i18n->get(8),
 		-hoverHelp => $i18n->get('8 description'),
 		-value => $db{ldapPasswordName},
+   );
+   $f->text(
+        -name => "ldapGlobalRecursiveFilter",
+		-label => $i18n->get("global recursive filter label"),
+		-hoverHelp => $i18n->get("global recursive filter label description"),
+		-value => $db{ldapGlobalRecursiveFilter}
    );
 	$f->yesNo(
 		-name=>"ldapSendWelcomeMessage",
@@ -317,6 +323,7 @@ sub www_editLDAPLinkSave {
 	$properties->{ldapIdentity} = $session->form->process("ldapIdentity");
 	$properties->{ldapIdentityName} = $session->form->process("ldapIdentityName");
 	$properties->{ldapPasswordName} = $session->form->process("ldapPasswordName");
+	$properties->{ldapGlobalRecursiveFilter} = $session->form->process("ldapGlobalRecursiveFilter");
 	$properties->{ldapSendWelcomeMessage} = $session->form->yesNo("ldapSendWelcomeMessage");
 	$properties->{ldapWelcomeMessage} = $session->form->textarea("ldapWelcomeMessage");
 	$properties->{ldapAccountTemplate} = $session->form->template("ldapAccountTemplate");