gggeek /
phpxmlrpc
@@ -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')) { |
@@ -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 | } |
@@ -92,9 +92,9 @@ discard block |
||
| 92 | 92 | public function xml_header($charsetEncoding = '') |
| 93 | 93 | { |
| 94 | 94 | if ($charsetEncoding != '') { |
| 95 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n"; |
|
| 95 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n"; |
|
| 96 | 96 | } else { |
| 97 | - return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n"; |
|
| 97 | + return "<?xml version=\"1.0\"?".">\n<methodCall>\n"; |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
@@ -116,16 +116,16 @@ discard block |
||
| 116 | 116 | public function createPayload($charsetEncoding = '') |
| 117 | 117 | { |
| 118 | 118 | if ($charsetEncoding != '') { |
| 119 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 119 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 120 | 120 | } else { |
| 121 | 121 | $this->content_type = 'text/xml'; |
| 122 | 122 | } |
| 123 | 123 | $this->payload = $this->xml_header($charsetEncoding); |
| 124 | - $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities( |
|
| 125 | - $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n"; |
|
| 124 | + $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities( |
|
| 125 | + $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n"; |
|
| 126 | 126 | $this->payload .= "<params>\n"; |
| 127 | 127 | foreach ($this->params as $p) { |
| 128 | - $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) . |
|
| 128 | + $this->payload .= "<param>\n".$p->serialize($charsetEncoding). |
|
| 129 | 129 | "</param>\n"; |
| 130 | 130 | } |
| 131 | 131 | $this->payload .= "</params>\n"; |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array()); |
| 254 | 254 | |
| 255 | 255 | if ($data == '') { |
| 256 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.'); |
|
| 256 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.'); |
|
| 257 | 257 | return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']); |
| 258 | 258 | } |
| 259 | 259 | |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | // failed processing of HTTP response headers |
| 267 | 267 | // save into response obj the full payload received, for debugging |
| 268 | 268 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode())); |
| 269 | - } catch(\Exception $e) { |
|
| 269 | + } catch (\Exception $e) { |
|
| 270 | 270 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data)); |
| 271 | 271 | } |
| 272 | 272 | } |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | // idea from Luca Mariano <[email protected]> originally in PEARified version of the lib |
| 281 | 281 | $pos = strrpos($data, '</methodResponse>'); |
| 282 | 282 | if ($pos !== false) { |
| 283 | - $data = substr($data, 0, $pos + 17); |
|
| 283 | + $data = substr($data, 0, $pos+17); |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | // try to 'guestimate' the character encoding of the received response |
@@ -294,9 +294,9 @@ discard block |
||
| 294 | 294 | if ($start) { |
| 295 | 295 | $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
| 296 | 296 | $end = strpos($data, '-->', $start); |
| 297 | - $comments = substr($data, $start, $end - $start); |
|
| 298 | - $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" . |
|
| 299 | - str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding); |
|
| 297 | + $comments = substr($data, $start, $end-$start); |
|
| 298 | + $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t". |
|
| 299 | + str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding); |
|
| 300 | 300 | } |
| 301 | 301 | } |
| 302 | 302 | |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | if ($respEncoding == 'ISO-8859-1') { |
| 319 | 319 | $data = utf8_encode($data); |
| 320 | 320 | } else { |
| 321 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received response: ' . $respEncoding); |
|
| 321 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$respEncoding); |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | } |
@@ -339,12 +339,12 @@ discard block |
||
| 339 | 339 | $xmlRpcParser->parse($data, $returnType, XMLParser::ACCEPT_RESPONSE, $options); |
| 340 | 340 | |
| 341 | 341 | // first error check: xml not well-formed |
| 342 | - if ($xmlRpcParser->_xh['isf'] > 2) { |
|
| 342 | + if ($xmlRpcParser->_xh['isf']>2) { |
|
| 343 | 343 | |
| 344 | 344 | // BC break: in the past for some cases we used the error message: 'XML error at line 1, check URL' |
| 345 | 345 | |
| 346 | 346 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'], |
| 347 | - PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', |
|
| 347 | + PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '', |
|
| 348 | 348 | $this->httpResponse |
| 349 | 349 | ); |
| 350 | 350 | |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | // second error check: xml well-formed but not xml-rpc compliant |
| 356 | 356 | elseif ($xmlRpcParser->_xh['isf'] == 2) { |
| 357 | 357 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'], |
| 358 | - PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', |
|
| 358 | + PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '', |
|
| 359 | 359 | $this->httpResponse |
| 360 | 360 | ); |
| 361 | 361 | |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | '', $this->httpResponse |
| 372 | 372 | ); |
| 373 | 373 | } else { |
| 374 | - if ($this->debug > 1) { |
|
| 374 | + if ($this->debug>1) { |
|
| 375 | 375 | $this->getLogger()->debugMessage( |
| 376 | 376 | "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---" |
| 377 | 377 | ); |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $this->me['struct'] = $val; |
| 120 | 120 | break; |
| 121 | 121 | default: |
| 122 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
| 122 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | if ($typeOf !== 1) { |
| 147 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
| 147 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
| 148 | 148 | return 0; |
| 149 | 149 | } |
| 150 | 150 | |
@@ -161,10 +161,10 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | switch ($this->mytype) { |
| 163 | 163 | case 1: |
| 164 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
| 164 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
| 165 | 165 | return 0; |
| 166 | 166 | case 3: |
| 167 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 167 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 168 | 168 | return 0; |
| 169 | 169 | case 2: |
| 170 | 170 | // we're adding a scalar value to an array here |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | return 1; |
| 208 | 208 | } else { |
| 209 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 209 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 210 | 210 | return 0; |
| 211 | 211 | } |
| 212 | 212 | } |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | |
| 238 | 238 | return 1; |
| 239 | 239 | } else { |
| 240 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 240 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 241 | 241 | return 0; |
| 242 | 242 | } |
| 243 | 243 | } |
@@ -280,19 +280,19 @@ discard block |
||
| 280 | 280 | case 1: |
| 281 | 281 | switch ($typ) { |
| 282 | 282 | case static::$xmlrpcBase64: |
| 283 | - $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
| 283 | + $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
| 284 | 284 | break; |
| 285 | 285 | case static::$xmlrpcBoolean: |
| 286 | - $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
| 286 | + $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
| 287 | 287 | break; |
| 288 | 288 | case static::$xmlrpcString: |
| 289 | 289 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
| 290 | - $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
| 290 | + $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
| 291 | 291 | break; |
| 292 | 292 | case static::$xmlrpcInt: |
| 293 | 293 | case static::$xmlrpcI4: |
| 294 | 294 | case static::$xmlrpcI8: |
| 295 | - $rs .= "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
| 295 | + $rs .= "<{$typ}>".(int) $val."</{$typ}>"; |
|
| 296 | 296 | break; |
| 297 | 297 | case static::$xmlrpcDouble: |
| 298 | 298 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -300,16 +300,16 @@ discard block |
||
| 300 | 300 | // sprintf('%F') could be most likely ok, but it fails eg. on 2e-14. |
| 301 | 301 | // The code below tries its best at keeping max precision while avoiding exp notation, |
| 302 | 302 | // but there is of course no limit in the number of decimal places to be used... |
| 303 | - $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
| 303 | + $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
| 304 | 304 | break; |
| 305 | 305 | case static::$xmlrpcDateTime: |
| 306 | 306 | if (is_string($val)) { |
| 307 | 307 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
| 308 | 308 | // DateTimeInterface is not present in php 5.4... |
| 309 | 309 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
| 310 | - $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
| 310 | + $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
| 311 | 311 | } elseif (is_int($val)) { |
| 312 | - $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
| 312 | + $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
| 313 | 313 | } else { |
| 314 | 314 | // not really a good idea here: but what should we output anyway? left for backward compat... |
| 315 | 315 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
@@ -331,14 +331,14 @@ discard block |
||
| 331 | 331 | case 3: |
| 332 | 332 | // struct |
| 333 | 333 | if ($this->_php_class) { |
| 334 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
| 334 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
| 335 | 335 | } else { |
| 336 | 336 | $rs .= "<struct>\n"; |
| 337 | 337 | } |
| 338 | 338 | $charsetEncoder = $this->getCharsetEncoder(); |
| 339 | 339 | /** @var Value $val2 */ |
| 340 | 340 | foreach ($val as $key2 => $val2) { |
| 341 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
| 341 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
| 342 | 342 | //$rs.=$this->serializeval($val2); |
| 343 | 343 | $rs .= $val2->serialize($charsetEncoding); |
| 344 | 344 | $rs .= "</member>\n"; |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | $val = reset($this->me); |
| 375 | 375 | $typ = key($this->me); |
| 376 | 376 | |
| 377 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
| 377 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | /** |
@@ -71,14 +71,14 @@ discard block |
||
| 71 | 71 | if (count($this->xml_iso88591_Entities['in'])) { |
| 72 | 72 | return; |
| 73 | 73 | } |
| 74 | - for ($i = 0; $i < 32; $i++) { |
|
| 74 | + for ($i = 0; $i<32; $i++) { |
|
| 75 | 75 | $this->xml_iso88591_Entities["in"][] = chr($i); |
| 76 | 76 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 80 | 80 | |
| 81 | - for ($i = 160; $i < 256; $i++) { |
|
| 81 | + for ($i = 160; $i<256; $i++) { |
|
| 82 | 82 | $this->xml_iso88591_Entities["in"][] = chr($i); |
| 83 | 83 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
| 84 | 84 | } |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | break;*/ |
| 107 | 107 | |
| 108 | 108 | default: |
| 109 | - throw new \Exception('Unsupported table: ' . $tableName); |
|
| 109 | + throw new \Exception('Unsupported table: '.$tableName); |
|
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | 112 | |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | $destEncoding = 'US-ASCII'; |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - $conversion = strtoupper($srcEncoding . '_' . $destEncoding); |
|
| 152 | + $conversion = strtoupper($srcEncoding.'_'.$destEncoding); |
|
| 153 | 153 | |
| 154 | 154 | // list ordered with (expected) most common scenarios first |
| 155 | 155 | switch ($conversion) { |
@@ -167,20 +167,20 @@ discard block |
||
| 167 | 167 | // NB: this will choke on invalid UTF-8, going most likely beyond EOF |
| 168 | 168 | $escapedData = ''; |
| 169 | 169 | // be kind to users creating string xmlrpc values out of different php types |
| 170 | - $data = (string)$data; |
|
| 170 | + $data = (string) $data; |
|
| 171 | 171 | $ns = strlen($data); |
| 172 | - for ($nn = 0; $nn < $ns; $nn++) { |
|
| 172 | + for ($nn = 0; $nn<$ns; $nn++) { |
|
| 173 | 173 | $ch = $data[$nn]; |
| 174 | 174 | $ii = ord($ch); |
| 175 | 175 | // 7 bits in 1 byte: 0bbbbbbb (127) |
| 176 | - if ($ii < 32) { |
|
| 176 | + if ($ii<32) { |
|
| 177 | 177 | if ($conversion == 'UTF-8_US-ASCII') { |
| 178 | 178 | $escapedData .= sprintf('&#%d;', $ii); |
| 179 | 179 | } else { |
| 180 | 180 | $escapedData .= $ch; |
| 181 | 181 | } |
| 182 | 182 | } |
| 183 | - else if ($ii < 128) { |
|
| 183 | + else if ($ii<128) { |
|
| 184 | 184 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
| 185 | 185 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 186 | 186 | switch ($ii) { |
@@ -205,25 +205,25 @@ discard block |
||
| 205 | 205 | } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047) |
| 206 | 206 | elseif ($ii >> 5 == 6) { |
| 207 | 207 | $b1 = ($ii & 31); |
| 208 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 209 | - $ii = ($b1 * 64) + $b2; |
|
| 208 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 209 | + $ii = ($b1 * 64)+$b2; |
|
| 210 | 210 | $escapedData .= sprintf('&#%d;', $ii); |
| 211 | 211 | $nn += 1; |
| 212 | 212 | } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb |
| 213 | 213 | elseif ($ii >> 4 == 14) { |
| 214 | 214 | $b1 = ($ii & 15); |
| 215 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 216 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
| 217 | - $ii = ((($b1 * 64) + $b2) * 64) + $b3; |
|
| 215 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 216 | + $b3 = (ord($data[$nn+2]) & 63); |
|
| 217 | + $ii = ((($b1 * 64)+$b2) * 64)+$b3; |
|
| 218 | 218 | $escapedData .= sprintf('&#%d;', $ii); |
| 219 | 219 | $nn += 2; |
| 220 | 220 | } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb |
| 221 | 221 | elseif ($ii >> 3 == 30) { |
| 222 | 222 | $b1 = ($ii & 7); |
| 223 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 224 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
| 225 | - $b4 = (ord($data[$nn + 3]) & 63); |
|
| 226 | - $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4; |
|
| 223 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 224 | + $b3 = (ord($data[$nn+2]) & 63); |
|
| 225 | + $b4 = (ord($data[$nn+3]) & 63); |
|
| 226 | + $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4; |
|
| 227 | 227 | $escapedData .= sprintf('&#%d;', $ii); |
| 228 | 228 | $nn += 3; |
| 229 | 229 | } |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | default: |
| 274 | 274 | $escapedData = ''; |
| 275 | 275 | /// @todo allow usage of a custom Logger via the DIC(ish) pattern we use in other classes |
| 276 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
| 276 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | return $escapedData; |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | case 'iso88591': |
| 327 | 327 | return $this->xml_iso88591_Entities; |
| 328 | 328 | default: |
| 329 | - throw new \Exception('Unsupported charset: ' . $charset); |
|
| 329 | + throw new \Exception('Unsupported charset: '.$charset); |
|
| 330 | 330 | } |
| 331 | 331 | } |
| 332 | 332 | } |
@@ -182,20 +182,20 @@ discard block |
||
| 182 | 182 | $callable = explode('::', $callable); |
| 183 | 183 | } |
| 184 | 184 | if (is_array($callable)) { |
| 185 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 186 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 185 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 186 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 187 | 187 | return false; |
| 188 | 188 | } |
| 189 | 189 | if (is_string($callable[0])) { |
| 190 | 190 | $plainFuncName = implode('::', $callable); |
| 191 | 191 | } elseif (is_object($callable[0])) { |
| 192 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 192 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 193 | 193 | } |
| 194 | 194 | $exists = method_exists($callable[0], $callable[1]); |
| 195 | 195 | } else if ($callable instanceof \Closure) { |
| 196 | 196 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 197 | 197 | if (!$buildIt) { |
| 198 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 198 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 199 | 199 | return false; |
| 200 | 200 | } |
| 201 | 201 | |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | if (!$exists) { |
| 210 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 210 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 211 | 211 | return false; |
| 212 | 212 | } |
| 213 | 213 | |
@@ -251,23 +251,23 @@ discard block |
||
| 251 | 251 | if (is_array($callable)) { |
| 252 | 252 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 253 | 253 | if ($func->isPrivate()) { |
| 254 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 254 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 255 | 255 | return false; |
| 256 | 256 | } |
| 257 | 257 | if ($func->isProtected()) { |
| 258 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 258 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 259 | 259 | return false; |
| 260 | 260 | } |
| 261 | 261 | if ($func->isConstructor()) { |
| 262 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 262 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 263 | 263 | return false; |
| 264 | 264 | } |
| 265 | 265 | if ($func->isDestructor()) { |
| 266 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 266 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 267 | 267 | return false; |
| 268 | 268 | } |
| 269 | 269 | if ($func->isAbstract()) { |
| 270 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 270 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 271 | 271 | return false; |
| 272 | 272 | } |
| 273 | 273 | /// @todo add more checks for static vs. nonstatic? |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | if ($func->isInternal()) { |
| 278 | 278 | /// @todo from PHP 5.1.0 onward, we should be able to use invokeargs instead of getparameters to fully |
| 279 | 279 | /// reflect internal php functions |
| 280 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 280 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 281 | 281 | return false; |
| 282 | 282 | } |
| 283 | 283 | |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | $i = 0; |
| 330 | 330 | foreach ($func->getParameters() as $paramObj) { |
| 331 | 331 | $params[$i] = array(); |
| 332 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 332 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 333 | 333 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 334 | 334 | $i++; |
| 335 | 335 | } |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | // build a signature |
| 394 | 394 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 395 | 395 | $pSig = array($funcDesc['returnsDocs']); |
| 396 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 396 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 397 | 397 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 398 | 398 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 399 | 399 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | $numPars = $req->getNumParams(); |
| 453 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 453 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 454 | 454 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 455 | 455 | } |
| 456 | 456 | |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | |
| 464 | 464 | $result = call_user_func_array($callable, $params); |
| 465 | 465 | |
| 466 | - if (! is_a($result, $responseClass)) { |
|
| 466 | + if (!is_a($result, $responseClass)) { |
|
| 467 | 467 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 468 | 468 | $result = new $valueClass($result, $funcDesc['returns']); |
| 469 | 469 | } else { |
@@ -498,9 +498,9 @@ discard block |
||
| 498 | 498 | if ($newFuncName == '') { |
| 499 | 499 | if (is_array($callable)) { |
| 500 | 500 | if (is_string($callable[0])) { |
| 501 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 501 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 502 | 502 | } else { |
| 503 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 503 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 504 | 504 | } |
| 505 | 505 | } else { |
| 506 | 506 | if ($callable instanceof \Closure) { |
@@ -536,8 +536,8 @@ discard block |
||
| 536 | 536 | { |
| 537 | 537 | $namespace = '\\PhpXmlRpc\\'; |
| 538 | 538 | |
| 539 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 540 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 539 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 540 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 541 | 541 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 542 | 542 | |
| 543 | 543 | $i = 0; |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | // build body of new function |
| 573 | 573 | |
| 574 | 574 | $innerCode = "\$paramCount = \$req->getNumParams();\n"; |
| 575 | - $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 575 | + $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 576 | 576 | |
| 577 | 577 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 578 | 578 | if ($decodePhpObjects) { |
@@ -586,13 +586,13 @@ discard block |
||
| 586 | 586 | if (is_array($callable) && is_object($callable[0])) { |
| 587 | 587 | self::$objHolder[$newFuncName] = $callable[0]; |
| 588 | 588 | $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n"; |
| 589 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 589 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 590 | 590 | } else { |
| 591 | 591 | $realFuncName = $plainFuncName; |
| 592 | 592 | } |
| 593 | 593 | foreach ($parsVariations as $i => $pars) { |
| 594 | - $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 595 | - if ($i < (count($parsVariations) - 1)) |
|
| 594 | + $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 595 | + if ($i<(count($parsVariations)-1)) |
|
| 596 | 596 | $innerCode .= "else\n"; |
| 597 | 597 | } |
| 598 | 598 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
@@ -609,7 +609,7 @@ discard block |
||
| 609 | 609 | // if ($func->returnsReference()) |
| 610 | 610 | // return false; |
| 611 | 611 | |
| 612 | - $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}"; |
|
| 612 | + $code = "function $newFuncName(\$req) {\n".$innerCode."\n}"; |
|
| 613 | 613 | |
| 614 | 614 | return $code; |
| 615 | 615 | } |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 664 | 664 | { |
| 665 | 665 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 666 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 666 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | if (is_object($className)) { |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | } else { |
| 672 | 672 | $realClassName = $className; |
| 673 | 673 | } |
| 674 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 674 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | /** |
@@ -752,21 +752,21 @@ discard block |
||
| 752 | 752 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 753 | 753 | { |
| 754 | 754 | $namespace = '\\PhpXmlRpc\\'; |
| 755 | - $reqClass = $namespace . 'Request'; |
|
| 756 | - $valClass = $namespace . 'Value'; |
|
| 757 | - $decoderClass = $namespace . 'Encoder'; |
|
| 755 | + $reqClass = $namespace.'Request'; |
|
| 756 | + $valClass = $namespace.'Value'; |
|
| 757 | + $decoderClass = $namespace.'Encoder'; |
|
| 758 | 758 | |
| 759 | 759 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 760 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 760 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 761 | 761 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 762 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 762 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 763 | 763 | |
| 764 | 764 | $req = new $reqClass('system.methodSignature'); |
| 765 | 765 | $req->addparam(new $valClass($methodName)); |
| 766 | 766 | $client->setDebug($debug); |
| 767 | 767 | $response = $client->send($req, $timeout, $protocol); |
| 768 | 768 | if ($response->faultCode()) { |
| 769 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 769 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 770 | 770 | return false; |
| 771 | 771 | } |
| 772 | 772 | |
@@ -777,8 +777,8 @@ discard block |
||
| 777 | 777 | $mSig = $decoder->decode($mSig); |
| 778 | 778 | } |
| 779 | 779 | |
| 780 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 781 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 780 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 781 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 782 | 782 | return false; |
| 783 | 783 | } |
| 784 | 784 | |
@@ -794,11 +794,11 @@ discard block |
||
| 794 | 794 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 795 | 795 | { |
| 796 | 796 | $namespace = '\\PhpXmlRpc\\'; |
| 797 | - $reqClass = $namespace . 'Request'; |
|
| 798 | - $valClass = $namespace . 'Value'; |
|
| 797 | + $reqClass = $namespace.'Request'; |
|
| 798 | + $valClass = $namespace.'Value'; |
|
| 799 | 799 | |
| 800 | 800 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 801 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 801 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 802 | 802 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 803 | 803 | |
| 804 | 804 | $mDesc = ''; |
@@ -832,10 +832,10 @@ discard block |
||
| 832 | 832 | $clientClone = clone $client; |
| 833 | 833 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 834 | 834 | { |
| 835 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 835 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 836 | 836 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 837 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 838 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 837 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 838 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 839 | 839 | if (isset($extraOptions['return_on_fault'])) { |
| 840 | 840 | $decodeFault = true; |
| 841 | 841 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -844,9 +844,9 @@ discard block |
||
| 844 | 844 | } |
| 845 | 845 | |
| 846 | 846 | $namespace = '\\PhpXmlRpc\\'; |
| 847 | - $reqClass = $namespace . 'Request'; |
|
| 848 | - $encoderClass = $namespace . 'Encoder'; |
|
| 849 | - $valueClass = $namespace . 'Value'; |
|
| 847 | + $reqClass = $namespace.'Request'; |
|
| 848 | + $encoderClass = $namespace.'Encoder'; |
|
| 849 | + $valueClass = $namespace.'Value'; |
|
| 850 | 850 | |
| 851 | 851 | $encoder = new $encoderClass(); |
| 852 | 852 | $encodeOptions = array(); |
@@ -919,13 +919,13 @@ discard block |
||
| 919 | 919 | * @param string $mDesc |
| 920 | 920 | * @return string[] keys: source, docstring |
| 921 | 921 | */ |
| 922 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 922 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 923 | 923 | { |
| 924 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 924 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 925 | 925 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 926 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 927 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 928 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 926 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 927 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 928 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 929 | 929 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 930 | 930 | if (isset($extraOptions['return_on_fault'])) { |
| 931 | 931 | $decodeFault = true; |
@@ -938,7 +938,7 @@ discard block |
||
| 938 | 938 | $namespace = '\\PhpXmlRpc\\'; |
| 939 | 939 | |
| 940 | 940 | $code = "function $newFuncName ("; |
| 941 | - if ($clientCopyMode < 2) { |
|
| 941 | + if ($clientCopyMode<2) { |
|
| 942 | 942 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 943 | 943 | $verbatimClientCopy = !$clientCopyMode; |
| 944 | 944 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -953,7 +953,7 @@ discard block |
||
| 953 | 953 | |
| 954 | 954 | if ($mDesc != '') { |
| 955 | 955 | // take care that PHP comment is not terminated unwillingly by method description |
| 956 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 956 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 957 | 957 | } else { |
| 958 | 958 | $mDesc = "/**\nFunction $newFuncName\n"; |
| 959 | 959 | } |
@@ -962,7 +962,7 @@ discard block |
||
| 962 | 962 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 963 | 963 | $plist = array(); |
| 964 | 964 | $pCount = count($mSig); |
| 965 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 965 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 966 | 966 | $plist[] = "\$p$i"; |
| 967 | 967 | $pType = $mSig[$i]; |
| 968 | 968 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -978,19 +978,19 @@ discard block |
||
| 978 | 978 | } |
| 979 | 979 | } |
| 980 | 980 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 981 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 981 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 982 | 982 | } |
| 983 | - if ($clientCopyMode < 2) { |
|
| 983 | + if ($clientCopyMode<2) { |
|
| 984 | 984 | $plist[] = '$debug=0'; |
| 985 | 985 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 986 | 986 | } |
| 987 | 987 | $plist = implode(', ', $plist); |
| 988 | - $mDesc .= "* @return {$namespace}Response|" . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 988 | + $mDesc .= "* @return {$namespace}Response|".$this->xmlrpc2PhpType($mSig[0])." (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 989 | 989 | |
| 990 | 990 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 991 | 991 | if ($decodeFault) { |
| 992 | 992 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 993 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 993 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 994 | 994 | } else { |
| 995 | 995 | $respCode = var_export($faultResponse, true); |
| 996 | 996 | } |
@@ -1003,7 +1003,7 @@ discard block |
||
| 1003 | 1003 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 1004 | 1004 | } |
| 1005 | 1005 | |
| 1006 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 1006 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 1007 | 1007 | |
| 1008 | 1008 | return array('source' => $code, 'docstring' => $mDesc); |
| 1009 | 1009 | } |
@@ -1030,24 +1030,24 @@ discard block |
||
| 1030 | 1030 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1031 | 1031 | { |
| 1032 | 1032 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1033 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1033 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1034 | 1034 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1035 | 1035 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1036 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1037 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1036 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1037 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1038 | 1038 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1039 | 1039 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1040 | 1040 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1041 | 1041 | $namespace = '\\PhpXmlRpc\\'; |
| 1042 | 1042 | |
| 1043 | - $reqClass = $namespace . 'Request'; |
|
| 1044 | - $decoderClass = $namespace . 'Encoder'; |
|
| 1043 | + $reqClass = $namespace.'Request'; |
|
| 1044 | + $decoderClass = $namespace.'Encoder'; |
|
| 1045 | 1045 | |
| 1046 | 1046 | // retrieve the list of methods |
| 1047 | 1047 | $req = new $reqClass('system.listMethods'); |
| 1048 | 1048 | $response = $client->send($req, $timeout, $protocol); |
| 1049 | 1049 | if ($response->faultCode()) { |
| 1050 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1050 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1051 | 1051 | |
| 1052 | 1052 | return false; |
| 1053 | 1053 | } |
@@ -1058,7 +1058,7 @@ discard block |
||
| 1058 | 1058 | $mList = $decoder->decode($mList); |
| 1059 | 1059 | } |
| 1060 | 1060 | if (!is_array($mList) || !count($mList)) { |
| 1061 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1061 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1062 | 1062 | |
| 1063 | 1063 | return false; |
| 1064 | 1064 | } |
@@ -1067,8 +1067,8 @@ discard block |
||
| 1067 | 1067 | if ($newClassName != '') { |
| 1068 | 1068 | $xmlrpcClassName = $newClassName; |
| 1069 | 1069 | } else { |
| 1070 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1071 | - array('_', ''), $client->server) . '_client'; |
|
| 1070 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1071 | + array('_', ''), $client->server).'_client'; |
|
| 1072 | 1072 | } |
| 1073 | 1073 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1074 | 1074 | $xmlrpcClassName .= 'x'; |
@@ -1099,20 +1099,20 @@ discard block |
||
| 1099 | 1099 | if (!$buildIt) { |
| 1100 | 1100 | $source .= $methodWrap['docstring']; |
| 1101 | 1101 | } |
| 1102 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1102 | + $source .= $methodWrap['source']."\n"; |
|
| 1103 | 1103 | } else { |
| 1104 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1104 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1105 | 1105 | } |
| 1106 | 1106 | } |
| 1107 | 1107 | } |
| 1108 | 1108 | $source .= "}\n"; |
| 1109 | 1109 | if ($buildIt) { |
| 1110 | 1110 | $allOK = 0; |
| 1111 | - eval($source . '$allOK=1;'); |
|
| 1111 | + eval($source.'$allOK=1;'); |
|
| 1112 | 1112 | if ($allOK) { |
| 1113 | 1113 | return $xmlrpcClassName; |
| 1114 | 1114 | } else { |
| 1115 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1115 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1116 | 1116 | return false; |
| 1117 | 1117 | } |
| 1118 | 1118 | } else { |
@@ -1131,8 +1131,8 @@ discard block |
||
| 1131 | 1131 | */ |
| 1132 | 1132 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1133 | 1133 | { |
| 1134 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) . |
|
| 1135 | - "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n"; |
|
| 1134 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path). |
|
| 1135 | + "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server)."', $client->port);\n"; |
|
| 1136 | 1136 | |
| 1137 | 1137 | // copy all client fields to the client that will be generated runtime |
| 1138 | 1138 | // (this provides for future expansion or subclassing of client obj) |
@@ -184,10 +184,10 @@ discard block |
||
| 184 | 184 | $server = $parts['host']; |
| 185 | 185 | $path = isset($parts['path']) ? $parts['path'] : ''; |
| 186 | 186 | if (isset($parts['query'])) { |
| 187 | - $path .= '?' . $parts['query']; |
|
| 187 | + $path .= '?'.$parts['query']; |
|
| 188 | 188 | } |
| 189 | 189 | if (isset($parts['fragment'])) { |
| 190 | - $path .= '#' . $parts['fragment']; |
|
| 190 | + $path .= '#'.$parts['fragment']; |
|
| 191 | 191 | } |
| 192 | 192 | if (isset($parts['port'])) { |
| 193 | 193 | $port = $parts['port']; |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | if ($path == '' || $path[0] != '/') { |
| 206 | - $this->path = '/' . $path; |
|
| 206 | + $this->path = '/'.$path; |
|
| 207 | 207 | } else { |
| 208 | 208 | $this->path = $path; |
| 209 | 209 | } |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | }*/ |
| 242 | 242 | |
| 243 | 243 | // initialize user_agent string |
| 244 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
| 244 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | /** |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | */ |
| 634 | 634 | protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 635 | 635 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 636 | - $method='http') |
|
| 636 | + $method = 'http') |
|
| 637 | 637 | { |
| 638 | 638 | //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED); |
| 639 | 639 | |
@@ -665,7 +665,7 @@ discard block |
||
| 665 | 665 | * @param int $sslVersion |
| 666 | 666 | * @return Response |
| 667 | 667 | */ |
| 668 | - protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 668 | + protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 669 | 669 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 670 | 670 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 671 | 671 | $sslVersion = 0) |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | */ |
| 705 | 705 | protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 706 | 706 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 707 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '', |
|
| 707 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '', |
|
| 708 | 708 | $sslVersion = 0) |
| 709 | 709 | { |
| 710 | 710 | /// @todo log a warning if passed an unsupported method |
@@ -740,16 +740,16 @@ discard block |
||
| 740 | 740 | // thanks to Grant Rauscher <[email protected]> for this |
| 741 | 741 | $credentials = ''; |
| 742 | 742 | if ($username != '') { |
| 743 | - $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n"; |
|
| 743 | + $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n"; |
|
| 744 | 744 | if ($authType != 1) { |
| 745 | 745 | /// @todo make this a proper error, ie. return a failure |
| 746 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 746 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 747 | 747 | } |
| 748 | 748 | } |
| 749 | 749 | |
| 750 | 750 | $acceptedEncoding = ''; |
| 751 | 751 | if (is_array($this->accepted_compression) && count($this->accepted_compression)) { |
| 752 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n"; |
|
| 752 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n"; |
|
| 753 | 753 | } |
| 754 | 754 | |
| 755 | 755 | $proxyCredentials = ''; |
@@ -761,13 +761,13 @@ discard block |
||
| 761 | 761 | $connectPort = $proxyPort; |
| 762 | 762 | $transport = 'tcp'; |
| 763 | 763 | /// @todo check: should we not use https in some cases? |
| 764 | - $uri = 'http://' . $server . ':' . $port . $this->path; |
|
| 764 | + $uri = 'http://'.$server.':'.$port.$this->path; |
|
| 765 | 765 | if ($proxyUsername != '') { |
| 766 | 766 | if ($proxyAuthType != 1) { |
| 767 | 767 | /// @todo make this a proper error, ie. return a failure |
| 768 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 768 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 769 | 769 | } |
| 770 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n"; |
|
| 770 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n"; |
|
| 771 | 771 | } |
| 772 | 772 | } else { |
| 773 | 773 | $connectServer = $server; |
@@ -782,45 +782,45 @@ discard block |
||
| 782 | 782 | $version = ''; |
| 783 | 783 | foreach ($this->cookies as $name => $cookie) { |
| 784 | 784 | if ($cookie['version']) { |
| 785 | - $version = ' $Version="' . $cookie['version'] . '";'; |
|
| 786 | - $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";'; |
|
| 785 | + $version = ' $Version="'.$cookie['version'].'";'; |
|
| 786 | + $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";'; |
|
| 787 | 787 | if ($cookie['path']) { |
| 788 | - $cookieHeader .= ' $Path="' . $cookie['path'] . '";'; |
|
| 788 | + $cookieHeader .= ' $Path="'.$cookie['path'].'";'; |
|
| 789 | 789 | } |
| 790 | 790 | if ($cookie['domain']) { |
| 791 | - $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";'; |
|
| 791 | + $cookieHeader .= ' $Domain="'.$cookie['domain'].'";'; |
|
| 792 | 792 | } |
| 793 | 793 | if ($cookie['port']) { |
| 794 | - $cookieHeader .= ' $Port="' . $cookie['port'] . '";'; |
|
| 794 | + $cookieHeader .= ' $Port="'.$cookie['port'].'";'; |
|
| 795 | 795 | } |
| 796 | 796 | } else { |
| 797 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 797 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 798 | 798 | } |
| 799 | 799 | } |
| 800 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 800 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 801 | 801 | } |
| 802 | 802 | |
| 803 | 803 | // omit port if default |
| 804 | 804 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
| 805 | - $port = ''; |
|
| 805 | + $port = ''; |
|
| 806 | 806 | } else { |
| 807 | - $port = ':' . $port; |
|
| 807 | + $port = ':'.$port; |
|
| 808 | 808 | } |
| 809 | 809 | |
| 810 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 811 | - 'User-Agent: ' . $this->user_agent . "\r\n" . |
|
| 812 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 813 | - $credentials . |
|
| 814 | - $proxyCredentials . |
|
| 815 | - $acceptedEncoding . |
|
| 816 | - $encodingHdr . |
|
| 817 | - 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" . |
|
| 818 | - $cookieHeader . |
|
| 819 | - 'Content-Type: ' . $req->content_type . "\r\nContent-Length: " . |
|
| 820 | - strlen($payload) . "\r\n\r\n" . |
|
| 810 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 811 | + 'User-Agent: '.$this->user_agent."\r\n". |
|
| 812 | + 'Host: '.$server.$port."\r\n". |
|
| 813 | + $credentials. |
|
| 814 | + $proxyCredentials. |
|
| 815 | + $acceptedEncoding. |
|
| 816 | + $encodingHdr. |
|
| 817 | + 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n". |
|
| 818 | + $cookieHeader. |
|
| 819 | + 'Content-Type: '.$req->content_type."\r\nContent-Length: ". |
|
| 820 | + strlen($payload)."\r\n\r\n". |
|
| 821 | 821 | $payload; |
| 822 | 822 | |
| 823 | - if ($this->debug > 1) { |
|
| 823 | + if ($this->debug>1) { |
|
| 824 | 824 | $this->getLogger()->debugMessage("---SENDING---\n$op\n---END---"); |
| 825 | 825 | } |
| 826 | 826 | |
@@ -847,7 +847,7 @@ discard block |
||
| 847 | 847 | |
| 848 | 848 | $context = stream_context_create($contextOptions); |
| 849 | 849 | |
| 850 | - if ($timeout <= 0) { |
|
| 850 | + if ($timeout<=0) { |
|
| 851 | 851 | $connectTimeout = ini_get('default_socket_timeout'); |
| 852 | 852 | } else { |
| 853 | 853 | $connectTimeout = $timeout; |
@@ -859,7 +859,7 @@ discard block |
||
| 859 | 859 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 860 | 860 | STREAM_CLIENT_CONNECT, $context); |
| 861 | 861 | if ($fp) { |
| 862 | - if ($timeout > 0) { |
|
| 862 | + if ($timeout>0) { |
|
| 863 | 863 | stream_set_timeout($fp, $timeout, 0); |
| 864 | 864 | } |
| 865 | 865 | } else { |
@@ -868,8 +868,8 @@ discard block |
||
| 868 | 868 | $this->errstr = $err['message']; |
| 869 | 869 | } |
| 870 | 870 | |
| 871 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 872 | - $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 871 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 872 | + $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 873 | 873 | |
| 874 | 874 | return $r; |
| 875 | 875 | } |
@@ -957,18 +957,18 @@ discard block |
||
| 957 | 957 | $keyPass, $sslVersion); |
| 958 | 958 | |
| 959 | 959 | if (!$curl) { |
| 960 | - return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': error during curl initialization. Check php error log for details'); |
|
| 960 | + return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': error during curl initialization. Check php error log for details'); |
|
| 961 | 961 | } |
| 962 | 962 | |
| 963 | 963 | $result = curl_exec($curl); |
| 964 | 964 | |
| 965 | - if ($this->debug > 1) { |
|
| 965 | + if ($this->debug>1) { |
|
| 966 | 966 | $message = "---CURL INFO---\n"; |
| 967 | 967 | foreach (curl_getinfo($curl) as $name => $val) { |
| 968 | 968 | if (is_array($val)) { |
| 969 | 969 | $val = implode("\n", $val); |
| 970 | 970 | } |
| 971 | - $message .= $name . ': ' . $val . "\n"; |
|
| 971 | + $message .= $name.': '.$val."\n"; |
|
| 972 | 972 | } |
| 973 | 973 | $message .= '---END---'; |
| 974 | 974 | $this->getLogger()->debugMessage($message); |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 979 | 979 | |
| 980 | 980 | $this->errstr = 'no response'; |
| 981 | - $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
| 981 | + $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
| 982 | 982 | curl_close($curl); |
| 983 | 983 | if ($keepAlive) { |
| 984 | 984 | $this->xmlrpc_curl_handle = null; |
@@ -1048,12 +1048,12 @@ discard block |
||
| 1048 | 1048 | // http, https |
| 1049 | 1049 | $protocol = $method; |
| 1050 | 1050 | if (strpos($protocol, ':') !== false) { |
| 1051 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1051 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1052 | 1052 | return false; |
| 1053 | 1053 | } |
| 1054 | 1054 | } |
| 1055 | 1055 | } |
| 1056 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path); |
|
| 1056 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path); |
|
| 1057 | 1057 | if (!$curl) { |
| 1058 | 1058 | return false; |
| 1059 | 1059 | } |
@@ -1067,7 +1067,7 @@ discard block |
||
| 1067 | 1067 | // results into variable |
| 1068 | 1068 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 1069 | 1069 | |
| 1070 | - if ($this->debug > 1) { |
|
| 1070 | + if ($this->debug>1) { |
|
| 1071 | 1071 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 1072 | 1072 | /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered |
| 1073 | 1073 | } |
@@ -1092,7 +1092,7 @@ discard block |
||
| 1092 | 1092 | } |
| 1093 | 1093 | } |
| 1094 | 1094 | // extra headers |
| 1095 | - $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings)); |
|
| 1095 | + $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)); |
|
| 1096 | 1096 | // if no keepalive is wanted, let the server know it in advance |
| 1097 | 1097 | if (!$keepAlive) { |
| 1098 | 1098 | $headers[] = 'Connection: close'; |
@@ -1109,7 +1109,7 @@ discard block |
||
| 1109 | 1109 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
| 1110 | 1110 | // timeout is borked |
| 1111 | 1111 | if ($timeout) { |
| 1112 | - curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1); |
|
| 1112 | + curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1); |
|
| 1113 | 1113 | } |
| 1114 | 1114 | |
| 1115 | 1115 | switch ($method) { |
@@ -1124,7 +1124,7 @@ discard block |
||
| 1124 | 1124 | curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE); |
| 1125 | 1125 | } else { |
| 1126 | 1126 | /// @todo make this a proper error, ie. return a failure |
| 1127 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1127 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install'); |
|
| 1128 | 1128 | } |
| 1129 | 1129 | break; |
| 1130 | 1130 | case 'h2': |
@@ -1133,12 +1133,12 @@ discard block |
||
| 1133 | 1133 | } |
| 1134 | 1134 | |
| 1135 | 1135 | if ($username && $password) { |
| 1136 | - curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password); |
|
| 1136 | + curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password); |
|
| 1137 | 1137 | if (defined('CURLOPT_HTTPAUTH')) { |
| 1138 | 1138 | curl_setopt($curl, CURLOPT_HTTPAUTH, $authType); |
| 1139 | 1139 | } elseif ($authType != 1) { |
| 1140 | 1140 | /// @todo make this a proper error, ie. return a failure |
| 1141 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1141 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1142 | 1142 | } |
| 1143 | 1143 | } |
| 1144 | 1144 | |
@@ -1181,14 +1181,14 @@ discard block |
||
| 1181 | 1181 | if ($proxyPort == 0) { |
| 1182 | 1182 | $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1183 | 1183 | } |
| 1184 | - curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort); |
|
| 1184 | + curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort); |
|
| 1185 | 1185 | if ($proxyUsername) { |
| 1186 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword); |
|
| 1186 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword); |
|
| 1187 | 1187 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1188 | 1188 | curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType); |
| 1189 | 1189 | } elseif ($proxyAuthType != 1) { |
| 1190 | 1190 | /// @todo make this a proper error, ie. return a failure |
| 1191 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1191 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1192 | 1192 | } |
| 1193 | 1193 | } |
| 1194 | 1194 | } |
@@ -1198,7 +1198,7 @@ discard block |
||
| 1198 | 1198 | if (count($this->cookies)) { |
| 1199 | 1199 | $cookieHeader = ''; |
| 1200 | 1200 | foreach ($this->cookies as $name => $cookie) { |
| 1201 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1201 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1202 | 1202 | } |
| 1203 | 1203 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1204 | 1204 | } |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | curl_setopt($curl, $opt, $val); |
| 1208 | 1208 | } |
| 1209 | 1209 | |
| 1210 | - if ($this->debug > 1) { |
|
| 1210 | + if ($this->debug>1) { |
|
| 1211 | 1211 | $this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---"); |
| 1212 | 1212 | } |
| 1213 | 1213 | |
@@ -1305,7 +1305,7 @@ discard block |
||
| 1305 | 1305 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1306 | 1306 | $numParams = $req->getNumParams(); |
| 1307 | 1307 | $params = array(); |
| 1308 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1308 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1309 | 1309 | $params[$i] = $req->getParam($i); |
| 1310 | 1310 | } |
| 1311 | 1311 | $call['params'] = new Value($params, 'array'); |
@@ -1330,15 +1330,15 @@ discard block |
||
| 1330 | 1330 | } elseif ($this->return_type == 'phpvals') { |
| 1331 | 1331 | /// @todo test this code branch... |
| 1332 | 1332 | if (!is_array($rets)) { |
| 1333 | - return false; // bad return type from system.multicall |
|
| 1333 | + return false; // bad return type from system.multicall |
|
| 1334 | 1334 | } |
| 1335 | 1335 | $numRets = count($rets); |
| 1336 | 1336 | if ($numRets != count($reqs)) { |
| 1337 | - return false; // wrong number of return values. |
|
| 1337 | + return false; // wrong number of return values. |
|
| 1338 | 1338 | } |
| 1339 | 1339 | |
| 1340 | 1340 | $response = array(); |
| 1341 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1341 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1342 | 1342 | $val = $rets[$i]; |
| 1343 | 1343 | if (!is_array($val)) { |
| 1344 | 1344 | return false; |
@@ -1346,7 +1346,7 @@ discard block |
||
| 1346 | 1346 | switch (count($val)) { |
| 1347 | 1347 | case 1: |
| 1348 | 1348 | if (!isset($val[0])) { |
| 1349 | - return false; // Bad value |
|
| 1349 | + return false; // Bad value |
|
| 1350 | 1350 | } |
| 1351 | 1351 | // Normal return value |
| 1352 | 1352 | $response[$i] = new Response($val[0], 0, '', 'phpvals'); |
@@ -1372,11 +1372,11 @@ discard block |
||
| 1372 | 1372 | } else { |
| 1373 | 1373 | // return type == 'xmlrpcvals' |
| 1374 | 1374 | if ($rets->kindOf() != 'array') { |
| 1375 | - return false; // bad return type from system.multicall |
|
| 1375 | + return false; // bad return type from system.multicall |
|
| 1376 | 1376 | } |
| 1377 | 1377 | $numRets = $rets->count(); |
| 1378 | 1378 | if ($numRets != count($reqs)) { |
| 1379 | - return false; // wrong number of return values. |
|
| 1379 | + return false; // wrong number of return values. |
|
| 1380 | 1380 | } |
| 1381 | 1381 | |
| 1382 | 1382 | $response = array(); |
@@ -1384,7 +1384,7 @@ discard block |
||
| 1384 | 1384 | switch ($val->kindOf()) { |
| 1385 | 1385 | case 'array': |
| 1386 | 1386 | if ($val->count() != 1) { |
| 1387 | - return false; // Bad value |
|
| 1387 | + return false; // Bad value |
|
| 1388 | 1388 | } |
| 1389 | 1389 | // Normal return value |
| 1390 | 1390 | $response[] = new Response($val[0]); |
@@ -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 | use PhpXmlRpc\Encoder; |
| 5 | 5 | use PhpXmlRpc\Client; |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | $handles = array(); |
| 25 | 25 | $curl = curl_multi_init(); |
| 26 | 26 | |
| 27 | - foreach($requests as $k => $req) { |
|
| 27 | + foreach ($requests as $k => $req) { |
|
| 28 | 28 | $req->setDebug($this->debug); |
| 29 | 29 | |
| 30 | 30 | $handle = $this->prepareCurlHandle( |
@@ -57,19 +57,19 @@ discard block |
||
| 57 | 57 | $running = 0; |
| 58 | 58 | do { |
| 59 | 59 | curl_multi_exec($curl, $running); |
| 60 | - } while($running > 0); |
|
| 60 | + } while ($running>0); |
|
| 61 | 61 | |
| 62 | 62 | $responses = array(); |
| 63 | - foreach($handles as $k => $h) { |
|
| 63 | + foreach ($handles as $k => $h) { |
|
| 64 | 64 | $responses[$k] = curl_multi_getcontent($handles[$k]); |
| 65 | 65 | |
| 66 | - if ($this->debug > 1) { |
|
| 66 | + if ($this->debug>1) { |
|
| 67 | 67 | $message = "---CURL INFO---\n"; |
| 68 | 68 | foreach (curl_getinfo($h) as $name => $val) { |
| 69 | 69 | if (is_array($val)) { |
| 70 | 70 | $val = implode("\n", $val); |
| 71 | 71 | } |
| 72 | - $message .= $name . ': ' . $val . "\n"; |
|
| 72 | + $message .= $name.': '.$val."\n"; |
|
| 73 | 73 | } |
| 74 | 74 | $message .= '---END---'; |
| 75 | 75 | $this->getLogger()->debugMessage($message); |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | } |
| 81 | 81 | curl_multi_close($curl); |
| 82 | 82 | |
| 83 | - foreach($responses as $k => $resp) { |
|
| 83 | + foreach ($responses as $k => $resp) { |
|
| 84 | 84 | if (!$resp) { |
| 85 | - $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
| 85 | + $responses[$k] = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
| 86 | 86 | } else { |
| 87 | 87 | $responses[$k] = $requests[$k]->parseResponse($resp, true, $this->return_type); |
| 88 | 88 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $value = $encoder->encode($data, array('auto_dates')); |
| 100 | 100 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 101 | 101 | $reqs = array(); |
| 102 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 102 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 103 | 103 | $reqs[] = $req; |
| 104 | 104 | } |
| 105 | 105 | |
@@ -114,18 +114,18 @@ discard block |
||
| 114 | 114 | |
| 115 | 115 | $t = microtime(true); |
| 116 | 116 | $resp = $client->send($reqs); |
| 117 | -$t = microtime(true) - $t; |
|
| 118 | -echo "Sequential send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 117 | +$t = microtime(true)-$t; |
|
| 118 | +echo "Sequential send: ".sprintf('%.3f', $t)." secs.\n"; |
|
| 119 | 119 | flush(); |
| 120 | 120 | |
| 121 | 121 | $t = microtime(true); |
| 122 | 122 | $resp = $client->sendParallel($reqs); |
| 123 | -$t = microtime(true) - $t; |
|
| 124 | -echo "Parallel send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 123 | +$t = microtime(true)-$t; |
|
| 124 | +echo "Parallel send: ".sprintf('%.3f', $t)." secs.\n"; |
|
| 125 | 125 | flush(); |
| 126 | 126 | |
| 127 | 127 | $client->no_multicall = false; |
| 128 | 128 | $t = microtime(true); |
| 129 | 129 | $resp = $client->send($reqs); |
| 130 | -$t = microtime(true) - $t; |
|
| 131 | -echo "Multicall send: " . sprintf('%.3f', $t) . " secs.\n"; |
|
| 130 | +$t = microtime(true)-$t; |
|
| 131 | +echo "Multicall send: ".sprintf('%.3f', $t)." secs.\n"; |
|
