adding recursive group filter for cases where the LDAP group property and recursive property are the same.

This commit is contained in:
Frank Dillon 2006-07-12 20:29:14 +00:00
parent 3937180957
commit 45b5d6ea5b
2 changed files with 14 additions and 0 deletions

View file

@ -407,6 +407,12 @@ sub www_editGroup {
-hoverHelp=>$i18n->get("LDAPLink_ldapRecursiveProperty","AuthLDAP"), -hoverHelp=>$i18n->get("LDAPLink_ldapRecursiveProperty","AuthLDAP"),
-value=>$g->ldapRecursiveProperty -value=>$g->ldapRecursiveProperty
); );
$f->text(
-name=>"ldapRecursiveFilter",
-label=>$i18n->get("LDAPLink_ldapRecursiveFilter","AuthLDAP"),
-hoverHelp=>$i18n->get("LDAPLink_ldapRecursiveFilterDescription","AuthLDAP"),
-value=>$g->ldapRecursiveFilter
);
$f->interval( $f->interval(
-name=>"groupCacheTimeout", -name=>"groupCacheTimeout",
-label=>$i18n->get(1004), -label=>$i18n->get(1004),
@ -442,6 +448,7 @@ sub www_editGroupSave {
$g->ldapGroup($session->form->text("ldapGroup")); $g->ldapGroup($session->form->text("ldapGroup"));
$g->ldapGroupProperty($session->form->text("ldapGroupProperty")); $g->ldapGroupProperty($session->form->text("ldapGroupProperty"));
$g->ldapRecursiveProperty($session->form->text("ldapRecursiveProperty")); $g->ldapRecursiveProperty($session->form->text("ldapRecursiveProperty"));
$g->ldapRecursiveFilter($session->form->text("ldapRecursiveFilter"));
return www_listGroups($session); return www_listGroups($session);
} }

View file

@ -250,6 +250,12 @@ sub www_editLDAPLink {
-label => $i18n->get(8), -label => $i18n->get(8),
-hoverHelp => $i18n->get('8 description'), -hoverHelp => $i18n->get('8 description'),
-value => $db{ldapPasswordName}, -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( $f->yesNo(
-name=>"ldapSendWelcomeMessage", -name=>"ldapSendWelcomeMessage",
@ -317,6 +323,7 @@ sub www_editLDAPLinkSave {
$properties->{ldapIdentity} = $session->form->process("ldapIdentity"); $properties->{ldapIdentity} = $session->form->process("ldapIdentity");
$properties->{ldapIdentityName} = $session->form->process("ldapIdentityName"); $properties->{ldapIdentityName} = $session->form->process("ldapIdentityName");
$properties->{ldapPasswordName} = $session->form->process("ldapPasswordName"); $properties->{ldapPasswordName} = $session->form->process("ldapPasswordName");
$properties->{ldapGlobalRecursiveFilter} = $session->form->process("ldapGlobalRecursiveFilter");
$properties->{ldapSendWelcomeMessage} = $session->form->yesNo("ldapSendWelcomeMessage"); $properties->{ldapSendWelcomeMessage} = $session->form->yesNo("ldapSendWelcomeMessage");
$properties->{ldapWelcomeMessage} = $session->form->textarea("ldapWelcomeMessage"); $properties->{ldapWelcomeMessage} = $session->form->textarea("ldapWelcomeMessage");
$properties->{ldapAccountTemplate} = $session->form->template("ldapAccountTemplate"); $properties->{ldapAccountTemplate} = $session->form->template("ldapAccountTemplate");