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

Fix: Warning in nusoap with PHP 5.3

Browse Source
This commit is contained in:
Laurent Destailleur 2010-04-13 21:33:02 +00:00
parent 0e715c7075
commit 9df4f1ad7e
3 changed files with 255 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/includes/dolibarr_changes.txt
View File

@ -7,6 +7,15 @@ ALL:
Replace "& new" by "new" Replace "& new" by "new"
NUSOAP:
-------
* In file nusoap.php, to avoid a warning,
Replace
if (isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
By
if (! is_array($this->methodreturn) && isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
FPDF: FPDF:
----- -----
* All changes were added in fpdf.php file and marked with tag DOLCHANGE or DOL_CHANGE * All changes were added in fpdf.php file and marked with tag DOLCHANGE or DOL_CHANGE

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

@ -4018,7 +4018,10 @@ class nusoap_server extends nusoap_base {
function serialize_return() { function serialize_return() {
$this->debug('Entering serialize_return methodname: ' . $this->methodname . ' methodURI: ' . $this->methodURI); $this->debug('Entering serialize_return methodname: ' . $this->methodname . ' methodURI: ' . $this->methodURI);
// if fault // if fault
if (isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
// DOL_CHANGE LDR
//if (isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
if (! is_array($this->methodreturn) && isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
$this->debug('got a fault object from method'); $this->debug('got a fault object from method');
$this->fault = $this->methodreturn; $this->fault = $this->methodreturn;
return; return;

6
htdocs/webservices/client.php
View File

@ -56,13 +56,15 @@ echo '</head>'."\n";
echo '<body>'."\n"; echo '<body>'."\n";
echo "<h2>Request</h2>"; echo "<h2>Request:</h2>";
echo '<h4>Function</h4>'; echo '<h4>Function</h4>';
echo $WS_METHOD; echo $WS_METHOD;
echo '<h4>SOAP Message</h4>'; echo '<h4>SOAP Message</h4>';
echo '<pre>' . htmlspecialchars($soapclient->request, ENT_QUOTES) . '</pre>'; echo '<pre>' . htmlspecialchars($soapclient->request, ENT_QUOTES) . '</pre>';
echo "<h2>Response</h2>"; echo '<hr>';
echo "<h2>Response:</h2>";
echo '<h4>Result</h4>'; echo '<h4>Result</h4>';
echo '<pre>'; echo '<pre>';
print_r($result); print_r($result);