LdapUserGroupBackendForm: Do not disable base_dn' and user_base_dn'

refs #7343
Icinga · Jun 5, 2015 · e910a5a · e910a5a
1 parent 797e9de
commit e910a5a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php b/application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
@@ -76,6 +76,7 @@ public function createElements(array $formData)
             $groupConfigDisabled = $userConfigDisabled = true;
         }
 
+        $dnDisabled = null; // MUST BE null
         if (isset($formData['user_backend']) && $formData['user_backend'] !== 'none') {
             $userBackend = UserBackend::create($formData['user_backend']);
             $defaults->merge(array(
@@ -84,11 +85,11 @@ public function createElements(array $formData)
                 'user_name_attribute'   => $userBackend->getUserNameAttribute(),
                 'user_filter'           => $userBackend->getFilter()
             ));
-            $userConfigDisabled = true;
+            $userConfigDisabled = $dnDisabled = true;
         }
 
         $this->createGroupConfigElements($defaults, $groupConfigDisabled);
-        $this->createUserConfigElements($defaults, $userConfigDisabled);
+        $this->createUserConfigElements($defaults, $userConfigDisabled, $dnDisabled);
     }
 
     /**
@@ -161,7 +162,6 @@ protected function createGroupConfigElements(ConfigObject $defaults, $disabled)
             'base_dn',
             array(
                 'preserveDefault'   => true,
-                'disabled'          => $disabled,
                 'label'             => $this->translate('LDAP Group Base DN'),
                 'description'       => $this->translate(
                     'The path where groups can be found on the LDAP server. Leave ' .
@@ -177,8 +177,9 @@ protected function createGroupConfigElements(ConfigObject $defaults, $disabled)
      *
      * @param   ConfigObject    $defaults
      * @param   null|bool       $disabled
+     * @param   null|bool       $dnDisabled
      */
-    protected function createUserConfigElements(ConfigObject $defaults, $disabled)
+    protected function createUserConfigElements(ConfigObject $defaults, $disabled, $dnDisabled)
     {
         $this->addElement(
             'text',
@@ -242,7 +243,7 @@ protected function createUserConfigElements(ConfigObject $defaults, $disabled)
             'user_base_dn',
             array(
                 'preserveDefault'   => true,
-                'disabled'          => $disabled,
+                'disabled'          => $dnDisabled,
                 'label'             => $this->translate('LDAP User Base DN'),
                 'description'       => $this->translate(
                     'The path where users can be found on the LDAP server. Leave ' .