- Fix LDAP addressbook browsing when only one directory is used (#1486022)

alecpl

2009-08-28 6855ce6f702d5fd5c055b6edf9af0085882a4c56

 program/include/rcube_ldap.php

@@ -4,7 +4,7 @@
 | program/include/rcube_ldap.php                                        |
 |                                                                       |
 | This file is part of the RoundCube Webmail client                     |
 | Copyright (C) 2006-2008, RoundCube Dev. - Switzerland                 |
 | Copyright (C) 2006-2009, RoundCube Dev. - Switzerland                 |
 | Licensed under the GNU GPL                                            |
 |                                                                       |
 | PURPOSE:                                                              |
@@ -24,7 +24,7 @@
 *
 * @package Addressbook
 */
class rcube_ldap
class rcube_ldap extends rcube_addressbook
{
  var $conn;
  var $prop = array();
@@ -52,7 +52,7 @@
  function __construct($p)
  {
    $this->prop = $p;
    

    foreach ($p as $prop => $value)
      if (preg_match('/^(.+)_field$/', $prop, $matches))
        $this->fieldmap[$matches[1]] = $value;
@@ -105,7 +105,7 @@
      if ($this->prop["user_specific"]) {
        // No password set, use the session password
        if (empty($this->prop['bind_pass'])) {
          $this->prop['bind_pass'] = $RCMAIL->decrypt_passwd($_SESSION["password"]);
          $this->prop['bind_pass'] = $RCMAIL->decrypt($_SESSION['password']);
        }

        // Get the pieces needed for variable replacement.