lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: renommage de soapclient en soapclient_nusoap pour eviter conflit avec module Soap de PHP5

Browse Source
This commit is contained in:
Laurent Destailleur 2007-08-10 21:48:06 +00:00
parent 2f755c6cbc
commit 9e3a175d3c
17 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/tgz/tar.exclude
View File

@ -39,6 +39,7 @@ htdocs/includes/modules/modEditeur.class.php
htdocs/includes/modules/modPostnuke.class.php htdocs/includes/modules/modPostnuke.class.php
htdocs/includes/triggers/interface_user.class.php htdocs/includes/triggers/interface_user.class.php
htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN
htdocs/oscommerce_ws/ws_client_demo
htdocs/theme/rodolphe htdocs/theme/rodolphe
scripts/lolix scripts/lolix
CVS CVS

2
htdocs/includes/nusoap/lib/class.soap_transport_http.php
View File

@ -832,7 +832,7 @@ class soap_transport_http extends nusoap_base {
($http_status >= 400 && $http_status <= 417) || ($http_status >= 400 && $http_status <= 417) ||
($http_status >= 501 && $http_status <= 505) ($http_status >= 501 && $http_status <= 505)
) { ) {
$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)"); $this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient_nusoap->response has contents of the response)");
return false; return false;
} }

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

@ -5,12 +5,12 @@
/** /**
* *
* soapclient higher level class for easy usage. * soapclient_nusoap higher level class for easy usage.
* *
* usage: * usage:
* *
* // instantiate client with server info * // instantiate client with server info
* $soapclient = new soapclient( string path [ ,boolean wsdl] ); * $soapclient = new soapclient_nusoap( string path [ ,boolean wsdl] );
* *
* // call method, get results * // call method, get results
* echo $soapclient->call( string methodname [ ,array parameters] ); * echo $soapclient->call( string methodname [ ,array parameters] );
@ -22,7 +22,7 @@
* @version $Id$ * @version $Id$
* @access public * @access public
*/ */
class soapclient extends nusoap_base { class soapclient_nusoap extends nusoap_base {
var $username = ''; var $username = '';
var $password = ''; var $password = '';
@ -89,7 +89,7 @@ class soapclient extends nusoap_base {
* @param integer $response_timeout set the response timeout * @param integer $response_timeout set the response timeout
* @access public * @access public
*/ */
function soapclient($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;
@ -669,7 +669,7 @@ class soapclient extends nusoap_base {
unset($paramCommentStr); unset($paramCommentStr);
} }
} }
$evalStr = 'class soap_proxy_'.$r.' extends soapclient { $evalStr = 'class soap_proxy_'.$r.' extends soapclient_nusoap {
'.$evalStr.' '.$evalStr.'
}'; }';
return $evalStr; return $evalStr;

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

@ -2824,7 +2824,7 @@ class soap_transport_http extends nusoap_base {
($http_status >= 400 && $http_status <= 417) || ($http_status >= 400 && $http_status <= 417) ||
($http_status >= 501 && $http_status <= 505) ($http_status >= 501 && $http_status <= 505)
) { ) {
$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)"); $this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient_nusoap->response has contents of the response)");
return false; return false;
} }
@ -6387,12 +6387,12 @@ class soap_parser extends nusoap_base {
/** /**
* *
* soapclient higher level class for easy usage. * soapclient_nusoap higher level class for easy usage.
* *
* usage: * usage:
* *
* // instantiate client with server info * // instantiate client with server info
* $soapclient = new soapclient( string path [ ,boolean wsdl] ); * $soapclient = new soapclient_nusoap( string path [ ,boolean wsdl] );
* *
* // call method, get results * // call method, get results
* echo $soapclient->call( string methodname [ ,array parameters] ); * echo $soapclient->call( string methodname [ ,array parameters] );
@ -6404,7 +6404,7 @@ class soap_parser extends nusoap_base {
* @version $Id$ * @version $Id$
* @access public * @access public
*/ */
class soapclient extends nusoap_base { class soapclient_nusoap extends nusoap_base {
var $username = ''; var $username = '';
var $password = ''; var $password = '';
@ -6471,7 +6471,7 @@ class soapclient extends nusoap_base {
* @param integer $response_timeout set the response timeout * @param integer $response_timeout set the response timeout
* @access public * @access public
*/ */
function soapclient($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;
@ -7051,7 +7051,7 @@ class soapclient extends nusoap_base {
unset($paramCommentStr); unset($paramCommentStr);
} }
} }
$evalStr = 'class soap_proxy_'.$r.' extends soapclient { $evalStr = 'class soap_proxy_'.$r.' extends soapclient_nusoap {
'.$evalStr.' '.$evalStr.'
}'; }';
return $evalStr; return $evalStr;

2
htdocs/oscommerce_ws/clients/index.php
View File

@ -42,7 +42,7 @@ require_once("../includes/configure.php");
$parameters = array("custid"=>"0"); $parameters = array("custid"=>"0");
// Set the WebService URL // Set the WebService URL
$client = new soapclient(OSCWS_DIR."ws_customers.php"); $client = new soapclient_nusoap(OSCWS_DIR."ws_customers.php");
$result = $client->call("get_Client",$parameters ); $result = $client->call("get_Client",$parameters );

2
htdocs/oscommerce_ws/clients/osc_customer.class.php
View File

@ -99,7 +99,7 @@ class Osc_customer
$parameters = array("custid"=>$id); $parameters = array("custid"=>$id);
// Set the WebService URL // Set the WebService URL
$client = new soapclient(OSCWS_DIR."/ws_customers.php"); $client = new soapclient_nusoap(OSCWS_DIR."/ws_customers.php");
// Call the WebSeclient->fault)rvice and store its result in $obj // Call the WebSeclient->fault)rvice and store its result in $obj
$obj = $client->call("get_Client",$parameters ); $obj = $client->call("get_Client",$parameters );

2
htdocs/oscommerce_ws/commandes/index.php
View File

@ -41,7 +41,7 @@ require_once("../includes/configure.php");
$parameters = array("orderid"=>"0"); $parameters = array("orderid"=>"0");
// Set the WebService URL // Set the WebService URL
$client = new soapclient(OSCWS_DIR."ws_orders.php"); $client = new soapclient_nusoap(OSCWS_DIR."ws_orders.php");
$result = $client->call("get_Order",$parameters ); $result = $client->call("get_Order",$parameters );

2
htdocs/oscommerce_ws/commandes/osc_order.class.php
View File

@ -98,7 +98,7 @@ class Osc_order
$parameters = array("orderid"=>$id); $parameters = array("orderid"=>$id);
// Set the WebService URL // Set the WebService URL
$client = new soapclient(OSCWS_DIR."/ws_orders.php"); $client = new soapclient_nusoap(OSCWS_DIR."/ws_orders.php");
// Call the WebSeclient->fault)rvice and store its result in $obj // Call the WebSeclient->fault)rvice and store its result in $obj
$obj = $client->call("get_Order",$parameters ); $obj = $client->call("get_Order",$parameters );

2
htdocs/oscommerce_ws/index.php
View File

@ -52,7 +52,7 @@ require_once("./includes/configure.php");
$parameters = array(); $parameters = array();
// Set the WebService URL // Set the WebService URL
$client = new soapclient(OSCWS_DIR."ws_orders.php"); $client = new soapclient_nusoap(OSCWS_DIR."ws_orders.php");
/* /*
/* Chiffre d'affaire /* Chiffre d'affaire

2
htdocs/oscommerce_ws/produits/OSCvente.php
View File

@ -104,7 +104,7 @@ if ($_GET["action"] == 'vendre' )
$parameters = array("prod"=>$prod); $parameters = array("prod"=>$prod);
// Set the WebService URL // Set the WebService URL
$client = new soapclient(OSCWS_DIR."ws_articles.php"); $client = new soapclient_nusoap(OSCWS_DIR."ws_articles.php");
// Call the WebService and store its result in $result. // Call the WebService and store its result in $result.
$result = $client->call("create_article",$parameters ); $result = $client->call("create_article",$parameters );

2
htdocs/oscommerce_ws/produits/index.php
View File

@ -44,7 +44,7 @@ require_once("../includes/configure.php");
$parameters = array(); $parameters = array();
// Set the WebService URL // Set the WebService URL
$client = new soapclient(OSCWS_DIR."ws_articles.php"); $client = new soapclient_nusoap(OSCWS_DIR."ws_articles.php");
$result = $client->call("get_listearticles",$parameters ); $result = $client->call("get_listearticles",$parameters );
if ($client->fault) { if ($client->fault) {

2
htdocs/oscommerce_ws/produits/osc_product.class.php
View File

@ -93,7 +93,7 @@ class Osc_product
$parameters = array("id"=>$id,"ref"=>$ref); $parameters = array("id"=>$id,"ref"=>$ref);
// Set the WebService URL // Set the WebService URL
$client = new soapclient(OSCWS_DIR."/ws_articles.php"); $client = new soapclient_nusoap(OSCWS_DIR."/ws_articles.php");
// Call the WebSeclient->fault)rvice and store its result in $obj // Call the WebSeclient->fault)rvice and store its result in $obj
$obj = $client->call("get_article",$parameters ); $obj = $client->call("get_article",$parameters );

8
htdocs/oscommerce_ws/ws_server/lib/class.soapclient.php
View File

@ -10,7 +10,7 @@
* usage: * usage:
* *
* // instantiate client with server info * // instantiate client with server info
* $soapclient = new soapclient( string path [ ,boolean wsdl] ); * $soapclient = new soapclient_nusoap( string path [ ,boolean wsdl] );
* *
* // call method, get results * // call method, get results
* echo $soapclient->call( string methodname [ ,array parameters] ); * echo $soapclient->call( string methodname [ ,array parameters] );
@ -22,7 +22,7 @@
* @version $Id$ * @version $Id$
* @access public * @access public
*/ */
class soapclient extends nusoap_base { class soapclient_nusoap extends nusoap_base {
var $username = ''; var $username = '';
var $password = ''; var $password = '';
@ -89,7 +89,7 @@ class soapclient extends nusoap_base {
* @param integer $response_timeout set the response timeout * @param integer $response_timeout set the response timeout
* @access public * @access public
*/ */
function soapclient($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;
@ -669,7 +669,7 @@ class soapclient extends nusoap_base {
unset($paramCommentStr); unset($paramCommentStr);
} }
} }
$evalStr = 'class soap_proxy_'.$r.' extends soapclient { $evalStr = 'class soap_proxy_'.$r.' extends soapclient_nusoap {
'.$evalStr.' '.$evalStr.'
}'; }';
return $evalStr; return $evalStr;

12
htdocs/oscommerce_ws/ws_server/lib/nusoap.php
View File

@ -2824,7 +2824,7 @@ class soap_transport_http extends nusoap_base {
($http_status >= 400 && $http_status <= 417) || ($http_status >= 400 && $http_status <= 417) ||
($http_status >= 501 && $http_status <= 505) ($http_status >= 501 && $http_status <= 505)
) { ) {
$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)"); $this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient_nusoap->response has contents of the response)");
return false; return false;
} }
@ -6387,12 +6387,12 @@ class soap_parser extends nusoap_base {
/** /**
* *
* soapclient higher level class for easy usage. * soapclient_nusoap higher level class for easy usage.
* *
* usage: * usage:
* *
* // instantiate client with server info * // instantiate client with server info
* $soapclient = new soapclient( string path [ ,boolean wsdl] ); * $soapclient = new soapclient_nusoap( string path [ ,boolean wsdl] );
* *
* // call method, get results * // call method, get results
* echo $soapclient->call( string methodname [ ,array parameters] ); * echo $soapclient->call( string methodname [ ,array parameters] );
@ -6404,7 +6404,7 @@ class soap_parser extends nusoap_base {
* @version $Id$ * @version $Id$
* @access public * @access public
*/ */
class soapclient extends nusoap_base { class soapclient_nusoap extends nusoap_base {
var $username = ''; var $username = '';
var $password = ''; var $password = '';
@ -6471,7 +6471,7 @@ class soapclient extends nusoap_base {
* @param integer $response_timeout set the response timeout * @param integer $response_timeout set the response timeout
* @access public * @access public
*/ */
function soapclient($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;
@ -7051,7 +7051,7 @@ class soapclient extends nusoap_base {
unset($paramCommentStr); unset($paramCommentStr);
} }
} }
$evalStr = 'class soap_proxy_'.$r.' extends soapclient { $evalStr = 'class soap_proxy_'.$r.' extends soapclient_nusoap {
'.$evalStr.' '.$evalStr.'
}'; }';
return $evalStr; return $evalStr;

2
htdocs/oscommerce_ws/ws_server/lib/nusoapmime.php
View File

@ -45,7 +45,7 @@ require_once('Mail/mimePart.php');
* @version $Id$ * @version $Id$
* @access public * @access public
*/ */
class soapclientmime extends soapclient { class soapclientmime 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

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

@ -65,8 +65,8 @@ else
"vatNumber" => $_REQUEST["vatNumber"]); "vatNumber" => $_REQUEST["vatNumber"]);
// Set the WebService URL // Set the WebService URL
dolibarr_syslog("Create soapclient for URL=".$WS_DOL_URL); dolibarr_syslog("Create soapclient_nusoap for URL=".$WS_DOL_URL);
$soapclient = new soapclient($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.
dolibarr_syslog("Call method ".$WS_METHOD); dolibarr_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
dolibarr_syslog("Create soapclient for URL=".$WS_DOL_URL); dolibarr_syslog("Create soapclient_nusoap for URL=".$WS_DOL_URL);
$soapclient = new soapclient($WS_DOL_URL); $soapclient = new soapclient_nusoap($WS_DOL_URL);
if ($soapclient) if ($soapclient)
{ {