[Phpgroupware-cvs] phpgwapi/inc class.soapclient.inc.php class.soa... [Version-0_9_16-branch]

[Caeies]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         Version-0_9_16-branch
Changes by:     Caeies <Caeies> 07/03/25 17:27:07

Modified files:
        inc            : class.soapclient.inc.php class.soapval.inc.php 
                         soap_functions.inc.php 

Log message:
        SOAP WSDL fix from patch #5761

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.soapclient.inc.php?cvsroot=phpgwapi&only_with_tag=Version-0_9_16-branch&r1=1.7.4.4&r2=1.7.4.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.soapval.inc.php?cvsroot=phpgwapi&only_with_tag=Version-0_9_16-branch&r1=1.8.4.4&r2=1.8.4.5
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/soap_functions.inc.php?cvsroot=phpgwapi&only_with_tag=Version-0_9_16-branch&r1=1.9.4.2&r2=1.9.4.3

Patches:
Index: class.soapclient.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.soapclient.inc.php,v
retrieving revision 1.7.4.4
retrieving revision 1.7.4.5
diff -u -b -r1.7.4.4 -r1.7.4.5
--- class.soapclient.inc.php    6 Nov 2004 15:34:26 -0000       1.7.4.4
+++ class.soapclient.inc.php    25 Mar 2007 17:27:07 -0000      1.7.4.5
@@ -10,7 +10,7 @@
        * @copyright Portions Copyright (C) 2003,2004 Free Software Foundation, 
Inc. http://www.fsf.org/
        * @package phpgwapi
        * @subpackage communication
-       * @version $Id: class.soapclient.inc.php,v 1.7.4.4 2004/11/06 15:34:26 
powerstat Exp $
+       * @version $Id: class.soapclient.inc.php,v 1.7.4.5 2007/03/25 17:27:07 
Caeies Exp $
        * @internal This project began based on code from the 2 projects below,
        * @internal and still contains some original code. The licenses of both 
must be respected.
        * @internal XML-RPC for PHP; SOAP for PHP
@@ -61,7 +61,10 @@
                        if($this->endpointType == 'wsdl')
                        {
                                // instantiate wsdl class
+                               if(!is_object($this->wsdl))
+                               {
                                $this->wsdl = 
CreateObject('phpgwapi.wsdl',$this->endpoint);
+                               }
                                // get portName
                                if(!$this->portName)
                                {

Index: class.soapval.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.soapval.inc.php,v
retrieving revision 1.8.4.4
retrieving revision 1.8.4.5
diff -u -b -r1.8.4.4 -r1.8.4.5
--- class.soapval.inc.php       10 Feb 2004 13:51:19 -0000      1.8.4.4
+++ class.soapval.inc.php       25 Mar 2007 17:27:07 -0000      1.8.4.5
@@ -10,7 +10,7 @@
        * @copyright Portions Copyright (C) 2003,2004 Free Software Foundation, 
Inc. http://www.fsf.org/
        * @package phpgwapi
        * @subpackage communication
-       * @version $Id: class.soapval.inc.php,v 1.8.4.4 2004/02/10 13:51:19 ceb 
Exp $
+       * @version $Id: class.soapval.inc.php,v 1.8.4.5 2007/03/25 17:27:07 
Caeies Exp $
        * @internal This project began based on code from the 2 projects below,
        * @internal and still contains some original code. The licenses of both 
must be respected.
        * @internal XML-RPC for PHP; SOAP for PHP
@@ -345,7 +345,7 @@
                                        }
                                        elseif(count($array_types) >= 1)
                                        {
-                                               $array_type = 
$array_val->type_prefix.":".$array_val->type;
+                                               $array_type = 
$soapval->type_prefix.":".$soapval->type;
                                        }
 
                                        $xml = "<$soapval->name 
xsi:type=\"SOAP-ENC:Array\" 
SOAP-ENC:arrayType=\"".$array_type."[".sizeof($soapval->value)."]\">\n".$xml."</$soapval->name>\n";

Index: soap_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/soap_functions.inc.php,v
retrieving revision 1.9.4.2
retrieving revision 1.9.4.3
diff -u -b -r1.9.4.2 -r1.9.4.3
--- soap_functions.inc.php      10 Feb 2004 13:51:20 -0000      1.9.4.2
+++ soap_functions.inc.php      25 Mar 2007 17:27:07 -0000      1.9.4.3
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage communication
-       * @version $Id: soap_functions.inc.php,v 1.9.4.2 2004/02/10 13:51:20 
ceb Exp $
+       * @version $Id: soap_functions.inc.php,v 1.9.4.3 2007/03/25 17:27:07 
Caeies Exp $
        */
 
        $GLOBALS['soapTypes'] = array(
@@ -30,7 +30,7 @@
 
        while(list($key,$val) = each($GLOBALS['soapTypes']))
        {
-               $GLOBALS['soapKeys'][] = $val;
+               $GLOBALS['soapKeys'][] = $key;
        }
 
        $GLOBALS['typemap'] = array(