gggeek /
phpxmlrpc
@@ -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')) { |
@@ -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"); |
@@ -156,10 +156,10 @@ discard block |
||
| 156 | 156 | $server = $parts['host']; |
| 157 | 157 | $path = isset($parts['path']) ? $parts['path'] : ''; |
| 158 | 158 | if (isset($parts['query'])) { |
| 159 | - $path .= '?' . $parts['query']; |
|
| 159 | + $path .= '?'.$parts['query']; |
|
| 160 | 160 | } |
| 161 | 161 | if (isset($parts['fragment'])) { |
| 162 | - $path .= '#' . $parts['fragment']; |
|
| 162 | + $path .= '#'.$parts['fragment']; |
|
| 163 | 163 | } |
| 164 | 164 | if (isset($parts['port'])) { |
| 165 | 165 | $port = $parts['port']; |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | } |
| 176 | 176 | } |
| 177 | 177 | if ($path == '' || $path[0] != '/') { |
| 178 | - $this->path = '/' . $path; |
|
| 178 | + $this->path = '/'.$path; |
|
| 179 | 179 | } else { |
| 180 | 180 | $this->path = $path; |
| 181 | 181 | } |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | }*/ |
| 214 | 214 | |
| 215 | 215 | // initialize user_agent string |
| 216 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
| 216 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | /** |
@@ -593,7 +593,7 @@ discard block |
||
| 593 | 593 | */ |
| 594 | 594 | protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 595 | 595 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 596 | - $method='http') |
|
| 596 | + $method = 'http') |
|
| 597 | 597 | { |
| 598 | 598 | //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED); |
| 599 | 599 | |
@@ -626,7 +626,7 @@ discard block |
||
| 626 | 626 | * |
| 627 | 627 | * @return Response |
| 628 | 628 | */ |
| 629 | - protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 629 | + protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 630 | 630 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 631 | 631 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 632 | 632 | $sslVersion = 0) |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | */ |
| 667 | 667 | protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 668 | 668 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 669 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '', |
|
| 669 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '', |
|
| 670 | 670 | $sslVersion = 0) |
| 671 | 671 | { |
| 672 | 672 | /// @todo log a warning if passed an unsupported method |
@@ -702,15 +702,15 @@ discard block |
||
| 702 | 702 | // thanks to Grant Rauscher <[email protected]> for this |
| 703 | 703 | $credentials = ''; |
| 704 | 704 | if ($username != '') { |
| 705 | - $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n"; |
|
| 705 | + $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n"; |
|
| 706 | 706 | if ($authType != 1) { |
| 707 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 707 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 708 | 708 | } |
| 709 | 709 | } |
| 710 | 710 | |
| 711 | 711 | $acceptedEncoding = ''; |
| 712 | 712 | if (is_array($this->accepted_compression) && count($this->accepted_compression)) { |
| 713 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n"; |
|
| 713 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n"; |
|
| 714 | 714 | } |
| 715 | 715 | |
| 716 | 716 | $proxyCredentials = ''; |
@@ -721,12 +721,12 @@ discard block |
||
| 721 | 721 | $connectServer = $proxyHost; |
| 722 | 722 | $connectPort = $proxyPort; |
| 723 | 723 | $transport = 'tcp'; |
| 724 | - $uri = 'http://' . $server . ':' . $port . $this->path; |
|
| 724 | + $uri = 'http://'.$server.':'.$port.$this->path; |
|
| 725 | 725 | if ($proxyUsername != '') { |
| 726 | 726 | if ($proxyAuthType != 1) { |
| 727 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 727 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 728 | 728 | } |
| 729 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n"; |
|
| 729 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n"; |
|
| 730 | 730 | } |
| 731 | 731 | } else { |
| 732 | 732 | $connectServer = $server; |
@@ -741,45 +741,45 @@ discard block |
||
| 741 | 741 | $version = ''; |
| 742 | 742 | foreach ($this->cookies as $name => $cookie) { |
| 743 | 743 | if ($cookie['version']) { |
| 744 | - $version = ' $Version="' . $cookie['version'] . '";'; |
|
| 745 | - $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";'; |
|
| 744 | + $version = ' $Version="'.$cookie['version'].'";'; |
|
| 745 | + $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";'; |
|
| 746 | 746 | if ($cookie['path']) { |
| 747 | - $cookieHeader .= ' $Path="' . $cookie['path'] . '";'; |
|
| 747 | + $cookieHeader .= ' $Path="'.$cookie['path'].'";'; |
|
| 748 | 748 | } |
| 749 | 749 | if ($cookie['domain']) { |
| 750 | - $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";'; |
|
| 750 | + $cookieHeader .= ' $Domain="'.$cookie['domain'].'";'; |
|
| 751 | 751 | } |
| 752 | 752 | if ($cookie['port']) { |
| 753 | - $cookieHeader .= ' $Port="' . $cookie['port'] . '";'; |
|
| 753 | + $cookieHeader .= ' $Port="'.$cookie['port'].'";'; |
|
| 754 | 754 | } |
| 755 | 755 | } else { |
| 756 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 756 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 757 | 757 | } |
| 758 | 758 | } |
| 759 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 759 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 760 | 760 | } |
| 761 | 761 | |
| 762 | 762 | // omit port if default |
| 763 | 763 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
| 764 | - $port = ''; |
|
| 764 | + $port = ''; |
|
| 765 | 765 | } else { |
| 766 | - $port = ':' . $port; |
|
| 766 | + $port = ':'.$port; |
|
| 767 | 767 | } |
| 768 | 768 | |
| 769 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 770 | - 'User-Agent: ' . $this->user_agent . "\r\n" . |
|
| 771 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 772 | - $credentials . |
|
| 773 | - $proxyCredentials . |
|
| 774 | - $acceptedEncoding . |
|
| 775 | - $encodingHdr . |
|
| 776 | - 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" . |
|
| 777 | - $cookieHeader . |
|
| 778 | - 'Content-Type: ' . $req->content_type . "\r\nContent-Length: " . |
|
| 779 | - strlen($payload) . "\r\n\r\n" . |
|
| 769 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 770 | + 'User-Agent: '.$this->user_agent."\r\n". |
|
| 771 | + 'Host: '.$server.$port."\r\n". |
|
| 772 | + $credentials. |
|
| 773 | + $proxyCredentials. |
|
| 774 | + $acceptedEncoding. |
|
| 775 | + $encodingHdr. |
|
| 776 | + 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n". |
|
| 777 | + $cookieHeader. |
|
| 778 | + 'Content-Type: '.$req->content_type."\r\nContent-Length: ". |
|
| 779 | + strlen($payload)."\r\n\r\n". |
|
| 780 | 780 | $payload; |
| 781 | 781 | |
| 782 | - if ($this->debug > 1) { |
|
| 782 | + if ($this->debug>1) { |
|
| 783 | 783 | $this->getLogger()->debugMessage("---SENDING---\n$op\n---END---"); |
| 784 | 784 | } |
| 785 | 785 | |
@@ -806,7 +806,7 @@ discard block |
||
| 806 | 806 | |
| 807 | 807 | $context = stream_context_create($contextOptions); |
| 808 | 808 | |
| 809 | - if ($timeout <= 0) { |
|
| 809 | + if ($timeout<=0) { |
|
| 810 | 810 | $connectTimeout = ini_get('default_socket_timeout'); |
| 811 | 811 | } else { |
| 812 | 812 | $connectTimeout = $timeout; |
@@ -818,7 +818,7 @@ discard block |
||
| 818 | 818 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 819 | 819 | STREAM_CLIENT_CONNECT, $context); |
| 820 | 820 | if ($fp) { |
| 821 | - if ($timeout > 0) { |
|
| 821 | + if ($timeout>0) { |
|
| 822 | 822 | stream_set_timeout($fp, $timeout); |
| 823 | 823 | } |
| 824 | 824 | } else { |
@@ -827,8 +827,8 @@ discard block |
||
| 827 | 827 | $this->errstr = $err['message']; |
| 828 | 828 | } |
| 829 | 829 | |
| 830 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 831 | - $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 830 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 831 | + $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 832 | 832 | |
| 833 | 833 | return $r; |
| 834 | 834 | } |
@@ -917,18 +917,18 @@ discard block |
||
| 917 | 917 | $keyPass, $sslVersion); |
| 918 | 918 | |
| 919 | 919 | if (!$curl) { |
| 920 | - return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': error during curl initialization. Check php error log for details'); |
|
| 920 | + return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': error during curl initialization. Check php error log for details'); |
|
| 921 | 921 | } |
| 922 | 922 | |
| 923 | 923 | $result = curl_exec($curl); |
| 924 | 924 | |
| 925 | - if ($this->debug > 1) { |
|
| 925 | + if ($this->debug>1) { |
|
| 926 | 926 | $message = "---CURL INFO---\n"; |
| 927 | 927 | foreach (curl_getinfo($curl) as $name => $val) { |
| 928 | 928 | if (is_array($val)) { |
| 929 | 929 | $val = implode("\n", $val); |
| 930 | 930 | } |
| 931 | - $message .= $name . ': ' . $val . "\n"; |
|
| 931 | + $message .= $name.': '.$val."\n"; |
|
| 932 | 932 | } |
| 933 | 933 | $message .= '---END---'; |
| 934 | 934 | $this->getLogger()->debugMessage($message); |
@@ -938,7 +938,7 @@ discard block |
||
| 938 | 938 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 939 | 939 | |
| 940 | 940 | $this->errstr = 'no response'; |
| 941 | - $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
| 941 | + $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
| 942 | 942 | curl_close($curl); |
| 943 | 943 | if ($keepAlive) { |
| 944 | 944 | $this->xmlrpc_curl_handle = null; |
@@ -1008,12 +1008,12 @@ discard block |
||
| 1008 | 1008 | // http, https |
| 1009 | 1009 | $protocol = $method; |
| 1010 | 1010 | if (strpos($protocol, ':') !== false) { |
| 1011 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1011 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1012 | 1012 | return false; |
| 1013 | 1013 | } |
| 1014 | 1014 | } |
| 1015 | 1015 | } |
| 1016 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path); |
|
| 1016 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path); |
|
| 1017 | 1017 | if (!$curl) { |
| 1018 | 1018 | return false; |
| 1019 | 1019 | } |
@@ -1027,7 +1027,7 @@ discard block |
||
| 1027 | 1027 | // results into variable |
| 1028 | 1028 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 1029 | 1029 | |
| 1030 | - if ($this->debug > 1) { |
|
| 1030 | + if ($this->debug>1) { |
|
| 1031 | 1031 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 1032 | 1032 | /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered |
| 1033 | 1033 | } |
@@ -1052,7 +1052,7 @@ discard block |
||
| 1052 | 1052 | } |
| 1053 | 1053 | } |
| 1054 | 1054 | // extra headers |
| 1055 | - $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings)); |
|
| 1055 | + $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)); |
|
| 1056 | 1056 | // if no keepalive is wanted, let the server know it in advance |
| 1057 | 1057 | if (!$keepAlive) { |
| 1058 | 1058 | $headers[] = 'Connection: close'; |
@@ -1069,7 +1069,7 @@ discard block |
||
| 1069 | 1069 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
| 1070 | 1070 | // timeout is borked |
| 1071 | 1071 | if ($timeout) { |
| 1072 | - curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1); |
|
| 1072 | + curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1); |
|
| 1073 | 1073 | } |
| 1074 | 1074 | |
| 1075 | 1075 | switch ($method) { |
@@ -1088,11 +1088,11 @@ discard block |
||
| 1088 | 1088 | } |
| 1089 | 1089 | |
| 1090 | 1090 | if ($username && $password) { |
| 1091 | - curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password); |
|
| 1091 | + curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password); |
|
| 1092 | 1092 | if (defined('CURLOPT_HTTPAUTH')) { |
| 1093 | 1093 | curl_setopt($curl, CURLOPT_HTTPAUTH, $authType); |
| 1094 | 1094 | } elseif ($authType != 1) { |
| 1095 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1095 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1096 | 1096 | } |
| 1097 | 1097 | } |
| 1098 | 1098 | |
@@ -1134,13 +1134,13 @@ discard block |
||
| 1134 | 1134 | if ($proxyPort == 0) { |
| 1135 | 1135 | $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1136 | 1136 | } |
| 1137 | - curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort); |
|
| 1137 | + curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort); |
|
| 1138 | 1138 | if ($proxyUsername) { |
| 1139 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword); |
|
| 1139 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword); |
|
| 1140 | 1140 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1141 | 1141 | curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType); |
| 1142 | 1142 | } elseif ($proxyAuthType != 1) { |
| 1143 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1143 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1144 | 1144 | } |
| 1145 | 1145 | } |
| 1146 | 1146 | } |
@@ -1150,7 +1150,7 @@ discard block |
||
| 1150 | 1150 | if (count($this->cookies)) { |
| 1151 | 1151 | $cookieHeader = ''; |
| 1152 | 1152 | foreach ($this->cookies as $name => $cookie) { |
| 1153 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1153 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1154 | 1154 | } |
| 1155 | 1155 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1156 | 1156 | } |
@@ -1159,7 +1159,7 @@ discard block |
||
| 1159 | 1159 | curl_setopt($curl, $opt, $val); |
| 1160 | 1160 | } |
| 1161 | 1161 | |
| 1162 | - if ($this->debug > 1) { |
|
| 1162 | + if ($this->debug>1) { |
|
| 1163 | 1163 | $this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---"); |
| 1164 | 1164 | } |
| 1165 | 1165 | |
@@ -1258,7 +1258,7 @@ discard block |
||
| 1258 | 1258 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1259 | 1259 | $numParams = $req->getNumParams(); |
| 1260 | 1260 | $params = array(); |
| 1261 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1261 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1262 | 1262 | $params[$i] = $req->getParam($i); |
| 1263 | 1263 | } |
| 1264 | 1264 | $call['params'] = new Value($params, 'array'); |
@@ -1284,15 +1284,15 @@ discard block |
||
| 1284 | 1284 | /// @todo test this code branch... |
| 1285 | 1285 | $rets = $result->value(); |
| 1286 | 1286 | if (!is_array($rets)) { |
| 1287 | - return false; // bad return type from system.multicall |
|
| 1287 | + return false; // bad return type from system.multicall |
|
| 1288 | 1288 | } |
| 1289 | 1289 | $numRets = count($rets); |
| 1290 | 1290 | if ($numRets != count($reqs)) { |
| 1291 | - return false; // wrong number of return values. |
|
| 1291 | + return false; // wrong number of return values. |
|
| 1292 | 1292 | } |
| 1293 | 1293 | |
| 1294 | 1294 | $response = array(); |
| 1295 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1295 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1296 | 1296 | $val = $rets[$i]; |
| 1297 | 1297 | if (!is_array($val)) { |
| 1298 | 1298 | return false; |
@@ -1300,7 +1300,7 @@ discard block |
||
| 1300 | 1300 | switch (count($val)) { |
| 1301 | 1301 | case 1: |
| 1302 | 1302 | if (!isset($val[0])) { |
| 1303 | - return false; // Bad value |
|
| 1303 | + return false; // Bad value |
|
| 1304 | 1304 | } |
| 1305 | 1305 | // Normal return value |
| 1306 | 1306 | $response[$i] = new Response($val[0], 0, '', 'phpvals'); |
@@ -1328,11 +1328,11 @@ discard block |
||
| 1328 | 1328 | |
| 1329 | 1329 | $rets = $result->value(); |
| 1330 | 1330 | if ($rets->kindOf() != 'array') { |
| 1331 | - return false; // bad return type from system.multicall |
|
| 1331 | + return false; // bad return type from system.multicall |
|
| 1332 | 1332 | } |
| 1333 | 1333 | $numRets = $rets->count(); |
| 1334 | 1334 | if ($numRets != count($reqs)) { |
| 1335 | - return false; // wrong number of return values. |
|
| 1335 | + return false; // wrong number of return values. |
|
| 1336 | 1336 | } |
| 1337 | 1337 | |
| 1338 | 1338 | $response = array(); |
@@ -1340,7 +1340,7 @@ discard block |
||
| 1340 | 1340 | switch ($val->kindOf()) { |
| 1341 | 1341 | case 'array': |
| 1342 | 1342 | if ($val->count() != 1) { |
| 1343 | - return false; // Bad value |
|
| 1343 | + return false; // Bad value |
|
| 1344 | 1344 | } |
| 1345 | 1345 | // Normal return value |
| 1346 | 1346 | $response[] = new Response($val[0]); |
@@ -24,12 +24,12 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | // read chunk-size, chunk-extension (if any) and crlf |
| 26 | 26 | // get the position of the linebreak |
| 27 | - $chunkEnd = strpos($buffer, "\r\n") + 2; |
|
| 27 | + $chunkEnd = strpos($buffer, "\r\n")+2; |
|
| 28 | 28 | $temp = substr($buffer, 0, $chunkEnd); |
| 29 | 29 | $chunkSize = hexdec(trim($temp)); |
| 30 | 30 | $chunkStart = $chunkEnd; |
| 31 | - while ($chunkSize > 0) { |
|
| 32 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize); |
|
| 31 | + while ($chunkSize>0) { |
|
| 32 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize); |
|
| 33 | 33 | |
| 34 | 34 | // just in case we got a broken connection |
| 35 | 35 | if ($chunkEnd == false) { |
@@ -41,19 +41,19 @@ discard block |
||
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | // read chunk-data and crlf |
| 44 | - $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 44 | + $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 45 | 45 | // append chunk-data to entity-body |
| 46 | 46 | $new .= $chunk; |
| 47 | 47 | // length := length + chunk-size |
| 48 | 48 | $length += strlen($chunk); |
| 49 | 49 | // read chunk-size and crlf |
| 50 | - $chunkStart = $chunkEnd + 2; |
|
| 50 | + $chunkStart = $chunkEnd+2; |
|
| 51 | 51 | |
| 52 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2; |
|
| 52 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2; |
|
| 53 | 53 | if ($chunkEnd == false) { |
| 54 | 54 | break; // just in case we got a broken connection |
| 55 | 55 | } |
| 56 | - $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 56 | + $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 57 | 57 | $chunkSize = hexdec(trim($temp)); |
| 58 | 58 | $chunkStart = $chunkEnd; |
| 59 | 59 | } |
@@ -83,11 +83,11 @@ discard block |
||
| 83 | 83 | // Look for CR/LF or simple LF as line separator (even though it is not valid http) |
| 84 | 84 | $pos = strpos($data, "\r\n\r\n"); |
| 85 | 85 | if ($pos || is_int($pos)) { |
| 86 | - $bd = $pos + 4; |
|
| 86 | + $bd = $pos+4; |
|
| 87 | 87 | } else { |
| 88 | 88 | $pos = strpos($data, "\n\n"); |
| 89 | 89 | if ($pos || is_int($pos)) { |
| 90 | - $bd = $pos + 2; |
|
| 90 | + $bd = $pos+2; |
|
| 91 | 91 | } else { |
| 92 | 92 | // No separation between response headers and body: fault? |
| 93 | 93 | $bd = 0; |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | // this filters out all http headers from proxy. maybe we could take them into account, too? |
| 98 | 98 | $data = substr($data, $bd); |
| 99 | 99 | } else { |
| 100 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 101 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 100 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 101 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
@@ -131,19 +131,19 @@ discard block |
||
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | if ($httpResponse['status_code'] !== '200') { |
| 134 | - $errstr = substr($data, 0, strpos($data, "\n") - 1); |
|
| 135 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr); |
|
| 136 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 134 | + $errstr = substr($data, 0, strpos($data, "\n")-1); |
|
| 135 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr); |
|
| 136 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http) |
| 140 | 140 | $pos = strpos($data, "\r\n\r\n"); |
| 141 | 141 | if ($pos || is_int($pos)) { |
| 142 | - $bd = $pos + 4; |
|
| 142 | + $bd = $pos+4; |
|
| 143 | 143 | } else { |
| 144 | 144 | $pos = strpos($data, "\n\n"); |
| 145 | 145 | if ($pos || is_int($pos)) { |
| 146 | - $bd = $pos + 2; |
|
| 146 | + $bd = $pos+2; |
|
| 147 | 147 | } else { |
| 148 | 148 | // No separation between response headers and body: fault? |
| 149 | 149 | // we could take some action here instead of going on... |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | foreach ($ar as $line) { |
| 158 | 158 | // take care of multi-line headers and cookies |
| 159 | 159 | $arr = explode(':', $line, 2); |
| 160 | - if (count($arr) > 1) { |
|
| 160 | + if (count($arr)>1) { |
|
| 161 | 161 | $headerName = strtolower(trim($arr[0])); |
| 162 | 162 | /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be |
| 163 | 163 | /// passed using multiple header lines. |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | foreach ($cookies as $cookie) { |
| 175 | 175 | // glue together all received cookies, using a comma to separate them (same as php does with getallheaders()) |
| 176 | 176 | if (isset($httpResponse['headers'][$headerName])) { |
| 177 | - $httpResponse['headers'][$headerName] .= ', ' . trim($cookie); |
|
| 177 | + $httpResponse['headers'][$headerName] .= ', '.trim($cookie); |
|
| 178 | 178 | } else { |
| 179 | 179 | $httpResponse['headers'][$headerName] = trim($cookie); |
| 180 | 180 | } |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | } |
| 204 | 204 | } elseif (isset($headerName)) { |
| 205 | 205 | /// @todo version1 cookies might span multiple lines, thus breaking the parsing above |
| 206 | - $httpResponse['headers'][$headerName] .= ' ' . trim($line); |
|
| 206 | + $httpResponse['headers'][$headerName] .= ' '.trim($line); |
|
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | 209 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | // Decode chunked encoding sent by http 1.1 servers |
| 227 | 227 | if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') { |
| 228 | 228 | if (!$data = static::decodeChunked($data)) { |
| 229 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 229 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 230 | 230 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']); |
| 231 | 231 | } |
| 232 | 232 | } |
@@ -241,19 +241,19 @@ discard block |
||
| 241 | 241 | if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 242 | 242 | $data = $degzdata; |
| 243 | 243 | if ($debug) { |
| 244 | - Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 244 | + Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 245 | 245 | } |
| 246 | 246 | } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 247 | 247 | $data = $degzdata; |
| 248 | 248 | if ($debug) { |
| 249 | - Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 249 | + Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 250 | 250 | } |
| 251 | 251 | } else { |
| 252 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server'); |
|
| 252 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server'); |
|
| 253 | 253 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']); |
| 254 | 254 | } |
| 255 | 255 | } else { |
| 256 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 256 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 257 | 257 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']); |
| 258 | 258 | } |
| 259 | 259 | } |
@@ -183,20 +183,20 @@ discard block |
||
| 183 | 183 | $callable = explode('::', $callable); |
| 184 | 184 | } |
| 185 | 185 | if (is_array($callable)) { |
| 186 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 186 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 188 | 188 | return false; |
| 189 | 189 | } |
| 190 | 190 | if (is_string($callable[0])) { |
| 191 | 191 | $plainFuncName = implode('::', $callable); |
| 192 | 192 | } elseif (is_object($callable[0])) { |
| 193 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 193 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 194 | 194 | } |
| 195 | 195 | $exists = method_exists($callable[0], $callable[1]); |
| 196 | 196 | } else if ($callable instanceof \Closure) { |
| 197 | 197 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 198 | 198 | if (!$buildIt) { |
| 199 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 199 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 200 | 200 | return false; |
| 201 | 201 | } |
| 202 | 202 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | if (!$exists) { |
| 211 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 211 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 212 | 212 | return false; |
| 213 | 213 | } |
| 214 | 214 | |
@@ -253,23 +253,23 @@ discard block |
||
| 253 | 253 | if (is_array($callable)) { |
| 254 | 254 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 255 | 255 | if ($func->isPrivate()) { |
| 256 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 256 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 257 | 257 | return false; |
| 258 | 258 | } |
| 259 | 259 | if ($func->isProtected()) { |
| 260 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 260 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 261 | 261 | return false; |
| 262 | 262 | } |
| 263 | 263 | if ($func->isConstructor()) { |
| 264 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 264 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 265 | 265 | return false; |
| 266 | 266 | } |
| 267 | 267 | if ($func->isDestructor()) { |
| 268 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 268 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 269 | 269 | return false; |
| 270 | 270 | } |
| 271 | 271 | if ($func->isAbstract()) { |
| 272 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 272 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 273 | 273 | return false; |
| 274 | 274 | } |
| 275 | 275 | /// @todo add more checks for static vs. nonstatic? |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | if ($func->isInternal()) { |
| 280 | 280 | // Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs |
| 281 | 281 | // instead of getparameters to fully reflect internal php functions ? |
| 282 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 282 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 283 | 283 | return false; |
| 284 | 284 | } |
| 285 | 285 | |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | $i = 0; |
| 332 | 332 | foreach ($func->getParameters() as $paramObj) { |
| 333 | 333 | $params[$i] = array(); |
| 334 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 334 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 335 | 335 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 336 | 336 | $i++; |
| 337 | 337 | } |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | // build a signature |
| 397 | 397 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 398 | 398 | $pSig = array($funcDesc['returnsDocs']); |
| 399 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 399 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 400 | 400 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 401 | 401 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 402 | 402 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | } |
| 455 | 455 | } |
| 456 | 456 | $numPars = $req->getNumParams(); |
| 457 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 457 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 458 | 458 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 459 | 459 | } |
| 460 | 460 | |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | |
| 468 | 468 | $result = call_user_func_array($callable, $params); |
| 469 | 469 | |
| 470 | - if (! is_a($result, $responseClass)) { |
|
| 470 | + if (!is_a($result, $responseClass)) { |
|
| 471 | 471 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 472 | 472 | $result = new $valueClass($result, $funcDesc['returns']); |
| 473 | 473 | } else { |
@@ -503,9 +503,9 @@ discard block |
||
| 503 | 503 | if ($newFuncName == '') { |
| 504 | 504 | if (is_array($callable)) { |
| 505 | 505 | if (is_string($callable[0])) { |
| 506 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 506 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 507 | 507 | } else { |
| 508 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 508 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 509 | 509 | } |
| 510 | 510 | } else { |
| 511 | 511 | if ($callable instanceof \Closure) { |
@@ -542,8 +542,8 @@ discard block |
||
| 542 | 542 | { |
| 543 | 543 | $namespace = '\\PhpXmlRpc\\'; |
| 544 | 544 | |
| 545 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 546 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 545 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 546 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 547 | 547 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 548 | 548 | |
| 549 | 549 | $i = 0; |
@@ -578,7 +578,7 @@ discard block |
||
| 578 | 578 | // build body of new function |
| 579 | 579 | |
| 580 | 580 | $innerCode = "\$paramCount = \$req->getNumParams();\n"; |
| 581 | - $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 581 | + $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 582 | 582 | |
| 583 | 583 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 584 | 584 | if ($decodePhpObjects) { |
@@ -592,13 +592,13 @@ discard block |
||
| 592 | 592 | if (is_array($callable) && is_object($callable[0])) { |
| 593 | 593 | self::$objHolder[$newFuncName] = $callable[0]; |
| 594 | 594 | $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n"; |
| 595 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 595 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 596 | 596 | } else { |
| 597 | 597 | $realFuncName = $plainFuncName; |
| 598 | 598 | } |
| 599 | 599 | foreach ($parsVariations as $i => $pars) { |
| 600 | - $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 601 | - if ($i < (count($parsVariations) - 1)) |
|
| 600 | + $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 601 | + if ($i<(count($parsVariations)-1)) |
|
| 602 | 602 | $innerCode .= "else\n"; |
| 603 | 603 | } |
| 604 | 604 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
@@ -615,7 +615,7 @@ discard block |
||
| 615 | 615 | // if ($func->returnsReference()) |
| 616 | 616 | // return false; |
| 617 | 617 | |
| 618 | - $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}"; |
|
| 618 | + $code = "function $newFuncName(\$req) {\n".$innerCode."\n}"; |
|
| 619 | 619 | |
| 620 | 620 | return $code; |
| 621 | 621 | } |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 672 | 672 | { |
| 673 | 673 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 674 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 674 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | if (is_object($className)) { |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | } else { |
| 680 | 680 | $realClassName = $className; |
| 681 | 681 | } |
| 682 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 682 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 683 | 683 | } |
| 684 | 684 | |
| 685 | 685 | /** |
@@ -770,21 +770,21 @@ discard block |
||
| 770 | 770 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 771 | 771 | { |
| 772 | 772 | $namespace = '\\PhpXmlRpc\\'; |
| 773 | - $reqClass = $namespace . 'Request'; |
|
| 774 | - $valClass = $namespace . 'Value'; |
|
| 775 | - $decoderClass = $namespace . 'Encoder'; |
|
| 773 | + $reqClass = $namespace.'Request'; |
|
| 774 | + $valClass = $namespace.'Value'; |
|
| 775 | + $decoderClass = $namespace.'Encoder'; |
|
| 776 | 776 | |
| 777 | 777 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 778 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 778 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 779 | 779 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 780 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 780 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 781 | 781 | |
| 782 | 782 | $req = new $reqClass('system.methodSignature'); |
| 783 | 783 | $req->addparam(new $valClass($methodName)); |
| 784 | 784 | $client->setDebug($debug); |
| 785 | 785 | $response = $client->send($req, $timeout, $protocol); |
| 786 | 786 | if ($response->faultCode()) { |
| 787 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 787 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 788 | 788 | return false; |
| 789 | 789 | } |
| 790 | 790 | |
@@ -794,8 +794,8 @@ discard block |
||
| 794 | 794 | $mSig = $decoder->decode($mSig); |
| 795 | 795 | } |
| 796 | 796 | |
| 797 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 798 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 797 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 798 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 799 | 799 | return false; |
| 800 | 800 | } |
| 801 | 801 | |
@@ -812,11 +812,11 @@ discard block |
||
| 812 | 812 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 813 | 813 | { |
| 814 | 814 | $namespace = '\\PhpXmlRpc\\'; |
| 815 | - $reqClass = $namespace . 'Request'; |
|
| 816 | - $valClass = $namespace . 'Value'; |
|
| 815 | + $reqClass = $namespace.'Request'; |
|
| 816 | + $valClass = $namespace.'Value'; |
|
| 817 | 817 | |
| 818 | 818 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 819 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 819 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 820 | 820 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 821 | 821 | |
| 822 | 822 | $mDesc = ''; |
@@ -851,10 +851,10 @@ discard block |
||
| 851 | 851 | $clientClone = clone $client; |
| 852 | 852 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 853 | 853 | { |
| 854 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 854 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 855 | 855 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 856 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 857 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 856 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 857 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 858 | 858 | if (isset($extraOptions['return_on_fault'])) { |
| 859 | 859 | $decodeFault = true; |
| 860 | 860 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -863,9 +863,9 @@ discard block |
||
| 863 | 863 | } |
| 864 | 864 | |
| 865 | 865 | $namespace = '\\PhpXmlRpc\\'; |
| 866 | - $reqClass = $namespace . 'Request'; |
|
| 867 | - $encoderClass = $namespace . 'Encoder'; |
|
| 868 | - $valueClass = $namespace . 'Value'; |
|
| 866 | + $reqClass = $namespace.'Request'; |
|
| 867 | + $encoderClass = $namespace.'Encoder'; |
|
| 868 | + $valueClass = $namespace.'Value'; |
|
| 869 | 869 | |
| 870 | 870 | $encoder = new $encoderClass(); |
| 871 | 871 | $encodeOptions = array(); |
@@ -937,13 +937,13 @@ discard block |
||
| 937 | 937 | * |
| 938 | 938 | * @return string[] keys: source, docstring |
| 939 | 939 | */ |
| 940 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 940 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 941 | 941 | { |
| 942 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 942 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 943 | 943 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 944 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 945 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 946 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 944 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 945 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 946 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 947 | 947 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 948 | 948 | if (isset($extraOptions['return_on_fault'])) { |
| 949 | 949 | $decodeFault = true; |
@@ -956,7 +956,7 @@ discard block |
||
| 956 | 956 | $namespace = '\\PhpXmlRpc\\'; |
| 957 | 957 | |
| 958 | 958 | $code = "function $newFuncName ("; |
| 959 | - if ($clientCopyMode < 2) { |
|
| 959 | + if ($clientCopyMode<2) { |
|
| 960 | 960 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 961 | 961 | $verbatimClientCopy = !$clientCopyMode; |
| 962 | 962 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -971,7 +971,7 @@ discard block |
||
| 971 | 971 | |
| 972 | 972 | if ($mDesc != '') { |
| 973 | 973 | // take care that PHP comment is not terminated unwillingly by method description |
| 974 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 974 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 975 | 975 | } else { |
| 976 | 976 | $mDesc = "/**\nFunction $newFuncName\n"; |
| 977 | 977 | } |
@@ -980,7 +980,7 @@ discard block |
||
| 980 | 980 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 981 | 981 | $plist = array(); |
| 982 | 982 | $pCount = count($mSig); |
| 983 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 983 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 984 | 984 | $plist[] = "\$p$i"; |
| 985 | 985 | $pType = $mSig[$i]; |
| 986 | 986 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -996,19 +996,19 @@ discard block |
||
| 996 | 996 | } |
| 997 | 997 | } |
| 998 | 998 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 999 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 999 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 1000 | 1000 | } |
| 1001 | - if ($clientCopyMode < 2) { |
|
| 1001 | + if ($clientCopyMode<2) { |
|
| 1002 | 1002 | $plist[] = '$debug=0'; |
| 1003 | 1003 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 1004 | 1004 | } |
| 1005 | 1005 | $plist = implode(', ', $plist); |
| 1006 | - $mDesc .= "* @return {$namespace}Response|" . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 1006 | + $mDesc .= "* @return {$namespace}Response|".$this->xmlrpc2PhpType($mSig[0])." (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 1007 | 1007 | |
| 1008 | 1008 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 1009 | 1009 | if ($decodeFault) { |
| 1010 | 1010 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 1011 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 1011 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 1012 | 1012 | } else { |
| 1013 | 1013 | $respCode = var_export($faultResponse, true); |
| 1014 | 1014 | } |
@@ -1021,7 +1021,7 @@ discard block |
||
| 1021 | 1021 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 1022 | 1022 | } |
| 1023 | 1023 | |
| 1024 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 1024 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 1025 | 1025 | |
| 1026 | 1026 | return array('source' => $code, 'docstring' => $mDesc); |
| 1027 | 1027 | } |
@@ -1047,23 +1047,23 @@ discard block |
||
| 1047 | 1047 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1048 | 1048 | { |
| 1049 | 1049 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1050 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1050 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1051 | 1051 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1052 | 1052 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1053 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1054 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1053 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1054 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1055 | 1055 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1056 | 1056 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1057 | 1057 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1058 | 1058 | $namespace = '\\PhpXmlRpc\\'; |
| 1059 | 1059 | |
| 1060 | - $reqClass = $namespace . 'Request'; |
|
| 1061 | - $decoderClass = $namespace . 'Encoder'; |
|
| 1060 | + $reqClass = $namespace.'Request'; |
|
| 1061 | + $decoderClass = $namespace.'Encoder'; |
|
| 1062 | 1062 | |
| 1063 | 1063 | $req = new $reqClass('system.listMethods'); |
| 1064 | 1064 | $response = $client->send($req, $timeout, $protocol); |
| 1065 | 1065 | if ($response->faultCode()) { |
| 1066 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1066 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1067 | 1067 | |
| 1068 | 1068 | return false; |
| 1069 | 1069 | } else { |
@@ -1073,7 +1073,7 @@ discard block |
||
| 1073 | 1073 | $mList = $decoder->decode($mList); |
| 1074 | 1074 | } |
| 1075 | 1075 | if (!is_array($mList) || !count($mList)) { |
| 1076 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1076 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1077 | 1077 | |
| 1078 | 1078 | return false; |
| 1079 | 1079 | } else { |
@@ -1081,8 +1081,8 @@ discard block |
||
| 1081 | 1081 | if ($newClassName != '') { |
| 1082 | 1082 | $xmlrpcClassName = $newClassName; |
| 1083 | 1083 | } else { |
| 1084 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1085 | - array('_', ''), $client->server) . '_client'; |
|
| 1084 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1085 | + array('_', ''), $client->server).'_client'; |
|
| 1086 | 1086 | } |
| 1087 | 1087 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1088 | 1088 | $xmlrpcClassName .= 'x'; |
@@ -1113,20 +1113,20 @@ discard block |
||
| 1113 | 1113 | if (!$buildIt) { |
| 1114 | 1114 | $source .= $methodWrap['docstring']; |
| 1115 | 1115 | } |
| 1116 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1116 | + $source .= $methodWrap['source']."\n"; |
|
| 1117 | 1117 | } else { |
| 1118 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1118 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1119 | 1119 | } |
| 1120 | 1120 | } |
| 1121 | 1121 | } |
| 1122 | 1122 | $source .= "}\n"; |
| 1123 | 1123 | if ($buildIt) { |
| 1124 | 1124 | $allOK = 0; |
| 1125 | - eval($source . '$allOK=1;'); |
|
| 1125 | + eval($source.'$allOK=1;'); |
|
| 1126 | 1126 | if ($allOK) { |
| 1127 | 1127 | return $xmlrpcClassName; |
| 1128 | 1128 | } else { |
| 1129 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1129 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1130 | 1130 | return false; |
| 1131 | 1131 | } |
| 1132 | 1132 | } else { |
@@ -1148,8 +1148,8 @@ discard block |
||
| 1148 | 1148 | */ |
| 1149 | 1149 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1150 | 1150 | { |
| 1151 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) . |
|
| 1152 | - "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n"; |
|
| 1151 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path). |
|
| 1152 | + "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server)."', $client->port);\n"; |
|
| 1153 | 1153 | |
| 1154 | 1154 | // copy all client fields to the client that will be generated runtime |
| 1155 | 1155 | // (this provides for future expansion or subclassing of client obj) |
