gggeek /
phpxmlrpc
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | return true; |
| 86 | 86 | } else { |
| 87 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in must be a PhpXmlRpc\Value'); |
|
| 87 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in must be a PhpXmlRpc\Value'); |
|
| 88 | 88 | return false; |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -134,17 +134,17 @@ discard block |
||
| 134 | 134 | $this->logDeprecationUnlessCalledBy('serialize'); |
| 135 | 135 | |
| 136 | 136 | if ($charsetEncoding != '') { |
| 137 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 137 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 138 | 138 | } else { |
| 139 | 139 | $this->content_type = 'text/xml'; |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | $result = $this->xml_header($charsetEncoding); |
| 143 | - $result .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities( |
|
| 144 | - $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n"; |
|
| 143 | + $result .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities( |
|
| 144 | + $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n"; |
|
| 145 | 145 | $result .= "<params>\n"; |
| 146 | 146 | foreach ($this->params as $p) { |
| 147 | - $result .= "<param>\n" . $p->serialize($charsetEncoding) . |
|
| 147 | + $result .= "<param>\n".$p->serialize($charsetEncoding). |
|
| 148 | 148 | "</param>\n"; |
| 149 | 149 | } |
| 150 | 150 | $result .= "</params>\n"; |
@@ -164,9 +164,9 @@ discard block |
||
| 164 | 164 | $this->logDeprecationUnlessCalledBy('createPayload'); |
| 165 | 165 | |
| 166 | 166 | if ($charsetEncoding != '') { |
| 167 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n"; |
|
| 167 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n"; |
|
| 168 | 168 | } else { |
| 169 | - return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n"; |
|
| 169 | + return "<?xml version=\"1.0\"?".">\n<methodCall>\n"; |
|
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | |
@@ -228,14 +228,14 @@ discard block |
||
| 228 | 228 | */ |
| 229 | 229 | public function parseResponse($data = '', $headersProcessed = false, $returnType = XMLParser::RETURN_XMLRPCVALS) |
| 230 | 230 | { |
| 231 | - if ($this->debug > 0) { |
|
| 231 | + if ($this->debug>0) { |
|
| 232 | 232 | $this->getLogger()->debug("---GOT---\n$data\n---END---"); |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array()); |
| 236 | 236 | |
| 237 | 237 | if ($data == '') { |
| 238 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': no response received from server.'); |
|
| 238 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': no response received from server.'); |
|
| 239 | 239 | return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']); |
| 240 | 240 | } |
| 241 | 241 | |
@@ -243,12 +243,12 @@ discard block |
||
| 243 | 243 | if (substr($data, 0, 4) == 'HTTP') { |
| 244 | 244 | $httpParser = new Http(); |
| 245 | 245 | try { |
| 246 | - $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug > 0); |
|
| 246 | + $httpResponse = $httpParser->parseResponseHeaders($data, $headersProcessed, $this->debug>0); |
|
| 247 | 247 | } catch (HttpException $e) { |
| 248 | 248 | // failed processing of HTTP response headers |
| 249 | 249 | // save into response obj the full payload received, for debugging |
| 250 | 250 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code' => $e->statusCode())); |
| 251 | - } catch(\Exception $e) { |
|
| 251 | + } catch (\Exception $e) { |
|
| 252 | 252 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data)); |
| 253 | 253 | } |
| 254 | 254 | } else { |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | // idea from Luca Mariano, originally in PEARified version of the lib |
| 265 | 265 | $pos = strrpos($data, '</methodResponse>'); |
| 266 | 266 | if ($pos !== false) { |
| 267 | - $data = substr($data, 0, $pos + 17); |
|
| 267 | + $data = substr($data, 0, $pos+17); |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | // try to 'guestimate' the character encoding of the received response |
@@ -273,21 +273,21 @@ discard block |
||
| 273 | 273 | $data |
| 274 | 274 | ); |
| 275 | 275 | |
| 276 | - if ($this->debug >= 0) { |
|
| 276 | + if ($this->debug>=0) { |
|
| 277 | 277 | $this->httpResponse = $httpResponse; |
| 278 | 278 | } else { |
| 279 | 279 | $httpResponse = null; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - if ($this->debug > 0) { |
|
| 282 | + if ($this->debug>0) { |
|
| 283 | 283 | $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
| 284 | 284 | if ($start) { |
| 285 | 285 | $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
| 286 | 286 | /// @todo what if there is no end tag? |
| 287 | 287 | $end = strpos($data, '-->', $start); |
| 288 | - $comments = substr($data, $start, $end - $start); |
|
| 289 | - $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t" . |
|
| 290 | - str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", array('encoding' => $respEncoding)); |
|
| 288 | + $comments = substr($data, $start, $end-$start); |
|
| 289 | + $this->getLogger()->debug("---SERVER DEBUG INFO (DECODED)---\n\t". |
|
| 290 | + str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", array('encoding' => $respEncoding)); |
|
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | 293 | |
@@ -309,7 +309,7 @@ discard block |
||
| 309 | 309 | if ($respEncoding == 'ISO-8859-1') { |
| 310 | 310 | $data = utf8_encode($data); |
| 311 | 311 | } else { |
| 312 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received response: ' . $respEncoding); |
|
| 312 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received response: '.$respEncoding); |
|
| 313 | 313 | } |
| 314 | 314 | } |
| 315 | 315 | } |
@@ -339,16 +339,16 @@ discard block |
||
| 339 | 339 | // there could be proxies meddling with the request, or network data corruption... |
| 340 | 340 | |
| 341 | 341 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'], |
| 342 | - PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $_xh['isf_reason'], '', $httpResponse); |
|
| 342 | + PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$_xh['isf_reason'], '', $httpResponse); |
|
| 343 | 343 | |
| 344 | - if ($this->debug > 0) { |
|
| 344 | + if ($this->debug>0) { |
|
| 345 | 345 | $this->getLogger()->debug($_xh['isf_reason']); |
| 346 | 346 | } |
| 347 | 347 | } |
| 348 | 348 | // second error check: xml well-formed but not xml-rpc compliant |
| 349 | 349 | elseif ($_xh['isf'] == 2) { |
| 350 | 350 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'], |
| 351 | - PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $_xh['isf_reason'], '', $httpResponse); |
|
| 351 | + PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$_xh['isf_reason'], '', $httpResponse); |
|
| 352 | 352 | |
| 353 | 353 | /// @todo echo something for the user? check if it was already done by the parser... |
| 354 | 354 | //if ($this->debug > 0) { |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | // third error check: parsing of the response has somehow gone boink. |
| 359 | 359 | /// @todo shall we omit the 2nd part of this check, since we trust the parsing code? |
| 360 | 360 | /// Either that, or check the fault results too... |
| 361 | - elseif ($_xh['isf'] > 3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_xh['value']))) { |
|
| 361 | + elseif ($_xh['isf']>3 || ($returnType == XMLParser::RETURN_XMLRPCVALS && !$_xh['isf'] && !is_object($_xh['value']))) { |
|
| 362 | 362 | // something odd has happened and it's time to generate a client side error indicating something odd went on |
| 363 | 363 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_parsing_error'], PhpXmlRpc::$xmlrpcstr['xml_parsing_error'], |
| 364 | 364 | '', $httpResponse |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | |
| 367 | 367 | /// @todo echo something for the user? |
| 368 | 368 | } else { |
| 369 | - if ($this->debug > 1) { |
|
| 369 | + if ($this->debug>1) { |
|
| 370 | 370 | $this->getLogger()->debug( |
| 371 | 371 | "---PARSED---\n".var_export($_xh['value'], true)."\n---END---" |
| 372 | 372 | ); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | if ($errNo == 0) { |
| 391 | 391 | // FAULT returned, errno needs to reflect that |
| 392 | 392 | /// @todo feature creep - add this code to PhpXmlRpc::$xmlrpcerr |
| 393 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': fault response received with faultCode 0 or null. Converted it to -1'); |
|
| 393 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': fault response received with faultCode 0 or null. Converted it to -1'); |
|
| 394 | 394 | /// @todo in Encoder::decodeXML, we use PhpXmlRpc::$xmlrpcerr['invalid_return'] for this case (see |
| 395 | 395 | /// also the todo 17 lines above) |
| 396 | 396 | $errNo = -1; |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | case '_php_class': |
| 439 | 439 | case 'payload': |
| 440 | 440 | case 'content_type': |
| 441 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 441 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 442 | 442 | return $this->$name; |
| 443 | 443 | case 'httpResponse': |
| 444 | 444 | // manually implement the 'protected property' behaviour |
@@ -450,16 +450,16 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | if ($canAccess) { |
| 453 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 453 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 454 | 454 | return $this->httpResponse; |
| 455 | 455 | } else { |
| 456 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
| 456 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
| 457 | 457 | } |
| 458 | 458 | break; |
| 459 | 459 | default: |
| 460 | 460 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 461 | 461 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 462 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 462 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 463 | 463 | $result = null; |
| 464 | 464 | return $result; |
| 465 | 465 | } |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | case 'debug': |
| 474 | 474 | case 'payload': |
| 475 | 475 | case 'content_type': |
| 476 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 476 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 477 | 477 | $this->$name = $value; |
| 478 | 478 | break; |
| 479 | 479 | case 'httpResponse': |
@@ -486,16 +486,16 @@ discard block |
||
| 486 | 486 | } |
| 487 | 487 | } |
| 488 | 488 | if ($canAccess) { |
| 489 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 489 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 490 | 490 | $this->httpResponse = $value; |
| 491 | 491 | } else { |
| 492 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
| 492 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
| 493 | 493 | } |
| 494 | 494 | break; |
| 495 | 495 | default: |
| 496 | 496 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 497 | 497 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 498 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 498 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 499 | 499 | } |
| 500 | 500 | } |
| 501 | 501 | |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | case 'debug': |
| 508 | 508 | case 'payload': |
| 509 | 509 | case 'content_type': |
| 510 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 510 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 511 | 511 | return isset($this->$name); |
| 512 | 512 | case 'httpResponse': |
| 513 | 513 | // manually implement the 'protected property' behaviour |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | } |
| 520 | 520 | } |
| 521 | 521 | if ($canAccess) { |
| 522 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 522 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 523 | 523 | return isset($this->httpResponse); |
| 524 | 524 | } |
| 525 | 525 | // break through voluntarily |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | case 'debug': |
| 537 | 537 | case 'payload': |
| 538 | 538 | case 'content_type': |
| 539 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 539 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 540 | 540 | unset($this->$name); |
| 541 | 541 | break; |
| 542 | 542 | case 'httpResponse': |
@@ -549,16 +549,16 @@ discard block |
||
| 549 | 549 | } |
| 550 | 550 | } |
| 551 | 551 | if ($canAccess) { |
| 552 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 552 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 553 | 553 | unset($this->httpResponse); |
| 554 | 554 | } else { |
| 555 | - trigger_error("Cannot access protected property Request::httpResponse in " . __FILE__, E_USER_ERROR); |
|
| 555 | + trigger_error("Cannot access protected property Request::httpResponse in ".__FILE__, E_USER_ERROR); |
|
| 556 | 556 | } |
| 557 | 557 | break; |
| 558 | 558 | default: |
| 559 | 559 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 560 | 560 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 561 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 561 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 562 | 562 | } |
| 563 | 563 | } |
| 564 | 564 | } |
@@ -78,13 +78,13 @@ discard block |
||
| 78 | 78 | <body> |
| 79 | 79 | <?php |
| 80 | 80 | |
| 81 | -include __DIR__ . '/common.php'; |
|
| 81 | +include __DIR__.'/common.php'; |
|
| 82 | 82 | |
| 83 | 83 | if ($action) { |
| 84 | 84 | |
| 85 | 85 | // avoid php hanging when using the builtin webserver and sending requests to itself |
| 86 | 86 | $skip = false; |
| 87 | - if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) { |
|
| 87 | + if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) { |
|
| 88 | 88 | $localHost = explode(':', $_SERVER['HTTP_HOST']); |
| 89 | 89 | /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters, |
| 90 | 90 | /// and that proxy is us |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | if (!$skip) { |
| 98 | 98 | // make sure the script waits long enough for the call to complete... |
| 99 | 99 | if ($timeout) { |
| 100 | - set_time_limit($timeout + 10); |
|
| 100 | + set_time_limit($timeout+10); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | if ($wstype == 1) { |
@@ -118,13 +118,13 @@ discard block |
||
| 118 | 118 | $server = "$host$path"; |
| 119 | 119 | } |
| 120 | 120 | if ($protocol == 2 || $protocol == 3) { |
| 121 | - $server = 'https://' . $server; |
|
| 121 | + $server = 'https://'.$server; |
|
| 122 | 122 | } else { |
| 123 | - $server = 'http://' . $server; |
|
| 123 | + $server = 'http://'.$server; |
|
| 124 | 124 | } |
| 125 | 125 | if ($proxy != '') { |
| 126 | 126 | $pproxy = explode(':', $proxy); |
| 127 | - if (count($pproxy) > 1) { |
|
| 127 | + if (count($pproxy)>1) { |
|
| 128 | 128 | $pport = $pproxy[1]; |
| 129 | 129 | } else { |
| 130 | 130 | $pport = 8080; |
@@ -199,9 +199,9 @@ discard block |
||
| 199 | 199 | case 'wrap': |
| 200 | 200 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 201 | 201 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 202 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 202 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 203 | 203 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 204 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 204 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 205 | 205 | break; |
| 206 | 206 | case 'list': |
| 207 | 207 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | $msg[0] = new $requestClass($method, array(), $id); |
| 215 | 215 | // hack! build payload by hand |
| 216 | 216 | if ($wstype == 1) { |
| 217 | - $payload = "{\n" . |
|
| 218 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 219 | - $payload . |
|
| 217 | + $payload = "{\n". |
|
| 218 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 219 | + $payload. |
|
| 220 | 220 | "\n],\n\"id\": "; |
| 221 | 221 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 222 | 222 | if ($id == "") { |
@@ -231,22 +231,22 @@ discard block |
||
| 231 | 231 | $msg[0]->setPayload($payload); |
| 232 | 232 | } else { |
| 233 | 233 | $msg[0]->setPayload( |
| 234 | - $msg[0]->xml_header($inputcharset) . |
|
| 235 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 236 | - $payload . |
|
| 237 | - "</params>\n" . $msg[0]->xml_footer() |
|
| 234 | + $msg[0]->xml_header($inputcharset). |
|
| 235 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 236 | + $payload. |
|
| 237 | + "</params>\n".$msg[0]->xml_footer() |
|
| 238 | 238 | ); |
| 239 | 239 | } |
| 240 | - $actionname = 'Execution of method ' . $method; |
|
| 240 | + $actionname = 'Execution of method '.$method; |
|
| 241 | 241 | break; |
| 242 | 242 | default: // give a warning |
| 243 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 243 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 248 | 248 | // this gives good user feedback for long-running methods... |
| 249 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 249 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 250 | 250 | flush(); |
| 251 | 251 | |
| 252 | 252 | $response = null; |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | break; |
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | - $time = microtime(true) - $time; |
|
| 266 | + $time = microtime(true)-$time; |
|
| 267 | 267 | if ($debug) { |
| 268 | 268 | echo "</div>\n"; |
| 269 | 269 | } |
@@ -273,8 +273,8 @@ discard block |
||
| 273 | 273 | // call failed! echo out error msg! |
| 274 | 274 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 275 | 275 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 276 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 277 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 276 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 277 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 278 | 278 | echo(date("d/M/Y:H:i:s\n")); |
| 279 | 279 | } else { |
| 280 | 280 | // call succeeded: parse results |
@@ -290,36 +290,36 @@ discard block |
||
| 290 | 290 | $max = $v->count(); |
| 291 | 291 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 292 | 292 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 293 | - foreach($v as $i => $rec) { |
|
| 293 | + foreach ($v as $i => $rec) { |
|
| 294 | 294 | if ($i % 2) { |
| 295 | 295 | $class = ' class="oddrow"'; |
| 296 | 296 | } else { |
| 297 | 297 | $class = ' class="evenrow"'; |
| 298 | 298 | } |
| 299 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 300 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 301 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 302 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 320 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 321 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 322 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 299 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 300 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 301 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 302 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 320 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 321 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 322 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 323 | 323 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 324 | 324 | //echo("</tr>\n"); |
| 325 | 325 | |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | $r2 = $resp[1]->value(); |
| 347 | 347 | |
| 348 | 348 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 349 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 349 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 350 | 350 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 351 | 351 | if ($desc == "") { |
| 352 | 352 | $desc = "-"; |
@@ -356,24 +356,24 @@ discard block |
||
| 356 | 356 | if ($r2->kindOf() != "array") { |
| 357 | 357 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 358 | 358 | } else { |
| 359 | - foreach($r2 as $i => $x) { |
|
| 359 | + foreach ($r2 as $i => $x) { |
|
| 360 | 360 | $payload = ""; |
| 361 | 361 | $alt_payload = ""; |
| 362 | - if ($i + 1 % 2) { |
|
| 362 | + if ($i+1 % 2) { |
|
| 363 | 363 | $class = ' class="oddrow"'; |
| 364 | 364 | } else { |
| 365 | 365 | $class = ' class="evenrow"'; |
| 366 | 366 | } |
| 367 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 367 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 368 | 368 | if ($x->kindOf() == "array") { |
| 369 | 369 | $ret = $x[0]; |
| 370 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 371 | - if ($x->count() > 1) { |
|
| 372 | - foreach($x as $k => $y) { |
|
| 370 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 371 | + if ($x->count()>1) { |
|
| 372 | + foreach ($x as $k => $y) { |
|
| 373 | 373 | if ($k == 0) continue; |
| 374 | 374 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 375 | 375 | if ($wstype == 1) { |
| 376 | - switch($y->scalarval()) { |
|
| 376 | + switch ($y->scalarval()) { |
|
| 377 | 377 | case 'string': |
| 378 | 378 | case 'dateTime.iso8601': |
| 379 | 379 | case 'base64': |
@@ -406,22 +406,22 @@ discard block |
||
| 406 | 406 | } else { |
| 407 | 407 | $type = $y->scalarval(); |
| 408 | 408 | $payload .= '<param><value>'; |
| 409 | - switch($type) { |
|
| 409 | + switch ($type) { |
|
| 410 | 410 | case 'undefined': |
| 411 | 411 | break; |
| 412 | 412 | case 'null': |
| 413 | 413 | $type = 'nil'; |
| 414 | 414 | // fall thru intentionally |
| 415 | 415 | default: |
| 416 | - $payload .= '<' . |
|
| 417 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 418 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 416 | + $payload .= '<'. |
|
| 417 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 418 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 419 | 419 | '>'; |
| 420 | 420 | } |
| 421 | 421 | $payload .= "</value></param>\n"; |
| 422 | 422 | } |
| 423 | 423 | $alt_payload .= $y->scalarval(); |
| 424 | - if ($k < $x->count() - 1) { |
|
| 424 | + if ($k<$x->count()-1) { |
|
| 425 | 425 | $alt_payload .= ';'; |
| 426 | 426 | if ($wstype == 1) { |
| 427 | 427 | $payload .= ', '; |
@@ -437,63 +437,63 @@ discard block |
||
| 437 | 437 | echo '</td>'; |
| 438 | 438 | // button to test this method |
| 439 | 439 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 440 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 441 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 461 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 462 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 463 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 440 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 441 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 461 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 462 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 463 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 464 | 464 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 465 | 465 | //if ($wstype != 1) { |
| 466 | 466 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 467 | 467 | //} |
| 468 | 468 | echo "</form></td>\n"; |
| 469 | 469 | |
| 470 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 471 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 472 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 473 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 474 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 475 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 476 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 477 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 478 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 479 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 480 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 481 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 482 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 483 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 484 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 485 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 486 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 487 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 488 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 489 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 490 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 491 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 492 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 493 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 494 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 495 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 496 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 470 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 471 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 472 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 473 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 474 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 475 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 476 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 477 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 478 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 479 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 480 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 481 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 482 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 483 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 484 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 485 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 486 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 487 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 488 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 489 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 490 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 491 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 492 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 493 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 494 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 495 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 496 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 497 | 497 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 498 | 498 | echo "</form></td></tr>\n"; |
| 499 | 499 | } |
@@ -505,14 +505,14 @@ discard block |
||
| 505 | 505 | case 'wrap': |
| 506 | 506 | $r1 = $resp[0]->value(); |
| 507 | 507 | $r2 = $resp[1]->value(); |
| 508 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 508 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 509 | 509 | echo "Error: signature unknown\n"; |
| 510 | 510 | } else { |
| 511 | 511 | $mdesc = $r1->scalarval(); |
| 512 | 512 | $encoder = new PhpXmlRpc\Encoder(); |
| 513 | 513 | $msig = $encoder->decode($r2); |
| 514 | 514 | $msig = $msig[$methodsig]; |
| 515 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 515 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 516 | 516 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 517 | 517 | $clientcookies == '') { |
| 518 | 518 | $opts = 1; // simple client copy in stub code |
@@ -533,12 +533,12 @@ discard block |
||
| 533 | 533 | $client, |
| 534 | 534 | $method, |
| 535 | 535 | array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true), |
| 536 | - str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc |
|
| 536 | + str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc |
|
| 537 | 537 | ); |
| 538 | 538 | //if ($code) |
| 539 | 539 | //{ |
| 540 | 540 | echo "<div id=\"phpcode\">\n"; |
| 541 | - highlight_string("<?php\n" . $code['docstring'] . $code['source']); |
|
| 541 | + highlight_string("<?php\n".$code['docstring'].$code['source']); |
|
| 542 | 542 | echo "\n</div>"; |
| 543 | 543 | //} |
| 544 | 544 | //else |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | break; |
| 550 | 550 | |
| 551 | 551 | case 'execute': |
| 552 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 552 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 553 | 553 | break; |
| 554 | 554 | |
| 555 | 555 | default: // give a warning |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | public function getOptions() |
| 252 | 252 | { |
| 253 | 253 | $values = array(); |
| 254 | - foreach(static::$options as $opt) { |
|
| 254 | + foreach (static::$options as $opt) { |
|
| 255 | 255 | $values[$opt] = $this->getOption($opt); |
| 256 | 256 | } |
| 257 | 257 | return $values; |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | */ |
| 265 | 265 | public function setOptions($options) |
| 266 | 266 | { |
| 267 | - foreach($options as $name => $value) { |
|
| 267 | + foreach ($options as $name => $value) { |
|
| 268 | 268 | $this->setOption($name, $value); |
| 269 | 269 | } |
| 270 | 270 | |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | */ |
| 303 | 303 | public static function xmlrpc_debugmsg($msg) |
| 304 | 304 | { |
| 305 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
| 305 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | /** |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | */ |
| 315 | 315 | public static function error_occurred($msg) |
| 316 | 316 | { |
| 317 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
| 317 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | /** |
@@ -335,10 +335,10 @@ discard block |
||
| 335 | 335 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
| 336 | 336 | $out = ''; |
| 337 | 337 | if ($this->debug_info != '') { |
| 338 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
| 338 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
| 339 | 339 | } |
| 340 | 340 | if (static::$_xmlrpc_debuginfo != '') { |
| 341 | - $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
| 341 | + $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
| 342 | 342 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
| 343 | 343 | // into return payload AFTER the beginning tag |
| 344 | 344 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -367,8 +367,8 @@ discard block |
||
| 367 | 367 | $this->debug_info = ''; |
| 368 | 368 | |
| 369 | 369 | // Save what we received, before parsing it |
| 370 | - if ($this->debug > 1) { |
|
| 371 | - $this->debugMsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
| 370 | + if ($this->debug>1) { |
|
| 371 | + $this->debugMsg("+++GOT+++\n".$data."\n+++END+++"); |
|
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | $resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -385,13 +385,13 @@ discard block |
||
| 385 | 385 | $resp->raw_data = $rawData; |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') { |
|
| 389 | - $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
| 390 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
| 388 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') { |
|
| 389 | + $this->debugMsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
| 390 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
| 391 | 391 | } |
| 392 | 392 | |
| 393 | 393 | $header = $resp->xml_header($respCharset); |
| 394 | - if ($this->debug > 0) { |
|
| 394 | + if ($this->debug>0) { |
|
| 395 | 395 | $header .= $this->serializeDebug($respCharset); |
| 396 | 396 | } |
| 397 | 397 | |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | if (empty($payload)) { |
| 403 | 403 | $payload = $resp->serialize($respCharset); |
| 404 | 404 | } |
| 405 | - $payload = $header . $payload; |
|
| 405 | + $payload = $header.$payload; |
|
| 406 | 406 | |
| 407 | 407 | if ($returnPayload) { |
| 408 | 408 | return $payload; |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | // if we get a warning/error that has output some text before here, then we cannot |
| 412 | 412 | // add a new header. We cannot say we are sending xml, either... |
| 413 | 413 | if (!headers_sent()) { |
| 414 | - header('Content-Type: ' . $resp->getContentType()); |
|
| 414 | + header('Content-Type: '.$resp->getContentType()); |
|
| 415 | 415 | // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did |
| 416 | 416 | header("Vary: Accept-Charset"); |
| 417 | 417 | |
@@ -434,12 +434,12 @@ discard block |
||
| 434 | 434 | // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for |
| 435 | 435 | // responses up to 8000 bytes |
| 436 | 436 | if ($phpNoSelfCompress) { |
| 437 | - header('Content-Length: ' . (int)strlen($payload)); |
|
| 437 | + header('Content-Length: '.(int) strlen($payload)); |
|
| 438 | 438 | } |
| 439 | 439 | } else { |
| 440 | 440 | /// @todo allow the user to easily subclass this in a way which allows the resp. headers to be already sent |
| 441 | 441 | /// by now without flagging it as an error. Possibly check for presence of Content-Type header |
| 442 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 442 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 443 | 443 | } |
| 444 | 444 | |
| 445 | 445 | print $payload; |
@@ -528,9 +528,9 @@ discard block |
||
| 528 | 528 | $numParams = count($in); |
| 529 | 529 | } |
| 530 | 530 | foreach ($sigs as $curSig) { |
| 531 | - if (count($curSig) == $numParams + 1) { |
|
| 531 | + if (count($curSig) == $numParams+1) { |
|
| 532 | 532 | $itsOK = 1; |
| 533 | - for ($n = 0; $n < $numParams; $n++) { |
|
| 533 | + for ($n = 0; $n<$numParams; $n++) { |
|
| 534 | 534 | if (is_object($in)) { |
| 535 | 535 | $p = $in->getParam($n); |
| 536 | 536 | if ($p->kindOf() == 'scalar') { |
@@ -543,10 +543,10 @@ discard block |
||
| 543 | 543 | } |
| 544 | 544 | |
| 545 | 545 | // param index is $n+1, as first member of sig is return type |
| 546 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
| 546 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
| 547 | 547 | $itsOK = 0; |
| 548 | - $pno = $n + 1; |
|
| 549 | - $wanted = $curSig[$n + 1]; |
|
| 548 | + $pno = $n+1; |
|
| 549 | + $wanted = $curSig[$n+1]; |
|
| 550 | 550 | $got = $pt; |
| 551 | 551 | break; |
| 552 | 552 | } |
@@ -573,10 +573,10 @@ discard block |
||
| 573 | 573 | // check if $_SERVER is populated: it might have been disabled via ini file |
| 574 | 574 | // (this is true even when in CLI mode) |
| 575 | 575 | if (count($_SERVER) == 0) { |
| 576 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
| 576 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
| 577 | 577 | } |
| 578 | 578 | |
| 579 | - if ($this->debug > 1) { |
|
| 579 | + if ($this->debug>1) { |
|
| 580 | 580 | if (function_exists('getallheaders')) { |
| 581 | 581 | $this->debugMsg(''); // empty line |
| 582 | 582 | foreach (getallheaders() as $name => $val) { |
@@ -601,13 +601,13 @@ discard block |
||
| 601 | 601 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
| 602 | 602 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 603 | 603 | $data = $degzdata; |
| 604 | - if ($this->debug > 1) { |
|
| 605 | - $this->debugMsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 604 | + if ($this->debug>1) { |
|
| 605 | + $this->debugMsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 606 | 606 | } |
| 607 | 607 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 608 | 608 | $data = $degzdata; |
| 609 | - if ($this->debug > 1) { |
|
| 610 | - $this->debugMsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 609 | + if ($this->debug>1) { |
|
| 610 | + $this->debugMsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 611 | 611 | } |
| 612 | 612 | } else { |
| 613 | 613 | $r = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | if ($reqEncoding == 'ISO-8859-1') { |
| 696 | 696 | $data = utf8_encode($data); |
| 697 | 697 | } else { |
| 698 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding); |
|
| 698 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding); |
|
| 699 | 699 | } |
| 700 | 700 | } |
| 701 | 701 | } |
@@ -729,7 +729,7 @@ discard block |
||
| 729 | 729 | preg_match('/^XML error ([0-9]+)/', $_xh['isf_reason'], $matches); |
| 730 | 730 | return new static::$responseClass( |
| 731 | 731 | 0, |
| 732 | - PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1], |
|
| 732 | + PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1], |
|
| 733 | 733 | $_xh['isf_reason']); |
| 734 | 734 | } elseif ($_xh['isf']) { |
| 735 | 735 | /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc vs. |
@@ -737,7 +737,7 @@ discard block |
||
| 737 | 737 | return new static::$responseClass( |
| 738 | 738 | 0, |
| 739 | 739 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
| 740 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $_xh['isf_reason']); |
|
| 740 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$_xh['isf_reason']); |
|
| 741 | 741 | } else { |
| 742 | 742 | // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle |
| 743 | 743 | // this, but in the most common scenario (xml-rpc values type server with some methods registered as phpvals) |
@@ -747,8 +747,8 @@ discard block |
||
| 747 | 747 | ($this->dmap[$_xh['method']]['parameters_type'] != 'xmlrpcvals') |
| 748 | 748 | ) |
| 749 | 749 | ) { |
| 750 | - if ($this->debug > 1) { |
|
| 751 | - $this->debugMsg("\n+++PARSED+++\n" . var_export($_xh['params'], true) . "\n+++END+++"); |
|
| 750 | + if ($this->debug>1) { |
|
| 751 | + $this->debugMsg("\n+++PARSED+++\n".var_export($_xh['params'], true)."\n+++END+++"); |
|
| 752 | 752 | } |
| 753 | 753 | |
| 754 | 754 | return $this->execute($_xh['method'], $_xh['params'], $_xh['pt']); |
@@ -756,12 +756,12 @@ discard block |
||
| 756 | 756 | // build a Request object with data parsed from xml and add parameters in |
| 757 | 757 | $req = new Request($_xh['method']); |
| 758 | 758 | /// @todo for more speed, we could just pass in the array to the constructor (and loose the type validation)... |
| 759 | - for ($i = 0; $i < count($_xh['params']); $i++) { |
|
| 759 | + for ($i = 0; $i<count($_xh['params']); $i++) { |
|
| 760 | 760 | $req->addParam($_xh['params'][$i]); |
| 761 | 761 | } |
| 762 | 762 | |
| 763 | - if ($this->debug > 1) { |
|
| 764 | - $this->debugMsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
| 763 | + if ($this->debug>1) { |
|
| 764 | + $this->debugMsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
| 765 | 765 | } |
| 766 | 766 | |
| 767 | 767 | return $this->execute($req); |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | return new static::$responseClass( |
| 812 | 812 | 0, |
| 813 | 813 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 814 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}" |
|
| 814 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}" |
|
| 815 | 815 | ); |
| 816 | 816 | } |
| 817 | 817 | } |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | // build string representation of function 'name' |
| 827 | 827 | if (is_array($func)) { |
| 828 | 828 | if (is_object($func[0])) { |
| 829 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
| 829 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
| 830 | 830 | } else { |
| 831 | 831 | $funcName = implode('::', $func); |
| 832 | 832 | } |
@@ -838,16 +838,16 @@ discard block |
||
| 838 | 838 | |
| 839 | 839 | // verify that function to be invoked is in fact callable |
| 840 | 840 | if (!is_callable($func)) { |
| 841 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
| 841 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
| 842 | 842 | return new static::$responseClass( |
| 843 | 843 | 0, |
| 844 | 844 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 845 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
| 845 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
| 846 | 846 | ); |
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | if (isset($dmap[$methodName]['exception_handling'])) { |
| 850 | - $exception_handling = (int)$dmap[$methodName]['exception_handling']; |
|
| 850 | + $exception_handling = (int) $dmap[$methodName]['exception_handling']; |
|
| 851 | 851 | } else { |
| 852 | 852 | $exception_handling = $this->exception_handling; |
| 853 | 853 | } |
@@ -868,14 +868,14 @@ discard block |
||
| 868 | 868 | $r = call_user_func($func, $req); |
| 869 | 869 | } |
| 870 | 870 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
| 871 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
| 871 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
| 872 | 872 | if (is_a($r, 'PhpXmlRpc\Value')) { |
| 873 | 873 | $r = new static::$responseClass($r); |
| 874 | 874 | } else { |
| 875 | 875 | $r = new static::$responseClass( |
| 876 | 876 | 0, |
| 877 | 877 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 878 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
| 878 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
| 879 | 879 | ); |
| 880 | 880 | } |
| 881 | 881 | } |
@@ -890,7 +890,7 @@ discard block |
||
| 890 | 890 | $r = call_user_func_array($func, array($methodName, $params, $this->user_data)); |
| 891 | 891 | // mimic EPI behaviour: if we get an array that looks like an error, make it an error response |
| 892 | 892 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
| 893 | - $r = new static::$responseClass(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
| 893 | + $r = new static::$responseClass(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
| 894 | 894 | } else { |
| 895 | 895 | // functions using EPI api should NOT return resp objects, so make sure we encode the |
| 896 | 896 | // return type correctly |
@@ -1021,7 +1021,7 @@ discard block |
||
| 1021 | 1021 | */ |
| 1022 | 1022 | protected function debugMsg($string) |
| 1023 | 1023 | { |
| 1024 | - $this->debug_info .= $string . "\n"; |
|
| 1024 | + $this->debug_info .= $string."\n"; |
|
| 1025 | 1025 | } |
| 1026 | 1026 | |
| 1027 | 1027 | /** |
@@ -1312,7 +1312,7 @@ discard block |
||
| 1312 | 1312 | $i++; // for error message, we count params from 1 |
| 1313 | 1313 | return static::_xmlrpcs_multicall_error(new static::$responseClass(0, |
| 1314 | 1314 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 1315 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
| 1315 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
| 1316 | 1316 | } |
| 1317 | 1317 | } |
| 1318 | 1318 | |
@@ -1393,7 +1393,7 @@ discard block |
||
| 1393 | 1393 | } |
| 1394 | 1394 | } else { |
| 1395 | 1395 | $numCalls = count($req); |
| 1396 | - for ($i = 0; $i < $numCalls; $i++) { |
|
| 1396 | + for ($i = 0; $i<$numCalls; $i++) { |
|
| 1397 | 1397 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
| 1398 | 1398 | } |
| 1399 | 1399 | } |
@@ -1421,7 +1421,7 @@ discard block |
||
| 1421 | 1421 | // From PHP 8.4 the E_STRICT constant has been deprecated and will emit deprecation notices. |
| 1422 | 1422 | // PHP core and core extensions since PHP 8.0 and later do not emit E_STRICT notices at all. |
| 1423 | 1423 | // On PHP 7 series before PHP 7.4, some functions conditionally emit E_STRICT notices. |
| 1424 | - if (PHP_VERSION_ID >= 70400) { |
|
| 1424 | + if (PHP_VERSION_ID>=70400) { |
|
| 1425 | 1425 | static::error_occurred($errString); |
| 1426 | 1426 | } elseif ($errCode != E_STRICT) { |
| 1427 | 1427 | static::error_occurred($errString); |
@@ -1462,12 +1462,12 @@ discard block |
||
| 1462 | 1462 | */ |
| 1463 | 1463 | protected function xml_header($charsetEncoding = '') |
| 1464 | 1464 | { |
| 1465 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 1465 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 1466 | 1466 | |
| 1467 | 1467 | if ($charsetEncoding != '') { |
| 1468 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 1468 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 1469 | 1469 | } else { |
| 1470 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 1470 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 1471 | 1471 | } |
| 1472 | 1472 | } |
| 1473 | 1473 | |
@@ -1483,7 +1483,7 @@ discard block |
||
| 1483 | 1483 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1484 | 1484 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1485 | 1485 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1486 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 1486 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 1487 | 1487 | return $this->$name; |
| 1488 | 1488 | case 'accepted_charset_encodings': |
| 1489 | 1489 | // manually implement the 'protected property' behaviour |
@@ -1495,16 +1495,16 @@ discard block |
||
| 1495 | 1495 | } |
| 1496 | 1496 | } |
| 1497 | 1497 | if ($canAccess) { |
| 1498 | - $this->logDeprecation('Getting property Request::' . $name . ' is deprecated'); |
|
| 1498 | + $this->logDeprecation('Getting property Request::'.$name.' is deprecated'); |
|
| 1499 | 1499 | return $this->accepted_compression; |
| 1500 | 1500 | } else { |
| 1501 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1501 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1502 | 1502 | } |
| 1503 | 1503 | break; |
| 1504 | 1504 | default: |
| 1505 | 1505 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1506 | 1506 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1507 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1507 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1508 | 1508 | $result = null; |
| 1509 | 1509 | return $result; |
| 1510 | 1510 | } |
@@ -1521,7 +1521,7 @@ discard block |
||
| 1521 | 1521 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1522 | 1522 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1523 | 1523 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1524 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 1524 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 1525 | 1525 | $this->$name = $value; |
| 1526 | 1526 | break; |
| 1527 | 1527 | case 'accepted_charset_encodings': |
@@ -1534,16 +1534,16 @@ discard block |
||
| 1534 | 1534 | } |
| 1535 | 1535 | } |
| 1536 | 1536 | if ($canAccess) { |
| 1537 | - $this->logDeprecation('Setting property Request::' . $name . ' is deprecated'); |
|
| 1537 | + $this->logDeprecation('Setting property Request::'.$name.' is deprecated'); |
|
| 1538 | 1538 | $this->accepted_compression = $value; |
| 1539 | 1539 | } else { |
| 1540 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1540 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1541 | 1541 | } |
| 1542 | 1542 | break; |
| 1543 | 1543 | default: |
| 1544 | 1544 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1545 | 1545 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1546 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1546 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1547 | 1547 | } |
| 1548 | 1548 | } |
| 1549 | 1549 | |
@@ -1558,7 +1558,7 @@ discard block |
||
| 1558 | 1558 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1559 | 1559 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1560 | 1560 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1561 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 1561 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 1562 | 1562 | return isset($this->$name); |
| 1563 | 1563 | case 'accepted_charset_encodings': |
| 1564 | 1564 | // manually implement the 'protected property' behaviour |
@@ -1570,7 +1570,7 @@ discard block |
||
| 1570 | 1570 | } |
| 1571 | 1571 | } |
| 1572 | 1572 | if ($canAccess) { |
| 1573 | - $this->logDeprecation('Checking property Request::' . $name . ' is deprecated'); |
|
| 1573 | + $this->logDeprecation('Checking property Request::'.$name.' is deprecated'); |
|
| 1574 | 1574 | return isset($this->accepted_compression); |
| 1575 | 1575 | } |
| 1576 | 1576 | // break through voluntarily |
@@ -1590,7 +1590,7 @@ discard block |
||
| 1590 | 1590 | case self::OPT_FUNCTIONS_PARAMETERS_TYPE: |
| 1591 | 1591 | case self::OPT_PHPVALS_ENCODING_OPTIONS: |
| 1592 | 1592 | case self::OPT_RESPONSE_CHARSET_ENCODING: |
| 1593 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 1593 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 1594 | 1594 | unset($this->$name); |
| 1595 | 1595 | break; |
| 1596 | 1596 | case 'accepted_charset_encodings': |
@@ -1603,16 +1603,16 @@ discard block |
||
| 1603 | 1603 | } |
| 1604 | 1604 | } |
| 1605 | 1605 | if ($canAccess) { |
| 1606 | - $this->logDeprecation('Unsetting property Request::' . $name . ' is deprecated'); |
|
| 1606 | + $this->logDeprecation('Unsetting property Request::'.$name.' is deprecated'); |
|
| 1607 | 1607 | unset($this->accepted_compression); |
| 1608 | 1608 | } else { |
| 1609 | - trigger_error("Cannot access protected property Server::accepted_charset_encodings in " . __FILE__, E_USER_ERROR); |
|
| 1609 | + trigger_error("Cannot access protected property Server::accepted_charset_encodings in ".__FILE__, E_USER_ERROR); |
|
| 1610 | 1610 | } |
| 1611 | 1611 | break; |
| 1612 | 1612 | default: |
| 1613 | 1613 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 1614 | 1614 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 1615 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 1615 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 1616 | 1616 | } |
| 1617 | 1617 | } |
| 1618 | 1618 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | -require_once __DIR__ . "/_prepend.php"; |
|
| 27 | +require_once __DIR__."/_prepend.php"; |
|
| 28 | 28 | |
| 29 | 29 | use PhpXmlRpc\PhpXmlRpc; |
| 30 | 30 | use PhpXmlRpc\Server; |
@@ -10,8 +10,8 @@ |
||
| 10 | 10 | // That is generally a good idea security-wise, but you might want to allow it in case of specific needs. |
| 11 | 11 | // Look at the code in demo/server.php for an example of how to enable that. |
| 12 | 12 | |
| 13 | -require_once __DIR__ . "/../../lib/xmlrpc.inc"; |
|
| 14 | -require_once __DIR__ . "/../../lib/xmlrpcs.inc"; |
|
| 13 | +require_once __DIR__."/../../lib/xmlrpc.inc"; |
|
| 14 | +require_once __DIR__."/../../lib/xmlrpcs.inc"; |
|
| 15 | 15 | |
| 16 | 16 | $signatures1 = include(__DIR__.'/methodProviders/functions.php'); |
| 17 | 17 | $signatures2 = include(__DIR__.'/methodProviders/interop.php'); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | $headers['Authorization'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION']; |
| 44 | 44 | } elseif (isset($_SERVER['PHP_AUTH_USER'])) { |
| 45 | 45 | $basic_pass = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : ''; |
| 46 | - $headers['Authorization'] = 'Basic ' . base64_encode($_SERVER['PHP_AUTH_USER'] . ':' . $basic_pass); |
|
| 46 | + $headers['Authorization'] = 'Basic '.base64_encode($_SERVER['PHP_AUTH_USER'].':'.$basic_pass); |
|
| 47 | 47 | } elseif (isset($_SERVER['PHP_AUTH_DIGEST'])) { |
| 48 | 48 | $headers['Authorization'] = $_SERVER['PHP_AUTH_DIGEST']; |
| 49 | 49 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $sleep_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcInt)); |
| 98 | 98 | $sleep_doc = 'Sleeps for the requested number of seconds (between 1 and 60), before sending back the response'; |
| 99 | 99 | function sleepSeconds($secs) { |
| 100 | - if ($secs > 0 && $secs < 61) { |
|
| 100 | + if ($secs>0 && $secs<61) { |
|
| 101 | 101 | sleep($secs); |
| 102 | 102 | } |
| 103 | 103 | return $secs; |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | // Greek word 'kosme'. NB: NOT a valid ISO8859 string! |
| 125 | 125 | // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods |
| 126 | - "tests.utf8methodname." . 'κόσμε' => array( |
|
| 126 | + "tests.utf8methodname.".'κόσμε' => array( |
|
| 127 | 127 | "function" => "exampleMethods::stringEcho", |
| 128 | 128 | "signature" => exampleMethods::$stringecho_sig, |
| 129 | 129 | "docstring" => exampleMethods::$stringecho_doc, |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/ServerAwareTestCase.php'; |
|
| 5 | +include_once __DIR__.'/ServerAwareTestCase.php'; |
|
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | 8 | * Tests which involve interaction with the server - carried out via the client. |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | // (but only if not called from subclass objects / multitests) |
| 31 | 31 | if (function_exists('debug_backtrace') && strtolower(get_called_class()) == 'servertest') { |
| 32 | 32 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 33 | - for ($i = 0; $i < count($trace); $i++) { |
|
| 33 | + for ($i = 0; $i<count($trace); $i++) { |
|
| 34 | 34 | if (strpos($trace[$i]['function'], 'test') === 0) { |
| 35 | 35 | self::$failed_tests[$trace[$i]['function']] = true; |
| 36 | 36 | break; |
@@ -79,9 +79,9 @@ discard block |
||
| 79 | 79 | } |
| 80 | 80 | $this->validateResponse($r); |
| 81 | 81 | if (is_array($errorCode)) { |
| 82 | - $this->assertContains($r->faultCode(), $errorCode, 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 82 | + $this->assertContains($r->faultCode(), $errorCode, 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 83 | 83 | } else { |
| 84 | - $this->assertEquals($errorCode, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 84 | + $this->assertEquals($errorCode, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 85 | 85 | } |
| 86 | 86 | if (!$r->faultCode()) { |
| 87 | 87 | if ($returnResponse) { |
@@ -108,20 +108,20 @@ discard block |
||
| 108 | 108 | $query = parse_url($this->client->path, PHP_URL_QUERY); |
| 109 | 109 | parse_str($query, $vars); |
| 110 | 110 | $query = http_build_query(array_merge($vars, $data)); |
| 111 | - $this->client->path = parse_url($this->client->path, PHP_URL_PATH) . '?' . $query; |
|
| 111 | + $this->client->path = parse_url($this->client->path, PHP_URL_PATH).'?'.$query; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | public function testString() |
| 115 | 115 | { |
| 116 | - $sendString = "here are 3 \"entities\": < > & " . |
|
| 117 | - "and here's a dollar sign: \$pretendvarname and a backslash too: " . chr(92) . |
|
| 118 | - " - isn't that great? \\\"hackery\\\" at it's best " . |
|
| 119 | - " also don't want to miss out on \$item[0]. " . |
|
| 120 | - "The real weird stuff follows: CRLF here" . chr(13) . chr(10) . |
|
| 121 | - "a simple CR here" . chr(13) . |
|
| 122 | - "a simple LF here" . chr(10) . |
|
| 123 | - "and then LFCR" . chr(10) . chr(13) . |
|
| 124 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne, and an xml comment closing tag: -->"; |
|
| 116 | + $sendString = "here are 3 \"entities\": < > & ". |
|
| 117 | + "and here's a dollar sign: \$pretendvarname and a backslash too: ".chr(92). |
|
| 118 | + " - isn't that great? \\\"hackery\\\" at it's best ". |
|
| 119 | + " also don't want to miss out on \$item[0]. ". |
|
| 120 | + "The real weird stuff follows: CRLF here".chr(13).chr(10). |
|
| 121 | + "a simple CR here".chr(13). |
|
| 122 | + "a simple LF here".chr(10). |
|
| 123 | + "and then LFCR".chr(10).chr(13). |
|
| 124 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne, and an xml comment closing tag: -->"; |
|
| 125 | 125 | $m = new xmlrpcmsg('examples.stringecho', array( |
| 126 | 126 | new xmlrpcval($sendString, 'string'), |
| 127 | 127 | )); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | public function testLatin1String() |
| 143 | 143 | { |
| 144 | 144 | $sendString = |
| 145 | - "last but not least weird names: G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
| 145 | + "last but not least weird names: G".chr(252)."nter, El".chr(232)."ne"; |
|
| 146 | 146 | $x = '<?xml version="1.0" encoding="ISO-8859-1"?><methodCall><methodName>examples.stringecho</methodName><params><param><value>'. |
| 147 | 147 | $sendString. |
| 148 | 148 | '</value></param></params></methodCall>'; |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | public function testUtf8Method() |
| 252 | 252 | { |
| 253 | 253 | PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'UTF-8'; |
| 254 | - $m = new xmlrpcmsg("tests.utf8methodname." . 'κόσμε', array( |
|
| 254 | + $m = new xmlrpcmsg("tests.utf8methodname.".'κόσμε', array( |
|
| 255 | 255 | new xmlrpcval('hello') |
| 256 | 256 | )); |
| 257 | 257 | $v = $this->send($m); |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | )); |
| 273 | 273 | $v = $this->send($m); |
| 274 | 274 | if ($v) { |
| 275 | - $this->assertEquals($a + $b, $v->scalarval()); |
|
| 275 | + $this->assertEquals($a+$b, $v->scalarval()); |
|
| 276 | 276 | } |
| 277 | 277 | } |
| 278 | 278 | |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | )); |
| 285 | 285 | $v = $this->send($m); |
| 286 | 286 | if ($v) { |
| 287 | - $this->assertEquals(12 - 23, $v->scalarval()); |
|
| 287 | + $this->assertEquals(12-23, $v->scalarval()); |
|
| 288 | 288 | } |
| 289 | 289 | } |
| 290 | 290 | |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | if ($v) { |
| 324 | 324 | $sz = $v->arraysize(); |
| 325 | 325 | $got = ''; |
| 326 | - for ($i = 0; $i < $sz; $i++) { |
|
| 326 | + for ($i = 0; $i<$sz; $i++) { |
|
| 327 | 327 | $b = $v->arraymem($i); |
| 328 | 328 | if ($b->scalarval()) { |
| 329 | 329 | $got .= '1'; |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | $got = ''; |
| 371 | 371 | $expected = '37210'; |
| 372 | 372 | $expect_array = array('ctLeftAngleBrackets', 'ctRightAngleBrackets', 'ctAmpersands', 'ctApostrophes', 'ctQuotes'); |
| 373 | - foreach($expect_array as $val) { |
|
| 373 | + foreach ($expect_array as $val) { |
|
| 374 | 374 | $b = $v->structmem($val); |
| 375 | 375 | $got .= $b->scalarVal(); |
| 376 | 376 | } |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | { |
| 874 | 874 | // make a 'deep client copy' as the original one might have many properties set |
| 875 | 875 | // also for speed only wrap one method of the whole server |
| 876 | - $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/' )); |
|
| 876 | + $class = wrap_xmlrpc_server($this->client, array('simple_client_copy' => 0, 'method_filter' => '/examples\.getStateName/')); |
|
| 877 | 877 | if ($class == '') { |
| 878 | 878 | $this->fail('Registration of remote server failed'); |
| 879 | 879 | } else { |
@@ -912,9 +912,9 @@ discard block |
||
| 912 | 912 | $cookies = array( |
| 913 | 913 | //'c1' => array(), |
| 914 | 914 | 'c2' => array('value' => 'c2'), |
| 915 | - 'c3' => array('value' => 'c3', 'expires' => time() + 60 * 60 * 24 * 30), |
|
| 916 | - 'c4' => array('value' => 'c4', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/'), |
|
| 917 | - 'c5' => array('value' => 'c5', 'expires' => time() + 60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 915 | + 'c3' => array('value' => 'c3', 'expires' => time()+60 * 60 * 24 * 30), |
|
| 916 | + 'c4' => array('value' => 'c4', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/'), |
|
| 917 | + 'c5' => array('value' => 'c5', 'expires' => time()+60 * 60 * 24 * 30, 'path' => '/', 'domain' => 'localhost'), |
|
| 918 | 918 | ); |
| 919 | 919 | $cookiesval = php_xmlrpc_encode($cookies); |
| 920 | 920 | $m = new xmlrpcmsg('tests.setcookies', array($cookiesval)); |
@@ -962,10 +962,10 @@ discard block |
||
| 962 | 962 | $m = new xmlrpcmsg('tests.getcookies', array()); |
| 963 | 963 | foreach ($cookies as $cookie => $val) { |
| 964 | 964 | $this->client->setCookie($cookie, $val); |
| 965 | - $cookies[$cookie] = (string)$cookies[$cookie]; |
|
| 965 | + $cookies[$cookie] = (string) $cookies[$cookie]; |
|
| 966 | 966 | } |
| 967 | 967 | $r = $this->client->send($m, $this->timeout, $this->method); |
| 968 | - $this->assertEquals(0, $r->faultCode(), 'Error ' . $r->faultCode() . ' connecting to server: ' . $r->faultString()); |
|
| 968 | + $this->assertEquals(0, $r->faultCode(), 'Error '.$r->faultCode().' connecting to server: '.$r->faultString()); |
|
| 969 | 969 | if (!$r->faultCode()) { |
| 970 | 970 | $v = $r->value(); |
| 971 | 971 | $v = php_xmlrpc_decode($v); |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | // In case this file is made available on an open-access server, avoid it being useable by anyone who can not also |
| 8 | 8 | // write a specific file to disk. |
| 9 | 9 | // NB: keep filename, cookie name in sync with the code within the TestCase classes sending http requests to this file |
| 10 | -$idFile = sys_get_temp_dir() . '/phpunit_rand_id.txt'; |
|
| 10 | +$idFile = sys_get_temp_dir().'/phpunit_rand_id.txt'; |
|
| 11 | 11 | $randId = isset($_COOKIE['PHPUNIT_RANDOM_TEST_ID']) ? $_COOKIE['PHPUNIT_RANDOM_TEST_ID'] : ''; |
| 12 | 12 | $fileId = file_exists($idFile) ? file_get_contents($idFile) : ''; |
| 13 | 13 | if ($randId == '' || $fileId == '' || $fileId !== $randId) { |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777); |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 34 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | $targetFile = null; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
| 57 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 57 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | } elseif ($_GET['FORCE_AUTH'] == 'Digest') { |
| 88 | 88 | if (empty($_SERVER['PHP_AUTH_DIGEST'])) { |
| 89 | 89 | header('HTTP/1.1 401 Unauthorized'); |
| 90 | - header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"'); |
|
| 90 | + header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"'); |
|
| 91 | 91 | die('Text visible if user hits Cancel button'); |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -95,11 +95,11 @@ discard block |
||
| 95 | 95 | if (isset($_GET['FORCE_REDIRECT'])) { |
| 96 | 96 | header('HTTP/1.0 302 Found'); |
| 97 | 97 | unset($_GET['FORCE_REDIRECT']); |
| 98 | - header('Location: ' . $_SERVER['REQUEST_URI'] . (count($_GET) ? '?' . http_build_query($_GET) : '')); |
|
| 98 | + header('Location: '.$_SERVER['REQUEST_URI'].(count($_GET) ? '?'.http_build_query($_GET) : '')); |
|
| 99 | 99 | die(); |
| 100 | 100 | } |
| 101 | - if (isset($_GET['SLOW_LORIS']) && $_GET['SLOW_LORIS'] > 0) { |
|
| 102 | - slowLoris((int)$_GET['SLOW_LORIS'], $s); |
|
| 101 | + if (isset($_GET['SLOW_LORIS']) && $_GET['SLOW_LORIS']>0) { |
|
| 102 | + slowLoris((int) $_GET['SLOW_LORIS'], $s); |
|
| 103 | 103 | die(); |
| 104 | 104 | } |
| 105 | 105 | } |
@@ -113,13 +113,13 @@ discard block |
||
| 113 | 113 | { |
| 114 | 114 | /// @todo as is, this method can not be used by eg. jsonrpc servers. We could look at the value $s::$responseClass |
| 115 | 115 | /// to improve that |
| 116 | - $strings = array('<?xml version="1.0"?>','<methodResponse>','<params>','<param>','<value>','<string></string>','</value>','</param>','</params>','</methodResponse>'); |
|
| 116 | + $strings = array('<?xml version="1.0"?>', '<methodResponse>', '<params>', '<param>', '<value>', '<string></string>', '</value>', '</param>', '</params>', '</methodResponse>'); |
|
| 117 | 117 | |
| 118 | 118 | header('Content-type: xml; charset=utf-8'); |
| 119 | - foreach($strings as $i => $string) { |
|
| 119 | + foreach ($strings as $i => $string) { |
|
| 120 | 120 | echo $string; |
| 121 | 121 | flush(); |
| 122 | - if ($i < count($strings) && $secs > 0 && $secs <= 60) { |
|
| 122 | + if ($i<count($strings) && $secs>0 && $secs<=60) { |
|
| 123 | 123 | sleep($secs); |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/LoggerAwareTestCase.php'; |
|
| 3 | +include_once __DIR__.'/LoggerAwareTestCase.php'; |
|
| 4 | 4 | |
| 5 | 5 | /** |
| 6 | 6 | * Tests involving the Value class. |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | if (version_compare(PHP_VERSION, '8.0', '>=')) { |
| 139 | 139 | $str = sprintf("%f", $v->scalarval()); |
| 140 | 140 | } else { |
| 141 | - $str = (string)$v->scalarval(); |
|
| 141 | + $str = (string) $v->scalarval(); |
|
| 142 | 142 | } |
| 143 | 143 | if (strpos($str, ',') == 1) { |
| 144 | 144 | $r = $v->serialize(); |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | $this->assertequals(1, count($v1)); |
| 160 | 160 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
| 161 | 161 | |
| 162 | - foreach($v1 as $key => $val) |
|
| 162 | + foreach ($v1 as $key => $val) |
|
| 163 | 163 | { |
| 164 | 164 | $this->assertArrayHasKey($key, $out); |
| 165 | 165 | $expected = $out[$key]; |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $this->assertequals(2, count($v2)); |
| 175 | 175 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
| 176 | 176 | $i = 0; |
| 177 | - foreach($v2 as $key => $val) |
|
| 177 | + foreach ($v2 as $key => $val) |
|
| 178 | 178 | { |
| 179 | 179 | $expected = $out[$i]; |
| 180 | 180 | $this->assertequals($expected['key'], $key); |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | { |
| 202 | 202 | // nb: make sure that the serialized xml corresponding to this is > 10MB in size |
| 203 | 203 | $data = array(); |
| 204 | - for ($i = 0; $i < 500000; $i++ ) { |
|
| 204 | + for ($i = 0; $i<500000; $i++) { |
|
| 205 | 205 | $data[] = 'hello world'; |
| 206 | 206 | } |
| 207 | 207 | |
