From 8a7ba041b2385d351924ae5ef49eed01546c1678 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 3 Jun 2010 13:59:52 +0000
Subject: [PATCH] Qual: update NuSoap class for best compatibility with php5.3

---
 htdocs/includes/nusoap/lib/class.soapclient.php | 8 ++++----
 htdocs/includes/nusoap/lib/nusoap.php           | 2 +-
 htdocs/includes/nusoap/lib/nusoapmime.php       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/includes/nusoap/lib/class.soapclient.php b/htdocs/includes/nusoap/lib/class.soapclient.php
index e6c26f85500..e83df9247d7 100644
--- a/htdocs/includes/nusoap/lib/class.soapclient.php
+++ b/htdocs/includes/nusoap/lib/class.soapclient.php
@@ -23,7 +23,7 @@
 * @version  $Id$
 * @access   public
 */
-class nusoap_client extends nusoap_base  {
+class soapclient_nusoap extends nusoap_base  {
 
 	var $username = '';				// Username for HTTP authentication
 	var $password = '';				// Password for HTTP authentication
@@ -95,7 +95,7 @@ class nusoap_client extends nusoap_base  {
 	* @param	string $portName optional portName in WSDL document
 	* @access   public
 	*/
-	function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
+	function soapclient_nusoap($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30, $portName = ''){
 		parent::nusoap_base();
 		$this->endpoint = $endpoint;
 		$this->proxyhost = $proxyhost;
@@ -793,7 +793,7 @@ class nusoap_client extends nusoap_base  {
 				unset($paramCommentStr);
 			}
 		}
-		$evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client {
+		$evalStr = 'class nusoap_proxy_'.$r.' extends soapclient_nusoap {
 	'.$evalStr.'
 }';
 		return $evalStr;
@@ -985,7 +985,7 @@ if (!extension_loaded('soap')) {
 	/**
 	 *	For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded.
 	 */
-	class soapclient extends nusoap_client {
+	class soapclient extends soapclient_nusoap {
 	}
 }
 ?>
diff --git a/htdocs/includes/nusoap/lib/nusoap.php b/htdocs/includes/nusoap/lib/nusoap.php
index 144049f946e..0ad8c176d68 100644
--- a/htdocs/includes/nusoap/lib/nusoap.php
+++ b/htdocs/includes/nusoap/lib/nusoap.php
@@ -7950,7 +7950,7 @@ class soapclient_nusoap extends nusoap_base  {
 				unset($paramCommentStr);
 			}
 		}
-		$evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client {
+		$evalStr = 'class nusoap_proxy_'.$r.' extends soapclient_nusoap {
 	'.$evalStr.'
 }';
 		return $evalStr;
diff --git a/htdocs/includes/nusoap/lib/nusoapmime.php b/htdocs/includes/nusoap/lib/nusoapmime.php
index 6c2adde4361..a1528b854d8 100644
--- a/htdocs/includes/nusoap/lib/nusoapmime.php
+++ b/htdocs/includes/nusoap/lib/nusoapmime.php
@@ -51,7 +51,7 @@ require_once('Mail/mimePart.php');
 * @version  $Id$
 * @access   public
 */
-class nusoap_client_mime extends nusoap_client {
+class nusoap_client_mime extends soapclient_nusoap {
 	/**
 	 * @var array Each array element in the return is an associative array with keys
 	 * data, filename, contenttype, cid