[Phpgroupware-cvs] CVS: phpgwapi/inc class.interserver.inc.php,1.21,1.21.2.1 xml_functions.inc.php,1.22,1.22.2.1 xmlrpc.interop.php,1.3,1.3.2.1

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv23798/phpgwapi/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.interserver.inc.php xml_functions.inc.php 
        xmlrpc.interop.php 
Log Message:
GNU Bug #451.  All I did was rename xmlrpc_encode/xmlrpc_decode to 
phpgw_xmlrpc_encode/phpgw_xmlrpc_decode.  This just might be a temporary fix.  
A more appropriate fix would probably be to check to see if function_exists() 
and skip and use the internal if defined, else use the php coded method.

Index: class.interserver.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.interserver.inc.php,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -r1.21 -r1.21.2.1
*** class.interserver.inc.php   10 Dec 2001 02:09:31 -0000      1.21
--- class.interserver.inc.php   30 Jun 2002 00:54:25 -0000      1.21.2.1
***************
*** 199,203 ****
                        {
                                $this->debug('<hr>I got this value 
back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug);
!                               $this->result = xmlrpc_decode($v);
                        }
                        else
--- 199,203 ----
                        {
                                $this->debug('<hr>I got this value 
back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug);
!                               $this->result = phpgw_xmlrpc_decode($v);
                        }
                        else
***************
*** 252,256 ****
                        {
                                $this->debug('<hr>I got this value 
back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug);
!                               $this->result = xmlrpc_decode($v);
                        }
                        else
--- 252,256 ----
                        {
                                $this->debug('<hr>I got this value 
back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug);
!                               $this->result = phpgw_xmlrpc_decode($v);
                        }
                        else

Index: xml_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/xml_functions.inc.php,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -r1.22 -r1.22.2.1
*** xml_functions.inc.php       28 Dec 2001 18:41:33 -0000      1.22
--- xml_functions.inc.php       30 Jun 2002 00:54:25 -0000      1.22.2.1
***************
*** 469,473 ****
        * author: Dan Libby (address@hidden)                             *
        ****************************************************************/
!       function xmlrpc_decode($xmlrpc_val)
        {
                $kind = @$xmlrpc_val->kindOf();
--- 469,473 ----
        * author: Dan Libby (address@hidden)                             *
        ****************************************************************/
!       function phpgw_xmlrpc_decode($xmlrpc_val)
        {
                $kind = @$xmlrpc_val->kindOf();
***************
*** 484,488 ****
                        for($i = 0; $i < $size; $i++)
                        {
!                               $arr[]=xmlrpc_decode($xmlrpc_val->arraymem($i));
                        }
                        return $arr; 
--- 484,488 ----
                        for($i = 0; $i < $size; $i++)
                        {
!                               
$arr[]=phpgw_xmlrpc_decode($xmlrpc_val->arraymem($i));
                        }
                        return $arr; 
***************
*** 495,499 ****
                        while(list($key,$value)=$xmlrpc_val->structeach())
                        {
!                               $arr[$key] = xmlrpc_decode($value);
                        }
                        return $arr;
--- 495,499 ----
                        while(list($key,$value)=$xmlrpc_val->structeach())
                        {
!                               $arr[$key] = phpgw_xmlrpc_decode($value);
                        }
                        return $arr;
***************
*** 513,517 ****
        * author: Dan Libby (address@hidden)                             *
        ****************************************************************/
!       function xmlrpc_encode($php_val)
        {
                $type = gettype($php_val);
--- 513,517 ----
        * author: Dan Libby (address@hidden)                             *
        ****************************************************************/
!       function phpgw_xmlrpc_encode($php_val)
        {
                $type = gettype($php_val);
***************
*** 525,529 ****
                                while (list($k,$v) = each($php_val))
                                {
!                                       $arr[$k] = xmlrpc_encode($v);
                                }
                                $xmlrpc_val->addStruct($arr);
--- 525,529 ----
                                while (list($k,$v) = each($php_val))
                                {
!                                       $arr[$k] = phpgw_xmlrpc_encode($v);
                                }
                                $xmlrpc_val->addStruct($arr);

Index: xmlrpc.interop.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/xmlrpc.interop.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** xmlrpc.interop.php  4 Dec 2001 13:49:56 -0000       1.3
--- xmlrpc.interop.php  30 Jun 2002 00:54:25 -0000      1.3.2.1
***************
*** 590,594 ****
                        'toolkitOperatingSystem' => $GLOBALS['SERVER_SOFTWARE']
                );
!               return CreateObject('phpgwapi.xmlrpcresp',xmlrpc_encode($ret));
        }
  
--- 590,594 ----
                        'toolkitOperatingSystem' => $GLOBALS['SERVER_SOFTWARE']
                );
!               return 
CreateObject('phpgwapi.xmlrpcresp',phpgw_xmlrpc_encode($ret));
        }