Use configldap for prefs (untested).

diff --git a/framework/Prefs/lib/Horde/Prefs/Ldap.php b/framework/Prefs/lib/Horde/Prefs/Ldap.php
index 2baac92..8e425b3 100644 (file)
--- a/framework/Prefs/lib/Horde/Prefs/Ldap.php
+++ b/framework/Prefs/lib/Horde/Prefs/Ldap.php
@@ -3,22 +3,20 @@
  * Preferences storage implementation for PHP's LDAP extension.
  *
  * Required parameters:
- * 'basedn' - The base DN for the LDAP server.
- * 'hostspec' - The hostname of the LDAP server.
- * 'uid' - The username search key.
- * 'writedn' - One of "user", "admin", or "searchdn"
+ * - basedn:   The base DN for the LDAP server.
+ * - hostspec: The hostname of the LDAP server.
+ * - uid:      The username search key.
+ * - writeas:  One of "user", "admin", or "search"
  *
  * Optional parameters:
- * 'admindn' - The DN of the administrative account to bind for
- *             write operations.
- * 'adminpw' - 'admindn's password for bind authentication.
- * 'port' - The port of the LDAP server.
- *          DEFAULT: 389
- * 'searchdn' - The DN of a user with search permissions on the directory
- * 'searchpw' - 'searchdn's password for binding
- * 'tls' - Whether to use TLS connections.
- *         DEFAULT: false
- * 'version' - The version of the LDAP protocol to use.
+ * - binddn:   The DN of the administrative account to bind for write
+ *             operations.
+ * - bindpw:   'binddn's password for bind authentication.
+ * - port:     The port of the LDAP server. DEFAULT: 389
+ * - searchdn: The DN of a user with search permissions on the directory
+ * - searchpw: 'searchdn's password for binding
+ * - tls:      Whether to use TLS connections. DEFAULT: false
+ * - version:  The version of the LDAP protocol to use.
  *             DEFAULT: NONE (system default will be used)
  *
  * If setting up as the Horde preference handler in conf.php, the following
@@ -37,8 +35,8 @@
  * permission to modify their own LDAP accounts.
  *
  * <code>
- * $conf['prefs']['params']['admindn'] = 'cn=Manager,dc=example,dc=org';
- * $conf['prefs']['params']['adminpw'] = 'password';
+ * $conf['prefs']['params']['binddn'] = 'cn=Manager,dc=example,dc=org';
+ * $conf['prefs']['params']['bindpw'] = 'password';
  * </code>
  *
  * Copyright 1999-2010 The Horde Project (http://www.horde.org/)
@@ -123,7 +121,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs
         }
 
         Horde::assertDriverConfig($this->_params, 'prefs',
-            array('hostspec', 'basedn', 'uid', 'writedn'),
+            array('hostspec', 'basedn', 'uid', 'writeas'),
             'preferences LDAP');
 
         /* Connect to the LDAP server anonymously. */
@@ -220,7 +218,7 @@ class Horde_Prefs_Ldap extends Horde_Prefs
 
         // Now we should have the user's DN.  Re-bind as appropriate with write
         // permissions to be able to store preferences.
-        switch($this->_params['writedn']) {
+        switch($this->_params['writeas']) {
         case 'user':
             $result = @ldap_bind($this->_connection,
                                  $this->_dn, $this->_password);
@@ -228,11 +226,11 @@ class Horde_Prefs_Ldap extends Horde_Prefs
 
         case 'admin':
             $result = @ldap_bind($this->_connection,
-                                 $this->_params['admindn'],
-                                 $this->_params['adminpw']);
+                                 $this->_params['binddn'],
+                                 $this->_params['bindpw']);
             break;
 
-        case 'searchdn':
+        case 'search':
             // Since we've already bound as the search DN above, no rebinding
             // is necessary.
             $result = true;
@@ -272,18 +270,18 @@ class Horde_Prefs_Ldap extends Horde_Prefs
         }
 
         /* Figure out the DN of the authenticating user. */
-        switch($this->_params['writedn']) {
+        switch($this->_params['writeas']) {
         case 'user':
             $bind_dn = $this->_dn;
             $bind_pw = $this->_password;
             break;
 
         case 'admin':
-            $bind_dn = $this->_params['admindn'];
-            $bind_pw = $this->_params['adminpw'];
+            $bind_dn = $this->_params['binddn'];
+            $bind_pw = $this->_params['bindpw'];
             break;
 
-        case 'searchdn':
+        case 'search':
             $bind_dn = $this->_params['searchdn'];
             $bind_dn = $this->_params['searchpw'];
             break;

diff --git a/horde/config/conf.xml b/horde/config/conf.xml
index 6777bd1..a050194 100644 (file)
--- a/horde/config/conf.xml
+++ b/horde/config/conf.xml
@@ -825,35 +825,9 @@
      </case>
      <case name="Ldap" desc="LDAP">
       <configsection name="params">
-       <configstring name="hostspec" desc="The hostname of the LDAP server">
-       localhost</configstring>
-       <configinteger name="port" desc="The port of the LDAP server">
-       389</configinteger>
-       <configenum name="version" desc="LDAP protocol version">3
-        <values>
-         <value desc="LDAPv2 (deprecated)">2</value>
-         <value desc="LDAPv3">3</value>
-        </values>
-       </configenum>
-       <configboolean name="tls" desc="Enable TLS?">false</configboolean>
-       <configstring name="basedn" desc="The base DN for LDAP preference
-       searches"/>
-       <configstring name="searchdn" required="false" desc="DN with which to
-       bind for searches - blank for anonymous"/>
-       <configstring name="searchpw" required="false"  desc="Password with
-       which to bind for searches - blank for anonymous"/>
-       <configswitch name="writedn" desc="Bind to LDAP as which user when
-       writing permissions to LDAP">
-         <case name="user" desc="Bind as User" />
-         <case name="admin" desc="Bind as Admin">
-           <configstring name="admindn" desc="DN of the administrative account
-           with which to bind for write operations"/>
-           <configstring name="adminpw" desc="Password of the administrative
-           DN"/>
-         </case>
-         <case name="searchdn" desc="Use search credentials"/>
-       </configswitch>
-       <configstring name="uid" desc="The username search key"/>
+       <configldap switchname="driverconfig">
+        <configstring name="uid" desc="The username search key"/>
+       </configldap>
       </configsection>
      </case>
      <case name="Session" desc="PHP Sessions"/>
@@ -1310,8 +1284,7 @@
     </case>
     <case name="Ldap" desc="LDAP">
      <configsection name="params">
-      <configldap switchname="driverconfig">
-      </configldap>
+      <configldap switchname="driverconfig"/>
      </configsection>
     </case>
     <case name="Memcache" desc="Memcache only">