@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | // Make sure we set the correct charset type for output, so that we can display all characters |
18 | 18 | header('Content-Type: text/html; charset=utf-8'); |
19 | 19 | |
20 | -include __DIR__ . '/common.php'; |
|
20 | +include __DIR__.'/common.php'; |
|
21 | 21 | if ($action == '') { |
22 | 22 | $action = 'list'; |
23 | 23 | } |
@@ -33,30 +33,30 @@ discard block |
||
33 | 33 | /// @const JSXMLRPC_PATH Path to the visual xml-rpc editing dialog's containing folder. Can be absolute, or |
34 | 34 | /// relative to this debugger's folder. |
35 | 35 | if (defined('JSXMLRPC_PATH')) { |
36 | - $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH)); |
|
36 | + $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH)); |
|
37 | 37 | } else { |
38 | 38 | $editorpaths = array( |
39 | - __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile |
|
40 | - __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger |
|
41 | - __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger |
|
42 | - __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
43 | - __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
44 | - __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
45 | - __DIR__ . '/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc) |
|
46 | - __DIR__ . '/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer |
|
47 | - __DIR__ . '/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm |
|
48 | - __DIR__ . '/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project |
|
39 | + __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile |
|
40 | + __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger |
|
41 | + __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger |
|
42 | + __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
43 | + __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
44 | + __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
45 | + __DIR__.'/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc) |
|
46 | + __DIR__.'/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer |
|
47 | + __DIR__.'/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm |
|
48 | + __DIR__.'/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project |
|
49 | 49 | ); |
50 | 50 | } |
51 | - foreach($editorpaths as $editorpath) { |
|
52 | - if (is_file(realpath($editorpath . 'visualeditor.html'))) { |
|
51 | + foreach ($editorpaths as $editorpath) { |
|
52 | + if (is_file(realpath($editorpath.'visualeditor.html'))) { |
|
53 | 53 | $haseditor = true; |
54 | 54 | break; |
55 | 55 | } |
56 | 56 | } |
57 | 57 | if ($haseditor) { |
58 | - $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
59 | - $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath); |
|
58 | + $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
59 | + $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath); |
|
60 | 60 | /// @todo for cases above 4 and up, look at $controllerRootUrl and check if the web root is not pointing directly |
61 | 61 | /// at this folder, as in that case the link to the visualeditor will not |
62 | 62 | /// work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | } |
234 | 234 | |
235 | 235 | function activateeditor() { |
236 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\", "\\'"), $alt_payload); ?>'; |
|
236 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
237 | 237 | if (document.frmaction.wstype.value == "1") |
238 | 238 | url += '&type=jsonrpc'; |
239 | 239 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | JSON-RPC'; |
279 | 279 | } ?> |
280 | 280 | Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?> |
281 | -<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
281 | +<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. '.htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
282 | 282 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
283 | 283 | |
284 | 284 | <table id="serverblock"> |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | </select> |
340 | 340 | </td> |
341 | 341 | <td class="labelcell">Timeout:</td> |
342 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
342 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
343 | 343 | <td></td> |
344 | 344 | <td></td> |
345 | 345 | </tr> |
@@ -66,7 +66,12 @@ discard block |
||
66 | 66 | <html lang="en"> |
67 | 67 | <head> |
68 | 68 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
69 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
69 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
70 | + echo 'JSON-RPC'; |
|
71 | +} else { |
|
72 | + echo 'XML-RPC'; |
|
73 | +} |
|
74 | +?> Debugger</title> |
|
70 | 75 | <meta name="robots" content="index,nofollow"/> |
71 | 76 | <script type="text/javascript" language="Javascript"> |
72 | 77 | if (window.name != 'frmcontroller') |
@@ -266,19 +271,26 @@ discard block |
||
266 | 271 | </script> |
267 | 272 | </head> |
268 | 273 | <body |
269 | - onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) { |
|
274 | + onload="<?php if ($hasjsonrpcclient) { |
|
275 | + echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) { |
|
270 | 276 | echo ' document.forms[2].submit();'; |
277 | +} |
|
271 | 278 | } ?>"> |
272 | 279 | <h1>XML-RPC |
273 | 280 | <?php if ($hasjsonrpcclient) { |
274 | 281 | echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"'; |
275 | 282 | // q: does this if make sense at all? |
276 | - if (!class_exists('\PhpXmlRpc\Client')) echo ' disabled="disabled"'; |
|
283 | + if (!class_exists('\PhpXmlRpc\Client')) { |
|
284 | + echo ' disabled="disabled"'; |
|
285 | + } |
|
277 | 286 | echo ' /></form> / <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form> |
278 | 287 | JSON-RPC'; |
279 | 288 | } ?> |
280 | 289 | Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?> |
281 | -<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
290 | +<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) { |
|
291 | + echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); |
|
292 | +} |
|
293 | +?>)</h3> |
|
282 | 294 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
283 | 295 | |
284 | 296 | <table id="serverblock"> |
@@ -78,13 +78,13 @@ discard block |
||
78 | 78 | <body> |
79 | 79 | <?php |
80 | 80 | |
81 | -include __DIR__ . '/common.php'; |
|
81 | +include __DIR__.'/common.php'; |
|
82 | 82 | |
83 | 83 | if ($action) { |
84 | 84 | |
85 | 85 | // avoid php hanging when using the builtin webserver and sending requests to itself |
86 | 86 | $skip = false; |
87 | - if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) { |
|
87 | + if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) { |
|
88 | 88 | $localHost = explode(':', $_SERVER['HTTP_HOST']); |
89 | 89 | /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters, |
90 | 90 | /// and that proxy is us |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | if (!$skip) { |
98 | 98 | // make sure the script waits long enough for the call to complete... |
99 | 99 | if ($timeout) { |
100 | - set_time_limit($timeout + 10); |
|
100 | + set_time_limit($timeout+10); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | if ($wstype == 1) { |
@@ -118,13 +118,13 @@ discard block |
||
118 | 118 | $server = "$host$path"; |
119 | 119 | } |
120 | 120 | if ($protocol == 2 || $protocol == 3) { |
121 | - $server = 'https://' . $server; |
|
121 | + $server = 'https://'.$server; |
|
122 | 122 | } else { |
123 | - $server = 'http://' . $server; |
|
123 | + $server = 'http://'.$server; |
|
124 | 124 | } |
125 | 125 | if ($proxy != '') { |
126 | 126 | $pproxy = explode(':', $proxy); |
127 | - if (count($pproxy) > 1) { |
|
127 | + if (count($pproxy)>1) { |
|
128 | 128 | $pport = $pproxy[1]; |
129 | 129 | } else { |
130 | 130 | $pport = 8080; |
@@ -199,9 +199,9 @@ discard block |
||
199 | 199 | case 'wrap': |
200 | 200 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
201 | 201 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
202 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
202 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
203 | 203 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
204 | - $actionname = 'Description of method "' . $method . '"'; |
|
204 | + $actionname = 'Description of method "'.$method.'"'; |
|
205 | 205 | break; |
206 | 206 | case 'list': |
207 | 207 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -214,9 +214,9 @@ discard block |
||
214 | 214 | $msg[0] = new $requestClass($method, array(), $id); |
215 | 215 | // hack! build payload by hand |
216 | 216 | if ($wstype == 1) { |
217 | - $msg[0]->payload = "{\n" . |
|
218 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
219 | - $payload . |
|
217 | + $msg[0]->payload = "{\n". |
|
218 | + '"method": "'.$method."\",\n\"params\": [". |
|
219 | + $payload. |
|
220 | 220 | "\n],\n\"id\": "; |
221 | 221 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
222 | 222 | if ($id == "") { |
@@ -229,21 +229,21 @@ discard block |
||
229 | 229 | } |
230 | 230 | } |
231 | 231 | } else { |
232 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
233 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
234 | - $payload . |
|
235 | - "</params>\n" . $msg[0]->xml_footer(); |
|
232 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
233 | + '<methodName>'.$method."</methodName>\n<params>". |
|
234 | + $payload. |
|
235 | + "</params>\n".$msg[0]->xml_footer(); |
|
236 | 236 | } |
237 | - $actionname = 'Execution of method ' . $method; |
|
237 | + $actionname = 'Execution of method '.$method; |
|
238 | 238 | break; |
239 | 239 | default: // give a warning |
240 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
240 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
241 | 241 | } |
242 | 242 | } |
243 | 243 | |
244 | 244 | // Before calling execute, echo out brief description of action taken + date and time ??? |
245 | 245 | // this gives good user feedback for long-running methods... |
246 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
246 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
247 | 247 | flush(); |
248 | 248 | |
249 | 249 | $response = null; |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | break; |
261 | 261 | } |
262 | 262 | } |
263 | - $time = microtime(true) - $time; |
|
263 | + $time = microtime(true)-$time; |
|
264 | 264 | if ($debug) { |
265 | 265 | echo "</div>\n"; |
266 | 266 | } |
@@ -270,8 +270,8 @@ discard block |
||
270 | 270 | // call failed! echo out error msg! |
271 | 271 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
272 | 272 | echo "<h3>$protoName call FAILED!</h3>\n"; |
273 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
274 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
273 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
274 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
275 | 275 | echo(date("d/M/Y:H:i:s\n")); |
276 | 276 | } else { |
277 | 277 | // call succeeded: parse results |
@@ -287,36 +287,36 @@ discard block |
||
287 | 287 | $max = $v->count(); |
288 | 288 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
289 | 289 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
290 | - foreach($v as $i => $rec) { |
|
290 | + foreach ($v as $i => $rec) { |
|
291 | 291 | if ($i % 2) { |
292 | 292 | $class = ' class="oddrow"'; |
293 | 293 | } else { |
294 | 294 | $class = ' class="evenrow"'; |
295 | 295 | } |
296 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
297 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
298 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
299 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
300 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
301 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
302 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
303 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
304 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
305 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
306 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
307 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
308 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
309 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
310 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
311 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
312 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
313 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
314 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
315 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
316 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
317 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
318 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
319 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
296 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
297 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
298 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
299 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
300 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
301 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
302 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
303 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
304 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
305 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
306 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
307 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
308 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
309 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
310 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
311 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
312 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
313 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
314 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
315 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
316 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
317 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
318 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
319 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
320 | 320 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
321 | 321 | //echo("</tr>\n"); |
322 | 322 | |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | $r2 = $resp[1]->value(); |
344 | 344 | |
345 | 345 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
346 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
346 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
347 | 347 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
348 | 348 | if ($desc == "") { |
349 | 349 | $desc = "-"; |
@@ -353,24 +353,24 @@ discard block |
||
353 | 353 | if ($r2->kindOf() != "array") { |
354 | 354 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
355 | 355 | } else { |
356 | - foreach($r2 as $i => $x) { |
|
356 | + foreach ($r2 as $i => $x) { |
|
357 | 357 | $payload = ""; |
358 | 358 | $alt_payload = ""; |
359 | - if ($i + 1 % 2) { |
|
359 | + if ($i+1 % 2) { |
|
360 | 360 | $class = ' class="oddrow"'; |
361 | 361 | } else { |
362 | 362 | $class = ' class="evenrow"'; |
363 | 363 | } |
364 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
364 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
365 | 365 | if ($x->kindOf() == "array") { |
366 | 366 | $ret = $x[0]; |
367 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
368 | - if ($x->count() > 1) { |
|
369 | - foreach($x as $k => $y) { |
|
367 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
368 | + if ($x->count()>1) { |
|
369 | + foreach ($x as $k => $y) { |
|
370 | 370 | if ($k == 0) continue; |
371 | 371 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
372 | 372 | if ($wstype == 1) { |
373 | - switch($y->scalarval()) { |
|
373 | + switch ($y->scalarval()) { |
|
374 | 374 | case 'string': |
375 | 375 | case 'dateTime.iso8601': |
376 | 376 | case 'base64': |
@@ -403,22 +403,22 @@ discard block |
||
403 | 403 | } else { |
404 | 404 | $type = $y->scalarval(); |
405 | 405 | $payload .= '<param><value>'; |
406 | - switch($type) { |
|
406 | + switch ($type) { |
|
407 | 407 | case 'undefined': |
408 | 408 | break; |
409 | 409 | case 'null'; |
410 | 410 | $type = 'nil'; |
411 | 411 | // fall thru intentionally |
412 | 412 | default: |
413 | - $payload .= '<' . |
|
414 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
415 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
413 | + $payload .= '<'. |
|
414 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
415 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
416 | 416 | '>'; |
417 | 417 | } |
418 | 418 | $payload .= "</value></param>\n"; |
419 | 419 | } |
420 | 420 | $alt_payload .= $y->scalarval(); |
421 | - if ($k < $x->count() - 1) { |
|
421 | + if ($k<$x->count()-1) { |
|
422 | 422 | $alt_payload .= ';'; |
423 | 423 | if ($wstype == 1) { |
424 | 424 | $payload .= ', '; |
@@ -434,63 +434,63 @@ discard block |
||
434 | 434 | echo '</td>'; |
435 | 435 | // button to test this method |
436 | 436 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
437 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
438 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
439 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
440 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
441 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
442 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
443 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
444 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
445 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
446 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
447 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
448 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
449 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
450 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
451 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
452 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
453 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
454 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
455 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
456 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
457 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
458 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
459 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
460 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
437 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
438 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
439 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
440 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
441 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
442 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
443 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
444 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
445 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
446 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
447 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
448 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
449 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
450 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
451 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
452 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
453 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
454 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
455 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
456 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
457 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
458 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
459 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
460 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
461 | 461 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
462 | 462 | //if ($wstype != 1) { |
463 | 463 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
464 | 464 | //} |
465 | 465 | echo "</form></td>\n"; |
466 | 466 | |
467 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
468 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
469 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
470 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
471 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
472 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
473 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
474 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
475 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
476 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
477 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
478 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
479 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
480 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
481 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
482 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
483 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
484 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
485 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
486 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
487 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
488 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
489 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
490 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
491 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
492 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
493 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
467 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
468 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
469 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
470 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
471 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
472 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
473 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
474 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
475 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
476 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
477 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
478 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
479 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
480 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
481 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
482 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
483 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
484 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
485 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
486 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
487 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
488 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
489 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
490 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
491 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
492 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
493 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
494 | 494 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
495 | 495 | echo "</form></td></tr>\n"; |
496 | 496 | } |
@@ -502,14 +502,14 @@ discard block |
||
502 | 502 | case 'wrap': |
503 | 503 | $r1 = $resp[0]->value(); |
504 | 504 | $r2 = $resp[1]->value(); |
505 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
505 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
506 | 506 | echo "Error: signature unknown\n"; |
507 | 507 | } else { |
508 | 508 | $mdesc = $r1->scalarval(); |
509 | 509 | $encoder = new PhpXmlRpc\Encoder(); |
510 | 510 | $msig = $encoder->decode($r2); |
511 | 511 | $msig = $msig[$methodsig]; |
512 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
512 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
513 | 513 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
514 | 514 | $clientcookies == '') { |
515 | 515 | $opts = 1; // simple client copy in stub code |
@@ -526,11 +526,11 @@ discard block |
||
526 | 526 | } else { |
527 | 527 | $wrapper = new PhpXmlRpc\Wrapper(); |
528 | 528 | } |
529 | - $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc); |
|
529 | + $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc); |
|
530 | 530 | //if ($code) |
531 | 531 | //{ |
532 | 532 | echo "<div id=\"phpcode\">\n"; |
533 | - highlight_string("<?php\n" . $code['docstring'] . $code['source']); |
|
533 | + highlight_string("<?php\n".$code['docstring'].$code['source']); |
|
534 | 534 | echo "\n</div>"; |
535 | 535 | //} |
536 | 536 | //else |
@@ -541,7 +541,7 @@ discard block |
||
541 | 541 | break; |
542 | 542 | |
543 | 543 | case 'execute': |
544 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
544 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
545 | 545 | break; |
546 | 546 | |
547 | 547 | default: // give a warning |
@@ -15,7 +15,12 @@ discard block |
||
15 | 15 | <html lang="en"> |
16 | 16 | <head> |
17 | 17 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
18 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
18 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
19 | + echo 'JSON-RPC'; |
|
20 | +} else { |
|
21 | + echo 'XML-RPC'; |
|
22 | +} |
|
23 | +?> Debugger</title> |
|
19 | 24 | <meta name="robots" content="index,nofollow"/> |
20 | 25 | <style type="text/css"> |
21 | 26 | <!-- |
@@ -367,7 +372,9 @@ discard block |
||
367 | 372 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
368 | 373 | if ($x->count() > 1) { |
369 | 374 | foreach($x as $k => $y) { |
370 | - if ($k == 0) continue; |
|
375 | + if ($k == 0) { |
|
376 | + continue; |
|
377 | + } |
|
371 | 378 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
372 | 379 | if ($wstype == 1) { |
373 | 380 | switch($y->scalarval()) { |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | // assume this is either a standalone install, or installed as Composer dependency |
21 | 21 | /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level |
22 | 22 | /// debugger include this one, taking care of autoloading? |
23 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
23 | + include_once __DIR__."/../src/Autoloader.php"; |
|
24 | 24 | PhpXmlRpc\Autoloader::register(); |
25 | 25 | } |
26 | 26 | |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | // Variables that shouldn't be unset |
37 | - $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
37 | + $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
38 | 38 | |
39 | 39 | $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, |
40 | 40 | isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array() |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | $id = ''; |
87 | 87 | if (isset($_GET['action'])) { |
88 | 88 | if (isset($_GET['wstype']) && ($_GET['wstype'] == '1' || $_GET['wstype'] == '0')) { |
89 | - $wstype = (int)$_GET['wstype']; |
|
89 | + $wstype = (int) $_GET['wstype']; |
|
90 | 90 | if ($wstype === 1 && !$hasjsonrpcclient) { |
91 | 91 | $wstype = 0; |
92 | 92 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xml-rpc error... |
98 | 98 | if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2' || $_GET['protocol'] == '3' |
99 | 99 | || $_GET['protocol'] == '4')) { |
100 | - $protocol = (int)$_GET['protocol']; |
|
100 | + $protocol = (int) $_GET['protocol']; |
|
101 | 101 | } |
102 | 102 | if (strpos($host, 'http://') === 0) { |
103 | 103 | // NB: if protocol is https or h2, it will override http:// |
@@ -109,18 +109,18 @@ discard block |
||
109 | 109 | $protocol = 2; |
110 | 110 | } |
111 | 111 | } |
112 | - $port = isset($_GET['port']) ? (int)$_GET['port'] : ''; |
|
112 | + $port = isset($_GET['port']) ? (int) $_GET['port'] : ''; |
|
113 | 113 | if ($port === 0) { |
114 | 114 | $port = ''; |
115 | 115 | } |
116 | 116 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
117 | 117 | // in case user forgot initial '/' in xml-rpc server path, add it back |
118 | 118 | if ($path && ($path[0]) != '/') { |
119 | - $path = '/' . $path; |
|
119 | + $path = '/'.$path; |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
123 | - $debug = (int)$_GET['debug']; |
|
123 | + $debug = (int) $_GET['debug']; |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0; |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | /// @todo what about an https proxy? |
138 | 138 | $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : ''; |
139 | 139 | $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : ''; |
140 | - $timeout = isset($_GET['timeout']) ? (int)$_GET['timeout'] : 0; |
|
140 | + $timeout = isset($_GET['timeout']) ? (int) $_GET['timeout'] : 0; |
|
141 | 141 | $action = $_GET['action']; |
142 | 142 | |
143 | 143 | $method = isset($_GET['method']) ? $_GET['method'] : ''; |
@@ -152,15 +152,15 @@ discard block |
||
152 | 152 | $username = isset($_GET['username']) ? $_GET['username'] : ''; |
153 | 153 | $password = isset($_GET['password']) ? $_GET['password'] : ''; |
154 | 154 | |
155 | - $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int)$_GET['authtype'] : 1; |
|
155 | + $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int) $_GET['authtype'] : 1; |
|
156 | 156 | |
157 | 157 | if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) { |
158 | - (int)$requestcompression = $_GET['requestcompression']; |
|
158 | + (int) $requestcompression = $_GET['requestcompression']; |
|
159 | 159 | } else { |
160 | 160 | $requestcompression = 0; |
161 | 161 | } |
162 | 162 | if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) { |
163 | - $responsecompression = (int)$_GET['responsecompression']; |
|
163 | + $responsecompression = (int) $_GET['responsecompression']; |
|
164 | 164 | } else { |
165 | 165 | $responsecompression = 0; |
166 | 166 | } |
@@ -13,7 +13,12 @@ |
||
13 | 13 | <html lang="en"> |
14 | 14 | <head> |
15 | 15 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
16 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
16 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
17 | + echo 'JSON-RPC'; |
|
18 | +} else { |
|
19 | + echo 'XML-RPC'; |
|
20 | +} |
|
21 | +?> Debugger</title> |
|
17 | 22 | </head> |
18 | 23 | <frameset rows="360,*"> |
19 | 24 | <frame name="frmcontroller" src="controller.php<?php echo htmlspecialchars($query); ?>" marginwidth="0" |