From: Gunnar Wrobel <p@rdus.de>
Date: Tue, 2 Jun 2009 20:27:03 +0000 (+0200)
Subject: Fix handling of the user pass when accessing LDAP with a proxy user for searching.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=78b1ba1beb59801b508f6c47df7f18bd1797508b;p=horde.git

Fix handling of the user pass when accessing LDAP with a proxy user for searching.

Fixed a typo.
---

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
index 34b2270c4..0780c8cd7 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server.php
@@ -156,6 +156,8 @@ abstract class Horde_Kolab_Server
 
         if (empty($instances[$signature])) {
 
+            $user_pass = '';
+
             if (!empty($params['driver'])) {
                 $driver = $params['driver'];
                 unset($params['driver']);
@@ -165,6 +167,10 @@ abstract class Horde_Kolab_Server
                     if (!is_array($params)) {
                         $params = $conf['kolab']['server']['params'];
                     } else {
+                        if (isset($params['user']) && isset($params['pass'])) {
+                            $user_pass = $params['pass'];
+                            unset($params['pass']);
+                        }
                         $params = array_merge($conf['kolab']['server']['params'],
                                               $params);
                     }
@@ -175,6 +181,7 @@ abstract class Horde_Kolab_Server
             }
 
             if (isset($params['user'])) {
+
                 $tmp_server = &Horde_Kolab_Server::factory($driver, $params);
 
                 try {
@@ -192,6 +199,7 @@ abstract class Horde_Kolab_Server
                 }
                 $params['uid'] = $uid;
                 unset($params['user']);
+                $params['pass'] = $user_pass;
             }
 
             if (!empty($params['write']) && isset($params['host_master'])) {
@@ -214,7 +222,7 @@ abstract class Horde_Kolab_Server
     function &getMaster()
     {
         if (!isset($this->params['host_master'])
-            || !emtpy($this->params['write'])
+            || !empty($this->params['write'])
             || $this->params['host_master'] == $this->params['host']) {
             return $this;
         }