Bug #9060: Global LDAP configuration can be empty

diff --git a/framework/Core/lib/Horde/Config.php b/framework/Core/lib/Horde/Config.php
index 4cb8973..32131a9 100644 (file)
--- a/framework/Core/lib/Horde/Config.php
+++ b/framework/Core/lib/Horde/Config.php
@@ -619,12 +619,12 @@ class Horde_Config
      * Custom configuration parts.
      *
      * @param string $ctx         The context of the <configldap> tag.
-     * @param DomNode $node       The DomNode representation of the <configldap>
-     *                            tag.
+     * @param DomNode $node       The DomNode representation of the
+     *                            <configldap> tag.
      * @param string $switchname  If DomNode is not set, the value of the
      *                            tag's switchname attribute.
      *
-     * @return array  An associative array with the SQL configuration tree.
+     * @return array  An associative array with the LDAP configuration tree.
      */
     protected function _configLDAP($ctx, $node = null,
                                   $switchname = 'driverconfig')
@@ -728,15 +728,29 @@ class Horde_Config
         );
 
         $custom_fields = array(
-            'hostspec' => $hostspec,
-            'port' => $port,
-            'version' => $version,
-            'tls' => $tls,
-            'searchdn' => $searchdn,
-            'searchpw' => $searchpw,
-            'basedn' => $basedn,
-            'writedn' => $writedn,
-            'ca' => $ca
+            'required' => true,
+            'desc' => 'Use a LDAP backend?',
+            'default' => $this->_default($ctx . '|useldap', 'false'),
+            'switch' => array(
+                'false' => array(
+                    'desc' => 'No',
+                    'fields' => array()
+                ),
+                'true' => array(
+                    'desc' => 'Yes',
+                    'fields' => array(
+                        'hostspec' => $hostspec,
+                        'port' => $port,
+                        'version' => $version,
+                        'tls' => $tls,
+                        'searchdn' => $searchdn,
+                        'searchpw' => $searchpw,
+                        'basedn' => $basedn,
+                        'writedn' => $writedn,
+                        'ca' => $ca
+                    )
+                )
+            )
         );
 
         if (isset($node) && $node->getAttribute('baseconfig') == 'true') {

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index c71240e..dd4b5b3 100644 (file)
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -150,7 +150,7 @@
    <em>default</em> values for any LDAP driven backends. You
    still need to configure the different systems like "Preferences" to actually
    &lt;em&gt;use&lt;/em&gt; a LDAP backend.</configdescription>
-   <configldap switchname="phptype" baseconfig="true" />
+   <configldap switchname="useldap" baseconfig="true" />
   </configsection>
  </configtab>