@@ -90,13 +90,13 @@ discard block |
||
| 90 | 90 | <body> |
| 91 | 91 | <?php |
| 92 | 92 | |
| 93 | -include __DIR__ . '/common.php'; |
|
| 93 | +include __DIR__.'/common.php'; |
|
| 94 | 94 | |
| 95 | 95 | if ($action) { |
| 96 | 96 | |
| 97 | 97 | // avoid php hanging when using the builtin webserver and sending requests to itself |
| 98 | 98 | $skip = false; |
| 99 | - if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) { |
|
| 99 | + if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) { |
|
| 100 | 100 | $localHost = explode(':', $_SERVER['HTTP_HOST']); |
| 101 | 101 | /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters, |
| 102 | 102 | /// and that proxy is us |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | if (!$skip) { |
| 110 | 110 | // make sure the script waits long enough for the call to complete... |
| 111 | 111 | if ($timeout) { |
| 112 | - set_time_limit($timeout + 10); |
|
| 112 | + set_time_limit($timeout+10); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | if ($wstype == 1) { |
@@ -133,13 +133,13 @@ discard block |
||
| 133 | 133 | $server = "$host$path"; |
| 134 | 134 | } |
| 135 | 135 | if ($protocol == 2 || $protocol == 3) { |
| 136 | - $server = 'https://' . $server; |
|
| 136 | + $server = 'https://'.$server; |
|
| 137 | 137 | } else { |
| 138 | - $server = 'http://' . $server; |
|
| 138 | + $server = 'http://'.$server; |
|
| 139 | 139 | } |
| 140 | 140 | if ($proxy != '') { |
| 141 | 141 | $pproxy = explode(':', $proxy); |
| 142 | - if (count($pproxy) > 1) { |
|
| 142 | + if (count($pproxy)>1) { |
|
| 143 | 143 | $pport = $pproxy[1]; |
| 144 | 144 | } else { |
| 145 | 145 | $pport = 8080; |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | case 'wrap': |
| 215 | 215 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 216 | 216 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 217 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 217 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 218 | 218 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 219 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 219 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 220 | 220 | break; |
| 221 | 221 | case 'list': |
| 222 | 222 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -229,9 +229,9 @@ discard block |
||
| 229 | 229 | $msg[0] = new $requestClass($method, array(), $id); |
| 230 | 230 | // hack! build xml payload by hand |
| 231 | 231 | if ($wstype == 1) { |
| 232 | - $msg[0]->payload = "{\n" . |
|
| 233 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 234 | - $payload . |
|
| 232 | + $msg[0]->payload = "{\n". |
|
| 233 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 234 | + $payload. |
|
| 235 | 235 | "\n],\n\"id\": "; |
| 236 | 236 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 237 | 237 | if ($id == "") { |
@@ -244,21 +244,21 @@ discard block |
||
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | } else { |
| 247 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
| 248 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 249 | - $payload . |
|
| 250 | - "</params>\n" . $msg[0]->xml_footer(); |
|
| 247 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
| 248 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 249 | + $payload. |
|
| 250 | + "</params>\n".$msg[0]->xml_footer(); |
|
| 251 | 251 | } |
| 252 | - $actionname = 'Execution of method ' . $method; |
|
| 252 | + $actionname = 'Execution of method '.$method; |
|
| 253 | 253 | break; |
| 254 | 254 | default: // give a warning |
| 255 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 255 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 256 | 256 | } |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 260 | 260 | // this gives good user feedback for long-running methods... |
| 261 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 261 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 262 | 262 | flush(); |
| 263 | 263 | |
| 264 | 264 | $response = null; |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | break; |
| 276 | 276 | } |
| 277 | 277 | } |
| 278 | - $time = microtime(true) - $time; |
|
| 278 | + $time = microtime(true)-$time; |
|
| 279 | 279 | if ($debug) { |
| 280 | 280 | echo "</div>\n"; |
| 281 | 281 | } |
@@ -285,8 +285,8 @@ discard block |
||
| 285 | 285 | // call failed! echo out error msg! |
| 286 | 286 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 287 | 287 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 288 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 289 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 288 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 289 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 290 | 290 | echo(date("d/M/Y:H:i:s\n")); |
| 291 | 291 | } else { |
| 292 | 292 | // call succeeded: parse results |
@@ -302,36 +302,36 @@ discard block |
||
| 302 | 302 | $max = $v->count(); |
| 303 | 303 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 304 | 304 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 305 | - foreach($v as $i => $rec) { |
|
| 305 | + foreach ($v as $i => $rec) { |
|
| 306 | 306 | if ($i % 2) { |
| 307 | 307 | $class = ' class="oddrow"'; |
| 308 | 308 | } else { |
| 309 | 309 | $class = ' class="evenrow"'; |
| 310 | 310 | } |
| 311 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 312 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 320 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 321 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 322 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 323 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 324 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 325 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 326 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 327 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 328 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 329 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 330 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 331 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 332 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 333 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 334 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 311 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 312 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 320 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 321 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 322 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 323 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 324 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 325 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 326 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 327 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 328 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 329 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 330 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 331 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 332 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 333 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 334 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 335 | 335 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 336 | 336 | //echo("</tr>\n"); |
| 337 | 337 | |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | $r2 = $resp[1]->value(); |
| 359 | 359 | |
| 360 | 360 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 361 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 361 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 362 | 362 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 363 | 363 | if ($desc == "") { |
| 364 | 364 | $desc = "-"; |
@@ -368,41 +368,41 @@ discard block |
||
| 368 | 368 | if ($r2->kindOf() != "array") { |
| 369 | 369 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 370 | 370 | } else { |
| 371 | - foreach($r2 as $i => $x) { |
|
| 371 | + foreach ($r2 as $i => $x) { |
|
| 372 | 372 | $payload = ""; |
| 373 | 373 | $alt_payload = ""; |
| 374 | - if ($i + 1 % 2) { |
|
| 374 | + if ($i+1 % 2) { |
|
| 375 | 375 | $class = ' class="oddrow"'; |
| 376 | 376 | } else { |
| 377 | 377 | $class = ' class="evenrow"'; |
| 378 | 378 | } |
| 379 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 379 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 380 | 380 | if ($x->kindOf() == "array") { |
| 381 | 381 | $ret = $x[0]; |
| 382 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 383 | - if ($x->count() > 1) { |
|
| 384 | - foreach($x as $k => $y) { |
|
| 382 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 383 | + if ($x->count()>1) { |
|
| 384 | + foreach ($x as $k => $y) { |
|
| 385 | 385 | if ($k == 0) continue; |
| 386 | 386 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 387 | 387 | if ($wstype != 1) { |
| 388 | 388 | $type = $y->scalarval(); |
| 389 | 389 | $payload .= '<param><value>'; |
| 390 | - switch($type) { |
|
| 390 | + switch ($type) { |
|
| 391 | 391 | case 'undefined': |
| 392 | 392 | break; |
| 393 | 393 | case 'null'; |
| 394 | 394 | $type = 'nil'; |
| 395 | 395 | // fall thru intentionally |
| 396 | 396 | default: |
| 397 | - $payload .= '<' . |
|
| 398 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 399 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 397 | + $payload .= '<'. |
|
| 398 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 399 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 400 | 400 | '>'; |
| 401 | 401 | } |
| 402 | 402 | $payload .= "</value></param>\n"; |
| 403 | 403 | } |
| 404 | 404 | $alt_payload .= $y->scalarval(); |
| 405 | - if ($k < $x->count() - 1) { |
|
| 405 | + if ($k<$x->count()-1) { |
|
| 406 | 406 | $alt_payload .= ';'; |
| 407 | 407 | echo ", "; |
| 408 | 408 | } |
@@ -415,63 +415,63 @@ discard block |
||
| 415 | 415 | echo '</td>'; |
| 416 | 416 | // button to test this method |
| 417 | 417 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 418 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 419 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 420 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 421 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 422 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 423 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 424 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 425 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 426 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 427 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 428 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 429 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 430 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 431 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 432 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 433 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 434 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 435 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 436 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 437 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 438 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 439 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 440 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 441 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 418 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 419 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 420 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 421 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 422 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 423 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 424 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 425 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 426 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 427 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 428 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 429 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 430 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 431 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 432 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 433 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 434 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 435 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 436 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 437 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 438 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 439 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 440 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 441 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 442 | 442 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 443 | 443 | if ($wstype != 1) { |
| 444 | 444 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 445 | 445 | } |
| 446 | 446 | echo "</form></td>\n"; |
| 447 | 447 | |
| 448 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 449 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 461 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 462 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 463 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 464 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 465 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 466 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 467 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 468 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 469 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 470 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 471 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 472 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 473 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 474 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 448 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 449 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 461 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 462 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 463 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 464 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 465 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 466 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 467 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 468 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 469 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 470 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 471 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 472 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 473 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 474 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 475 | 475 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 476 | 476 | echo "</form></td></tr>\n"; |
| 477 | 477 | } |
@@ -483,14 +483,14 @@ discard block |
||
| 483 | 483 | case 'wrap': |
| 484 | 484 | $r1 = $resp[0]->value(); |
| 485 | 485 | $r2 = $resp[1]->value(); |
| 486 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 486 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 487 | 487 | echo "Error: signature unknown\n"; |
| 488 | 488 | } else { |
| 489 | 489 | $mdesc = $r1->scalarval(); |
| 490 | 490 | $encoder = new PhpXmlRpc\Encoder(); |
| 491 | 491 | $msig = $encoder->decode($r2); |
| 492 | 492 | $msig = $msig[$methodsig]; |
| 493 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 493 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 494 | 494 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 495 | 495 | $clientcookies == '' |
| 496 | 496 | ) { |
@@ -504,11 +504,11 @@ discard block |
||
| 504 | 504 | $prefix = 'xmlrpc'; |
| 505 | 505 | } |
| 506 | 506 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 507 | - $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc); |
|
| 507 | + $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc); |
|
| 508 | 508 | //if ($code) |
| 509 | 509 | //{ |
| 510 | 510 | echo "<div id=\"phpcode\">\n"; |
| 511 | - highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>'); |
|
| 511 | + highlight_string("<?php\n".$code['docstring'].$code['source'].'?>'); |
|
| 512 | 512 | echo "\n</div>"; |
| 513 | 513 | //} |
| 514 | 514 | //else |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | break; |
| 520 | 520 | |
| 521 | 521 | case 'execute': |
| 522 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 522 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 523 | 523 | break; |
| 524 | 524 | |
| 525 | 525 | default: // give a warning |
@@ -17,23 +17,23 @@ discard block |
||
| 17 | 17 | // Make sure we set the correct charset type for output, so that we can display all characters |
| 18 | 18 | header('Content-Type: text/html; charset=utf-8'); |
| 19 | 19 | |
| 20 | -include __DIR__ . '/common.php'; |
|
| 20 | +include __DIR__.'/common.php'; |
|
| 21 | 21 | if ($action == '') { |
| 22 | 22 | $action = 'list'; |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | // Path to the visual xmlrpc editing dialog's containing folder. Can be absolute, or relative to this debugger's folder. |
| 26 | 26 | // We allow to easily configure this path via defines |
| 27 | -$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/debugger/'; |
|
| 27 | +$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/debugger/'; |
|
| 28 | 28 | // In case the webserver is set up so that the url to that folder is different. We default to JSXMLRPC_PATH for BC |
| 29 | 29 | $editorurlpath = defined('JSXMLRPC_BASEURL') ? JSXMLRPC_BASEURL : $editorpath; |
| 30 | 30 | if (defined('JSXMLRPC_BASEURL')) { |
| 31 | 31 | $haseditor = true; |
| 32 | 32 | } else { |
| 33 | 33 | if ($editorpath[0] !== '/') { |
| 34 | - $haseditor = is_file(realpath(__DIR__ . '/' . $editorpath . 'visualeditor.html')); |
|
| 34 | + $haseditor = is_file(realpath(__DIR__.'/'.$editorpath.'visualeditor.html')); |
|
| 35 | 35 | } else { |
| 36 | - $haseditor = is_file(realpath($editorpath . 'visualeditor.html'));; |
|
| 36 | + $haseditor = is_file(realpath($editorpath.'visualeditor.html')); ; |
|
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | function activateeditor() { |
| 211 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>'; |
|
| 211 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
| 212 | 212 | if (document.frmaction.wstype.value == "1") |
| 213 | 213 | url += '&type=jsonrpc'; |
| 214 | 214 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -245,9 +245,9 @@ discard block |
||
| 245 | 245 | echo ' document.forms[2].submit();'; |
| 246 | 246 | } ?>"> |
| 247 | 247 | <h1>XMLRPC |
| 248 | - <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
| 248 | + <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
| 249 | 249 | / |
| 250 | - <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
| 250 | + <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
| 251 | 251 | JSONRPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHP-XMLRPC</a> library) |
| 252 | 252 | </h1> |
| 253 | 253 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | </select> |
| 311 | 311 | </td> |
| 312 | 312 | <td class="labelcell">Timeout:</td> |
| 313 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 313 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 314 | 314 | <td></td> |
| 315 | 315 | <td></td> |
| 316 | 316 | </tr> |