[Phpgroupware-cvs] CVS: xmlrpc server.php,1.2,1.2.2.1 comment.php,1.3,1.3.2.1 discuss.php,1.3,1.3.2.1 which.php,1.1.1.1,1.1.1.1.2.1

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        server.php comment.php discuss.php which.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: server.php
===================================================================
RCS file: /cvsroot/phpgroupware/xmlrpc/server.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** server.php  5 Dec 2001 16:27:28 -0000       1.2
--- server.php  30 Jun 2002 00:54:25 -0000      1.2.2.1
***************
*** 522,526 ****
                                                 "toolkitVersion" => 
$xmlrpcVersion,
                                                 "toolkitOperatingSystem" => 
$SERVER_SOFTWARE);
!       return CreateObject('phpgwapi.xmlrpcresp',xmlrpc_encode($ret));
  }
  
--- 522,526 ----
                                                 "toolkitVersion" => 
$xmlrpcVersion,
                                                 "toolkitOperatingSystem" => 
$SERVER_SOFTWARE);
!       return CreateObject('phpgwapi.xmlrpcresp',phpgw_xmlrpc_encode($ret));
  }
  

Index: comment.php
===================================================================
RCS file: /cvsroot/phpgroupware/xmlrpc/comment.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** comment.php 5 Dec 2001 16:27:28 -0000       1.3
--- comment.php 30 Jun 2002 00:54:25 -0000      1.3.2.1
***************
*** 46,50 ****
                        bomb();
                } 
!               return xmlrpc_decode($resp->value());   
        }
  
--- 46,50 ----
                        bomb();
                } 
!               return phpgw_xmlrpc_decode($resp->value());     
        }
  

Index: discuss.php
===================================================================
RCS file: /cvsroot/phpgroupware/xmlrpc/discuss.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** discuss.php 5 Dec 2001 16:27:28 -0000       1.3
--- discuss.php 30 Jun 2002 00:54:25 -0000      1.3.2.1
***************
*** 42,48 ****
                $err = '';
                // get the first param
!               $msgID   = xmlrpc_decode($m->getParam(0));
!               $name    = xmlrpc_decode($m->getParam(1));
!               $comment = xmlrpc_decode($m->getParam(2));
        
                $countID = "${msgID}_count";
--- 42,48 ----
                $err = '';
                // get the first param
!               $msgID   = phpgw_xmlrpc_decode($m->getParam(0));
!               $name    = phpgw_xmlrpc_decode($m->getParam(1));
!               $comment = phpgw_xmlrpc_decode($m->getParam(2));
        
                $countID = "${msgID}_count";
***************
*** 84,88 ****
                $ra = array();
                // get the first param
!               $msgID = xmlrpc_decode($m->getParam(0));
  
                $countID = "${msgID}_count";
--- 84,88 ----
                $ra = array();
                // get the first param
!               $msgID = phpgw_xmlrpc_decode($m->getParam(0));
  
                $countID = "${msgID}_count";

Index: which.php
===================================================================
RCS file: /cvsroot/phpgroupware/xmlrpc/which.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** which.php   7 Aug 2001 23:07:50 -0000       1.1.1.1
--- which.php   30 Jun 2002 00:54:25 -0000      1.1.1.1.2.1
***************
*** 11,15 ****
    $r=$c->send($f);
    if (!$r) { die("send failed"); }
!   $v=xmlrpc_decode($r->value());
    if (!$r->faultCode()) {
        print "<pre>";
--- 11,15 ----
    $r=$c->send($f);
    if (!$r) { die("send failed"); }
!   $v=phpgw_xmlrpc_decode($r->value());
    if (!$r->faultCode()) {
        print "<pre>";