namespace PhpXmlRpc;
-use PhpXmlRpc\Helper\Logger;
use PhpXmlRpc\Helper\Charset;
+use PhpXmlRpc\Helper\Logger;
use PhpXmlRpc\Helper\XMLParser;
/**
* Defines how functions in dmap will be invoked: either using an xmlrpc request object
* or plain php values.
* Valid strings are 'xmlrpcvals', 'phpvals' or 'epivals'
+ * @todo create class constants for these
*/
public $functions_parameters_type = 'xmlrpcvals';
* Add a method to the dispatch map.
*
* @param string $methodName the name with which the method will be made available
- * @param string $function the php function that will get invoked
+ * @param callable $function the php function that will get invoked
* @param array $sig the array of valid method signatures
* @param string $doc method documentation
* @param array $sigDoc the array of valid method signatures docs (one string per param, one for return type)
+ *
+ * @todo raise a warning if the user tries to register a 'system.' method
*/
public function add_to_map($methodName, $function, $sig = null, $doc = false, $sigDoc = false)
{
* @param array|Request $in array of either xmlrpc value objects or xmlrpc type definitions
* @param array $sigs array of known signatures to match against
*
- * @return array
+ * @return array int, string
*/
protected function verifySignature($in, $sigs)
{
} else {
$methName = $req;
}
- $sysCall = $this->allow_system_funcs && (strpos($methName, "system.") === 0);
+ $sysCall = $this->isSyscall($methName);
$dmap = $sysCall ? $this->getSystemDispatchMap() : $this->dmap;
if (!isset($dmap[$methName]['function'])) {
if ($this->functions_parameters_type == 'epivals') {
$r = call_user_func_array($func, array($methName, $params, $this->user_data));
// mimic EPI behaviour: if we get an array that looks like an error, make it
- // an eror response
+ // an error response
if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) {
$r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']);
} else {
}
}
throw $e;
- break;
case 1:
$r = new Response(0, $e->getCode(), $e->getMessage());
break;
}
}
+ /**
+ * @param string $methName
+ * @return bool
+ */
+ protected function isSyscall($methName)
+ {
+ return (strpos($methName, "system.") === 0);
+ }
+
/* Functions that implement system.XXX methods of xmlrpc servers */
/**
- * @return array
+ * @return array[]
*/
public function getSystemDispatchMap()
{
+ if (!$this->allow_system_funcs) {
+ return array();
+ }
+
return array(
'system.listMethods' => array(
'function' => 'PhpXmlRpc\Server::_xmlrpcs_listMethods',
'system.getCapabilities' => array(
'function' => 'PhpXmlRpc\Server::_xmlrpcs_getCapabilities',
'signature' => array(array(Value::$xmlrpcStruct)),
- 'docstring' => 'This method lists all the capabilites that the XML-RPC server has: the (more or less standard) extensions to the xmlrpc spec that it adheres to',
+ 'docstring' => 'This method lists all the capabilities that the XML-RPC server has: the (more or less standard) extensions to the xmlrpc spec that it adheres to',
'signature_docs' => array(array('list of capabilities, described as structs with a version number and url for the spec')),
),
);
}
/**
- * @return array
+ * @return array[]
*/
public function getCapabilities()
{
foreach ($server->dmap as $key => $val) {
$outAr[] = new Value($key, 'string');
}
- if ($server->allow_system_funcs) {
- foreach ($server->getSystemDispatchMap() as $key => $val) {
- $outAr[] = new Value($key, 'string');
- }
+ foreach ($server->getSystemDispatchMap() as $key => $val) {
+ $outAr[] = new Value($key, 'string');
}
return new Response(new Value($outAr, 'array'));
} else {
$methName = $req;
}
- if (strpos($methName, "system.") === 0) {
+ if ($server->isSyscall($methName)) {
$dmap = $server->getSystemDispatchMap();
} else {
$dmap = $server->dmap;
} else {
$methName = $req;
}
- if (strpos($methName, "system.") === 0) {
+ if ($server->isSyscall($methName)) {
$dmap = $server->getSystemDispatchMap();
} else {
$dmap = $server->dmap;
}
if (isset($dmap[$methName])) {
if (isset($dmap[$methName]['docstring'])) {
- $r = new Response(new Value($dmap[$methName]['docstring']), 'string');
+ $r = new Response(new Value($dmap[$methName]['docstring'], 'string'));
} else {
$r = new Response(new Value('', 'string'));
}
return static::_xmlrpcs_multicall_error('notarray');
}
- // this is a real dirty and simplistic hack, since we might have received a
+ // this is a simplistic hack, since we might have received
// base64 or datetime values, but they will be listed as strings here...
$pt = array();
$wrapper = new Wrapper();
foreach ($call['params'] as $val) {
- $pt[] = $wrapper->php2XmlrpcType(gettype($val));
+ // support EPI-encoded base64 and datetime values
+ if ($val instanceof \stdClass && isset($val->xmlrpc_type)) {
+ $pt[] = $val->xmlrpc_type == 'datetime' ? Value::$xmlrpcDateTime : $val->xmlrpc_type;
+ } else {
+ $pt[] = $wrapper->php2XmlrpcType(gettype($val));
+ }
}
$result = $server->execute($call['methodName'], $call['params'], $pt);