[Phpgroupware-cvs] phpgwapi/inc class.xmlrpc_client.inc.php xml_fu...

[Dave Hall]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/10/24 00:31:33

Modified files:
        inc            : class.xmlrpc_client.inc.php 
                         xml_functions.inc.php 

Log message:
        get this working again, the test suite support still needs to be readded

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.xmlrpc_client.inc.php?cvsroot=phpgwapi&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/xml_functions.inc.php?cvsroot=phpgwapi&r1=1.33&r2=1.34

Patches:
Index: class.xmlrpc_client.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.xmlrpc_client.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.xmlrpc_client.inc.php 17 Sep 2006 11:18:31 -0000      1.13
+++ class.xmlrpc_client.inc.php 24 Oct 2006 00:31:33 -0000      1.14
@@ -5,7 +5,7 @@
        * @copyright Copyright (C) 1999-2001 Edd Dumbill
        * @package phpgwapi
        * @subpackage xml
-       * @version $Id: class.xmlrpc_client.inc.php,v 1.13 2006/09/17 11:18:31 
skwashd Exp $
+       * @version $Id: class.xmlrpc_client.inc.php,v 1.14 2006/10/24 00:31:33 
skwashd Exp $
        */
 
 // Redistribution and use in source and binary forms, with or without
@@ -37,6 +37,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 // OF THE POSSIBILITY OF SUCH DAMAGE.
 
+       include_once(PHPGW_API_INC . '/xml_functions.inc.php');
 
        /**
        * XMLRPC client

Index: xml_functions.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/xml_functions.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- xml_functions.inc.php       17 Sep 2006 11:18:31 -0000      1.33
+++ xml_functions.inc.php       24 Oct 2006 00:31:33 -0000      1.34
@@ -3,12 +3,25 @@
        * XML RPC
        * @author Edd Dumbill <address@hidden>
        * @copyright Copyright (C) 1999-2001 Edd Dumbill
-       * @copyright Portions Copyright (C) 2004 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @copyright Portions Copyright (C) 2004 - 2006 Free Software 
Foundation, Inc. http://www.fsf.org/
        * @package phpgwapi
        * @subpackage communication
-       * @version $Id: xml_functions.inc.php,v 1.33 2006/09/17 11:18:31 
skwashd Exp $
+       * @version $Id: xml_functions.inc.php,v 1.34 2006/10/24 00:31:33 
skwashd Exp $
        */
 
+       /**
+       * Include XMLRPC Response class
+       */
+       include_once(PHPGW_API_INC . '/class.xmlrpcresp.inc.php');
+       /**
+       * Include XMLRPC values class
+       */
+       include_once(PHPGW_API_INC . '/class.xmlrpcval.inc.php');
+       /**
+       * Include XMLRPC message class
+       */
+       include_once(PHPGW_API_INC . '/class.xmlrpcmsg.inc.php');
+
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
 // are met:
@@ -1281,7 +1294,7 @@
        }
 
        // listMethods: either a string, or nothing
-       $GLOBALS['_xmlrpcs_listMethods_sig'] = array(array(xmlrpcArray, 
xmlrpcString), array(xmlrpcArray));
+       $GLOBALS['_xmlrpcs_listMethods_sig'] = 
array(array($GLOBALS['xmlrpcArray'], $GLOBALS['xmlrpcString']), 
array($GLOBALS['xmlrpcArray']));
        $GLOBALS['_xmlrpcs_listMethods_doc'] = 'This method lists all the 
methods that the XML-RPC server knows how to dispatch';
        function _xmlrpcs_listMethods($server, $m)
        {
@@ -1301,7 +1314,7 @@
                return CreateObject('phpgwapi.xmlrpcresp',$v);
        }
 
-       $GLOBALS['_xmlrpcs_methodSignature_sig']=array(array(xmlrpcArray, 
xmlrpcString));
+       
$GLOBALS['_xmlrpcs_methodSignature_sig']=array(array($GLOBALS['xmlrpcArray'], 
$GLOBALS['xmlrpcString']));
        $GLOBALS['_xmlrpcs_methodSignature_doc']='Returns an array of known 
signatures (an array of arrays) for the method name passed. If no signatures 
are known, returns a none-array (test for type != array to detect missing 
signature)';
        function _xmlrpcs_methodSignature($server, $m)
        {
@@ -1348,7 +1361,7 @@
                return $r;
        }
 
-       $GLOBALS['_xmlrpcs_methodHelp_sig'] = array(array(xmlrpcString, 
xmlrpcString));
+       $GLOBALS['_xmlrpcs_methodHelp_sig'] = 
array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
        $GLOBALS['_xmlrpcs_methodHelp_doc'] = 'Returns help text if defined for 
the method passed, otherwise returns an empty string';
        function _xmlrpcs_methodHelp($server, $m)
        {
@@ -1413,7 +1426,7 @@
        }
        */
 
-       $GLOBALS['_xmlrpcs_login_sig'] = 
array(array(xmlrpcStruct,xmlrpcStruct));
+       $GLOBALS['_xmlrpcs_login_sig'] = array(array($GLOBALS['xmlrpcStruct'], 
$GLOBALS['xmlrpcStruct']));
        $GLOBALS['_xmlrpcs_login_doc'] = 'phpGroupWare client or server login 
via XML-RPC';
        function _xmlrpcs_login($server,$m)
        {
@@ -1463,7 +1476,7 @@
                return 
CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',$rtrn,'struct'));
        }
 
-       $GLOBALS['_xmlrpcs_phpgw_api_version_sig'] = 
array(array(xmlrpcString,xmlrpcString));
+       $GLOBALS['_xmlrpcs_phpgw_api_version_sig'] = 
array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
        $GLOBALS['_xmlrpcs_phpgw_api_version_doc'] = 'Returns the phpGroupWare 
API version';
        function _xmlrpcs_phpgw_api_version($server,$m)
        {
@@ -1473,7 +1486,7 @@
        }
 
 
-       $GLOBALS['_xmlrpcs_logout_sig'] = 
array(array(xmlrpcStruct,xmlrpcStruct));
+       $GLOBALS['_xmlrpcs_logout_sig'] = array(array($GLOBALS['xmlrpcStruct'], 
$GLOBALS['xmlrpcStruct']));
        $GLOBALS['_xmlrpcs_logout_doc'] = 'phpGroupWare client or server logout 
via XML-RPC';
        function _xmlrpcs_logout($server,$m)
        {