Changeset 787 in subversion

Timestamp:

Sep 9, 2007 1:58:13 PM (6 years ago)

Author:

thomasb

Message:

Applied patch for LDAP version (#1484552)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcube_ldap.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2007/09/09 (thomasb)
+----------
+- Applied patch for LDAP version (#1484552)
+- Improved XHTML validation
+
 
 2007/09/05 (thomasb)

trunk/roundcubemail/config/main.inc.php.dist

@@ -200 +200 @@
  *  'bind_dn'       => '',
  *  'bind_pass'     => '',
+ *  'ldap_version'  => 3,       // using LDAPv3
  *  'search_fields' => array('mail', 'cn'),  // fields to search in
  *  'name_field'    => 'cn',    // this field represents the contact's name

trunk/roundcubemail/program/include/rcube_ldap.inc

@@ -87 +87 @@
       $this->prop['hosts'] = array($this->prop['hosts']);
 
+    if (empty($this->prop['ldap_version']))
+      $this->prop['ldap_version'] = 3;
+
     foreach ($this->prop['hosts'] as $host)
     {
       if ($lc = @ldap_connect($host, $this->prop['port']))
       {
-        ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['port']);
+        ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['ldap_version']);
         $this->prop['host'] = $host;
         $this->conn = $lc;