@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
5 | 5 | |
6 | -include_once __DIR__ . '/parse_args.php'; |
|
6 | +include_once __DIR__.'/parse_args.php'; |
|
7 | 7 | |
8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
9 | 9 | |
10 | 10 | use PHPUnit\Runner\BaseTestRunner; |
11 | 11 | |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | public function testI8() |
105 | 105 | { |
106 | - if (PHP_INT_SIZE == 4 ) { |
|
106 | + if (PHP_INT_SIZE == 4) { |
|
107 | 107 | $this->markTestSkipped('Can not test i8 as php is compiled in 32 bit mode'); |
108 | 108 | return; |
109 | 109 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | |
134 | 134 | public function testUnicodeInMemberName() |
135 | 135 | { |
136 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
136 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
137 | 137 | $v = array($str => new xmlrpcval(1)); |
138 | 138 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
139 | 139 | $r = $r->serialize(); |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | '<?xml version="1.0"?> |
151 | 151 | <!-- $Id --> |
152 | 152 | <!-- found by G. Giunta, covers what happens when lib receives UTF8 chars in response text and comments --> |
153 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
153 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
154 | 154 | <methodResponse> |
155 | 155 | <fault> |
156 | 156 | <value> |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | </member> |
162 | 162 | <member> |
163 | 163 | <name>faultString</name> |
164 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
164 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
165 | 165 | </member> |
166 | 166 | </struct> |
167 | 167 | </value> |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | $m = $this->newMsg('dummy'); |
171 | 171 | $r = $m->parseResponse($response); |
172 | 172 | $v = $r->faultString(); |
173 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
173 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | public function testBrokenRequests() |
@@ -410,11 +410,11 @@ discard block |
||
410 | 410 | |
411 | 411 | public function testUTF8Response() |
412 | 412 | { |
413 | - $string = chr(224) . chr(252) . chr(232); |
|
413 | + $string = chr(224).chr(252).chr(232); |
|
414 | 414 | |
415 | 415 | $s = $this->newMsg('dummy'); |
416 | - $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
417 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
416 | + $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
417 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
418 | 418 | '; |
419 | 419 | $r = $s->parseResponse($f, false, 'phpvals'); |
420 | 420 | $v = $r->value(); |
@@ -422,7 +422,7 @@ discard block |
||
422 | 422 | $this->assertEquals($string, $v); |
423 | 423 | |
424 | 424 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
425 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
425 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . @utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
426 | 426 | '; |
427 | 427 | $r = $s->parseResponse($f, false, 'phpvals'); |
428 | 428 | $v = $r->value(); |
@@ -438,11 +438,11 @@ discard block |
||
438 | 438 | |
439 | 439 | public function testLatin1Response() |
440 | 440 | { |
441 | - $string = chr(224) . chr(252) . chr(232); |
|
441 | + $string = chr(224).chr(252).chr(232); |
|
442 | 442 | |
443 | 443 | $s = $this->newMsg('dummy'); |
444 | - $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
445 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
444 | + $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
445 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
446 | 446 | '; |
447 | 447 | $r = $s->parseResponse($f, false, 'phpvals'); |
448 | 448 | $v = $r->value(); |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | $this->assertEquals($string, $v); |
451 | 451 | |
452 | 452 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
453 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
453 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
454 | 454 | '; |
455 | 455 | $r = $s->parseResponse($f, false, 'phpvals'); |
456 | 456 | $v = $r->value(); |
@@ -76,13 +76,13 @@ discard block |
||
76 | 76 | 'scalar' => $val, |
77 | 77 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val) |
78 | 78 | ); |
79 | - return (object)$xmlrpcVal; |
|
79 | + return (object) $xmlrpcVal; |
|
80 | 80 | case 'base64': |
81 | 81 | $xmlrpcVal = array( |
82 | 82 | 'xmlrpc_type' => 'base64', |
83 | 83 | 'scalar' => $val |
84 | 84 | ); |
85 | - return (object)$xmlrpcVal; |
|
85 | + return (object) $xmlrpcVal; |
|
86 | 86 | case 'string': |
87 | 87 | if (isset($options['extension_api_encoding'])) { |
88 | 88 | $dval = @iconv('UTF-8', $options['extension_api_encoding'], $val); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | case 'msg': |
146 | 146 | $paramCount = $xmlrpcVal->getNumParams(); |
147 | 147 | $arr = array(); |
148 | - for ($i = 0; $i < $paramCount; $i++) { |
|
148 | + for ($i = 0; $i<$paramCount; $i++) { |
|
149 | 149 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
150 | 150 | } |
151 | 151 | return $arr; |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | break; |
263 | 263 | case 'resource': |
264 | 264 | if (in_array('extension_api', $options)) { |
265 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
265 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
266 | 266 | } else { |
267 | 267 | $xmlrpcVal = new Value(); |
268 | 268 | } |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | if ($valEncoding == 'ISO-8859-1') { |
311 | 311 | $xmlVal = utf8_encode($xmlVal); |
312 | 312 | } else { |
313 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
313 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding); |
|
314 | 314 | } |
315 | 315 | } |
316 | 316 | } |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | $parserOptions |
333 | 333 | ); |
334 | 334 | |
335 | - if ($xmlRpcParser->_xh['isf'] > 1) { |
|
335 | + if ($xmlRpcParser->_xh['isf']>1) { |
|
336 | 336 | // test that $xmlrpc->_xh['value'] is an obj, too??? |
337 | 337 | |
338 | 338 | $this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']); |
@@ -356,7 +356,7 @@ discard block |
||
356 | 356 | |
357 | 357 | case 'methodcall': |
358 | 358 | $req = new Request($xmlRpcParser->_xh['method']); |
359 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
359 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
360 | 360 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
361 | 361 | } |
362 | 362 | return $req; |
@@ -4,7 +4,7 @@ |
||
4 | 4 | if (isset($_GET['run'])) { |
5 | 5 | $path = parse_url($_GET['run']); |
6 | 6 | if (isset($path['query'])) { |
7 | - $query = '?' . $path['query']; |
|
7 | + $query = '?'.$path['query']; |
|
8 | 8 | } |
9 | 9 | } |
10 | 10 |
@@ -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 |
@@ -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() |
@@ -54,8 +54,7 @@ discard block |
||
54 | 54 | function stripslashes_deep($value) |
55 | 55 | { |
56 | 56 | $value = is_array($value) ? |
57 | - array_map('stripslashes_deep', $value) : |
|
58 | - stripslashes($value); |
|
57 | + array_map('stripslashes_deep', $value) : stripslashes($value); |
|
59 | 58 | |
60 | 59 | return $value; |
61 | 60 | } |
@@ -105,7 +104,7 @@ discard block |
||
105 | 104 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
106 | 105 | // in case user forgot initial '/' in xmlrpc server path, add it back |
107 | 106 | if ($path && ($path[0]) != '/') { |
108 | - $path = '/' . $path; |
|
107 | + $path = '/'.$path; |
|
109 | 108 | } |
110 | 109 | |
111 | 110 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
@@ -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,24 +33,24 @@ discard block |
||
33 | 33 | /// @const JSXMLRPC_PATH Path to the visual xmlrpc 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__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger |
|
40 | - __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger |
|
41 | - __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
42 | - __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
43 | - __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
39 | + __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger |
|
40 | + __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger |
|
41 | + __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
42 | + __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
43 | + __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
44 | 44 | ); |
45 | 45 | } |
46 | - foreach($editorpaths as $editorpath) { |
|
47 | - if (is_file(realpath($editorpath . 'visualeditor.html'))) { |
|
46 | + foreach ($editorpaths as $editorpath) { |
|
47 | + if (is_file(realpath($editorpath.'visualeditor.html'))) { |
|
48 | 48 | $haseditor = true; |
49 | 49 | break; |
50 | 50 | } |
51 | 51 | } |
52 | 52 | if ($haseditor) { |
53 | - $editorurlpath = preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath); |
|
53 | + $editorurlpath = preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath); |
|
54 | 54 | |
55 | 55 | /// @todo for cases 3, 4 and 5 above, look at `parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)` and check if the |
56 | 56 | /// web root is not pointing directly at this folder, as in that case the link to the visualeditor will not |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | } |
229 | 229 | |
230 | 230 | function activateeditor() { |
231 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>'; |
|
231 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
232 | 232 | if (document.frmaction.wstype.value == "1") |
233 | 233 | url += '&type=jsonrpc'; |
234 | 234 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -265,9 +265,9 @@ discard block |
||
265 | 265 | echo ' document.forms[2].submit();'; |
266 | 266 | } ?>"> |
267 | 267 | <h1>XMLRPC |
268 | - <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> |
|
268 | + <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> |
|
269 | 269 | / |
270 | - <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> |
|
270 | + <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> |
|
271 | 271 | JSONRPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHP-XMLRPC</a> library) |
272 | 272 | </h1> |
273 | 273 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | </select> |
331 | 331 | </td> |
332 | 332 | <td class="labelcell">Timeout:</td> |
333 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
333 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
334 | 334 | <td></td> |
335 | 335 | <td></td> |
336 | 336 | </tr> |
@@ -7,7 +7,7 @@ |
||
7 | 7 | * @todo rename to something akin to xsltproc |
8 | 8 | */ |
9 | 9 | |
10 | -if ($_SERVER['argc'] < 4) { |
|
10 | +if ($_SERVER['argc']<4) { |
|
11 | 11 | error("Usage: php convert.php docbook.xml stylesheet.xsl output-dir|output_file"); |
12 | 12 | } |
13 | 13 |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/_prepend.php"; |
|
2 | +require_once __DIR__."/_prepend.php"; |
|
3 | 3 | |
4 | 4 | output('<html lang="en"> |
5 | 5 | <head><title>xmlrpc - Webservice wrapper demo</title></head> |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | $client->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals |
21 | 21 | $resp = $client->send(new PhpXmlRpc\Request('system.listMethods')); |
22 | 22 | if ($resp->faultCode()) { |
23 | - output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '" . htmlspecialchars($resp->faultString()) . "'</p>\n"); |
|
23 | + output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '".htmlspecialchars($resp->faultString())."'</p>\n"); |
|
24 | 24 | } else { |
25 | 25 | output("<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n"); |
26 | 26 | flush(); |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | if ($methodName == 'examples.getStateName') { |
33 | 33 | $callable = $wrapper->wrapXmlrpcMethod($client, $methodName); |
34 | 34 | if ($callable) { |
35 | - output("<li>Remote server method " . htmlspecialchars($methodName) . " wrapped into php function</li>\n"); |
|
35 | + output("<li>Remote server method ".htmlspecialchars($methodName)." wrapped into php function</li>\n"); |
|
36 | 36 | } else { |
37 | - output("<li>Remote server method " . htmlspecialchars($methodName) . " could not be wrapped!</li>\n"); |
|
37 | + output("<li>Remote server method ".htmlspecialchars($methodName)." could not be wrapped!</li>\n"); |
|
38 | 38 | } |
39 | 39 | break; |
40 | 40 | } |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once __DIR__ . "/_prepend.php"; |
|
2 | +require_once __DIR__."/_prepend.php"; |
|
3 | 3 | |
4 | 4 | output('<html lang="en"> |
5 | 5 | <head><title>xmlrpc - Agesort demo</title></head> |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | |
15 | 15 | output("This is the input data:<br/><pre>"); |
16 | 16 | foreach ($inAr as $key => $val) { |
17 | - output($key . ", " . $val . "\n"); |
|
17 | + output($key.", ".$val."\n"); |
|
18 | 18 | } |
19 | 19 | output("</pre>"); |
20 | 20 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | ); |
31 | 31 | } |
32 | 32 | $v = new PhpXmlRpc\Value($p, "array"); |
33 | -output("Encoded into xmlrpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n"); |
|
33 | +output("Encoded into xmlrpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n"); |
|
34 | 34 | |
35 | 35 | // create client and message objects |
36 | 36 | $req = new PhpXmlRpc\Request('examples.sortByAge', array($v)); |
@@ -50,15 +50,15 @@ discard block |
||
50 | 50 | foreach ($value as $struct) { |
51 | 51 | $name = $struct["name"]; |
52 | 52 | $age = $struct["age"]; |
53 | - output(htmlspecialchars($name->scalarval()) . ", " . htmlspecialchars($age->scalarval()) . "\n"); |
|
53 | + output(htmlspecialchars($name->scalarval()).", ".htmlspecialchars($age->scalarval())."\n"); |
|
54 | 54 | } |
55 | 55 | |
56 | - output("<hr/>For nerds: I got this value back<br/><pre>" . |
|
57 | - htmlentities($resp->serialize()) . "</pre><hr/>\n"); |
|
56 | + output("<hr/>For nerds: I got this value back<br/><pre>". |
|
57 | + htmlentities($resp->serialize())."</pre><hr/>\n"); |
|
58 | 58 | } else { |
59 | 59 | output("An error occurred:<pre>"); |
60 | - output("Code: " . htmlspecialchars($resp->faultCode()) . |
|
61 | - "\nReason: '" . htmlspecialchars($resp->faultString()) . '\'</pre><hr/>'); |
|
60 | + output("Code: ".htmlspecialchars($resp->faultCode()). |
|
61 | + "\nReason: '".htmlspecialchars($resp->faultString()).'\'</pre><hr/>'); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | output("</body></html>\n"); |