From 2e7f3b941ce2b2fe898ebd627a6d9cb426079ea2 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Mon, 31 Aug 2015 14:02:16 +0200
Subject: [PATCH] LdapUserGroupBackendForm: Add missing form field..

..to configure the group_member_attribute option.

fixes #9903
---
 .../UserGroup/LdapUserGroupBackendForm.php       | 16 ++++++++++++++--
 .../setup/library/Setup/Steps/UserGroupStep.php  |  4 ++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
index 0e7b63b5b..4f67b788b 100644
--- a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
+++ b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -177,13 +177,25 @@ class LdapUserGroupBackendForm extends Form
                 'preserveDefault'   => true,
                 'ignore'            => $disabled,
                 'disabled'          => $disabled,
-                    'label'         => $this->translate('LDAP Group Name Attribute'),
+                'label'             => $this->translate('LDAP Group Name Attribute'),
                 'description'       => $this->translate(
                     'The attribute name used for storing a group\'s name on the LDAP server.'
                 ),
                 'value'             => $defaults->group_name_attribute
             )
         );
+        $this->addElement(
+            'text',
+            'group_member_attribute',
+            array(
+                'preserveDefault'   => true,
+                'ignore'            => $disabled,
+                'disabled'          => $disabled,
+                'label'             => $this->translate('LDAP Group Member Attribute'),
+                'description'       => $this->translate('The attribute name used for storing a group\'s members.'),
+                'value'             => $defaults->group_member_attribute
+            )
+        );
         $this->addElement(
             'text',
             'base_dn',
@@ -258,7 +270,7 @@ class LdapUserGroupBackendForm extends Form
                 'preserveDefault'   => true,
                 'ignore'            => $disabled,
                 'disabled'          => $disabled,
-                    'label'         => $this->translate('LDAP User Name Attribute'),
+                'label'             => $this->translate('LDAP User Name Attribute'),
                 'description'       => $this->translate(
                     'The attribute name used for storing a user\'s name on the LDAP server.'
                 ),
diff --git a/modules/setup/library/Setup/Steps/UserGroupStep.php b/modules/setup/library/Setup/Steps/UserGroupStep.php
index ab58c1880..61948b3d2 100644
--- a/modules/setup/library/Setup/Steps/UserGroupStep.php
+++ b/modules/setup/library/Setup/Steps/UserGroupStep.php
@@ -153,6 +153,10 @@ class UserGroupStep extends Step
             . '<td><strong>' . mt('setup', 'Group Name Attribute') . '</strong></td>'
             . '<td>' . $this->data['groupConfig']['group_name_attribute'] . '</td>'
             . '</tr>'
+            . '<tr>'
+            . '<td><strong>' . mt('setup', 'Group Member Attribute') . '</strong></td>'
+            . '<td>' . $this->data['groupConfig']['group_member_attribute'] . '</td>'
+            . '</tr>'
             . '</tbody>'
             . '</table>';