From 70f3c549d92507b12371884d4c1d31f93ec7ea2c Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Thu, 24 Jun 2010 14:45:04 +0200
Subject: [PATCH] 'filter' and 'objectclass' are not required.

---
 framework/Auth/lib/Horde/Auth/Ldap.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/framework/Auth/lib/Horde/Auth/Ldap.php b/framework/Auth/lib/Horde/Auth/Ldap.php
index a2ceed4db..6c3cc4004 100644
--- a/framework/Auth/lib/Horde/Auth/Ldap.php
+++ b/framework/Auth/lib/Horde/Auth/Ldap.php
@@ -43,23 +43,23 @@ class Horde_Auth_Ldap extends Horde_Auth_Base
      * Constructor.
      *
      * @param array $params  Required parameters:
-     * <pre>
-     * 'basedn' - (string) The base DN for the LDAP server.
-     * 'filter' - (string) The LDAP formatted search filter to search for
-     *            users. This setting overrides the 'objectclass' method
-     *            below.
-     * 'ldap' - (Horde_Ldap) Horde LDAP object.
-     * 'objectclass' - (mixed) The objectclass filter used to search for
-     *                 users. Can be a single objectclass or an array.
-     * 'uid' - (string) The username search key.
-     * </pre>
+     *                       - basedn (string): The base DN for the LDAP server.
+     *                       - ldap (Horde_Ldap): Horde LDAP object.
+     *                       - uid (string): The username search key.
+     *                       Optional parameters:
+     *                       - filter (string): The LDAP formatted search filter
+     *                         to search for users. This setting overrides the
+     *                         'objectclass' method below.
+     *                       - objectclass (string|array): The objectclass
+     *                         filter used to search for users. Either a single
+     *                         or an array of objectclasses.
      *
      * @throws Horde_Auth_Exception
      * @throws InvalidArgumentException
      */
     public function __construct(array $params = array())
     {
-        foreach (array('basedn', 'filter', 'ldap', 'uid') as $val) {
+        foreach (array('basedn', 'ldap', 'uid') as $val) {
             if (!isset($params[$val])) {
                 throw new InvalidArgumentException(__CLASS__ . ': Missing ' . $val . ' parameter.');
             }
-- 
2.11.0