gggeek /
phpxmlrpc
@@ -19,9 +19,9 @@ discard block |
||
| 19 | 19 | use PhpXmlRpc\Encoder; |
| 20 | 20 | |
| 21 | 21 | /// @todo allow autoloading when the library is installed as dependency |
| 22 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
| 22 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
| 23 | 23 | |
| 24 | -include __DIR__ . '/../tests/parse_args.php'; |
|
| 24 | +include __DIR__.'/../tests/parse_args.php'; |
|
| 25 | 25 | $args = argParser::getArgs(); |
| 26 | 26 | |
| 27 | 27 | function begin_test($test_name, $test_case) |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | if (!isset($test_results[$test_name][$test_case])) { |
| 42 | 42 | trigger_error('ending test that was not started'); |
| 43 | 43 | } |
| 44 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
| 44 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
| 45 | 45 | $test_results[$test_name][$test_case]['result'] = $test_result; |
| 46 | 46 | echo '.'; |
| 47 | 47 | flush(); |
@@ -75,24 +75,24 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | if ($is_web) { |
| 78 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
| 78 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
| 79 | 79 | if ($xd) { |
| 80 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
| 80 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
| 81 | 81 | } |
| 82 | 82 | flush(); |
| 83 | 83 | ob_flush(); |
| 84 | 84 | } else { |
| 85 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
| 85 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
| 86 | 86 | if ($xd) { |
| 87 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
| 87 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
| 88 | 88 | } |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | // test 'manual style' data encoding vs. 'automatic style' encoding |
| 92 | 92 | begin_test('Data encoding (large array)', 'manual encoding'); |
| 93 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 93 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 94 | 94 | $vals = array(); |
| 95 | - for ($j = 0; $j < 10; $j++) { |
|
| 95 | + for ($j = 0; $j<10; $j++) { |
|
| 96 | 96 | $valArray = array(); |
| 97 | 97 | foreach ($data[$j] as $key => $val) { |
| 98 | 98 | $values = array(); |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | |
| 118 | 118 | begin_test('Data encoding (large array)', 'automatic encoding'); |
| 119 | 119 | $encoder = new Encoder(); |
| 120 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 120 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 121 | 121 | $value = $encoder->encode($data, array('auto_dates')); |
| 122 | 122 | $out = $value->serialize(); |
| 123 | 123 | } |
@@ -125,8 +125,8 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | if (function_exists('xmlrpc_set_type')) { |
| 127 | 127 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
| 128 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 129 | - for ($j = 0; $j < 10; $j++) { |
|
| 128 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 129 | + for ($j = 0; $j<10; $j++) { |
|
| 130 | 130 | foreach ($keys as $k) { |
| 131 | 131 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
| 132 | 132 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -140,18 +140,18 @@ discard block |
||
| 140 | 140 | // test 'old style' data decoding vs. 'automatic style' decoding |
| 141 | 141 | $dummy = new Request(''); |
| 142 | 142 | $out = new Response($data); |
| 143 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
| 143 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
| 144 | 144 | |
| 145 | 145 | begin_test('Data decoding (large array)', 'manual decoding'); |
| 146 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 146 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 147 | 147 | $response = $dummy->parseResponse($in, true); |
| 148 | 148 | $value = $response->value(); |
| 149 | 149 | $result = array(); |
| 150 | - foreach($value as $val1) { |
|
| 150 | + foreach ($value as $val1) { |
|
| 151 | 151 | $out = array(); |
| 152 | - foreach($val1 as $name => $val) { |
|
| 152 | + foreach ($val1 as $name => $val) { |
|
| 153 | 153 | $out[$name] = array(); |
| 154 | - foreach($val as $data) { |
|
| 154 | + foreach ($val as $data) { |
|
| 155 | 155 | $out[$name][] = $data->scalarVal(); |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -161,18 +161,18 @@ discard block |
||
| 161 | 161 | end_test('Data decoding (large array)', 'manual decoding', $result); |
| 162 | 162 | |
| 163 | 163 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
| 164 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 164 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 165 | 165 | $response = $dummy->ParseResponse($in, true); |
| 166 | 166 | $value = $response->value(); |
| 167 | 167 | $result = array(); |
| 168 | 168 | $l = $value->arraySize(); |
| 169 | - for ($k = 0; $k < $l; $k++) { |
|
| 169 | + for ($k = 0; $k<$l; $k++) { |
|
| 170 | 170 | $val1 = $value->arrayMem($k); |
| 171 | 171 | $out = array(); |
| 172 | - foreach($val1 as $name => $val) { |
|
| 172 | + foreach ($val1 as $name => $val) { |
|
| 173 | 173 | $out[$name] = array(); |
| 174 | 174 | $m = $val->arraySize(); |
| 175 | - for ($j = 0; $j < $m; $j++) { |
|
| 175 | + for ($j = 0; $j<$m; $j++) { |
|
| 176 | 176 | $data = $val->arrayMem($j); |
| 177 | 177 | $out[$name][] = $data->scalarVal(); |
| 178 | 178 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
| 184 | 184 | |
| 185 | 185 | begin_test('Data decoding (large array)', 'automatic decoding'); |
| 186 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 186 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 187 | 187 | $response = $dummy->parseResponse($in, true, 'phpvals'); |
| 188 | 188 | $value = $response->value(); |
| 189 | 189 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | |
| 192 | 192 | if (function_exists('xmlrpc_decode')) { |
| 193 | 193 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
| 194 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 194 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 195 | 195 | $response = $dummy->parseResponse($in, true, 'xml'); |
| 196 | 196 | $value = xmlrpc_decode($response->value()); |
| 197 | 197 | } |
@@ -208,16 +208,16 @@ discard block |
||
| 208 | 208 | $value = $encoder->encode($data1, array('auto_dates')); |
| 209 | 209 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 210 | 210 | $reqs = array(); |
| 211 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 211 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 212 | 212 | $reqs[] = $req; |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | 215 | $server = explode(':', $args['HTTPSERVER']); |
| 216 | - if (count($server) > 1) { |
|
| 217 | - $srv = 'http://' . $server[0] . '://' . $server[1] . $args['HTTPURI']; |
|
| 216 | + if (count($server)>1) { |
|
| 217 | + $srv = 'http://'.$server[0].'://'.$server[1].$args['HTTPURI']; |
|
| 218 | 218 | $c = new Client($args['HTTPURI'], $server[0], $server[1]); |
| 219 | 219 | } else { |
| 220 | - $srv = 'http://' . $args['HTTPSERVER'] . $args['HTTPURI']; |
|
| 220 | + $srv = 'http://'.$args['HTTPSERVER'].$args['HTTPURI']; |
|
| 221 | 221 | $c = new Client($args['HTTPURI'], $args['HTTPSERVER']); |
| 222 | 222 | } |
| 223 | 223 | |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | begin_test($testName, 'http 10'); |
| 231 | 231 | $response = array(); |
| 232 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 232 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 233 | 233 | $resp = $c->send($req); |
| 234 | 234 | $response[] = $resp->value(); |
| 235 | 235 | } |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 240 | 240 | begin_test($testName, 'http 11 no keepalive'); |
| 241 | 241 | $response = array(); |
| 242 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 242 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 243 | 243 | $resp = $c->send($req, 10, 'http11'); |
| 244 | 244 | $response[] = $resp->value(); |
| 245 | 245 | } |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | |
| 248 | 248 | begin_test($testName, 'http 11 w. keep-alive'); |
| 249 | 249 | $response = array(); |
| 250 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 250 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 251 | 251 | $resp = $c->send($req, 10, 'http11'); |
| 252 | 252 | $response[] = $resp->value(); |
| 253 | 253 | } |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | |
| 270 | 270 | begin_test($testName, 'http 10 w. compression'); |
| 271 | 271 | $response = array(); |
| 272 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 272 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 273 | 273 | $resp = $c->send($req); |
| 274 | 274 | $response[] = $resp->value(); |
| 275 | 275 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 280 | 280 | begin_test($testName, 'http 11 w. compression and no keepalive'); |
| 281 | 281 | $response = array(); |
| 282 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 282 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 283 | 283 | $resp = $c->send($req, 10, 'http11'); |
| 284 | 284 | $response[] = $resp->value(); |
| 285 | 285 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 289 | 289 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
| 290 | 290 | $response = array(); |
| 291 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 291 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 292 | 292 | $resp = $c->send($req, 10, 'http11'); |
| 293 | 293 | $response[] = $resp->value(); |
| 294 | 294 | } |
@@ -309,11 +309,11 @@ discard block |
||
| 309 | 309 | /// test multicall vs. many calls vs. keep-alives - HTTPS |
| 310 | 310 | |
| 311 | 311 | $server = explode(':', $args['HTTPSSERVER']); |
| 312 | - if (count($server) > 1) { |
|
| 313 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
| 312 | + if (count($server)>1) { |
|
| 313 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
| 314 | 314 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
| 315 | 315 | } else { |
| 316 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
| 316 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
| 317 | 317 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'https'); |
| 318 | 318 | } |
| 319 | 319 | $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']); |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 328 | 328 | begin_test($testName, 'https no keep-alive'); |
| 329 | 329 | $response = array(); |
| 330 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 330 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 331 | 331 | $resp = $c->send($req); |
| 332 | 332 | $response[] = $resp->value(); |
| 333 | 333 | } |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 337 | 337 | begin_test($testName, 'https w. keep-alive'); |
| 338 | 338 | $response = array(); |
| 339 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 339 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 340 | 340 | $resp = $c->send($req, 10); |
| 341 | 341 | $response[] = $resp->value(); |
| 342 | 342 | } |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 358 | 358 | begin_test($testName, 'https w. compression and no keepalive'); |
| 359 | 359 | $response = array(); |
| 360 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 360 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 361 | 361 | $resp = $c->send($req); |
| 362 | 362 | $response[] = $resp->value(); |
| 363 | 363 | } |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 367 | 367 | begin_test($testName, 'https w. keep-alive and compression'); |
| 368 | 368 | $response = array(); |
| 369 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 369 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 370 | 370 | $resp = $c->send($req, 10); |
| 371 | 371 | $response[] = $resp->value(); |
| 372 | 372 | } |
@@ -387,11 +387,11 @@ discard block |
||
| 387 | 387 | /// test multicall vs. many calls vs. keep-alives - HTTP/2 |
| 388 | 388 | |
| 389 | 389 | $server = explode(':', $args['HTTPSSERVER']); |
| 390 | - if (count($server) > 1) { |
|
| 391 | - $srv = 'https://' . $server[0] . ':' . $server[1] . $args['HTTPSURI']; |
|
| 390 | + if (count($server)>1) { |
|
| 391 | + $srv = 'https://'.$server[0].':'.$server[1].$args['HTTPSURI']; |
|
| 392 | 392 | $c = new Client($args['HTTPSURI'], $server[0], $server[1], 'https'); |
| 393 | 393 | } else { |
| 394 | - $srv = 'https://' . $args['HTTPSSERVER'] . $args['HTTPSURI']; |
|
| 394 | + $srv = 'https://'.$args['HTTPSSERVER'].$args['HTTPSURI']; |
|
| 395 | 395 | $c = new Client($args['HTTPSURI'], $args['HTTPSSERVER'], 443, 'h2'); |
| 396 | 396 | } |
| 397 | 397 | $c->setOption(Client::OPT_VERIFY_PEER, !$args['HTTPSIGNOREPEER']); |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 406 | 406 | begin_test($testName, 'http2 no keep-alive'); |
| 407 | 407 | $response = array(); |
| 408 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 408 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 409 | 409 | $resp = $c->send($req); |
| 410 | 410 | $response[] = $resp->value(); |
| 411 | 411 | } |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 415 | 415 | begin_test($testName, 'http2 w. keep-alive'); |
| 416 | 416 | $response = array(); |
| 417 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 417 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 418 | 418 | $resp = $c->send($req, 10); |
| 419 | 419 | $response[] = $resp->value(); |
| 420 | 420 | } |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | $c->setOption(Client::OPT_KEEPALIVE, false); |
| 436 | 436 | begin_test($testName, 'http2 w. compression and no keepalive'); |
| 437 | 437 | $response = array(); |
| 438 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 438 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 439 | 439 | $resp = $c->send($req); |
| 440 | 440 | $response[] = $resp->value(); |
| 441 | 441 | } |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | $c->setOption(Client::OPT_KEEPALIVE, true); |
| 445 | 445 | begin_test($testName, 'http2 w. keep-alive and compression'); |
| 446 | 446 | $response = array(); |
| 447 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 447 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 448 | 448 | $resp = $c->send($req, 10); |
| 449 | 449 | $response[] = $resp->value(); |
| 450 | 450 | } |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | foreach ($test_results as $test => $results) { |
| 467 | 467 | echo "\nTEST: $test\n"; |
| 468 | 468 | foreach ($results as $case => $data) { |
| 469 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
| 469 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
| 470 | 470 | } |
| 471 | 471 | } |
| 472 | 472 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | // user declares the type of resp value: we "almost" trust it... but log errors just in case |
| 79 | 79 | if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) || |
| 80 | 80 | ($this->valtyp == 'xml' && (!is_string($this->val)))) { |
| 81 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType); |
|
| 81 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType); |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | } |
@@ -165,34 +165,34 @@ discard block |
||
| 165 | 165 | public function serialize($charsetEncoding = '') |
| 166 | 166 | { |
| 167 | 167 | if ($charsetEncoding != '') { |
| 168 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 168 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 169 | 169 | } else { |
| 170 | 170 | $this->content_type = 'text/xml'; |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 174 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 174 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 175 | 175 | } else { |
| 176 | 176 | $result = "<methodResponse>\n"; |
| 177 | 177 | } |
| 178 | 178 | if ($this->errno) { |
| 179 | 179 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 180 | - $result .= "<fault>\n" . |
|
| 181 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 182 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 183 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . |
|
| 180 | + $result .= "<fault>\n". |
|
| 181 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 182 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 183 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding). |
|
| 184 | 184 | "</string></value>\n</member>\n</struct>\n</value>\n</fault>"; |
| 185 | 185 | } else { |
| 186 | 186 | if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) { |
| 187 | - $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 187 | + $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 188 | 188 | } else if (is_string($this->val) && $this->valtyp == 'xml') { |
| 189 | - $result .= "<params>\n<param>\n" . |
|
| 190 | - $this->val . |
|
| 189 | + $result .= "<params>\n<param>\n". |
|
| 190 | + $this->val. |
|
| 191 | 191 | "</param>\n</params>"; |
| 192 | 192 | } else if ($this->valtyp == 'phpvals') { |
| 193 | 193 | $encoder = new Encoder(); |
| 194 | 194 | $val = $encoder->encode($this->val); |
| 195 | - $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 195 | + $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 196 | 196 | } else { |
| 197 | 197 | throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values'); |
| 198 | 198 | } |
@@ -211,9 +211,9 @@ discard block |
||
| 211 | 211 | public function xml_header($charsetEncoding = '') |
| 212 | 212 | { |
| 213 | 213 | if ($charsetEncoding != '') { |
| 214 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 214 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 215 | 215 | } else { |
| 216 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 216 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
@@ -229,21 +229,21 @@ discard block |
||
| 229 | 229 | case 'errstr': |
| 230 | 230 | case 'payload': |
| 231 | 231 | case 'content_type': |
| 232 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 232 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 233 | 233 | return $this->$name; |
| 234 | 234 | case 'hdrs': |
| 235 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 235 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 236 | 236 | return $this->httpResponse['headers']; |
| 237 | 237 | case '_cookies': |
| 238 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 238 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 239 | 239 | return $this->httpResponse['cookies']; |
| 240 | 240 | case 'raw_data': |
| 241 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 241 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 242 | 242 | return $this->httpResponse['raw_data']; |
| 243 | 243 | default: |
| 244 | 244 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 245 | 245 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 246 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 246 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 247 | 247 | $result = null; |
| 248 | 248 | return $result; |
| 249 | 249 | } |
@@ -258,25 +258,25 @@ discard block |
||
| 258 | 258 | case 'errstr': |
| 259 | 259 | case 'payload': |
| 260 | 260 | case 'content_type': |
| 261 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 261 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 262 | 262 | $this->$name = $value; |
| 263 | 263 | break; |
| 264 | 264 | case 'hdrs': |
| 265 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 265 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 266 | 266 | $this->httpResponse['headers'] = $value; |
| 267 | 267 | break; |
| 268 | 268 | case '_cookies': |
| 269 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 269 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 270 | 270 | $this->httpResponse['cookies'] = $value; |
| 271 | 271 | break; |
| 272 | 272 | case 'raw_data': |
| 273 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 273 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 274 | 274 | $this->httpResponse['raw_data'] = $value; |
| 275 | 275 | break; |
| 276 | 276 | default: |
| 277 | 277 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 278 | 278 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 279 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 279 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 280 | 280 | } |
| 281 | 281 | } |
| 282 | 282 | |
@@ -289,16 +289,16 @@ discard block |
||
| 289 | 289 | case 'errstr': |
| 290 | 290 | case 'payload': |
| 291 | 291 | case 'content_type': |
| 292 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 292 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 293 | 293 | return isset($this->$name); |
| 294 | 294 | case 'hdrs': |
| 295 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 295 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 296 | 296 | return isset($this->httpResponse['headers']); |
| 297 | 297 | case '_cookies': |
| 298 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 298 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 299 | 299 | return isset($this->httpResponse['cookies']); |
| 300 | 300 | case 'raw_data': |
| 301 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 301 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 302 | 302 | return isset($this->httpResponse['raw_data']); |
| 303 | 303 | default: |
| 304 | 304 | return false; |
@@ -314,25 +314,25 @@ discard block |
||
| 314 | 314 | case 'errstr': |
| 315 | 315 | case 'payload': |
| 316 | 316 | case 'content_type': |
| 317 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 317 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 318 | 318 | unset($this->$name); |
| 319 | 319 | break; |
| 320 | 320 | case 'hdrs': |
| 321 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 321 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 322 | 322 | unset($this->httpResponse['headers']); |
| 323 | 323 | break; |
| 324 | 324 | case '_cookies': |
| 325 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 325 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 326 | 326 | unset($this->httpResponse['cookies']); |
| 327 | 327 | break; |
| 328 | 328 | case 'raw_data': |
| 329 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 329 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 330 | 330 | unset($this->httpResponse['raw_data']); |
| 331 | 331 | break; |
| 332 | 332 | default: |
| 333 | 333 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 334 | 334 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 335 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 335 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 336 | 336 | } |
| 337 | 337 | } |
| 338 | 338 | } |
@@ -28,12 +28,12 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | // read chunk-size, chunk-extension (if any) and crlf |
| 30 | 30 | // get the position of the linebreak |
| 31 | - $chunkEnd = strpos($buffer, "\r\n") + 2; |
|
| 31 | + $chunkEnd = strpos($buffer, "\r\n")+2; |
|
| 32 | 32 | $temp = substr($buffer, 0, $chunkEnd); |
| 33 | 33 | $chunkSize = hexdec(trim($temp)); |
| 34 | 34 | $chunkStart = $chunkEnd; |
| 35 | - while ($chunkSize > 0) { |
|
| 36 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize); |
|
| 35 | + while ($chunkSize>0) { |
|
| 36 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize); |
|
| 37 | 37 | |
| 38 | 38 | // just in case we got a broken connection |
| 39 | 39 | if ($chunkEnd == false) { |
@@ -45,19 +45,19 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | // read chunk-data and crlf |
| 48 | - $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 48 | + $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 49 | 49 | // append chunk-data to entity-body |
| 50 | 50 | $new .= $chunk; |
| 51 | 51 | // length := length + chunk-size |
| 52 | 52 | $length += strlen($chunk); |
| 53 | 53 | // read chunk-size and crlf |
| 54 | - $chunkStart = $chunkEnd + 2; |
|
| 54 | + $chunkStart = $chunkEnd+2; |
|
| 55 | 55 | |
| 56 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2; |
|
| 56 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2; |
|
| 57 | 57 | if ($chunkEnd == false) { |
| 58 | 58 | break; // just in case we got a broken connection |
| 59 | 59 | } |
| 60 | - $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 60 | + $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 61 | 61 | $chunkSize = hexdec(trim($temp)); |
| 62 | 62 | $chunkStart = $chunkEnd; |
| 63 | 63 | } |
@@ -86,11 +86,11 @@ discard block |
||
| 86 | 86 | // Look for CR/LF or simple LF as line separator (even though it is not valid http) |
| 87 | 87 | $pos = strpos($data, "\r\n\r\n"); |
| 88 | 88 | if ($pos || is_int($pos)) { |
| 89 | - $bd = $pos + 4; |
|
| 89 | + $bd = $pos+4; |
|
| 90 | 90 | } else { |
| 91 | 91 | $pos = strpos($data, "\n\n"); |
| 92 | 92 | if ($pos || is_int($pos)) { |
| 93 | - $bd = $pos + 2; |
|
| 93 | + $bd = $pos+2; |
|
| 94 | 94 | } else { |
| 95 | 95 | // No separation between response headers and body: fault? |
| 96 | 96 | $bd = 0; |
@@ -100,8 +100,8 @@ discard block |
||
| 100 | 100 | // this filters out all http headers from proxy. maybe we could take them into account, too? |
| 101 | 101 | $data = substr($data, $bd); |
| 102 | 102 | } else { |
| 103 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 104 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 103 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 104 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | |
@@ -134,19 +134,19 @@ discard block |
||
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | if (!in_array($httpResponse['status_code'], $this->acceptedStatusCodes)) { |
| 137 | - $errstr = substr($data, 0, strpos($data, "\n") - 1); |
|
| 138 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr); |
|
| 139 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 137 | + $errstr = substr($data, 0, strpos($data, "\n")-1); |
|
| 138 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr); |
|
| 139 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http) |
| 143 | 143 | $pos = strpos($data, "\r\n\r\n"); |
| 144 | 144 | if ($pos || is_int($pos)) { |
| 145 | - $bd = $pos + 4; |
|
| 145 | + $bd = $pos+4; |
|
| 146 | 146 | } else { |
| 147 | 147 | $pos = strpos($data, "\n\n"); |
| 148 | 148 | if ($pos || is_int($pos)) { |
| 149 | - $bd = $pos + 2; |
|
| 149 | + $bd = $pos+2; |
|
| 150 | 150 | } else { |
| 151 | 151 | // No separation between response headers and body: fault? |
| 152 | 152 | // we could take some action here instead of going on... |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | foreach ($ar as $line) { |
| 161 | 161 | // take care of (multi-line) headers and cookies |
| 162 | 162 | $arr = explode(':', $line, 2); |
| 163 | - if (count($arr) > 1) { |
|
| 163 | + if (count($arr)>1) { |
|
| 164 | 164 | /// @todo according to https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should reject with error |
| 165 | 165 | /// 400 any messages where a space is present between the header name and colon |
| 166 | 166 | $headerName = strtolower(trim($arr[0])); |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | $cookie = $arr[1]; |
| 169 | 169 | // glue together all received cookies, using a comma to separate them (same as php does with getallheaders()) |
| 170 | 170 | if (isset($httpResponse['headers'][$headerName])) { |
| 171 | - $httpResponse['headers'][$headerName] .= ', ' . trim($cookie); |
|
| 171 | + $httpResponse['headers'][$headerName] .= ', '.trim($cookie); |
|
| 172 | 172 | } else { |
| 173 | 173 | $httpResponse['headers'][$headerName] = trim($cookie); |
| 174 | 174 | } |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | } elseif (isset($headerName)) { |
| 200 | 200 | /// @todo improve this: 1. check that the line starts with a space or tab; 2. according to |
| 201 | 201 | /// https://www.rfc-editor.org/rfc/rfc7230#section-3.2.4, we should flat out refuse these messages |
| 202 | - $httpResponse['headers'][$headerName] .= ' ' . trim($line); |
|
| 202 | + $httpResponse['headers'][$headerName] .= ' '.trim($line); |
|
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | // Decode chunked encoding sent by http 1.1 servers |
| 223 | 223 | if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') { |
| 224 | 224 | if (!$data = static::decodeChunked($data)) { |
| 225 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 225 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 226 | 226 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']); |
| 227 | 227 | } |
| 228 | 228 | } |
@@ -237,19 +237,19 @@ discard block |
||
| 237 | 237 | if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 238 | 238 | $data = $degzdata; |
| 239 | 239 | if ($debug) { |
| 240 | - $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 240 | + $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 241 | 241 | } |
| 242 | 242 | } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 243 | 243 | $data = $degzdata; |
| 244 | 244 | if ($debug) { |
| 245 | - $this->getLogger()->debug("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 245 | + $this->getLogger()->debug("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 246 | 246 | } |
| 247 | 247 | } else { |
| 248 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server'); |
|
| 248 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server'); |
|
| 249 | 249 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']); |
| 250 | 250 | } |
| 251 | 251 | } else { |
| 252 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 252 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 253 | 253 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']); |
| 254 | 254 | } |
| 255 | 255 | } |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | public function parseAcceptHeader($header) |
| 270 | 270 | { |
| 271 | 271 | $accepted = array(); |
| 272 | - foreach(explode(',', $header) as $c) { |
|
| 272 | + foreach (explode(',', $header) as $c) { |
|
| 273 | 273 | if (preg_match('/^([^;]+); *q=([0-9.]+)/', $c, $matches)) { |
| 274 | 274 | $c = $matches[1]; |
| 275 | 275 | $w = $matches[2]; |
@@ -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 || DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
| 18 | + <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) { |
|
| 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 | <!-- |
@@ -404,7 +409,9 @@ discard block |
||
| 404 | 409 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
| 405 | 410 | if ($x->count() > 1) { |
| 406 | 411 | foreach($x as $k => $y) { |
| 407 | - if ($k == 0) continue; |
|
| 412 | + if ($k == 0) { |
|
| 413 | + continue; |
|
| 414 | + } |
|
| 408 | 415 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 409 | 416 | if ($wstype == 1 || $wstype == 2) { |
| 410 | 417 | switch($y->scalarval()) { |
@@ -79,8 +79,8 @@ |
||
| 79 | 79 | <?php |
| 80 | 80 | |
| 81 | 81 | global $inputcharset, $debug, $protocol, $run, $hasjsonrpcclient, $hasjsonrpc2, $wstype, $id, $host, $port, $path, $action, |
| 82 | - $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy, |
|
| 83 | - $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies; |
|
| 82 | + $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy, |
|
| 83 | + $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies; |
|
| 84 | 84 | |
| 85 | 85 | include __DIR__ . '/common.php'; |
| 86 | 86 | |
@@ -82,13 +82,13 @@ discard block |
||
| 82 | 82 | $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy, |
| 83 | 83 | $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies; |
| 84 | 84 | |
| 85 | -include __DIR__ . '/common.php'; |
|
| 85 | +include __DIR__.'/common.php'; |
|
| 86 | 86 | |
| 87 | 87 | if ($action) { |
| 88 | 88 | |
| 89 | 89 | // avoid php hanging when using the builtin webserver and sending requests to itself |
| 90 | 90 | $skip = false; |
| 91 | - if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) { |
|
| 91 | + if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) { |
|
| 92 | 92 | $localHost = explode(':', $_SERVER['HTTP_HOST']); |
| 93 | 93 | /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters, |
| 94 | 94 | /// and that proxy is us |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | if (!$skip) { |
| 102 | 102 | // make sure the script waits long enough for the call to complete... |
| 103 | 103 | if ($timeout) { |
| 104 | - set_time_limit($timeout + 10); |
|
| 104 | + set_time_limit($timeout+10); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | if ($wstype == 1 || $wstype == 2) { |
@@ -128,13 +128,13 @@ discard block |
||
| 128 | 128 | $server = "$host$path"; |
| 129 | 129 | } |
| 130 | 130 | if ($protocol == 2 || $protocol == 3) { |
| 131 | - $server = 'https://' . $server; |
|
| 131 | + $server = 'https://'.$server; |
|
| 132 | 132 | } else { |
| 133 | - $server = 'http://' . $server; |
|
| 133 | + $server = 'http://'.$server; |
|
| 134 | 134 | } |
| 135 | 135 | if ($proxy != '') { |
| 136 | 136 | $pproxy = explode(':', $proxy); |
| 137 | - if (count($pproxy) > 1) { |
|
| 137 | + if (count($pproxy)>1) { |
|
| 138 | 138 | $pport = $pproxy[1]; |
| 139 | 139 | } else { |
| 140 | 140 | $pport = 8080; |
@@ -207,9 +207,9 @@ discard block |
||
| 207 | 207 | // fall thru intentionally |
| 208 | 208 | case 'describe': |
| 209 | 209 | case 'wrap': |
| 210 | - $msg[0] = new $requestClass('system.methodHelp', array(), (int)$id); |
|
| 210 | + $msg[0] = new $requestClass('system.methodHelp', array(), (int) $id); |
|
| 211 | 211 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 212 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 212 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 213 | 213 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 214 | 214 | if ($wstype == 2) { |
| 215 | 215 | $msg[0]->setJsonRpcVersion('2.0'); |
@@ -218,10 +218,10 @@ discard block |
||
| 218 | 218 | $msg[0]->setJsonRpcVersion('1.0'); |
| 219 | 219 | $msg[1]->setJsonRpcVersion('1.0'); |
| 220 | 220 | } |
| 221 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 221 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 222 | 222 | break; |
| 223 | 223 | case 'list': |
| 224 | - $msg[0] = new $requestClass('system.listMethods', array(), (int)$id); |
|
| 224 | + $msg[0] = new $requestClass('system.listMethods', array(), (int) $id); |
|
| 225 | 225 | if ($wstype == 2) { |
| 226 | 226 | $msg[0]->setJsonRpcVersion('2.0'); |
| 227 | 227 | } elseif ($wstype == 1 && $hasjsonrpc2) { |
@@ -241,10 +241,10 @@ discard block |
||
| 241 | 241 | } |
| 242 | 242 | // hack! build payload by hand |
| 243 | 243 | if ($wstype == 2) { |
| 244 | - $payload = "{\n" . |
|
| 245 | - '"jsonrpc": "2.0"' . ",\n" . |
|
| 246 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 247 | - $payload . |
|
| 244 | + $payload = "{\n". |
|
| 245 | + '"jsonrpc": "2.0"'.",\n". |
|
| 246 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 247 | + $payload. |
|
| 248 | 248 | "\n]"; |
| 249 | 249 | if ($action == "notification") { |
| 250 | 250 | $payload .= "\n"; |
@@ -259,9 +259,9 @@ discard block |
||
| 259 | 259 | $msg[0]->setPayload($payload); |
| 260 | 260 | $msg[0]->setJsonRpcVersion('2.0'); |
| 261 | 261 | } elseif ($wstype == 1) { |
| 262 | - $payload = "{\n" . |
|
| 263 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 264 | - $payload . |
|
| 262 | + $payload = "{\n". |
|
| 263 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 264 | + $payload. |
|
| 265 | 265 | "\n],\n\"id\": "; |
| 266 | 266 | if ($action == "notification") { |
| 267 | 267 | $payload .= "null\n}"; |
@@ -279,26 +279,26 @@ discard block |
||
| 279 | 279 | } |
| 280 | 280 | } else { |
| 281 | 281 | $msg[0]->setPayload( |
| 282 | - $msg[0]->xml_header($inputcharset) . |
|
| 283 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 284 | - $payload . |
|
| 285 | - "</params>\n" . $msg[0]->xml_footer() |
|
| 282 | + $msg[0]->xml_header($inputcharset). |
|
| 283 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 284 | + $payload. |
|
| 285 | + "</params>\n".$msg[0]->xml_footer() |
|
| 286 | 286 | ); |
| 287 | 287 | } |
| 288 | 288 | if ($action == 'notification') { |
| 289 | - $actionname = 'Execution of notification ' . $method; |
|
| 289 | + $actionname = 'Execution of notification '.$method; |
|
| 290 | 290 | } else { |
| 291 | - $actionname = 'Execution of method ' . $method; |
|
| 291 | + $actionname = 'Execution of method '.$method; |
|
| 292 | 292 | } |
| 293 | 293 | break; |
| 294 | 294 | default: // give a warning |
| 295 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 295 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 296 | 296 | } |
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 300 | 300 | // this gives good user feedback for long-running methods... |
| 301 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 301 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 302 | 302 | flush(); |
| 303 | 303 | |
| 304 | 304 | $response = null; |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | break; |
| 317 | 317 | } |
| 318 | 318 | } |
| 319 | - $time = microtime(true) - $time; |
|
| 319 | + $time = microtime(true)-$time; |
|
| 320 | 320 | if ($debug) { |
| 321 | 321 | echo "</div>\n"; |
| 322 | 322 | } |
@@ -330,8 +330,8 @@ discard block |
||
| 330 | 330 | // call failed! echo out error msg! |
| 331 | 331 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 332 | 332 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 333 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 334 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 333 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 334 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 335 | 335 | echo(date("d/M/Y:H:i:s\n")); |
| 336 | 336 | } else { |
| 337 | 337 | // call succeeded: parse results |
@@ -347,36 +347,36 @@ discard block |
||
| 347 | 347 | $max = $v->count(); |
| 348 | 348 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 349 | 349 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 350 | - foreach($v as $i => $rec) { |
|
| 350 | + foreach ($v as $i => $rec) { |
|
| 351 | 351 | if ($i % 2) { |
| 352 | 352 | $class = ' class="oddrow"'; |
| 353 | 353 | } else { |
| 354 | 354 | $class = ' class="evenrow"'; |
| 355 | 355 | } |
| 356 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 357 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 358 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 359 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 360 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 361 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 362 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 363 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 364 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 365 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 366 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 367 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 368 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 369 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 370 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 371 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 372 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 373 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 374 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 375 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 376 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 377 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 378 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 379 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 356 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 357 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 358 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 359 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 360 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 361 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 362 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 363 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 364 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 365 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 366 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 367 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 368 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 369 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 370 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 371 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 372 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 373 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 374 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 375 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 376 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 377 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 378 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 379 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 380 | 380 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 381 | 381 | //echo("</tr>\n"); |
| 382 | 382 | |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | $r2 = $resp[1]->value(); |
| 404 | 404 | |
| 405 | 405 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 406 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 406 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 407 | 407 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 408 | 408 | if ($desc == "") { |
| 409 | 409 | $desc = "-"; |
@@ -413,24 +413,24 @@ discard block |
||
| 413 | 413 | if ($r2->kindOf() != "array") { |
| 414 | 414 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 415 | 415 | } else { |
| 416 | - foreach($r2 as $i => $x) { |
|
| 416 | + foreach ($r2 as $i => $x) { |
|
| 417 | 417 | $payload = ""; |
| 418 | 418 | $alt_payload = ""; |
| 419 | - if ($i + 1 % 2) { |
|
| 419 | + if ($i+1 % 2) { |
|
| 420 | 420 | $class = ' class="oddrow"'; |
| 421 | 421 | } else { |
| 422 | 422 | $class = ' class="evenrow"'; |
| 423 | 423 | } |
| 424 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 424 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 425 | 425 | if ($x->kindOf() == "array") { |
| 426 | 426 | $ret = $x[0]; |
| 427 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 428 | - if ($x->count() > 1) { |
|
| 429 | - foreach($x as $k => $y) { |
|
| 427 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 428 | + if ($x->count()>1) { |
|
| 429 | + foreach ($x as $k => $y) { |
|
| 430 | 430 | if ($k == 0) continue; |
| 431 | 431 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 432 | 432 | if ($wstype == 1 || $wstype == 2) { |
| 433 | - switch($y->scalarval()) { |
|
| 433 | + switch ($y->scalarval()) { |
|
| 434 | 434 | case 'string': |
| 435 | 435 | case 'dateTime.iso8601': |
| 436 | 436 | case 'base64': |
@@ -463,22 +463,22 @@ discard block |
||
| 463 | 463 | } else { |
| 464 | 464 | $type = $y->scalarval(); |
| 465 | 465 | $payload .= '<param><value>'; |
| 466 | - switch($type) { |
|
| 466 | + switch ($type) { |
|
| 467 | 467 | case 'undefined': |
| 468 | 468 | break; |
| 469 | 469 | case 'null': |
| 470 | 470 | $type = 'nil'; |
| 471 | 471 | // fall thru intentionally |
| 472 | 472 | default: |
| 473 | - $payload .= '<' . |
|
| 474 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 475 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 473 | + $payload .= '<'. |
|
| 474 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 475 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 476 | 476 | '>'; |
| 477 | 477 | } |
| 478 | 478 | $payload .= "</value></param>\n"; |
| 479 | 479 | } |
| 480 | 480 | $alt_payload .= $y->scalarval(); |
| 481 | - if ($k < $x->count() - 1) { |
|
| 481 | + if ($k<$x->count()-1) { |
|
| 482 | 482 | $alt_payload .= ';'; |
| 483 | 483 | if ($wstype == 1 || $wstype == 2) { |
| 484 | 484 | $payload .= ', '; |
@@ -494,63 +494,63 @@ discard block |
||
| 494 | 494 | echo '</td>'; |
| 495 | 495 | // button to test this method |
| 496 | 496 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 497 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 498 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 499 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 500 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 501 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 502 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 503 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 504 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 505 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 506 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 507 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 508 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 509 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 510 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 511 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 512 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 513 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 514 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 515 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 516 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 517 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 518 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 519 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 520 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 497 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 498 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 499 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 500 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 501 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 502 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 503 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 504 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 505 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 506 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 507 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 508 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 509 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 510 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 511 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 512 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 513 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 514 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 515 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 516 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 517 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 518 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 519 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 520 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 521 | 521 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 522 | 522 | //if ($wstype != 1) { |
| 523 | 523 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 524 | 524 | //} |
| 525 | 525 | echo "</form></td>\n"; |
| 526 | 526 | |
| 527 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 528 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 529 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 530 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 531 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 532 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 533 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 534 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 535 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 536 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 537 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 538 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 539 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 540 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 541 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 542 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 543 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 544 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 545 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 546 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 547 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 548 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 549 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 550 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 551 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 552 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 553 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 527 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 528 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 529 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 530 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 531 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 532 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 533 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 534 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 535 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 536 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 537 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 538 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 539 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 540 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 541 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 542 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 543 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 544 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 545 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 546 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 547 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 548 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 549 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 550 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 551 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 552 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 553 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 554 | 554 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 555 | 555 | echo "</form></td></tr>\n"; |
| 556 | 556 | } |
@@ -562,14 +562,14 @@ discard block |
||
| 562 | 562 | case 'wrap': |
| 563 | 563 | $r1 = $resp[0]->value(); |
| 564 | 564 | $r2 = $resp[1]->value(); |
| 565 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 565 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 566 | 566 | echo "Error: signature unknown\n"; |
| 567 | 567 | } else { |
| 568 | 568 | $mdesc = $r1->scalarval(); |
| 569 | 569 | $encoder = new PhpXmlRpc\Encoder(); |
| 570 | 570 | $msig = $encoder->decode($r2); |
| 571 | 571 | $msig = $msig[$methodsig]; |
| 572 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 572 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 573 | 573 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 574 | 574 | $clientcookies == '') { |
| 575 | 575 | $opts = 1; // simple client copy in stub code |
@@ -590,12 +590,12 @@ discard block |
||
| 590 | 590 | $client, |
| 591 | 591 | $method, |
| 592 | 592 | array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true), |
| 593 | - str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc |
|
| 593 | + str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc |
|
| 594 | 594 | ); |
| 595 | 595 | //if ($code) |
| 596 | 596 | //{ |
| 597 | 597 | echo "<div id=\"phpcode\">\n"; |
| 598 | - highlight_string("<?php\n" . $code['docstring'] . $code['source']); |
|
| 598 | + highlight_string("<?php\n".$code['docstring'].$code['source']); |
|
| 599 | 599 | echo "\n</div>"; |
| 600 | 600 | //} |
| 601 | 601 | //else |
@@ -606,11 +606,11 @@ discard block |
||
| 606 | 606 | break; |
| 607 | 607 | |
| 608 | 608 | case 'execute': |
| 609 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 609 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 610 | 610 | break; |
| 611 | 611 | |
| 612 | 612 | case 'notification': |
| 613 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 613 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 614 | 614 | break; |
| 615 | 615 | |
| 616 | 616 | default: // give a warning |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy, |
| 22 | 22 | $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies; |
| 23 | 23 | |
| 24 | -include __DIR__ . '/common.php'; |
|
| 24 | +include __DIR__.'/common.php'; |
|
| 25 | 25 | |
| 26 | 26 | if ($action == '') { |
| 27 | 27 | $action = 'list'; |
@@ -38,30 +38,30 @@ discard block |
||
| 38 | 38 | /// @const JSXMLRPC_PATH Path to the visual xml-rpc editing dialog's containing folder. Can be absolute, or |
| 39 | 39 | /// relative to this debugger's folder. |
| 40 | 40 | if (defined('JSXMLRPC_PATH')) { |
| 41 | - $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH)); |
|
| 41 | + $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH)); |
|
| 42 | 42 | } else { |
| 43 | 43 | $editorpaths = array( |
| 44 | - __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile |
|
| 45 | - __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger |
|
| 46 | - __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger |
|
| 47 | - __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 48 | - __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 49 | - __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 50 | - __DIR__ . '/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc) |
|
| 51 | - __DIR__ . '/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer |
|
| 52 | - __DIR__ . '/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm |
|
| 53 | - __DIR__ . '/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project |
|
| 44 | + __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile |
|
| 45 | + __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger |
|
| 46 | + __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger |
|
| 47 | + __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 48 | + __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 49 | + __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 50 | + __DIR__.'/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc) |
|
| 51 | + __DIR__.'/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer |
|
| 52 | + __DIR__.'/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm |
|
| 53 | + __DIR__.'/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project |
|
| 54 | 54 | ); |
| 55 | 55 | } |
| 56 | - foreach($editorpaths as $editorpath) { |
|
| 57 | - if (is_file(realpath($editorpath . 'visualeditor.html'))) { |
|
| 56 | + foreach ($editorpaths as $editorpath) { |
|
| 57 | + if (is_file(realpath($editorpath.'visualeditor.html'))) { |
|
| 58 | 58 | $haseditor = true; |
| 59 | 59 | break; |
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | if ($haseditor) { |
| 63 | - $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
| 64 | - $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath); |
|
| 63 | + $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
| 64 | + $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath); |
|
| 65 | 65 | /// @todo for cases above 4 and up, look at $controllerRootUrl and check if the web root is not pointing directly |
| 66 | 66 | /// at this folder, as in that case the link to the visualeditor will not |
| 67 | 67 | /// work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | function activateeditor() { |
| 278 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\", "\\'"), $alt_payload); ?>'; |
|
| 278 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
| 279 | 279 | if (document.frmaction.wstype.value == "1" || document.frmaction.wstype.value == "2") |
| 280 | 280 | url += '&type=jsonrpc'; |
| 281 | 281 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -313,16 +313,16 @@ discard block |
||
| 313 | 313 | } ?>"> |
| 314 | 314 | <h1>XML-RPC |
| 315 | 315 | <?php if ($hasjsonrpcclient) { |
| 316 | - echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"' . |
|
| 316 | + echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"'. |
|
| 317 | 317 | // q: does this check make sense at all? |
| 318 | - (!class_exists('\PhpXmlRpc\Client') ? ' disabled="disabled"' : '') . ' /></form>'; |
|
| 318 | + (!class_exists('\PhpXmlRpc\Client') ? ' disabled="disabled"' : '').' /></form>'; |
|
| 319 | 319 | if ($hasjsonrpc2) { |
| 320 | 320 | echo ' / <form name="frmjsonrpc2" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(2);"/></form>JSON-RPC 2.0 '; |
| 321 | 321 | } |
| 322 | 322 | echo ' / <form name="frmjsonrpc1" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSON-RPC 1.0 '; |
| 323 | 323 | } ?> |
| 324 | 324 | Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?> |
| 325 | -<?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> |
|
| 325 | +<?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> |
|
| 326 | 326 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
| 327 | 327 | |
| 328 | 328 | <table id="serverblock"> |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | </select> |
| 385 | 385 | </td> |
| 386 | 386 | <td class="labelcell">Timeout:</td> |
| 387 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 387 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 388 | 388 | <td></td> |
| 389 | 389 | <td></td> |
| 390 | 390 | </tr> |
@@ -71,7 +71,12 @@ discard block |
||
| 71 | 71 | <html lang="en"> |
| 72 | 72 | <head> |
| 73 | 73 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 74 | - <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
| 74 | + <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) { |
|
| 75 | + echo 'JSON-RPC'; |
|
| 76 | +} else { |
|
| 77 | + echo 'XML-RPC'; |
|
| 78 | +} |
|
| 79 | +?> Debugger</title> |
|
| 75 | 80 | <meta name="robots" content="index,nofollow"/> |
| 76 | 81 | <script type="text/javascript" language="Javascript"> |
| 77 | 82 | if (window.name != 'frmcontroller') |
@@ -308,8 +313,10 @@ discard block |
||
| 308 | 313 | </script> |
| 309 | 314 | </head> |
| 310 | 315 | <body |
| 311 | - onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) { |
|
| 316 | + onload="<?php if ($hasjsonrpcclient) { |
|
| 317 | + echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) { |
|
| 312 | 318 | echo ' document.frmaction.submit();'; |
| 319 | +} |
|
| 313 | 320 | } ?>"> |
| 314 | 321 | <h1>XML-RPC |
| 315 | 322 | <?php if ($hasjsonrpcclient) { |
@@ -322,7 +329,10 @@ discard block |
||
| 322 | 329 | echo ' / <form name="frmjsonrpc1" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSON-RPC 1.0 '; |
| 323 | 330 | } ?> |
| 324 | 331 | Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?> |
| 325 | -<?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> |
|
| 332 | +<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) { |
|
| 333 | + echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); |
|
| 334 | +} |
|
| 335 | +?>)</h3> |
|
| 326 | 336 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
| 327 | 337 | |
| 328 | 338 | <table id="serverblock"> |
@@ -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,8 +86,8 @@ discard block |
||
| 86 | 86 | $wstype = defined('DEFAULT_WSTYPE') ? DEFAULT_WSTYPE : 0; |
| 87 | 87 | $id = ''; |
| 88 | 88 | if (isset($_GET['action'])) { |
| 89 | - if (isset($_GET['wstype']) && ($_GET['wstype'] == '2' || $_GET['wstype'] == '1' || $_GET['wstype'] == '0')) { |
|
| 90 | - $wstype = (int)$_GET['wstype']; |
|
| 89 | + if (isset($_GET['wstype']) && ($_GET['wstype'] == '2' || $_GET['wstype'] == '1' || $_GET['wstype'] == '0')) { |
|
| 90 | + $wstype = (int) $_GET['wstype']; |
|
| 91 | 91 | if ($wstype === 1 || $wstype === 2) { |
| 92 | 92 | if (!$hasjsonrpcclient) { |
| 93 | 93 | $wstype = 0; |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xml-rpc error... |
| 103 | 103 | if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2' || $_GET['protocol'] == '3' |
| 104 | 104 | || $_GET['protocol'] == '4')) { |
| 105 | - $protocol = (int)$_GET['protocol']; |
|
| 105 | + $protocol = (int) $_GET['protocol']; |
|
| 106 | 106 | } |
| 107 | 107 | if (strpos($host, 'http://') === 0) { |
| 108 | 108 | // NB: if protocol is https or h2, it will override http:// |
@@ -114,18 +114,18 @@ discard block |
||
| 114 | 114 | $protocol = 2; |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | - $port = isset($_GET['port']) ? (int)$_GET['port'] : ''; |
|
| 117 | + $port = isset($_GET['port']) ? (int) $_GET['port'] : ''; |
|
| 118 | 118 | if ($port === 0) { |
| 119 | 119 | $port = ''; |
| 120 | 120 | } |
| 121 | 121 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
| 122 | 122 | // in case user forgot initial '/' in xml-rpc server path, add it back |
| 123 | 123 | if ($path && ($path[0]) != '/') { |
| 124 | - $path = '/' . $path; |
|
| 124 | + $path = '/'.$path; |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
| 128 | - $debug = (int)$_GET['debug']; |
|
| 128 | + $debug = (int) $_GET['debug']; |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0; |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | /// @todo what about an https proxy? |
| 143 | 143 | $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : ''; |
| 144 | 144 | $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : ''; |
| 145 | - $timeout = isset($_GET['timeout']) ? (int)$_GET['timeout'] : 0; |
|
| 145 | + $timeout = isset($_GET['timeout']) ? (int) $_GET['timeout'] : 0; |
|
| 146 | 146 | $action = $_GET['action']; |
| 147 | 147 | |
| 148 | 148 | $method = isset($_GET['method']) ? $_GET['method'] : ''; |
@@ -157,15 +157,15 @@ discard block |
||
| 157 | 157 | $username = isset($_GET['username']) ? $_GET['username'] : ''; |
| 158 | 158 | $password = isset($_GET['password']) ? $_GET['password'] : ''; |
| 159 | 159 | |
| 160 | - $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int)$_GET['authtype'] : 1; |
|
| 160 | + $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int) $_GET['authtype'] : 1; |
|
| 161 | 161 | |
| 162 | 162 | if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) { |
| 163 | - (int)$requestcompression = $_GET['requestcompression']; |
|
| 163 | + (int) $requestcompression = $_GET['requestcompression']; |
|
| 164 | 164 | } else { |
| 165 | 165 | $requestcompression = 0; |
| 166 | 166 | } |
| 167 | 167 | if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) { |
| 168 | - $responsecompression = (int)$_GET['responsecompression']; |
|
| 168 | + $responsecompression = (int) $_GET['responsecompression']; |
|
| 169 | 169 | } else { |
| 170 | 170 | $responsecompression = 0; |
| 171 | 171 | } |
