Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

fix : Cannot redeclare class SoapClient

Browse Source
This commit is contained in:
Philippe Grand
2010-04-13 14:06:09 +00:00
parent 8f171f4336
commit f21aed7f61
5 changed files with 9475 additions and 9475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/includes/nusoap/lib/class.soapclient.php
View File

@@ -10,7 +10,7 @@
* usage: * usage:
* *
* // instantiate client with server info * // instantiate client with server info
* $soapclient = new nusoap_client( string path [ ,mixed wsdl] ); * $soapclient = new soapclient_nusoap( string path [ ,mixed wsdl] );
* *
* // call method, get results * // call method, get results
* echo $soapclient->call( string methodname [ ,array parameters] ); * echo $soapclient->call( string methodname [ ,array parameters] );
@@ -23,7 +23,7 @@
* @version $Id$ * @version $Id$
* @access public * @access public
*/ */
class nusoap_client extends nusoap_base { class soapclient_nusoap extends nusoap_base {
var $username = ''; // Username for HTTP authentication var $username = ''; // Username for HTTP authentication
var $password = ''; // Password for HTTP authentication var $password = ''; // Password for HTTP authentication
@@ -94,7 +94,7 @@ class nusoap_client extends nusoap_base {
* @param integer $response_timeout set the response timeout * @param integer $response_timeout set the response timeout
* @access public * @access public
*/ */
function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){ function soapclient_nusoap($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
parent::nusoap_base(); parent::nusoap_base();
$this->endpoint = $endpoint; $this->endpoint = $endpoint;
$this->proxyhost = $proxyhost; $this->proxyhost = $proxyhost;
@@ -779,7 +779,7 @@ class nusoap_client extends nusoap_base {
unset($paramCommentStr); unset($paramCommentStr);
} }
} }
$evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client { $evalStr = 'class nusoap_proxy_'.$r.' extends soapclient_nusoap {
'.$evalStr.' '.$evalStr.'
}'; }';
return $evalStr; return $evalStr;
@@ -971,7 +971,7 @@ if (!extension_loaded('soap')) {
/** /**
* For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded. * For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded.
*/ */
class soapclient extends nusoap_client { class soapclient extends soapclient_nusoap {
} }
} }
?> ?>

10
htdocs/includes/nusoap/lib/nusoap.php
View File

@@ -7026,7 +7026,7 @@ class soap_parser extends nusoap_parser {
* usage: * usage:
* *
* // instantiate client with server info * // instantiate client with server info
* $soapclient = new nusoap_client( string path [ ,mixed wsdl] ); * $soapclient = new soapclient_nusoap( string path [ ,mixed wsdl] );
* *
* // call method, get results * // call method, get results
* echo $soapclient->call( string methodname [ ,array parameters] ); * echo $soapclient->call( string methodname [ ,array parameters] );
@@ -7039,7 +7039,7 @@ class soap_parser extends nusoap_parser {
* @version $Id$ * @version $Id$
* @access public * @access public
*/ */
class nusoap_client extends nusoap_base { class soapclient_nusoap extends nusoap_base {
var $username = ''; // Username for HTTP authentication var $username = ''; // Username for HTTP authentication
var $password = ''; // Password for HTTP authentication var $password = ''; // Password for HTTP authentication
@@ -7110,7 +7110,7 @@ class nusoap_client extends nusoap_base {
* @param integer $response_timeout set the response timeout * @param integer $response_timeout set the response timeout
* @access public * @access public
*/ */
function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){ function soapclient_nusoap($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
parent::nusoap_base(); parent::nusoap_base();
$this->endpoint = $endpoint; $this->endpoint = $endpoint;
$this->proxyhost = $proxyhost; $this->proxyhost = $proxyhost;
@@ -7795,7 +7795,7 @@ class nusoap_client extends nusoap_base {
unset($paramCommentStr); unset($paramCommentStr);
} }
} }
$evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client { $evalStr = 'class nusoap_proxy_'.$r.' extends soapclient_nusoap {
'.$evalStr.' '.$evalStr.'
}'; }';
return $evalStr; return $evalStr;
@@ -7987,7 +7987,7 @@ if (!extension_loaded('soap')) {
/** /**
* For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded. * For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded.
*/ */
class soapclient extends nusoap_client { class soapclient extends soapclient_nusoap {
} }
} }
?> ?>

6
htdocs/includes/nusoap/lib/nusoapmime.php
View File

@@ -43,7 +43,7 @@ require_once('Mail/mimeDecode.php');
require_once('Mail/mimePart.php'); require_once('Mail/mimePart.php');
/** /**
* nusoap_client_mime client supporting MIME attachments defined at * soapclient_nusoap_mime client supporting MIME attachments defined at
* http://www.w3.org/TR/SOAP-attachments. It depends on the PEAR Mail_MIME library. * http://www.w3.org/TR/SOAP-attachments. It depends on the PEAR Mail_MIME library.
* *
* @author Scott Nichol <snichol@users.sourceforge.net> * @author Scott Nichol <snichol@users.sourceforge.net>
@@ -51,7 +51,7 @@ require_once('Mail/mimePart.php');
* @version $Id$ * @version $Id$
* @access public * @access public
*/ */
class nusoap_client_mime extends nusoap_client { class soapclient_nusoap_mime extends soapclient_nusoap {
/** /**
* @var array Each array element in the return is an associative array with keys * @var array Each array element in the return is an associative array with keys
* data, filename, contenttype, cid * data, filename, contenttype, cid
@@ -268,7 +268,7 @@ class nusoap_client_mime extends nusoap_client {
* For backwards compatiblity, define soapclientmime unless the PHP SOAP extension is loaded. * For backwards compatiblity, define soapclientmime unless the PHP SOAP extension is loaded.
*/ */
if (!extension_loaded('soap')) { if (!extension_loaded('soap')) {
class soapclientmime extends nusoap_client_mime { class soapclientmime extends soapclient_nusoap_mime {
} }
} }

4
htdocs/societe/checkvat/checkVatPopup.php
View File

@@ -59,8 +59,8 @@ else
"vatNumber" => $vatNumber); "vatNumber" => $vatNumber);
// Set the WebService URL // Set the WebService URL
dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL); dol_syslog("Create soapclient_nusoap for URL=".$WS_DOL_URL);
$soapclient = new nusoap_client($WS_DOL_URL); $soapclient = new soapclient_nusoap($WS_DOL_URL);
// Call the WebService and store its result in $result. // Call the WebService and store its result in $result.
dol_syslog("Call method ".$WS_METHOD); dol_syslog("Call method ".$WS_METHOD);

4
htdocs/webservices/client.php
View File

@@ -35,8 +35,8 @@ $WS_METHOD = 'getVersions';
$parameters = array("param1"=>"value1"); $parameters = array("param1"=>"value1");
// Set the WebService URL // Set the WebService URL
dol_syslog("Create nusoap_client for URL=".$WS_DOL_URL); dol_syslog("Create soapclient_nusoap for URL=".$WS_DOL_URL);
$soapclient = new nusoap_client($WS_DOL_URL); $soapclient = new soapclient_nusoap($WS_DOL_URL);
if ($soapclient) if ($soapclient)
{ {
$soapclient->soap_defencoding='UTF-8'; $soapclient->soap_defencoding='UTF-8';