gggeek /
phpxmlrpc
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>phpxmlrpc - Agesort demo</title></head> |
@@ -17,21 +17,21 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | $inAr = array( |
| 19 | 19 | array('name' => 'Dave', 'age' => 24), |
| 20 | - array('name' => 'Edd', 'age' => 45), |
|
| 21 | - array('name' => 'Joe', 'age' => 37), |
|
| 20 | + array('name' => 'Edd', 'age' => 45), |
|
| 21 | + array('name' => 'Joe', 'age' => 37), |
|
| 22 | 22 | array('name' => 'Fred', 'age' => 27), |
| 23 | 23 | ); |
| 24 | 24 | |
| 25 | 25 | output('This is the input data:<br/><pre>'); |
| 26 | 26 | foreach ($inAr as $val) { |
| 27 | - output($val['name'] . ", " . $val['age'] . "\n"); |
|
| 27 | + output($val['name'].", ".$val['age']."\n"); |
|
| 28 | 28 | } |
| 29 | 29 | output('</pre>'); |
| 30 | 30 | |
| 31 | 31 | // Create xml-rpc parameters from the input array: an array of structs |
| 32 | 32 | $encoder = new Encoder(); |
| 33 | 33 | $v = $encoder->encode($inAr); |
| 34 | -output("Encoded into xml-rpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n"); |
|
| 34 | +output("Encoded into xml-rpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n"); |
|
| 35 | 35 | |
| 36 | 36 | // create client and request objects |
| 37 | 37 | $req = new Request('examples.sortByAge', array($v)); |
@@ -51,15 +51,15 @@ discard block |
||
| 51 | 51 | $value = $resp->value(); |
| 52 | 52 | foreach ($encoder->decode($value) as $struct) { |
| 53 | 53 | // note: here we are trusting the server's response to have the expected format |
| 54 | - output(htmlspecialchars($struct['name']) . ", " . htmlspecialchars($struct['age']) . "\n"); |
|
| 54 | + output(htmlspecialchars($struct['name']).", ".htmlspecialchars($struct['age'])."\n"); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - output('</pre><hr/>For nerds: I got this value back<br/><pre>' . |
|
| 58 | - htmlentities($resp->serialize()) . "</pre><hr/>\n"); |
|
| 57 | + output('</pre><hr/>For nerds: I got this value back<br/><pre>'. |
|
| 58 | + htmlentities($resp->serialize())."</pre><hr/>\n"); |
|
| 59 | 59 | } else { |
| 60 | 60 | output('An error occurred:<pre>'); |
| 61 | - output('Code: ' . htmlspecialchars($resp->faultCode()) . |
|
| 62 | - "\nReason: '" . htmlspecialchars($resp->faultString()) . "'</pre><hr/>"); |
|
| 61 | + output('Code: '.htmlspecialchars($resp->faultCode()). |
|
| 62 | + "\nReason: '".htmlspecialchars($resp->faultString())."'</pre><hr/>"); |
|
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | output("</body></html>\n"); |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | */ |
| 27 | 27 | function plain_findstate($stateNo) |
| 28 | 28 | { |
| 29 | - if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
| 29 | + if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
| 30 | 30 | return exampleMethods::$stateNames[$stateNo - 1]; |
| 31 | 31 | } else { |
| 32 | 32 | // not, there so complain |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | function plain_findstate($stateNo) |
| 28 | 28 | { |
| 29 | - if (isset(exampleMethods::$stateNames[$stateNo - 1])) { |
|
| 30 | - return exampleMethods::$stateNames[$stateNo - 1]; |
|
| 29 | + if (isset(exampleMethods::$stateNames[$stateNo-1])) { |
|
| 30 | + return exampleMethods::$stateNames[$stateNo-1]; |
|
| 31 | 31 | } else { |
| 32 | 32 | // not, there so complain |
| 33 | - throw new Exception("I don't have a state for the index '" . $stateNo . "'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 33 | + throw new Exception("I don't have a state for the index '".$stateNo."'", PhpXmlRpc\PhpXmlRpc::$xmlrpcerruser); |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($req->getNumParams()) { |
| 70 | 70 | $p1 = $req->getParam(0); |
| 71 | 71 | if ($p1->kindOf() === 'scalar') { |
| 72 | - $errNum = (int)$p1->scalarVal(); |
|
| 72 | + $errNum = (int) $p1->scalarVal(); |
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | throw new Exception("it's just a test", $errNum); |
@@ -141,13 +141,13 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | $findstate10_sig = array( |
| 143 | 143 | /// @todo add a demo and test with closure usage |
| 144 | - "function" => function ($req) { return exampleMethods::findState($req); }, |
|
| 144 | + "function" => function($req) { return exampleMethods::findState($req); }, |
|
| 145 | 145 | "signature" => array(array(Value::$xmlrpcString, Value::$xmlrpcInt)), |
| 146 | - "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the ' . |
|
| 146 | + "docstring" => 'When passed an integer between 1 and 51 returns the name of a US state, where the integer is the '. |
|
| 147 | 147 | 'index of that state name in an alphabetic order.', |
| 148 | 148 | ); |
| 149 | 149 | |
| 150 | -$findstate11_sig = $wrapper->wrapPhpFunction(function ($stateNo) { return plain_findstate($stateNo); }); |
|
| 150 | +$findstate11_sig = $wrapper->wrapPhpFunction(function($stateNo) { return plain_findstate($stateNo); }); |
|
| 151 | 151 | |
| 152 | 152 | /// @todo do we really need a new instance ? |
| 153 | 153 | $c = new handlersContainer(); |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | |
| 157 | 157 | $namespaceSignatures = $wrapper->wrapPhpClass($c, array('prefix' => 'namespacetest.', 'replace_class_name' => true, 'method_filter' => '/^findState$/', 'method_type' => 'static')); |
| 158 | 158 | |
| 159 | -$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 159 | +$returnObj_sig = $wrapper->wrapPhpFunction(array($c, 'returnObject'), '', array('encode_php_objs' => true)); |
|
| 160 | 160 | |
| 161 | 161 | return array_merge( |
| 162 | 162 | array( |
@@ -8,5 +8,5 @@ |
||
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer |
| 11 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
| 11 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
| 12 | 12 | PhpXmlRpc\Autoloader::register(); |
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | /** |
| 5 | 5 | * Demoing the charset conversion of the library: create a client class which uses data in the CP-1252 character set, |
@@ -17,7 +17,7 @@ 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 | } |
@@ -33,30 +33,30 @@ discard block |
||
| 33 | 33 | /// @const JSXMLRPC_PATH Path to the visual xml-rpc editing dialog's containing folder. Can be absolute, or |
| 34 | 34 | /// relative to this debugger's folder. |
| 35 | 35 | if (defined('JSXMLRPC_PATH')) { |
| 36 | - $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH)); |
|
| 36 | + $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH)); |
|
| 37 | 37 | } else { |
| 38 | 38 | $editorpaths = array( |
| 39 | - __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile |
|
| 40 | - __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger |
|
| 41 | - __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger |
|
| 42 | - __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 43 | - __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 44 | - __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 45 | - __DIR__ . '/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc) |
|
| 46 | - __DIR__ . '/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer |
|
| 47 | - __DIR__ . '/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm |
|
| 48 | - __DIR__ . '/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project |
|
| 39 | + __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile |
|
| 40 | + __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger |
|
| 41 | + __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger |
|
| 42 | + __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 43 | + __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 44 | + __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 45 | + __DIR__.'/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc) |
|
| 46 | + __DIR__.'/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer |
|
| 47 | + __DIR__.'/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm |
|
| 48 | + __DIR__.'/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project |
|
| 49 | 49 | ); |
| 50 | 50 | } |
| 51 | - foreach($editorpaths as $editorpath) { |
|
| 52 | - if (is_file(realpath($editorpath . 'visualeditor.html'))) { |
|
| 51 | + foreach ($editorpaths as $editorpath) { |
|
| 52 | + if (is_file(realpath($editorpath.'visualeditor.html'))) { |
|
| 53 | 53 | $haseditor = true; |
| 54 | 54 | break; |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | if ($haseditor) { |
| 58 | - $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
| 59 | - $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath); |
|
| 58 | + $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
| 59 | + $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath); |
|
| 60 | 60 | /// @todo for cases above 4 and up, look at $controllerRootUrl and check if the web root is not pointing directly |
| 61 | 61 | /// at this folder, as in that case the link to the visualeditor will not |
| 62 | 62 | /// work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | function activateeditor() { |
| 236 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\", "\\'"), $alt_payload); ?>'; |
|
| 236 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
| 237 | 237 | if (document.frmaction.wstype.value == "1") |
| 238 | 238 | url += '&type=jsonrpc'; |
| 239 | 239 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | JSON-RPC'; |
| 279 | 279 | } ?> |
| 280 | 280 | Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?> |
| 281 | -<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
| 281 | +<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. '.htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
| 282 | 282 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
| 283 | 283 | |
| 284 | 284 | <table id="serverblock"> |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | </select> |
| 340 | 340 | </td> |
| 341 | 341 | <td class="labelcell">Timeout:</td> |
| 342 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 342 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 343 | 343 | <td></td> |
| 344 | 344 | <td></td> |
| 345 | 345 | </tr> |
@@ -66,7 +66,12 @@ discard block |
||
| 66 | 66 | <html lang="en"> |
| 67 | 67 | <head> |
| 68 | 68 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 69 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
| 69 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 70 | + echo 'JSON-RPC'; |
|
| 71 | +} else { |
|
| 72 | + echo 'XML-RPC'; |
|
| 73 | +} |
|
| 74 | +?> Debugger</title> |
|
| 70 | 75 | <meta name="robots" content="index,nofollow"/> |
| 71 | 76 | <script type="text/javascript" language="Javascript"> |
| 72 | 77 | if (window.name != 'frmcontroller') |
@@ -266,19 +271,26 @@ discard block |
||
| 266 | 271 | </script> |
| 267 | 272 | </head> |
| 268 | 273 | <body |
| 269 | - onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) { |
|
| 274 | + onload="<?php if ($hasjsonrpcclient) { |
|
| 275 | + echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) { |
|
| 270 | 276 | echo ' document.frmaction.submit();'; |
| 277 | +} |
|
| 271 | 278 | } ?>"> |
| 272 | 279 | <h1>XML-RPC |
| 273 | 280 | <?php if ($hasjsonrpcclient) { |
| 274 | 281 | echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"'; |
| 275 | 282 | // q: does this if make sense at all? |
| 276 | - if (!class_exists('\PhpXmlRpc\Client')) echo ' disabled="disabled"'; |
|
| 283 | + if (!class_exists('\PhpXmlRpc\Client')) { |
|
| 284 | + echo ' disabled="disabled"'; |
|
| 285 | + } |
|
| 277 | 286 | echo ' /></form> / <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form> |
| 278 | 287 | JSON-RPC'; |
| 279 | 288 | } ?> |
| 280 | 289 | Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?> |
| 281 | -<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
| 290 | +<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) { |
|
| 291 | + echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); |
|
| 292 | +} |
|
| 293 | +?>)</h3> |
|
| 282 | 294 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
| 283 | 295 | |
| 284 | 296 | <table id="serverblock"> |
@@ -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 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
| 18 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 19 | + echo 'JSON-RPC'; |
|
| 20 | +} else { |
|
| 21 | + echo 'XML-RPC'; |
|
| 22 | +} |
|
| 23 | +?> Debugger</title> |
|
| 19 | 24 | <meta name="robots" content="index,nofollow"/> |
| 20 | 25 | <style type="text/css"> |
| 21 | 26 | <!-- |
@@ -367,7 +372,9 @@ discard block |
||
| 367 | 372 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
| 368 | 373 | if ($x->count() > 1) { |
| 369 | 374 | foreach($x as $k => $y) { |
| 370 | - if ($k == 0) continue; |
|
| 375 | + if ($k == 0) { |
|
| 376 | + continue; |
|
| 377 | + } |
|
| 371 | 378 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 372 | 379 | if ($wstype == 1) { |
| 373 | 380 | switch($y->scalarval()) { |
@@ -78,13 +78,13 @@ discard block |
||
| 78 | 78 | <body> |
| 79 | 79 | <?php |
| 80 | 80 | |
| 81 | -include __DIR__ . '/common.php'; |
|
| 81 | +include __DIR__.'/common.php'; |
|
| 82 | 82 | |
| 83 | 83 | if ($action) { |
| 84 | 84 | |
| 85 | 85 | // avoid php hanging when using the builtin webserver and sending requests to itself |
| 86 | 86 | $skip = false; |
| 87 | - if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) { |
|
| 87 | + if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) { |
|
| 88 | 88 | $localHost = explode(':', $_SERVER['HTTP_HOST']); |
| 89 | 89 | /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters, |
| 90 | 90 | /// and that proxy is us |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | if (!$skip) { |
| 98 | 98 | // make sure the script waits long enough for the call to complete... |
| 99 | 99 | if ($timeout) { |
| 100 | - set_time_limit($timeout + 10); |
|
| 100 | + set_time_limit($timeout+10); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | if ($wstype == 1) { |
@@ -118,13 +118,13 @@ discard block |
||
| 118 | 118 | $server = "$host$path"; |
| 119 | 119 | } |
| 120 | 120 | if ($protocol == 2 || $protocol == 3) { |
| 121 | - $server = 'https://' . $server; |
|
| 121 | + $server = 'https://'.$server; |
|
| 122 | 122 | } else { |
| 123 | - $server = 'http://' . $server; |
|
| 123 | + $server = 'http://'.$server; |
|
| 124 | 124 | } |
| 125 | 125 | if ($proxy != '') { |
| 126 | 126 | $pproxy = explode(':', $proxy); |
| 127 | - if (count($pproxy) > 1) { |
|
| 127 | + if (count($pproxy)>1) { |
|
| 128 | 128 | $pport = $pproxy[1]; |
| 129 | 129 | } else { |
| 130 | 130 | $pport = 8080; |
@@ -199,9 +199,9 @@ discard block |
||
| 199 | 199 | case 'wrap': |
| 200 | 200 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 201 | 201 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 202 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 202 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 203 | 203 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 204 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 204 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 205 | 205 | break; |
| 206 | 206 | case 'list': |
| 207 | 207 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | $msg[0] = new $requestClass($method, array(), $id); |
| 215 | 215 | // hack! build payload by hand |
| 216 | 216 | if ($wstype == 1) { |
| 217 | - $payload = "{\n" . |
|
| 218 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 219 | - $payload . |
|
| 217 | + $payload = "{\n". |
|
| 218 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 219 | + $payload. |
|
| 220 | 220 | "\n],\n\"id\": "; |
| 221 | 221 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 222 | 222 | if ($id == "") { |
@@ -231,22 +231,22 @@ discard block |
||
| 231 | 231 | $msg[0]->setPayload($payload); |
| 232 | 232 | } else { |
| 233 | 233 | $msg[0]->setPayload( |
| 234 | - $msg[0]->xml_header($inputcharset) . |
|
| 235 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 236 | - $payload . |
|
| 237 | - "</params>\n" . $msg[0]->xml_footer() |
|
| 234 | + $msg[0]->xml_header($inputcharset). |
|
| 235 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 236 | + $payload. |
|
| 237 | + "</params>\n".$msg[0]->xml_footer() |
|
| 238 | 238 | ); |
| 239 | 239 | } |
| 240 | - $actionname = 'Execution of method ' . $method; |
|
| 240 | + $actionname = 'Execution of method '.$method; |
|
| 241 | 241 | break; |
| 242 | 242 | default: // give a warning |
| 243 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 243 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 248 | 248 | // this gives good user feedback for long-running methods... |
| 249 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 249 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 250 | 250 | flush(); |
| 251 | 251 | |
| 252 | 252 | $response = null; |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | break; |
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | - $time = microtime(true) - $time; |
|
| 266 | + $time = microtime(true)-$time; |
|
| 267 | 267 | if ($debug) { |
| 268 | 268 | echo "</div>\n"; |
| 269 | 269 | } |
@@ -273,8 +273,8 @@ discard block |
||
| 273 | 273 | // call failed! echo out error msg! |
| 274 | 274 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 275 | 275 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 276 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 277 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 276 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 277 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 278 | 278 | echo(date("d/M/Y:H:i:s\n")); |
| 279 | 279 | } else { |
| 280 | 280 | // call succeeded: parse results |
@@ -290,36 +290,36 @@ discard block |
||
| 290 | 290 | $max = $v->count(); |
| 291 | 291 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 292 | 292 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 293 | - foreach($v as $i => $rec) { |
|
| 293 | + foreach ($v as $i => $rec) { |
|
| 294 | 294 | if ($i % 2) { |
| 295 | 295 | $class = ' class="oddrow"'; |
| 296 | 296 | } else { |
| 297 | 297 | $class = ' class="evenrow"'; |
| 298 | 298 | } |
| 299 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 300 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 301 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 302 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 320 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 321 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 322 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 299 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 300 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 301 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 302 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 320 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 321 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 322 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 323 | 323 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 324 | 324 | //echo("</tr>\n"); |
| 325 | 325 | |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | $r2 = $resp[1]->value(); |
| 347 | 347 | |
| 348 | 348 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 349 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 349 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 350 | 350 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 351 | 351 | if ($desc == "") { |
| 352 | 352 | $desc = "-"; |
@@ -356,24 +356,24 @@ discard block |
||
| 356 | 356 | if ($r2->kindOf() != "array") { |
| 357 | 357 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 358 | 358 | } else { |
| 359 | - foreach($r2 as $i => $x) { |
|
| 359 | + foreach ($r2 as $i => $x) { |
|
| 360 | 360 | $payload = ""; |
| 361 | 361 | $alt_payload = ""; |
| 362 | - if ($i + 1 % 2) { |
|
| 362 | + if ($i+1 % 2) { |
|
| 363 | 363 | $class = ' class="oddrow"'; |
| 364 | 364 | } else { |
| 365 | 365 | $class = ' class="evenrow"'; |
| 366 | 366 | } |
| 367 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 367 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 368 | 368 | if ($x->kindOf() == "array") { |
| 369 | 369 | $ret = $x[0]; |
| 370 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 371 | - if ($x->count() > 1) { |
|
| 372 | - foreach($x as $k => $y) { |
|
| 370 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 371 | + if ($x->count()>1) { |
|
| 372 | + foreach ($x as $k => $y) { |
|
| 373 | 373 | if ($k == 0) continue; |
| 374 | 374 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 375 | 375 | if ($wstype == 1) { |
| 376 | - switch($y->scalarval()) { |
|
| 376 | + switch ($y->scalarval()) { |
|
| 377 | 377 | case 'string': |
| 378 | 378 | case 'dateTime.iso8601': |
| 379 | 379 | case 'base64': |
@@ -406,22 +406,22 @@ discard block |
||
| 406 | 406 | } else { |
| 407 | 407 | $type = $y->scalarval(); |
| 408 | 408 | $payload .= '<param><value>'; |
| 409 | - switch($type) { |
|
| 409 | + switch ($type) { |
|
| 410 | 410 | case 'undefined': |
| 411 | 411 | break; |
| 412 | 412 | case 'null': |
| 413 | 413 | $type = 'nil'; |
| 414 | 414 | // fall thru intentionally |
| 415 | 415 | default: |
| 416 | - $payload .= '<' . |
|
| 417 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 418 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 416 | + $payload .= '<'. |
|
| 417 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 418 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 419 | 419 | '>'; |
| 420 | 420 | } |
| 421 | 421 | $payload .= "</value></param>\n"; |
| 422 | 422 | } |
| 423 | 423 | $alt_payload .= $y->scalarval(); |
| 424 | - if ($k < $x->count() - 1) { |
|
| 424 | + if ($k<$x->count()-1) { |
|
| 425 | 425 | $alt_payload .= ';'; |
| 426 | 426 | if ($wstype == 1) { |
| 427 | 427 | $payload .= ', '; |
@@ -437,63 +437,63 @@ discard block |
||
| 437 | 437 | echo '</td>'; |
| 438 | 438 | // button to test this method |
| 439 | 439 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 440 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 441 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 461 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 462 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 463 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 440 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 441 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 461 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 462 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 463 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 464 | 464 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 465 | 465 | //if ($wstype != 1) { |
| 466 | 466 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 467 | 467 | //} |
| 468 | 468 | echo "</form></td>\n"; |
| 469 | 469 | |
| 470 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 471 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 472 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 473 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 474 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 475 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 476 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 477 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 478 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 479 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 480 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 481 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 482 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 483 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 484 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 485 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 486 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 487 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 488 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 489 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 490 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 491 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 492 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 493 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 494 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 495 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 496 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 470 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 471 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 472 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 473 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 474 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 475 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 476 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 477 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 478 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 479 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 480 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 481 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 482 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 483 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 484 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 485 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 486 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 487 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 488 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 489 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 490 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 491 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 492 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 493 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 494 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 495 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 496 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 497 | 497 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 498 | 498 | echo "</form></td></tr>\n"; |
| 499 | 499 | } |
@@ -505,14 +505,14 @@ discard block |
||
| 505 | 505 | case 'wrap': |
| 506 | 506 | $r1 = $resp[0]->value(); |
| 507 | 507 | $r2 = $resp[1]->value(); |
| 508 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 508 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 509 | 509 | echo "Error: signature unknown\n"; |
| 510 | 510 | } else { |
| 511 | 511 | $mdesc = $r1->scalarval(); |
| 512 | 512 | $encoder = new PhpXmlRpc\Encoder(); |
| 513 | 513 | $msig = $encoder->decode($r2); |
| 514 | 514 | $msig = $msig[$methodsig]; |
| 515 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 515 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 516 | 516 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 517 | 517 | $clientcookies == '') { |
| 518 | 518 | $opts = 1; // simple client copy in stub code |
@@ -533,12 +533,12 @@ discard block |
||
| 533 | 533 | $client, |
| 534 | 534 | $method, |
| 535 | 535 | array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true), |
| 536 | - str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc |
|
| 536 | + str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc |
|
| 537 | 537 | ); |
| 538 | 538 | //if ($code) |
| 539 | 539 | //{ |
| 540 | 540 | echo "<div id=\"phpcode\">\n"; |
| 541 | - highlight_string("<?php\n" . $code['docstring'] . $code['source']); |
|
| 541 | + highlight_string("<?php\n".$code['docstring'].$code['source']); |
|
| 542 | 542 | echo "\n</div>"; |
| 543 | 543 | //} |
| 544 | 544 | //else |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | break; |
| 550 | 550 | |
| 551 | 551 | case 'execute': |
| 552 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 552 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 553 | 553 | break; |
| 554 | 554 | |
| 555 | 555 | default: // give a warning |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | // assume this is either a standalone install, or installed as Composer dependency |
| 21 | 21 | /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level |
| 22 | 22 | /// debugger include this one, taking care of autoloading? |
| 23 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
| 23 | + include_once __DIR__."/../src/Autoloader.php"; |
|
| 24 | 24 | PhpXmlRpc\Autoloader::register(); |
| 25 | 25 | } |
| 26 | 26 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | // Variables that shouldn't be unset |
| 37 | - $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 37 | + $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 38 | 38 | |
| 39 | 39 | $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, |
| 40 | 40 | isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array() |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $id = ''; |
| 87 | 87 | if (isset($_GET['action'])) { |
| 88 | 88 | if (isset($_GET['wstype']) && ($_GET['wstype'] == '1' || $_GET['wstype'] == '0')) { |
| 89 | - $wstype = (int)$_GET['wstype']; |
|
| 89 | + $wstype = (int) $_GET['wstype']; |
|
| 90 | 90 | if ($wstype === 1 && !$hasjsonrpcclient) { |
| 91 | 91 | $wstype = 0; |
| 92 | 92 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xml-rpc error... |
| 98 | 98 | if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2' || $_GET['protocol'] == '3' |
| 99 | 99 | || $_GET['protocol'] == '4')) { |
| 100 | - $protocol = (int)$_GET['protocol']; |
|
| 100 | + $protocol = (int) $_GET['protocol']; |
|
| 101 | 101 | } |
| 102 | 102 | if (strpos($host, 'http://') === 0) { |
| 103 | 103 | // NB: if protocol is https or h2, it will override http:// |
@@ -109,18 +109,18 @@ discard block |
||
| 109 | 109 | $protocol = 2; |
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | - $port = isset($_GET['port']) ? (int)$_GET['port'] : ''; |
|
| 112 | + $port = isset($_GET['port']) ? (int) $_GET['port'] : ''; |
|
| 113 | 113 | if ($port === 0) { |
| 114 | 114 | $port = ''; |
| 115 | 115 | } |
| 116 | 116 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
| 117 | 117 | // in case user forgot initial '/' in xml-rpc server path, add it back |
| 118 | 118 | if ($path && ($path[0]) != '/') { |
| 119 | - $path = '/' . $path; |
|
| 119 | + $path = '/'.$path; |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
| 123 | - $debug = (int)$_GET['debug']; |
|
| 123 | + $debug = (int) $_GET['debug']; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0; |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | /// @todo what about an https proxy? |
| 138 | 138 | $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : ''; |
| 139 | 139 | $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : ''; |
| 140 | - $timeout = isset($_GET['timeout']) ? (int)$_GET['timeout'] : 0; |
|
| 140 | + $timeout = isset($_GET['timeout']) ? (int) $_GET['timeout'] : 0; |
|
| 141 | 141 | $action = $_GET['action']; |
| 142 | 142 | |
| 143 | 143 | $method = isset($_GET['method']) ? $_GET['method'] : ''; |
@@ -152,15 +152,15 @@ discard block |
||
| 152 | 152 | $username = isset($_GET['username']) ? $_GET['username'] : ''; |
| 153 | 153 | $password = isset($_GET['password']) ? $_GET['password'] : ''; |
| 154 | 154 | |
| 155 | - $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int)$_GET['authtype'] : 1; |
|
| 155 | + $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int) $_GET['authtype'] : 1; |
|
| 156 | 156 | |
| 157 | 157 | if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) { |
| 158 | - (int)$requestcompression = $_GET['requestcompression']; |
|
| 158 | + (int) $requestcompression = $_GET['requestcompression']; |
|
| 159 | 159 | } else { |
| 160 | 160 | $requestcompression = 0; |
| 161 | 161 | } |
| 162 | 162 | if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) { |
| 163 | - $responsecompression = (int)$_GET['responsecompression']; |
|
| 163 | + $responsecompression = (int) $_GET['responsecompression']; |
|
| 164 | 164 | } else { |
| 165 | 165 | $responsecompression = 0; |
| 166 | 166 | } |
@@ -605,8 +605,9 @@ |
||
| 605 | 605 | } |
| 606 | 606 | foreach ($parsVariations as $i => $pars) { |
| 607 | 607 | $innerCode .= " if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
| 608 | - if ($i < (count($parsVariations) - 1)) |
|
| 609 | - $innerCode .= " else\n"; |
|
| 608 | + if ($i < (count($parsVariations) - 1)) { |
|
| 609 | + $innerCode .= " else\n"; |
|
| 610 | + } |
|
| 610 | 611 | } |
| 611 | 612 | $innerCode .= " if (is_a(\$retVal, '" . static::$namespace . "Response'))\n return \$retVal;\n else\n"; |
| 612 | 613 | /// q: why not do the same for int, float, bool, string? |
@@ -173,20 +173,20 @@ discard block |
||
| 173 | 173 | $callable = explode('::', $callable); |
| 174 | 174 | } |
| 175 | 175 | if (is_array($callable)) { |
| 176 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 177 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 176 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 177 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 178 | 178 | return false; |
| 179 | 179 | } |
| 180 | 180 | if (is_string($callable[0])) { |
| 181 | 181 | $plainFuncName = implode('::', $callable); |
| 182 | 182 | } elseif (is_object($callable[0])) { |
| 183 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 183 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 184 | 184 | } |
| 185 | 185 | $exists = method_exists($callable[0], $callable[1]); |
| 186 | 186 | } else if ($callable instanceof \Closure) { |
| 187 | 187 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 188 | 188 | if (!$buildIt) { |
| 189 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 189 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 190 | 190 | return false; |
| 191 | 191 | } |
| 192 | 192 | |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | if (!$exists) { |
| 201 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 201 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 202 | 202 | return false; |
| 203 | 203 | } |
| 204 | 204 | |
@@ -242,23 +242,23 @@ discard block |
||
| 242 | 242 | if (is_array($callable)) { |
| 243 | 243 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 244 | 244 | if ($func->isPrivate()) { |
| 245 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 245 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 246 | 246 | return false; |
| 247 | 247 | } |
| 248 | 248 | if ($func->isProtected()) { |
| 249 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 249 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 250 | 250 | return false; |
| 251 | 251 | } |
| 252 | 252 | if ($func->isConstructor()) { |
| 253 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 253 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 254 | 254 | return false; |
| 255 | 255 | } |
| 256 | 256 | if ($func->isDestructor()) { |
| 257 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 257 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 258 | 258 | return false; |
| 259 | 259 | } |
| 260 | 260 | if ($func->isAbstract()) { |
| 261 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 261 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 262 | 262 | return false; |
| 263 | 263 | } |
| 264 | 264 | /// @todo add more checks for static vs. nonstatic? |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | if ($func->isInternal()) { |
| 269 | 269 | /// @todo from PHP 5.1.0 onward, we should be able to use invokeargs instead of getparameters to fully |
| 270 | 270 | /// reflect internal php functions |
| 271 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 271 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 272 | 272 | return false; |
| 273 | 273 | } |
| 274 | 274 | |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | $i = 0; |
| 329 | 329 | foreach ($func->getParameters() as $paramObj) { |
| 330 | 330 | $params[$i] = array(); |
| 331 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 331 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 332 | 332 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 333 | 333 | if (method_exists($paramObj, 'getType')) { |
| 334 | 334 | $paramType = $paramObj->getType(); |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | // build a signature |
| 400 | 400 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 401 | 401 | $pSig = array($funcDesc['returnsDocs']); |
| 402 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 402 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 403 | 403 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 404 | 404 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 405 | 405 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | } |
| 456 | 456 | } |
| 457 | 457 | $numPars = $req->getNumParams(); |
| 458 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 458 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 459 | 459 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 460 | 460 | } |
| 461 | 461 | |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | |
| 469 | 469 | $result = call_user_func_array($callable, $params); |
| 470 | 470 | |
| 471 | - if (! is_a($result, $responseClass)) { |
|
| 471 | + if (!is_a($result, $responseClass)) { |
|
| 472 | 472 | // q: why not do the same for int, float, bool, string? |
| 473 | 473 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 474 | 474 | $result = new $valueClass($result, $funcDesc['returns']); |
@@ -507,9 +507,9 @@ discard block |
||
| 507 | 507 | if ($newFuncName == '') { |
| 508 | 508 | if (is_array($callable)) { |
| 509 | 509 | if (is_string($callable[0])) { |
| 510 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 510 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 511 | 511 | } else { |
| 512 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 512 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 513 | 513 | } |
| 514 | 514 | } else { |
| 515 | 515 | if ($callable instanceof \Closure) { |
@@ -541,9 +541,9 @@ discard block |
||
| 541 | 541 | */ |
| 542 | 542 | protected function buildWrapFunctionSource($callable, $newFuncName, $extraOptions, $plainFuncName, $funcDesc) |
| 543 | 543 | { |
| 544 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 545 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 546 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 544 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 545 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 546 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 547 | 547 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 548 | 548 | |
| 549 | 549 | $i = 0; |
@@ -578,9 +578,9 @@ discard block |
||
| 578 | 578 | // build body of new function |
| 579 | 579 | |
| 580 | 580 | $innerCode = " \$paramCount = \$req->getNumParams();\n"; |
| 581 | - $innerCode .= " if (\$paramCount < $minPars || \$paramCount > $maxPars) return new " . static::$namespace . "Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 581 | + $innerCode .= " if (\$paramCount < $minPars || \$paramCount > $maxPars) return new ".static::$namespace."Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 582 | 582 | |
| 583 | - $innerCode .= " \$encoder = new " . static::$namespace . "Encoder();\n"; |
|
| 583 | + $innerCode .= " \$encoder = new ".static::$namespace."Encoder();\n"; |
|
| 584 | 584 | if ($decodePhpObjects) { |
| 585 | 585 | $innerCode .= " \$params = \$encoder->decode(\$req, array('decode_php_objs'));\n"; |
| 586 | 586 | } else { |
@@ -593,23 +593,23 @@ discard block |
||
| 593 | 593 | static::holdObject($newFuncName, $callable[0]); |
| 594 | 594 | $class = get_class($callable[0]); |
| 595 | 595 | if ($class[0] !== '\\') { |
| 596 | - $class = '\\' . $class; |
|
| 596 | + $class = '\\'.$class; |
|
| 597 | 597 | } |
| 598 | 598 | $innerCode .= " /// @var $class \$obj\n"; |
| 599 | 599 | $innerCode .= " \$obj = PhpXmlRpc\\Wrapper::getHeldObject('$newFuncName');\n"; |
| 600 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 600 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 601 | 601 | } else { |
| 602 | 602 | $realFuncName = $plainFuncName; |
| 603 | 603 | } |
| 604 | 604 | foreach ($parsVariations as $i => $pars) { |
| 605 | - $innerCode .= " if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 606 | - if ($i < (count($parsVariations) - 1)) |
|
| 605 | + $innerCode .= " if (\$paramCount == ".count($pars).") \$retVal = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 606 | + if ($i<(count($parsVariations)-1)) |
|
| 607 | 607 | $innerCode .= " else\n"; |
| 608 | 608 | } |
| 609 | - $innerCode .= " if (is_a(\$retVal, '" . static::$namespace . "Response'))\n return \$retVal;\n else\n"; |
|
| 609 | + $innerCode .= " if (is_a(\$retVal, '".static::$namespace."Response'))\n return \$retVal;\n else\n"; |
|
| 610 | 610 | /// q: why not do the same for int, float, bool, string? |
| 611 | 611 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 612 | - $innerCode .= " return new " . static::$namespace . "Response(new " . static::$namespace . "Value(\$retVal, '{$funcDesc['returns']}'));"; |
|
| 612 | + $innerCode .= " return new ".static::$namespace."Response(new ".static::$namespace."Value(\$retVal, '{$funcDesc['returns']}'));"; |
|
| 613 | 613 | } else { |
| 614 | 614 | $encodeOptions = array(); |
| 615 | 615 | if ($encodeNulls) { |
@@ -620,18 +620,18 @@ discard block |
||
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | if ($encodeOptions) { |
| 623 | - $innerCode .= " return new " . static::$namespace . "Response(\$encoder->encode(\$retVal, array('" . |
|
| 624 | - implode("', '", $encodeOptions) . "')));"; |
|
| 623 | + $innerCode .= " return new ".static::$namespace."Response(\$encoder->encode(\$retVal, array('". |
|
| 624 | + implode("', '", $encodeOptions)."')));"; |
|
| 625 | 625 | } else { |
| 626 | - $innerCode .= " return new " . static::$namespace . "Response(\$encoder->encode(\$retVal));"; |
|
| 626 | + $innerCode .= " return new ".static::$namespace."Response(\$encoder->encode(\$retVal));"; |
|
| 627 | 627 | } |
| 628 | 628 | } |
| 629 | 629 | // shall we exclude functions returning by ref? |
| 630 | 630 | // if ($func->returnsReference()) |
| 631 | 631 | // return false; |
| 632 | 632 | |
| 633 | - $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n" . |
|
| 634 | - "function $newFuncName(\$req)\n{\n" . $innerCode . "\n}"; |
|
| 633 | + $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n". |
|
| 634 | + "function $newFuncName(\$req)\n{\n".$innerCode."\n}"; |
|
| 635 | 635 | |
| 636 | 636 | return $code; |
| 637 | 637 | } |
@@ -691,7 +691,7 @@ discard block |
||
| 691 | 691 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 692 | 692 | { |
| 693 | 693 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 694 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 694 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 695 | 695 | } |
| 696 | 696 | |
| 697 | 697 | if (is_object($className)) { |
@@ -699,7 +699,7 @@ discard block |
||
| 699 | 699 | } else { |
| 700 | 700 | $realClassName = $className; |
| 701 | 701 | } |
| 702 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 702 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 703 | 703 | } |
| 704 | 704 | |
| 705 | 705 | /** |
@@ -795,14 +795,14 @@ discard block |
||
| 795 | 795 | */ |
| 796 | 796 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 797 | 797 | { |
| 798 | - $reqClass = static::$namespace . 'Request'; |
|
| 799 | - $valClass = static::$namespace . 'Value'; |
|
| 800 | - $decoderClass = static::$namespace . 'Encoder'; |
|
| 798 | + $reqClass = static::$namespace.'Request'; |
|
| 799 | + $valClass = static::$namespace.'Value'; |
|
| 800 | + $decoderClass = static::$namespace.'Encoder'; |
|
| 801 | 801 | |
| 802 | 802 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 803 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 803 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 804 | 804 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 805 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 805 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 806 | 806 | |
| 807 | 807 | $req = new $reqClass('system.methodSignature'); |
| 808 | 808 | $req->addParam(new $valClass($methodName)); |
@@ -812,7 +812,7 @@ discard block |
||
| 812 | 812 | $response = $client->send($req, $timeout, $protocol); |
| 813 | 813 | $client->setDebug($origDebug); |
| 814 | 814 | if ($response->faultCode()) { |
| 815 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 815 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 816 | 816 | return false; |
| 817 | 817 | } |
| 818 | 818 | |
@@ -823,8 +823,8 @@ discard block |
||
| 823 | 823 | $mSig = $decoder->decode($mSig); |
| 824 | 824 | } |
| 825 | 825 | |
| 826 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 827 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 826 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 827 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 828 | 828 | return false; |
| 829 | 829 | } |
| 830 | 830 | |
@@ -839,11 +839,11 @@ discard block |
||
| 839 | 839 | */ |
| 840 | 840 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 841 | 841 | { |
| 842 | - $reqClass = static::$namespace . 'Request'; |
|
| 843 | - $valClass = static::$namespace . 'Value'; |
|
| 842 | + $reqClass = static::$namespace.'Request'; |
|
| 843 | + $valClass = static::$namespace.'Value'; |
|
| 844 | 844 | |
| 845 | 845 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 846 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 846 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 847 | 847 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 848 | 848 | |
| 849 | 849 | $mDesc = ''; |
@@ -880,11 +880,11 @@ discard block |
||
| 880 | 880 | $clientClone = clone $client; |
| 881 | 881 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 882 | 882 | { |
| 883 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 883 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 884 | 884 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 885 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 886 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 887 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 885 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 886 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 887 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 888 | 888 | $throwFault = false; |
| 889 | 889 | $decodeFault = false; |
| 890 | 890 | $faultResponse = null; |
@@ -895,9 +895,9 @@ discard block |
||
| 895 | 895 | $faultResponse = $extraOptions['return_on_fault']; |
| 896 | 896 | } |
| 897 | 897 | |
| 898 | - $reqClass = static::$namespace . 'Request'; |
|
| 899 | - $encoderClass = static::$namespace . 'Encoder'; |
|
| 900 | - $valueClass = static::$namespace . 'Value'; |
|
| 898 | + $reqClass = static::$namespace.'Request'; |
|
| 899 | + $encoderClass = static::$namespace.'Encoder'; |
|
| 900 | + $valueClass = static::$namespace.'Value'; |
|
| 901 | 901 | |
| 902 | 902 | $encoder = new $encoderClass(); |
| 903 | 903 | $encodeOptions = array(); |
@@ -979,14 +979,14 @@ discard block |
||
| 979 | 979 | * @param string $mDesc |
| 980 | 980 | * @return string[] keys: source, docstring |
| 981 | 981 | */ |
| 982 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 982 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 983 | 983 | { |
| 984 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 984 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 985 | 985 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 986 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 987 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 988 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 989 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 986 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 987 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 988 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 989 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 990 | 990 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 991 | 991 | $throwFault = false; |
| 992 | 992 | $decodeFault = false; |
@@ -999,10 +999,10 @@ discard block |
||
| 999 | 999 | } |
| 1000 | 1000 | |
| 1001 | 1001 | $code = "function $newFuncName("; |
| 1002 | - if ($clientCopyMode < 2) { |
|
| 1002 | + if ($clientCopyMode<2) { |
|
| 1003 | 1003 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 1004 | 1004 | $verbatimClientCopy = !$clientCopyMode; |
| 1005 | - $innerCode = ' ' . str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 1005 | + $innerCode = ' '.str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 1006 | 1006 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
| 1007 | 1007 | $this_ = ''; |
| 1008 | 1008 | } else { |
@@ -1010,28 +1010,28 @@ discard block |
||
| 1010 | 1010 | $innerCode = ''; |
| 1011 | 1011 | $this_ = 'this->'; |
| 1012 | 1012 | } |
| 1013 | - $innerCode .= " \$req = new " . static::$namespace . "Request('$methodName');\n"; |
|
| 1013 | + $innerCode .= " \$req = new ".static::$namespace."Request('$methodName');\n"; |
|
| 1014 | 1014 | |
| 1015 | 1015 | if ($mDesc != '') { |
| 1016 | 1016 | // take care that PHP comment is not terminated unwillingly by method description |
| 1017 | 1017 | /// @todo according to the spec, method desc can have html in it. We should run it through strip_tags... |
| 1018 | - $mDesc = "/**\n * " . str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc) . "\n"; |
|
| 1018 | + $mDesc = "/**\n * ".str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc)."\n"; |
|
| 1019 | 1019 | } else { |
| 1020 | 1020 | $mDesc = "/**\n * Function $newFuncName.\n"; |
| 1021 | 1021 | } |
| 1022 | 1022 | |
| 1023 | 1023 | // param parsing |
| 1024 | - $innerCode .= " \$encoder = new " . static::$namespace . "Encoder();\n"; |
|
| 1024 | + $innerCode .= " \$encoder = new ".static::$namespace."Encoder();\n"; |
|
| 1025 | 1025 | $plist = array(); |
| 1026 | 1026 | $pCount = count($mSig); |
| 1027 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 1027 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 1028 | 1028 | $plist[] = "\$p$i"; |
| 1029 | 1029 | $pType = $mSig[$i]; |
| 1030 | 1030 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
| 1031 | 1031 | $pType == 'string' || $pType == 'dateTime.iso8601' || $pType == 'base64' || $pType == 'null' |
| 1032 | 1032 | ) { |
| 1033 | 1033 | // only build directly xml-rpc values when type is known and scalar |
| 1034 | - $innerCode .= " \$p$i = new " . static::$namespace . "Value(\$p$i, '$pType');\n"; |
|
| 1034 | + $innerCode .= " \$p$i = new ".static::$namespace."Value(\$p$i, '$pType');\n"; |
|
| 1035 | 1035 | } else { |
| 1036 | 1036 | if ($encodePhpObjects || $encodeNulls) { |
| 1037 | 1037 | $encOpts = array(); |
@@ -1042,26 +1042,26 @@ discard block |
||
| 1042 | 1042 | $encOpts[] = 'null_extension'; |
| 1043 | 1043 | } |
| 1044 | 1044 | |
| 1045 | - $innerCode .= " \$p$i = \$encoder->encode(\$p$i, array( '" . implode("', '", $encOpts) . "'));\n"; |
|
| 1045 | + $innerCode .= " \$p$i = \$encoder->encode(\$p$i, array( '".implode("', '", $encOpts)."'));\n"; |
|
| 1046 | 1046 | } else { |
| 1047 | 1047 | $innerCode .= " \$p$i = \$encoder->encode(\$p$i);\n"; |
| 1048 | 1048 | } |
| 1049 | 1049 | } |
| 1050 | 1050 | $innerCode .= " \$req->addParam(\$p$i);\n"; |
| 1051 | - $mDesc .= " * @param " . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 1051 | + $mDesc .= " * @param ".$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 1052 | 1052 | } |
| 1053 | - if ($clientCopyMode < 2) { |
|
| 1053 | + if ($clientCopyMode<2) { |
|
| 1054 | 1054 | $plist[] = '$debug = 0'; |
| 1055 | 1055 | $mDesc .= " * @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 1056 | 1056 | } |
| 1057 | 1057 | $plist = implode(', ', $plist); |
| 1058 | - $mDesc .= ' * @return ' . $this->xmlrpc2PhpType($mSig[0]); |
|
| 1058 | + $mDesc .= ' * @return '.$this->xmlrpc2PhpType($mSig[0]); |
|
| 1059 | 1059 | if ($throwFault) { |
| 1060 | - $mDesc .= "\n * @throws " . (is_string($throwFault) ? $throwFault : '\\PhpXmlRpc\\Exception'); |
|
| 1060 | + $mDesc .= "\n * @throws ".(is_string($throwFault) ? $throwFault : '\\PhpXmlRpc\\Exception'); |
|
| 1061 | 1061 | } else if ($decodeFault) { |
| 1062 | - $mDesc .= '|' . gettype($faultResponse) . " (a " . gettype($faultResponse) . " if call fails)"; |
|
| 1062 | + $mDesc .= '|'.gettype($faultResponse)." (a ".gettype($faultResponse)." if call fails)"; |
|
| 1063 | 1063 | } else { |
| 1064 | - $mDesc .= '|' . static::$namespace . "Response (a " . static::$namespace . "Response obj instance if call fails)"; |
|
| 1064 | + $mDesc .= '|'.static::$namespace."Response (a ".static::$namespace."Response obj instance if call fails)"; |
|
| 1065 | 1065 | } |
| 1066 | 1066 | $mDesc .= "\n */\n"; |
| 1067 | 1067 | |
@@ -1074,9 +1074,9 @@ discard block |
||
| 1074 | 1074 | $respCode = "throw new $throwFault(\$res->faultString(), \$res->faultCode())"; |
| 1075 | 1075 | } else if ($decodeFault) { |
| 1076 | 1076 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 1077 | - $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 1077 | + $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 1078 | 1078 | } else { |
| 1079 | - $respCode = 'return ' . var_export($faultResponse, true); |
|
| 1079 | + $respCode = 'return '.var_export($faultResponse, true); |
|
| 1080 | 1080 | } |
| 1081 | 1081 | } else { |
| 1082 | 1082 | $respCode = 'return $res'; |
@@ -1087,7 +1087,7 @@ discard block |
||
| 1087 | 1087 | $innerCode .= " if (\$res->faultCode()) $respCode; else return \$encoder->decode(\$res->value());"; |
| 1088 | 1088 | } |
| 1089 | 1089 | |
| 1090 | - $code = $code . $plist . ")\n{\n" . $innerCode . "\n}\n"; |
|
| 1090 | + $code = $code.$plist.")\n{\n".$innerCode."\n}\n"; |
|
| 1091 | 1091 | |
| 1092 | 1092 | return array('source' => $code, 'docstring' => $mDesc); |
| 1093 | 1093 | } |
@@ -1117,26 +1117,26 @@ discard block |
||
| 1117 | 1117 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1118 | 1118 | { |
| 1119 | 1119 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1120 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1120 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1121 | 1121 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1122 | 1122 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1123 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 1124 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1125 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1123 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 1124 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1125 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1126 | 1126 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1127 | - $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool)$extraOptions['throw_on_fault'] : false; |
|
| 1127 | + $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool) $extraOptions['throw_on_fault'] : false; |
|
| 1128 | 1128 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1129 | 1129 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1130 | 1130 | |
| 1131 | - $reqClass = static::$namespace . 'Request'; |
|
| 1132 | - $decoderClass = static::$namespace . 'Encoder'; |
|
| 1131 | + $reqClass = static::$namespace.'Request'; |
|
| 1132 | + $decoderClass = static::$namespace.'Encoder'; |
|
| 1133 | 1133 | |
| 1134 | 1134 | // retrieve the list of methods |
| 1135 | 1135 | $req = new $reqClass('system.listMethods'); |
| 1136 | 1136 | /// @todo move setting of timeout, protocol to outside the send() call |
| 1137 | 1137 | $response = $client->send($req, $timeout, $protocol); |
| 1138 | 1138 | if ($response->faultCode()) { |
| 1139 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1139 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1140 | 1140 | |
| 1141 | 1141 | return false; |
| 1142 | 1142 | } |
@@ -1147,7 +1147,7 @@ discard block |
||
| 1147 | 1147 | $mList = $decoder->decode($mList); |
| 1148 | 1148 | } |
| 1149 | 1149 | if (!is_array($mList) || !count($mList)) { |
| 1150 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1150 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1151 | 1151 | |
| 1152 | 1152 | return false; |
| 1153 | 1153 | } |
@@ -1157,8 +1157,8 @@ discard block |
||
| 1157 | 1157 | $xmlrpcClassName = $newClassName; |
| 1158 | 1158 | } else { |
| 1159 | 1159 | /// @todo direct access to $client->server is now deprecated |
| 1160 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), array('_', ''), |
|
| 1161 | - $client->server) . '_client'; |
|
| 1160 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), array('_', ''), |
|
| 1161 | + $client->server).'_client'; |
|
| 1162 | 1162 | } |
| 1163 | 1163 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1164 | 1164 | $xmlrpcClassName .= 'x'; |
@@ -1166,7 +1166,7 @@ discard block |
||
| 1166 | 1166 | |
| 1167 | 1167 | $source = "class $xmlrpcClassName\n{\n public \$client;\n\n"; |
| 1168 | 1168 | $source .= " function __construct()\n {\n"; |
| 1169 | - $source .= ' ' . str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 1169 | + $source .= ' '.str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 1170 | 1170 | $source .= "\$this->client = \$client;\n }\n\n"; |
| 1171 | 1171 | $opts = array( |
| 1172 | 1172 | 'return_source' => true, |
@@ -1189,28 +1189,28 @@ discard block |
||
| 1189 | 1189 | $methodWrap = $this->wrapXmlrpcMethod($client, $mName, $opts); |
| 1190 | 1190 | if ($methodWrap) { |
| 1191 | 1191 | if ($buildIt) { |
| 1192 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1192 | + $source .= $methodWrap['source']."\n"; |
|
| 1193 | 1193 | |
| 1194 | 1194 | } else { |
| 1195 | - $source .= ' ' . str_replace("\n", "\n ", $methodWrap['docstring']); |
|
| 1196 | - $source .= str_replace("\n", "\n ", $methodWrap['source']). "\n"; |
|
| 1195 | + $source .= ' '.str_replace("\n", "\n ", $methodWrap['docstring']); |
|
| 1196 | + $source .= str_replace("\n", "\n ", $methodWrap['source'])."\n"; |
|
| 1197 | 1197 | } |
| 1198 | 1198 | |
| 1199 | 1199 | } else { |
| 1200 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1200 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1201 | 1201 | } |
| 1202 | 1202 | } |
| 1203 | 1203 | } |
| 1204 | 1204 | $source .= "}\n"; |
| 1205 | 1205 | if ($buildIt) { |
| 1206 | 1206 | $allOK = 0; |
| 1207 | - eval($source . '$allOK=1;'); |
|
| 1207 | + eval($source.'$allOK=1;'); |
|
| 1208 | 1208 | if ($allOK) { |
| 1209 | 1209 | return $xmlrpcClassName; |
| 1210 | 1210 | } else { |
| 1211 | 1211 | /// @todo direct access to $client->server is now deprecated |
| 1212 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . |
|
| 1213 | - ' to wrap remote server ' . $client->server); |
|
| 1212 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName. |
|
| 1213 | + ' to wrap remote server '.$client->server); |
|
| 1214 | 1214 | return false; |
| 1215 | 1215 | } |
| 1216 | 1216 | } else { |
@@ -1229,7 +1229,7 @@ discard block |
||
| 1229 | 1229 | */ |
| 1230 | 1230 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1231 | 1231 | { |
| 1232 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->getUrl()) . |
|
| 1232 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->getUrl()). |
|
| 1233 | 1233 | "');\n"; |
| 1234 | 1234 | |
| 1235 | 1235 | // copy all client fields to the client that will be generated runtime |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer |
| 11 | -include_once __DIR__ . '/../../src/Autoloader.php'; |
|
| 11 | +include_once __DIR__.'/../../src/Autoloader.php'; |
|
| 12 | 12 | PhpXmlRpc\Autoloader::register(); |
| 13 | 13 | |
| 14 | 14 | // Let unit tests run against localhost, 'plain' demos against a known public server |
@@ -22,5 +22,5 @@ discard block |
||
| 22 | 22 | function output($text) |
| 23 | 23 | { |
| 24 | 24 | /// @todo we should only strip html tags, and let through all xml tags |
| 25 | - echo PHP_SAPI == 'cli' ? strip_tags(str_replace(array('<br/>','<br>'), "\n", $text)) : $text; |
|
| 25 | + echo PHP_SAPI == 'cli' ? strip_tags(str_replace(array('<br/>', '<br>'), "\n", $text)) : $text; |
|
| 26 | 26 | } |
