protected static $_xmlrpc_debuginfo = '';
protected static $_xmlrpcs_occurred_errors = '';
- public static $_xmlrpcs_prev_ehandler = '';
+ protected static $_xmlrpcs_prev_ehandler = '';
/**
* @param array $dispatchMap the dispatch map with definition of exposed services
return $r;
}
} else {
- //error_log('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
$r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_cannot_decompress'], PhpXmlRpc::$xmlrpcstr['server_cannot_decompress']);
return $r;
// If debug level is 3, we should catch all errors generated during
// processing of user function, and log them as part of response
if ($this->debug > 2) {
- $GLOBALS['_xmlrpcs_prev_ehandler'] = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
+ self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler'));
}
try {
// Allow mixed-convention servers
if ($this->debug > 2) {
// note: restore the error handler we found before calling the
// user func, even if it has been changed inside the func itself
- if ($GLOBALS['_xmlrpcs_prev_ehandler']) {
- set_error_handler($GLOBALS['_xmlrpcs_prev_ehandler']);
+ if (self::$_xmlrpcs_prev_ehandler) {
+ set_error_handler(self::$_xmlrpcs_prev_ehandler);
} else {
restore_error_handler();
}
$this->debug_info .= $string . "\n";
}
+ /**
+ * @param string $charsetEncoding
+ * @return string
+ */
protected function xml_header($charsetEncoding = '')
{
if ($charsetEncoding != '') {
/* Functions that implement system.XXX methods of xmlrpc servers */
+ /**
+ * @return array
+ */
public function getSystemDispatchMap()
{
return array(
);
}
- public static function _xmlrpcs_getCapabilities($server, $req = null)
+ /**
+ * @return array
+ */
+ public function getCapabilities()
{
$outAr = array(
// xmlrpc spec: always supported
- 'xmlrpc' => new Value(array(
- 'specUrl' => new Value('http://www.xmlrpc.com/spec', 'string'),
- 'specVersion' => new Value(1, 'int'),
- ), 'struct'),
+ 'xmlrpc' => array(
+ 'specUrl' => 'http://www.xmlrpc.com/spec',
+ 'specVersion' => 1
+ ),
// if we support system.xxx functions, we always support multicall, too...
// Note that, as of 2006/09/17, the following URL does not respond anymore
- 'system.multicall' => new Value(array(
- 'specUrl' => new Value('http://www.xmlrpc.com/discuss/msgReader$1208', 'string'),
- 'specVersion' => new Value(1, 'int'),
- ), 'struct'),
+ 'system.multicall' => array(
+ 'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208',
+ 'specVersion' => 1
+ ),
// introspection: version 2! we support 'mixed', too
- 'introspection' => new Value(array(
- 'specUrl' => new Value('http://phpxmlrpc.sourceforge.net/doc-2/ch10.html', 'string'),
- 'specVersion' => new Value(2, 'int'),
- ), 'struct'),
+ 'introspection' => array(
+ 'specUrl' => 'http://phpxmlrpc.sourceforge.net/doc-2/ch10.html',
+ 'specVersion' => 2,
+ ),
);
// NIL extension
if (PhpXmlRpc::$xmlrpc_null_extension) {
- $outAr['nil'] = new Value(array(
- 'specUrl' => new Value('http://www.ontosys.com/xml-rpc/extensions.php', 'string'),
- 'specVersion' => new Value(1, 'int'),
- ), 'struct');
+ $outAr['nil'] = array(
+ 'specUrl' => 'http://www.ontosys.com/xml-rpc/extensions.php',
+ 'specVersion' => 1
+ );
}
- return new Response(new Value($outAr, 'struct'));
+ return $outAr;
+ }
+
+ public static function _xmlrpcs_getCapabilities($server, $req = null)
+ {
+ $encoder = new Encoder();
+ return new Response($encoder->encode($server->getCapabilities()));
}
public static function _xmlrpcs_listMethods($server, $req = null) // if called in plain php values mode, second param is missing
$pt = array();
$wrapper = new Wrapper();
foreach ($call['params'] as $val) {
- $pt[] = $wrapper->php_2_xmlrpc_type(gettype($val));
+ $pt[] = $wrapper->php2XmlrpcType(gettype($val));
}
$result = $server->execute($call['methodName'], $call['params'], $pt);
}
// Try to avoid as much as possible disruption to the previous error handling
// mechanism in place
- if ($GLOBALS['_xmlrpcs_prev_ehandler'] == '') {
+ if (self::$_xmlrpcs_prev_ehandler == '') {
// The previous error handler was the default: all we should do is log error
// to the default error log (if level high enough)
if (ini_get('log_errors') && (intval(ini_get('error_reporting')) & $errCode)) {
}
} else {
// Pass control on to previous error handler, trying to avoid loops...
- if ($GLOBALS['_xmlrpcs_prev_ehandler'] != array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler')) {
- if (is_array($GLOBALS['_xmlrpcs_prev_ehandler'])) {
+ if (self::$_xmlrpcs_prev_ehandler != array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler')) {
+ if (is_array(self::$_xmlrpcs_prev_ehandler)) {
// the following works both with static class methods and plain object methods as error handler
- call_user_func_array($GLOBALS['_xmlrpcs_prev_ehandler'], array($errCode, $errString, $filename, $lineNo, $context));
+ call_user_func_array(self::$_xmlrpcs_prev_ehandler, array($errCode, $errString, $filename, $lineNo, $context));
} else {
- $GLOBALS['_xmlrpcs_prev_ehandler']($errCode, $errString, $filename, $lineNo, $context);
+ $method = self::$_xmlrpcs_prev_ehandler;
+ $method($errCode, $errString, $filename, $lineNo, $context);
}
}
}