From f503d8f3fec9553b9fc6cbcd24970d9fdd9d6639 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Fri, 12 Jun 2009 11:28:37 -0400
Subject: [PATCH] port
 http://cvs.horde.org/diff.php/framework/RPC/RPC/PhpSoap.php?rt=horde&r1=1.3&r2=1.4&ty=u
 from CVS fix class name

---
 framework/Rpc/lib/Horde/Rpc/Soap.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/framework/Rpc/lib/Horde/Rpc/Soap.php b/framework/Rpc/lib/Horde/Rpc/Soap.php
index 8f53ebd85..72805424e 100644
--- a/framework/Rpc/lib/Horde/Rpc/Soap.php
+++ b/framework/Rpc/lib/Horde/Rpc/Soap.php
@@ -3,8 +3,6 @@
  * The Horde_RPC_PhpSoap class provides a PHP 5 Soap implementation
  * of the Horde RPC system.
  *
- * $Horde: framework/RPC/RPC/PhpSoap.php,v 1.2 2009/01/06 17:49:38 jan Exp $
- *
  * Copyright 2003-2009 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
@@ -14,8 +12,8 @@
  * @since   Horde 3.2
  * @package Horde_RPC
  */
-class Horde_RPC_PhpSoap extends Horde_RPC {
-
+class Horde_Rpc_Soap extends Horde_Rpc
+{
     /**
      * Resource handler for the RPC server.
      *
@@ -51,6 +49,8 @@ class Horde_RPC_PhpSoap extends Horde_RPC {
      */
     public function __construct($params = array())
     {
+        NLS::setCharset('UTF-8');
+
         parent::Horde_RPC($params);
 
         if (!empty($params['allowedTypes'])) {
@@ -144,6 +144,14 @@ class Horde_RPC_PhpSoap extends Horde_RPC {
             $options['allowRedirects'] = true;
             $options['maxRedirects']   = 3;
         }
+        if (isset($options['user'])) {
+            $options['login'] = $options['user'];
+            unset($options['user']);
+        }
+        if (isset($options['pass'])) {
+            $options['password'] = $options['pass'];
+            unset($options['pass']);
+        }
         $options['location'] = $url;
         $options['uri'] = $options['namespace'];
 
-- 
2.11.0