gggeek /
phpxmlrpc
@@ -17,23 +17,23 @@ discard block |
||
| 17 | 17 | // Make sure we set the correct charset type for output, so that we can display all characters |
| 18 | 18 | header('Content-Type: text/html; charset=utf-8'); |
| 19 | 19 | |
| 20 | -include __DIR__ . '/common.php'; |
|
| 20 | +include __DIR__.'/common.php'; |
|
| 21 | 21 | if ($action == '') { |
| 22 | 22 | $action = 'list'; |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | // Path to the visual xmlrpc editing dialog's containing folder. Can be absolute, or relative to this debugger's folder. |
| 26 | 26 | // We allow to easily configure this path via defines |
| 27 | -$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/debugger/'; |
|
| 27 | +$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/debugger/'; |
|
| 28 | 28 | // In case the webserver is set up so that the url to that folder is different. We default to JSXMLRPC_PATH for BC |
| 29 | 29 | $editorurlpath = defined('JSXMLRPC_BASEURL') ? JSXMLRPC_BASEURL : $editorpath; |
| 30 | 30 | if (defined('JSXMLRPC_BASEURL')) { |
| 31 | 31 | $haseditor = true; |
| 32 | 32 | } else { |
| 33 | 33 | if ($editorpath[0] !== '/') { |
| 34 | - $haseditor = is_file(realpath(__DIR__ . '/' . $editorpath . 'visualeditor.html')); |
|
| 34 | + $haseditor = is_file(realpath(__DIR__.'/'.$editorpath.'visualeditor.html')); |
|
| 35 | 35 | } else { |
| 36 | - $haseditor = is_file(realpath($editorpath . 'visualeditor.html'));; |
|
| 36 | + $haseditor = is_file(realpath($editorpath.'visualeditor.html')); ; |
|
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | function activateeditor() { |
| 211 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>'; |
|
| 211 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
| 212 | 212 | if (document.frmaction.wstype.value == "1") |
| 213 | 213 | url += '&type=jsonrpc'; |
| 214 | 214 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -239,9 +239,9 @@ discard block |
||
| 239 | 239 | echo ' document.forms[2].submit();'; |
| 240 | 240 | } ?>"> |
| 241 | 241 | <h1>XMLRPC |
| 242 | - <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
| 242 | + <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
| 243 | 243 | / |
| 244 | - <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
| 244 | + <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
| 245 | 245 | JSONRPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHP-XMLRPC</a> library) |
| 246 | 246 | </h1> |
| 247 | 247 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | </select> |
| 305 | 305 | </td> |
| 306 | 306 | <td class="labelcell">Timeout:</td> |
| 307 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 307 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 308 | 308 | <td</td> |
| 309 | 309 | <td></td> |
| 310 | 310 | </tr> |
@@ -41,7 +41,12 @@ |
||
| 41 | 41 | <html lang="en"> |
| 42 | 42 | <head> |
| 43 | 43 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 44 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
| 44 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 45 | + echo 'JSONRPC'; |
|
| 46 | +} else { |
|
| 47 | + echo 'XMLRPC'; |
|
| 48 | +} |
|
| 49 | +?> Debugger</title> |
|
| 45 | 50 | <meta name="robots" content="index,nofollow"/> |
| 46 | 51 | <script type="text/javascript" language="Javascript"> |
| 47 | 52 | if (window.name != 'frmcontroller') |
@@ -15,7 +15,12 @@ discard block |
||
| 15 | 15 | <html lang="en"> |
| 16 | 16 | <head> |
| 17 | 17 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 18 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
| 18 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 19 | + echo 'JSONRPC'; |
|
| 20 | +} else { |
|
| 21 | + echo 'XMLRPC'; |
|
| 22 | +} |
|
| 23 | +?> Debugger</title> |
|
| 19 | 24 | <meta name="robots" content="index,nofollow"/> |
| 20 | 25 | <style type="text/css"> |
| 21 | 26 | <!-- |
@@ -370,7 +375,9 @@ discard block |
||
| 370 | 375 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
| 371 | 376 | if ($x->count() > 1) { |
| 372 | 377 | foreach($x as $k => $y) { |
| 373 | - if ($k == 0) continue; |
|
| 378 | + if ($k == 0) { |
|
| 379 | + continue; |
|
| 380 | + } |
|
| 374 | 381 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 375 | 382 | if ($wstype != 1) { |
| 376 | 383 | $type = $y->scalarval(); |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | if (isset($_GET['run'])) { |
| 5 | 5 | $path = parse_url($_GET['run']); |
| 6 | 6 | if (isset($path['query'])) { |
| 7 | - $query = '?' . $path['query']; |
|
| 7 | + $query = '?'.$path['query']; |
|
| 8 | 8 | } |
| 9 | 9 | } |
| 10 | 10 | |
@@ -183,20 +183,20 @@ discard block |
||
| 183 | 183 | $callable = explode('::', $callable); |
| 184 | 184 | } |
| 185 | 185 | if (is_array($callable)) { |
| 186 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 186 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 188 | 188 | return false; |
| 189 | 189 | } |
| 190 | 190 | if (is_string($callable[0])) { |
| 191 | 191 | $plainFuncName = implode('::', $callable); |
| 192 | 192 | } elseif (is_object($callable[0])) { |
| 193 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 193 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 194 | 194 | } |
| 195 | 195 | $exists = method_exists($callable[0], $callable[1]); |
| 196 | 196 | } else if ($callable instanceof \Closure) { |
| 197 | 197 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 198 | 198 | if (!$buildIt) { |
| 199 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 199 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 200 | 200 | return false; |
| 201 | 201 | } |
| 202 | 202 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | if (!$exists) { |
| 211 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 211 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 212 | 212 | return false; |
| 213 | 213 | } |
| 214 | 214 | |
@@ -252,23 +252,23 @@ discard block |
||
| 252 | 252 | if (is_array($callable)) { |
| 253 | 253 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 254 | 254 | if ($func->isPrivate()) { |
| 255 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 255 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 256 | 256 | return false; |
| 257 | 257 | } |
| 258 | 258 | if ($func->isProtected()) { |
| 259 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 259 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 260 | 260 | return false; |
| 261 | 261 | } |
| 262 | 262 | if ($func->isConstructor()) { |
| 263 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 263 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 264 | 264 | return false; |
| 265 | 265 | } |
| 266 | 266 | if ($func->isDestructor()) { |
| 267 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 267 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 268 | 268 | return false; |
| 269 | 269 | } |
| 270 | 270 | if ($func->isAbstract()) { |
| 271 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 271 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 272 | 272 | return false; |
| 273 | 273 | } |
| 274 | 274 | /// @todo add more checks for static vs. nonstatic? |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | if ($func->isInternal()) { |
| 279 | 279 | // Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs |
| 280 | 280 | // instead of getparameters to fully reflect internal php functions ? |
| 281 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 281 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 282 | 282 | return false; |
| 283 | 283 | } |
| 284 | 284 | |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | $i = 0; |
| 331 | 331 | foreach ($func->getParameters() as $paramObj) { |
| 332 | 332 | $params[$i] = array(); |
| 333 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 333 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 334 | 334 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 335 | 335 | $i++; |
| 336 | 336 | } |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | // build a signature |
| 396 | 396 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 397 | 397 | $pSig = array($funcDesc['returnsDocs']); |
| 398 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 398 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 399 | 399 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 400 | 400 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 401 | 401 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | $numPars = $req->getNumParams(); |
| 453 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 453 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 454 | 454 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 455 | 455 | } |
| 456 | 456 | |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | |
| 464 | 464 | $result = call_user_func_array($callable, $params); |
| 465 | 465 | |
| 466 | - if (! is_a($result, $responseClass)) { |
|
| 466 | + if (!is_a($result, $responseClass)) { |
|
| 467 | 467 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 468 | 468 | $result = new $valueClass($result, $funcDesc['returns']); |
| 469 | 469 | } else { |
@@ -498,9 +498,9 @@ discard block |
||
| 498 | 498 | if ($newFuncName == '') { |
| 499 | 499 | if (is_array($callable)) { |
| 500 | 500 | if (is_string($callable[0])) { |
| 501 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 501 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 502 | 502 | } else { |
| 503 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 503 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 504 | 504 | } |
| 505 | 505 | } else { |
| 506 | 506 | if ($callable instanceof \Closure) { |
@@ -536,8 +536,8 @@ discard block |
||
| 536 | 536 | { |
| 537 | 537 | $namespace = '\\PhpXmlRpc\\'; |
| 538 | 538 | |
| 539 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 540 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 539 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 540 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 541 | 541 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 542 | 542 | |
| 543 | 543 | $i = 0; |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | // build body of new function |
| 573 | 573 | |
| 574 | 574 | $innerCode = "\$paramCount = \$req->getNumParams();\n"; |
| 575 | - $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 575 | + $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 576 | 576 | |
| 577 | 577 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 578 | 578 | if ($decodePhpObjects) { |
@@ -586,13 +586,13 @@ discard block |
||
| 586 | 586 | if (is_array($callable) && is_object($callable[0])) { |
| 587 | 587 | self::$objHolder[$newFuncName] = $callable[0]; |
| 588 | 588 | $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n"; |
| 589 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 589 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 590 | 590 | } else { |
| 591 | 591 | $realFuncName = $plainFuncName; |
| 592 | 592 | } |
| 593 | 593 | foreach ($parsVariations as $i => $pars) { |
| 594 | - $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 595 | - if ($i < (count($parsVariations) - 1)) |
|
| 594 | + $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 595 | + if ($i<(count($parsVariations)-1)) |
|
| 596 | 596 | $innerCode .= "else\n"; |
| 597 | 597 | } |
| 598 | 598 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
@@ -609,7 +609,7 @@ discard block |
||
| 609 | 609 | // if ($func->returnsReference()) |
| 610 | 610 | // return false; |
| 611 | 611 | |
| 612 | - $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}"; |
|
| 612 | + $code = "function $newFuncName(\$req) {\n".$innerCode."\n}"; |
|
| 613 | 613 | |
| 614 | 614 | return $code; |
| 615 | 615 | } |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 664 | 664 | { |
| 665 | 665 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 666 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 666 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | if (is_object($className)) { |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | } else { |
| 672 | 672 | $realClassName = $className; |
| 673 | 673 | } |
| 674 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 674 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | /** |
@@ -761,21 +761,21 @@ discard block |
||
| 761 | 761 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 762 | 762 | { |
| 763 | 763 | $namespace = '\\PhpXmlRpc\\'; |
| 764 | - $reqClass = $namespace . 'Request'; |
|
| 765 | - $valClass = $namespace . 'Value'; |
|
| 766 | - $decoderClass = $namespace . 'Encoder'; |
|
| 764 | + $reqClass = $namespace.'Request'; |
|
| 765 | + $valClass = $namespace.'Value'; |
|
| 766 | + $decoderClass = $namespace.'Encoder'; |
|
| 767 | 767 | |
| 768 | 768 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 769 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 769 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 770 | 770 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 771 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 771 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 772 | 772 | |
| 773 | 773 | $req = new $reqClass('system.methodSignature'); |
| 774 | 774 | $req->addparam(new $valClass($methodName)); |
| 775 | 775 | $client->setDebug($debug); |
| 776 | 776 | $response = $client->send($req, $timeout, $protocol); |
| 777 | 777 | if ($response->faultCode()) { |
| 778 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 778 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 779 | 779 | return false; |
| 780 | 780 | } |
| 781 | 781 | |
@@ -785,8 +785,8 @@ discard block |
||
| 785 | 785 | $mSig = $decoder->decode($mSig); |
| 786 | 786 | } |
| 787 | 787 | |
| 788 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 789 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 788 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 789 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 790 | 790 | return false; |
| 791 | 791 | } |
| 792 | 792 | |
@@ -802,11 +802,11 @@ discard block |
||
| 802 | 802 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 803 | 803 | { |
| 804 | 804 | $namespace = '\\PhpXmlRpc\\'; |
| 805 | - $reqClass = $namespace . 'Request'; |
|
| 806 | - $valClass = $namespace . 'Value'; |
|
| 805 | + $reqClass = $namespace.'Request'; |
|
| 806 | + $valClass = $namespace.'Value'; |
|
| 807 | 807 | |
| 808 | 808 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 809 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 809 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 810 | 810 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 811 | 811 | |
| 812 | 812 | $mDesc = ''; |
@@ -840,10 +840,10 @@ discard block |
||
| 840 | 840 | $clientClone = clone $client; |
| 841 | 841 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 842 | 842 | { |
| 843 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 843 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 844 | 844 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 845 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 846 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 845 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 846 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 847 | 847 | if (isset($extraOptions['return_on_fault'])) { |
| 848 | 848 | $decodeFault = true; |
| 849 | 849 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -852,9 +852,9 @@ discard block |
||
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | $namespace = '\\PhpXmlRpc\\'; |
| 855 | - $reqClass = $namespace . 'Request'; |
|
| 856 | - $encoderClass = $namespace . 'Encoder'; |
|
| 857 | - $valueClass = $namespace . 'Value'; |
|
| 855 | + $reqClass = $namespace.'Request'; |
|
| 856 | + $encoderClass = $namespace.'Encoder'; |
|
| 857 | + $valueClass = $namespace.'Value'; |
|
| 858 | 858 | |
| 859 | 859 | $encoder = new $encoderClass(); |
| 860 | 860 | $encodeOptions = array(); |
@@ -925,13 +925,13 @@ discard block |
||
| 925 | 925 | * @param string $mDesc |
| 926 | 926 | * @return string[] keys: source, docstring |
| 927 | 927 | */ |
| 928 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 928 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 929 | 929 | { |
| 930 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 930 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 931 | 931 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 932 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 933 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 934 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 932 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 933 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 934 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 935 | 935 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 936 | 936 | if (isset($extraOptions['return_on_fault'])) { |
| 937 | 937 | $decodeFault = true; |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | $namespace = '\\PhpXmlRpc\\'; |
| 945 | 945 | |
| 946 | 946 | $code = "function $newFuncName ("; |
| 947 | - if ($clientCopyMode < 2) { |
|
| 947 | + if ($clientCopyMode<2) { |
|
| 948 | 948 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 949 | 949 | $verbatimClientCopy = !$clientCopyMode; |
| 950 | 950 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -959,7 +959,7 @@ discard block |
||
| 959 | 959 | |
| 960 | 960 | if ($mDesc != '') { |
| 961 | 961 | // take care that PHP comment is not terminated unwillingly by method description |
| 962 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 962 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 963 | 963 | } else { |
| 964 | 964 | $mDesc = "/**\nFunction $newFuncName\n"; |
| 965 | 965 | } |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 969 | 969 | $plist = array(); |
| 970 | 970 | $pCount = count($mSig); |
| 971 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 971 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 972 | 972 | $plist[] = "\$p$i"; |
| 973 | 973 | $pType = $mSig[$i]; |
| 974 | 974 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -984,19 +984,19 @@ discard block |
||
| 984 | 984 | } |
| 985 | 985 | } |
| 986 | 986 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 987 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 987 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 988 | 988 | } |
| 989 | - if ($clientCopyMode < 2) { |
|
| 989 | + if ($clientCopyMode<2) { |
|
| 990 | 990 | $plist[] = '$debug=0'; |
| 991 | 991 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 992 | 992 | } |
| 993 | 993 | $plist = implode(', ', $plist); |
| 994 | - $mDesc .= "* @return {$namespace}Response|" . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 994 | + $mDesc .= "* @return {$namespace}Response|".$this->xmlrpc2PhpType($mSig[0])." (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 995 | 995 | |
| 996 | 996 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 997 | 997 | if ($decodeFault) { |
| 998 | 998 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 999 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 999 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 1000 | 1000 | } else { |
| 1001 | 1001 | $respCode = var_export($faultResponse, true); |
| 1002 | 1002 | } |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 1010 | 1010 | } |
| 1011 | 1011 | |
| 1012 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 1012 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 1013 | 1013 | |
| 1014 | 1014 | return array('source' => $code, 'docstring' => $mDesc); |
| 1015 | 1015 | } |
@@ -1035,23 +1035,23 @@ discard block |
||
| 1035 | 1035 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1036 | 1036 | { |
| 1037 | 1037 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1038 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1038 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1039 | 1039 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1040 | 1040 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1041 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1042 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1041 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1042 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1043 | 1043 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1044 | 1044 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1045 | 1045 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1046 | 1046 | $namespace = '\\PhpXmlRpc\\'; |
| 1047 | 1047 | |
| 1048 | - $reqClass = $namespace . 'Request'; |
|
| 1049 | - $decoderClass = $namespace . 'Encoder'; |
|
| 1048 | + $reqClass = $namespace.'Request'; |
|
| 1049 | + $decoderClass = $namespace.'Encoder'; |
|
| 1050 | 1050 | |
| 1051 | 1051 | $req = new $reqClass('system.listMethods'); |
| 1052 | 1052 | $response = $client->send($req, $timeout, $protocol); |
| 1053 | 1053 | if ($response->faultCode()) { |
| 1054 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1054 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1055 | 1055 | |
| 1056 | 1056 | return false; |
| 1057 | 1057 | } else { |
@@ -1061,7 +1061,7 @@ discard block |
||
| 1061 | 1061 | $mList = $decoder->decode($mList); |
| 1062 | 1062 | } |
| 1063 | 1063 | if (!is_array($mList) || !count($mList)) { |
| 1064 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1064 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1065 | 1065 | |
| 1066 | 1066 | return false; |
| 1067 | 1067 | } else { |
@@ -1069,8 +1069,8 @@ discard block |
||
| 1069 | 1069 | if ($newClassName != '') { |
| 1070 | 1070 | $xmlrpcClassName = $newClassName; |
| 1071 | 1071 | } else { |
| 1072 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1073 | - array('_', ''), $client->server) . '_client'; |
|
| 1072 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1073 | + array('_', ''), $client->server).'_client'; |
|
| 1074 | 1074 | } |
| 1075 | 1075 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1076 | 1076 | $xmlrpcClassName .= 'x'; |
@@ -1101,20 +1101,20 @@ discard block |
||
| 1101 | 1101 | if (!$buildIt) { |
| 1102 | 1102 | $source .= $methodWrap['docstring']; |
| 1103 | 1103 | } |
| 1104 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1104 | + $source .= $methodWrap['source']."\n"; |
|
| 1105 | 1105 | } else { |
| 1106 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1106 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1107 | 1107 | } |
| 1108 | 1108 | } |
| 1109 | 1109 | } |
| 1110 | 1110 | $source .= "}\n"; |
| 1111 | 1111 | if ($buildIt) { |
| 1112 | 1112 | $allOK = 0; |
| 1113 | - eval($source . '$allOK=1;'); |
|
| 1113 | + eval($source.'$allOK=1;'); |
|
| 1114 | 1114 | if ($allOK) { |
| 1115 | 1115 | return $xmlrpcClassName; |
| 1116 | 1116 | } else { |
| 1117 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1117 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1118 | 1118 | return false; |
| 1119 | 1119 | } |
| 1120 | 1120 | } else { |
@@ -1136,8 +1136,8 @@ discard block |
||
| 1136 | 1136 | */ |
| 1137 | 1137 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1138 | 1138 | { |
| 1139 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) . |
|
| 1140 | - "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n"; |
|
| 1139 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path). |
|
| 1140 | + "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server)."', $client->port);\n"; |
|
| 1141 | 1141 | |
| 1142 | 1142 | // copy all client fields to the client that will be generated runtime |
| 1143 | 1143 | // (this provides for future expansion or subclassing of client obj) |
