gggeek /
phpxmlrpc
@@ -348,7 +348,8 @@ |
||
| 348 | 348 | /** |
| 349 | 349 | * Parse http headers received along with xmlrpc request. If needed, inflate request. |
| 350 | 350 | * |
| 351 | - * @return mixed Response|null on success or an error Response |
|
| 351 | + * @param string $data |
|
| 352 | + * @return Response|null Response|null on success or an error Response |
|
| 352 | 353 | */ |
| 353 | 354 | protected function parseRequestHeaders(&$data, &$reqEncoding, &$respEncoding, &$respCompression) |
| 354 | 355 | { |
@@ -138,12 +138,12 @@ discard block |
||
| 138 | 138 | */ |
| 139 | 139 | public static function xmlrpc_debugmsg($msg) |
| 140 | 140 | { |
| 141 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
| 141 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
| 142 | 142 | } |
| 143 | 143 | |
| 144 | 144 | public static function error_occurred($msg) |
| 145 | 145 | { |
| 146 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
| 146 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | /** |
@@ -162,10 +162,10 @@ discard block |
||
| 162 | 162 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
| 163 | 163 | $out = ''; |
| 164 | 164 | if ($this->debug_info != '') { |
| 165 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
| 165 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
| 166 | 166 | } |
| 167 | 167 | if (static::$_xmlrpc_debuginfo != '') { |
| 168 | - $out .= "<!-- DEBUG INFO:\n" . Charset::instance()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
| 168 | + $out .= "<!-- DEBUG INFO:\n".Charset::instance()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
| 169 | 169 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
| 170 | 170 | // into return payload AFTER the beginning tag |
| 171 | 171 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -195,8 +195,8 @@ discard block |
||
| 195 | 195 | $this->debug_info = ''; |
| 196 | 196 | |
| 197 | 197 | // Save what we received, before parsing it |
| 198 | - if ($this->debug > 1) { |
|
| 199 | - $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
| 198 | + if ($this->debug>1) { |
|
| 199 | + $this->debugmsg("+++GOT+++\n".$data."\n+++END+++"); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | $r = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -208,14 +208,14 @@ discard block |
||
| 208 | 208 | // save full body of request into response, for more debugging usages |
| 209 | 209 | $r->raw_data = $rawData; |
| 210 | 210 | |
| 211 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors) { |
|
| 212 | - $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
| 213 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
| 211 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors) { |
|
| 212 | + $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
| 213 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | $payload = $this->xml_header($respCharset); |
| 217 | - if ($this->debug > 0) { |
|
| 218 | - $payload = $payload . $this->serializeDebug($respCharset); |
|
| 217 | + if ($this->debug>0) { |
|
| 218 | + $payload = $payload.$this->serializeDebug($respCharset); |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | // G. Giunta 2006-01-27: do not create response serialization if it has |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | if (empty($r->payload)) { |
| 224 | 224 | $r->serialize($respCharset); |
| 225 | 225 | } |
| 226 | - $payload = $payload . $r->payload; |
|
| 226 | + $payload = $payload.$r->payload; |
|
| 227 | 227 | |
| 228 | 228 | if ($returnPayload) { |
| 229 | 229 | return $payload; |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | // if we get a warning/error that has output some text before here, then we cannot |
| 233 | 233 | // add a new header. We cannot say we are sending xml, either... |
| 234 | 234 | if (!headers_sent()) { |
| 235 | - header('Content-Type: ' . $r->content_type); |
|
| 235 | + header('Content-Type: '.$r->content_type); |
|
| 236 | 236 | // we do not know if client actually told us an accepted charset, but if he did |
| 237 | 237 | // we have to tell him what we did |
| 238 | 238 | header("Vary: Accept-Charset"); |
@@ -258,10 +258,10 @@ discard block |
||
| 258 | 258 | // do not output content-length header if php is compressing output for us: |
| 259 | 259 | // it will mess up measurements |
| 260 | 260 | if ($phpNoSelfCompress) { |
| 261 | - header('Content-Length: ' . (int)strlen($payload)); |
|
| 261 | + header('Content-Length: '.(int) strlen($payload)); |
|
| 262 | 262 | } |
| 263 | 263 | } else { |
| 264 | - error_log('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 264 | + error_log('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | print $payload; |
@@ -310,9 +310,9 @@ discard block |
||
| 310 | 310 | $numParams = count($in); |
| 311 | 311 | } |
| 312 | 312 | foreach ($sigs as $curSig) { |
| 313 | - if (count($curSig) == $numParams + 1) { |
|
| 313 | + if (count($curSig) == $numParams+1) { |
|
| 314 | 314 | $itsOK = 1; |
| 315 | - for ($n = 0; $n < $numParams; $n++) { |
|
| 315 | + for ($n = 0; $n<$numParams; $n++) { |
|
| 316 | 316 | if (is_object($in)) { |
| 317 | 317 | $p = $in->getParam($n); |
| 318 | 318 | if ($p->kindOf() == 'scalar') { |
@@ -325,10 +325,10 @@ discard block |
||
| 325 | 325 | } |
| 326 | 326 | |
| 327 | 327 | // param index is $n+1, as first member of sig is return type |
| 328 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
| 328 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
| 329 | 329 | $itsOK = 0; |
| 330 | - $pno = $n + 1; |
|
| 331 | - $wanted = $curSig[$n + 1]; |
|
| 330 | + $pno = $n+1; |
|
| 331 | + $wanted = $curSig[$n+1]; |
|
| 332 | 332 | $got = $pt; |
| 333 | 333 | break; |
| 334 | 334 | } |
@@ -355,10 +355,10 @@ discard block |
||
| 355 | 355 | // check if $_SERVER is populated: it might have been disabled via ini file |
| 356 | 356 | // (this is true even when in CLI mode) |
| 357 | 357 | if (count($_SERVER) == 0) { |
| 358 | - error_log('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
| 358 | + error_log('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | - if ($this->debug > 1) { |
|
| 361 | + if ($this->debug>1) { |
|
| 362 | 362 | if (function_exists('getallheaders')) { |
| 363 | 363 | $this->debugmsg(''); // empty line |
| 364 | 364 | foreach (getallheaders() as $name => $val) { |
@@ -380,13 +380,13 @@ discard block |
||
| 380 | 380 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
| 381 | 381 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 382 | 382 | $data = $degzdata; |
| 383 | - if ($this->debug > 1) { |
|
| 384 | - $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 383 | + if ($this->debug>1) { |
|
| 384 | + $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 385 | 385 | } |
| 386 | 386 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 387 | 387 | $data = $degzdata; |
| 388 | - if ($this->debug > 1) { |
|
| 389 | - $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 388 | + if ($this->debug>1) { |
|
| 389 | + $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 390 | 390 | } |
| 391 | 391 | } else { |
| 392 | 392 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], PhpXmlRpc::$xmlrpcstr['server_decompress_fail']); |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | if (extension_loaded('mbstring')) { |
| 471 | 471 | $data = mb_convert_encoding($data, 'UTF-8', $reqEncoding); |
| 472 | 472 | } else { |
| 473 | - error_log('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding); |
|
| 473 | + error_log('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding); |
|
| 474 | 474 | } |
| 475 | 475 | } |
| 476 | 476 | } |
@@ -503,7 +503,7 @@ discard block |
||
| 503 | 503 | if (!xml_parse($parser, $data, 1)) { |
| 504 | 504 | // return XML error as a faultCode |
| 505 | 505 | $r = new Response(0, |
| 506 | - PhpXmlRpc::$xmlrpcerrxml + xml_get_error_code($parser), |
|
| 506 | + PhpXmlRpc::$xmlrpcerrxml+xml_get_error_code($parser), |
|
| 507 | 507 | sprintf('XML error: %s at line %d, column %d', |
| 508 | 508 | xml_error_string(xml_get_error_code($parser)), |
| 509 | 509 | xml_get_current_line_number($parser), xml_get_current_column_number($parser))); |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | xml_parser_free($parser); |
| 513 | 513 | $r = new Response(0, |
| 514 | 514 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
| 515 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']); |
|
| 515 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']); |
|
| 516 | 516 | } else { |
| 517 | 517 | xml_parser_free($parser); |
| 518 | 518 | // small layering violation in favor of speed and memory usage: |
@@ -520,20 +520,20 @@ discard block |
||
| 520 | 520 | // most common scenario (xmlrpc values type server with some methods |
| 521 | 521 | // registered as phpvals) that would mean a useless encode+decode pass |
| 522 | 522 | if ($this->functions_parameters_type != 'xmlrpcvals' || (isset($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type']) && ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] == 'phpvals'))) { |
| 523 | - if ($this->debug > 1) { |
|
| 524 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++"); |
|
| 523 | + if ($this->debug>1) { |
|
| 524 | + $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++"); |
|
| 525 | 525 | } |
| 526 | 526 | $r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']); |
| 527 | 527 | } else { |
| 528 | 528 | // build a Request object with data parsed from xml |
| 529 | 529 | $req = new Request($xmlRpcParser->_xh['method']); |
| 530 | 530 | // now add parameters in |
| 531 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
| 531 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
| 532 | 532 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
| 533 | 533 | } |
| 534 | 534 | |
| 535 | - if ($this->debug > 1) { |
|
| 536 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
| 535 | + if ($this->debug>1) { |
|
| 536 | + $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
| 537 | 537 | } |
| 538 | 538 | $r = $this->execute($req); |
| 539 | 539 | } |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | return new Response( |
| 587 | 587 | 0, |
| 588 | 588 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 589 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": ${errStr}" |
|
| 589 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": ${errStr}" |
|
| 590 | 590 | ); |
| 591 | 591 | } |
| 592 | 592 | } |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | |
| 600 | 600 | if (is_array($func)) { |
| 601 | 601 | if (is_object($func[0])) { |
| 602 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
| 602 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
| 603 | 603 | } else { |
| 604 | 604 | $funcName = implode('::', $func); |
| 605 | 605 | } |
@@ -611,17 +611,17 @@ discard block |
||
| 611 | 611 | |
| 612 | 612 | // verify that function to be invoked is in fact callable |
| 613 | 613 | if (!is_callable($func)) { |
| 614 | - error_log("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
| 614 | + error_log("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
| 615 | 615 | return new Response( |
| 616 | 616 | 0, |
| 617 | 617 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 618 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
| 618 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
| 619 | 619 | ); |
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | // If debug level is 3, we should catch all errors generated during |
| 623 | 623 | // processing of user function, and log them as part of response |
| 624 | - if ($this->debug > 2) { |
|
| 624 | + if ($this->debug>2) { |
|
| 625 | 625 | self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler')); |
| 626 | 626 | } |
| 627 | 627 | |
@@ -634,14 +634,14 @@ discard block |
||
| 634 | 634 | $r = call_user_func($func, $req); |
| 635 | 635 | } |
| 636 | 636 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
| 637 | - error_log("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
| 637 | + error_log("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
| 638 | 638 | if (is_a($r, 'PhpXmlRpc\Value')) { |
| 639 | 639 | $r = new Response($r); |
| 640 | 640 | } else { |
| 641 | 641 | $r = new Response( |
| 642 | 642 | 0, |
| 643 | 643 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 644 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
| 644 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
| 645 | 645 | ); |
| 646 | 646 | } |
| 647 | 647 | } |
@@ -657,7 +657,7 @@ discard block |
||
| 657 | 657 | // mimic EPI behaviour: if we get an array that looks like an error, make it |
| 658 | 658 | // an eror response |
| 659 | 659 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
| 660 | - $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
| 660 | + $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
| 661 | 661 | } else { |
| 662 | 662 | // functions using EPI api should NOT return resp objects, |
| 663 | 663 | // so make sure we encode the return type correctly |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | // in the called function, we wrap it in a proper error-response |
| 680 | 680 | switch ($this->exception_handling) { |
| 681 | 681 | case 2: |
| 682 | - if ($this->debug > 2) { |
|
| 682 | + if ($this->debug>2) { |
|
| 683 | 683 | if (self::$_xmlrpcs_prev_ehandler) { |
| 684 | 684 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
| 685 | 685 | } else { |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_error'], PhpXmlRpc::$xmlrpcstr['server_error']); |
| 696 | 696 | } |
| 697 | 697 | } |
| 698 | - if ($this->debug > 2) { |
|
| 698 | + if ($this->debug>2) { |
|
| 699 | 699 | // note: restore the error handler we found before calling the |
| 700 | 700 | // user func, even if it has been changed inside the func itself |
| 701 | 701 | if (self::$_xmlrpcs_prev_ehandler) { |
@@ -715,7 +715,7 @@ discard block |
||
| 715 | 715 | */ |
| 716 | 716 | protected function debugmsg($string) |
| 717 | 717 | { |
| 718 | - $this->debug_info .= $string . "\n"; |
|
| 718 | + $this->debug_info .= $string."\n"; |
|
| 719 | 719 | } |
| 720 | 720 | |
| 721 | 721 | /** |
@@ -725,9 +725,9 @@ discard block |
||
| 725 | 725 | protected function xml_header($charsetEncoding = '') |
| 726 | 726 | { |
| 727 | 727 | if ($charsetEncoding != '') { |
| 728 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 728 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 729 | 729 | } else { |
| 730 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 730 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 731 | 731 | } |
| 732 | 732 | } |
| 733 | 733 | |
@@ -935,12 +935,12 @@ discard block |
||
| 935 | 935 | } |
| 936 | 936 | |
| 937 | 937 | $req = new Request($methName->scalarval()); |
| 938 | - foreach($params as $i => $param) { |
|
| 938 | + foreach ($params as $i => $param) { |
|
| 939 | 939 | if (!$req->addParam($param)) { |
| 940 | 940 | $i++; // for error message, we count params from 1 |
| 941 | 941 | return static::_xmlrpcs_multicall_error(new Response(0, |
| 942 | 942 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 943 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
| 943 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
| 944 | 944 | } |
| 945 | 945 | } |
| 946 | 946 | |
@@ -998,12 +998,12 @@ discard block |
||
| 998 | 998 | // let accept a plain list of php parameters, beside a single xmlrpc msg object |
| 999 | 999 | if (is_object($req)) { |
| 1000 | 1000 | $calls = $req->getParam(0); |
| 1001 | - foreach($calls as $call) { |
|
| 1001 | + foreach ($calls as $call) { |
|
| 1002 | 1002 | $result[] = static::_xmlrpcs_multicall_do_call($server, $call); |
| 1003 | 1003 | } |
| 1004 | 1004 | } else { |
| 1005 | 1005 | $numCalls = count($req); |
| 1006 | - for ($i = 0; $i < $numCalls; $i++) { |
|
| 1006 | + for ($i = 0; $i<$numCalls; $i++) { |
|
| 1007 | 1007 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
| 1008 | 1008 | } |
| 1009 | 1009 | } |
@@ -33,6 +33,9 @@ |
||
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | + /** |
|
| 37 | + * @param string $methodName |
|
| 38 | + */ |
|
| 36 | 39 | protected function newMsg($methodName, $params = array()) |
| 37 | 40 | { |
| 38 | 41 | $msg = new xmlrpcmsg($methodName, $params); |
@@ -17,14 +17,16 @@ |
||
| 17 | 17 | protected function setUp() |
| 18 | 18 | { |
| 19 | 19 | $this->args = argParser::getArgs(); |
| 20 | - if ($this->args['DEBUG'] == 1) |
|
| 21 | - ob_start(); |
|
| 20 | + if ($this->args['DEBUG'] == 1) { |
|
| 21 | + ob_start(); |
|
| 22 | + } |
|
| 22 | 23 | } |
| 23 | 24 | |
| 24 | 25 | protected function tearDown() |
| 25 | 26 | { |
| 26 | - if ($this->args['DEBUG'] != 1) |
|
| 27 | - return; |
|
| 27 | + if ($this->args['DEBUG'] != 1) { |
|
| 28 | + return; |
|
| 29 | + } |
|
| 28 | 30 | $out = ob_get_clean(); |
| 29 | 31 | $status = $this->getStatus(); |
| 30 | 32 | if ($status == PHPUnit_Runner_BaseTestRunner::STATUS_ERROR |
@@ -2,10 +2,10 @@ discard block |
||
| 2 | 2 | /** |
| 3 | 3 | * NB: do not let your IDE fool you. The correct encoding for this file is NOT UTF8. |
| 4 | 4 | */ |
| 5 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 6 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
| 5 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 6 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/parse_args.php'; |
|
| 8 | +include_once __DIR__.'/parse_args.php'; |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Tests involving parsing of xml and handling of xmlrpc values |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | public function testUnicodeInMemberName() |
| 63 | 63 | { |
| 64 | - $str = "G" . chr(252) . "nter, El" . chr(232) . "ne"; |
|
| 64 | + $str = "G".chr(252)."nter, El".chr(232)."ne"; |
|
| 65 | 65 | $v = array($str => new xmlrpcval(1)); |
| 66 | 66 | $r = new xmlrpcresp(new xmlrpcval($v, 'struct')); |
| 67 | 67 | $r = $r->serialize(); |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | <!-- $Id --> |
| 79 | 79 | <!-- found by G. giunta, covers what happens when lib receives |
| 80 | 80 | UTF8 chars in response text and comments --> |
| 81 | -<!-- ' . chr(224) . chr(252) . chr(232) . 'àüè --> |
|
| 81 | +<!-- ' . chr(224).chr(252).chr(232).'àüè --> |
|
| 82 | 82 | <methodResponse> |
| 83 | 83 | <fault> |
| 84 | 84 | <value> |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | </member> |
| 90 | 90 | <member> |
| 91 | 91 | <name>faultString</name> |
| 92 | -<value><string>' . chr(224) . chr(252) . chr(232) . 'àüè</string></value> |
|
| 92 | +<value><string>' . chr(224).chr(252).chr(232).'àüè</string></value> |
|
| 93 | 93 | </member> |
| 94 | 94 | </struct> |
| 95 | 95 | </value> |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $m = $this->newMsg('dummy'); |
| 99 | 99 | $r = $m->parseResponse($response); |
| 100 | 100 | $v = $r->faultString(); |
| 101 | - $this->assertEquals(chr(224) . chr(252) . chr(232) . chr(224) . chr(252) . chr(232), $v); |
|
| 101 | + $this->assertEquals(chr(224).chr(252).chr(232).chr(224).chr(252).chr(232), $v); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | public function testValidNumbers() |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | |
| 160 | 160 | public function testI8() |
| 161 | 161 | { |
| 162 | - if (PHP_INT_SIZE == 4 ) { |
|
| 162 | + if (PHP_INT_SIZE == 4) { |
|
| 163 | 163 | $this->markTestSkipped('did not find a locale which sets decimal separator to comma'); |
| 164 | 164 | return; |
| 165 | 165 | } |
@@ -482,11 +482,11 @@ discard block |
||
| 482 | 482 | |
| 483 | 483 | public function testUTF8Response() |
| 484 | 484 | { |
| 485 | - $string = chr(224) . chr(252) . chr(232); |
|
| 485 | + $string = chr(224).chr(252).chr(232); |
|
| 486 | 486 | |
| 487 | 487 | $s = $this->newMsg('dummy'); |
| 488 | - $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
| 489 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 488 | + $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=UTF-8\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
| 489 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 490 | 490 | '; |
| 491 | 491 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 492 | 492 | $v = $r->value(); |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | $this->assertEquals($string, $v); |
| 495 | 495 | |
| 496 | 496 | $f = '<?xml version="1.0" encoding="UTF-8"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
| 497 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string) . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 497 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . utf8_encode($string).'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 498 | 498 | '; |
| 499 | 499 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 500 | 500 | $v = $r->value(); |
@@ -509,11 +509,11 @@ discard block |
||
| 509 | 509 | |
| 510 | 510 | public function testLatin1Response() |
| 511 | 511 | { |
| 512 | - $string = chr(224) . chr(252) . chr(232); |
|
| 512 | + $string = chr(224).chr(252).chr(232); |
|
| 513 | 513 | |
| 514 | 514 | $s = $this->newMsg('dummy'); |
| 515 | - $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n" . '<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
| 516 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 515 | + $f = "HTTP/1.1 200 OK\r\nContent-type: text/xml; charset=ISO-8859-1\r\n\r\n".'<?xml version="1.0"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
|
| 516 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 517 | 517 | '; |
| 518 | 518 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 519 | 519 | $v = $r->value(); |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | $this->assertEquals($string, $v); |
| 522 | 522 | |
| 523 | 523 | $f = '<?xml version="1.0" encoding="ISO-8859-1"?><methodResponse><params><param><value><struct><member><name>userid</name><value>311127</value></member> |
| 524 | -<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string . '</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 524 | +<member><name>dateCreated</name><value><dateTime.iso8601>20011126T09:17:52</dateTime.iso8601></value></member><member><name>content</name><value>' . $string.'</value></member><member><name>postid</name><value>7414222</value></member></struct></value></param></params></methodResponse> |
|
| 525 | 525 | '; |
| 526 | 526 | $r = $s->parseResponse($f, false, 'phpvals'); |
| 527 | 527 | $v = $r->value(); |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | $this->assertequals(1, count($v1)); |
| 617 | 617 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
| 618 | 618 | |
| 619 | - foreach($v1 as $key => $val) |
|
| 619 | + foreach ($v1 as $key => $val) |
|
| 620 | 620 | { |
| 621 | 621 | $this->assertArrayHasKey($key, $out); |
| 622 | 622 | $expected = $out[$key]; |
@@ -631,7 +631,7 @@ discard block |
||
| 631 | 631 | $this->assertequals(2, count($v2)); |
| 632 | 632 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
| 633 | 633 | $i = 0; |
| 634 | - foreach($v2 as $key => $val) |
|
| 634 | + foreach ($v2 as $key => $val) |
|
| 635 | 635 | { |
| 636 | 636 | $expected = $out[$i]; |
| 637 | 637 | $this->assertequals($expected['key'], $key); |
@@ -57,9 +57,9 @@ discard block |
||
| 57 | 57 | ); |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - public static function getOpts($args=array(), $cliOpts=array()) |
|
| 60 | + public static function getOpts($args = array(), $cliOpts = array()) |
|
| 61 | 61 | { |
| 62 | - if (count($args) > 0) |
|
| 62 | + if (count($args)>0) |
|
| 63 | 63 | // throw new \Exception('Missing library version argument'); |
| 64 | 64 | self::$libVersion = $args[0]; |
| 65 | 65 | |
@@ -157,17 +157,17 @@ discard block |
||
| 157 | 157 | $out = ''; |
| 158 | 158 | while (($start = strpos($content, $startTag, $last)) !== false) { |
| 159 | 159 | $end = strpos($content, $endTag, $start); |
| 160 | - $code = substr($content, $start + strlen($startTag), $end - $start - strlen($startTag)); |
|
| 161 | - if ($code[strlen($code) - 1] == "\n") { |
|
| 160 | + $code = substr($content, $start+strlen($startTag), $end-$start-strlen($startTag)); |
|
| 161 | + if ($code[strlen($code)-1] == "\n") { |
|
| 162 | 162 | $code = substr($code, 0, -1); |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | $code = str_replace(array('>', '<'), array('>', '<'), $code); |
| 166 | - $code = highlight_string('<?php ' . $code, true); |
|
| 166 | + $code = highlight_string('<?php '.$code, true); |
|
| 167 | 167 | $code = str_replace('<span style="color: #0000BB"><?php <br />', '<span style="color: #0000BB">', $code); |
| 168 | 168 | |
| 169 | - $out = $out . substr($content, $last, $start + strlen($startTag) - $last) . $code . $endTag; |
|
| 170 | - $last = $end + strlen($endTag); |
|
| 169 | + $out = $out.substr($content, $last, $start+strlen($startTag)-$last).$code.$endTag; |
|
| 170 | + $last = $end+strlen($endTag); |
|
| 171 | 171 | } |
| 172 | 172 | $out .= substr($content, $last, strlen($content)); |
| 173 | 173 | |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | use PhpXmlRpc\Builder; |
| 183 | 183 | |
| 184 | -function run_default($task=null, $args=array(), $cliOpts=array()) |
|
| 184 | +function run_default($task = null, $args = array(), $cliOpts = array()) |
|
| 185 | 185 | { |
| 186 | 186 | echo "Syntax: pake {\$pake-options} \$task \$lib-version [\$git-tag] {\$task-options}\n"; |
| 187 | 187 | echo "\n"; |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | echo " --zip=ZIP Location of the zip tool\n"; |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | -function run_getopts($task=null, $args=array(), $cliOpts=array()) |
|
| 201 | +function run_getopts($task = null, $args = array(), $cliOpts = array()) |
|
| 202 | 202 | { |
| 203 | 203 | Builder::getOpts($args, $cliOpts); |
| 204 | 204 | } |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | /** |
| 207 | 207 | * Downloads source code in the build workspace directory, optionally checking out the given branch/tag |
| 208 | 208 | */ |
| 209 | -function run_init($task=null, $args=array(), $cliOpts=array()) |
|
| 209 | +function run_init($task = null, $args = array(), $cliOpts = array()) |
|
| 210 | 210 | { |
| 211 | 211 | // download the current version into the workspace |
| 212 | 212 | $targetDir = Builder::workspaceDir(); |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * |
| 235 | 235 | * (does nothing by itself, as all the steps are managed via task dependencies) |
| 236 | 236 | */ |
| 237 | -function run_build($task=null, $args=array(), $cliOpts=array()) |
|
| 237 | +function run_build($task = null, $args = array(), $cliOpts = array()) |
|
| 238 | 238 | { |
| 239 | 239 | } |
| 240 | 240 | |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | /** |
| 251 | 251 | * Generates documentation in all formats |
| 252 | 252 | */ |
| 253 | -function run_doc($task=null, $args=array(), $cliOpts=array()) |
|
| 253 | +function run_doc($task = null, $args = array(), $cliOpts = array()) |
|
| 254 | 254 | { |
| 255 | 255 | $docDir = Builder::workspaceDir().'/doc'; |
| 256 | 256 | |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | /** |
| 319 | 319 | * Creates the tarballs for a release |
| 320 | 320 | */ |
| 321 | -function run_dist($task=null, $args=array(), $cliOpts=array()) |
|
| 321 | +function run_dist($task = null, $args = array(), $cliOpts = array()) |
|
| 322 | 322 | { |
| 323 | 323 | // copy workspace dir into dist dir, without git |
| 324 | 324 | pake_mkdirs(Builder::distDir()); |
@@ -332,7 +332,7 @@ discard block |
||
| 332 | 332 | // create tarballs |
| 333 | 333 | $cwd = getcwd(); |
| 334 | 334 | chdir(dirname(Builder::distDir())); |
| 335 | - foreach(Builder::distFiles() as $distFile) { |
|
| 335 | + foreach (Builder::distFiles() as $distFile) { |
|
| 336 | 336 | // php can not really create good zip files via phar: they are not compressed! |
| 337 | 337 | if (substr($distFile, -4) == '.zip') { |
| 338 | 338 | $cmd = Builder::tool('zip'); |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | chdir($cwd); |
| 351 | 351 | } |
| 352 | 352 | |
| 353 | -function run_clean_workspace($task=null, $args=array(), $cliOpts=array()) |
|
| 353 | +function run_clean_workspace($task = null, $args = array(), $cliOpts = array()) |
|
| 354 | 354 | { |
| 355 | 355 | pake_remove_dir(Builder::workspaceDir()); |
| 356 | 356 | } |
@@ -359,13 +359,13 @@ discard block |
||
| 359 | 359 | * Cleans up the whole build directory |
| 360 | 360 | * @todo 'make clean' usually just removes the results of the build, distclean removes all but sources |
| 361 | 361 | */ |
| 362 | -function run_clean($task=null, $args=array(), $cliOpts=array()) |
|
| 362 | +function run_clean($task = null, $args = array(), $cliOpts = array()) |
|
| 363 | 363 | { |
| 364 | 364 | pake_remove_dir(Builder::buildDir()); |
| 365 | 365 | } |
| 366 | 366 | |
| 367 | 367 | // helper task: display help text |
| 368 | -pake_task( 'default' ); |
|
| 368 | +pake_task('default'); |
|
| 369 | 369 | // internal task: parse cli options |
| 370 | 370 | pake_task('getopts'); |
| 371 | 371 | pake_task('init', 'getopts'); |
@@ -27,8 +27,9 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | public static function libVersion() |
| 29 | 29 | { |
| 30 | - if (self::$libVersion == null) |
|
| 31 | - throw new \Exception('Missing library version argument'); |
|
| 30 | + if (self::$libVersion == null) { |
|
| 31 | + throw new \Exception('Missing library version argument'); |
|
| 32 | + } |
|
| 32 | 33 | return self::$libVersion; |
| 33 | 34 | } |
| 34 | 35 | |
@@ -59,9 +60,10 @@ discard block |
||
| 59 | 60 | |
| 60 | 61 | public static function getOpts($args=array(), $cliOpts=array()) |
| 61 | 62 | { |
| 62 | - if (count($args) > 0) |
|
| 63 | - // throw new \Exception('Missing library version argument'); |
|
| 63 | + if (count($args) > 0) { |
|
| 64 | + // throw new \Exception('Missing library version argument'); |
|
| 64 | 65 | self::$libVersion = $args[0]; |
| 66 | + } |
|
| 65 | 67 | |
| 66 | 68 | foreach (self::$tools as $name => $binary) { |
| 67 | 69 | if (isset($cliOpts[$name])) { |
@@ -338,8 +340,7 @@ discard block |
||
| 338 | 340 | $cmd = Builder::tool('zip'); |
| 339 | 341 | $extra = '-9 -r'; |
| 340 | 342 | pake_sh("$cmd $distFile $extra ".basename(Builder::distDir())); |
| 341 | - } |
|
| 342 | - else { |
|
| 343 | + } else { |
|
| 343 | 344 | $finder = pakeFinder::type('any')->pattern(basename(Builder::distDir()).'/**'); |
| 344 | 345 | // see https://bugs.php.net/bug.php?id=58852 |
| 345 | 346 | $pharFile = str_replace(Builder::libVersion(), '_LIBVERSION_', $distFile); |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | // make sure we set the correct charset type for output, so that we can display all characters |
| 16 | 16 | header('Content-Type: text/html; charset=utf-8'); |
| 17 | 17 | |
| 18 | -include __DIR__ . '/common.php'; |
|
| 18 | +include __DIR__.'/common.php'; |
|
| 19 | 19 | if ($action == '') { |
| 20 | 20 | $action = 'list'; |
| 21 | 21 | } |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | </select> |
| 285 | 285 | </td> |
| 286 | 286 | <td class="labelcell">Timeout:</td> |
| 287 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 287 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 288 | 288 | <td class="labelcell">Protocol:</td> |
| 289 | 289 | <td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();"> |
| 290 | 290 | <option value="0"<?php if ($protocol == 0) { echo ' selected="selected"'; } ?>>HTTP 1.0</option> |
@@ -15,8 +15,7 @@ discard block |
||
| 15 | 15 | function stripslashes_deep($value) |
| 16 | 16 | { |
| 17 | 17 | $value = is_array($value) ? |
| 18 | - array_map('stripslashes_deep', $value) : |
|
| 19 | - stripslashes($value); |
|
| 18 | + array_map('stripslashes_deep', $value) : stripslashes($value); |
|
| 20 | 19 | |
| 21 | 20 | return $value; |
| 22 | 21 | } |
@@ -60,7 +59,7 @@ discard block |
||
| 60 | 59 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
| 61 | 60 | // in case user forgot initial '/' in xmlrpc server path, add it back |
| 62 | 61 | if ($path && ($path[0]) != '/') { |
| 63 | - $path = '/' . $path; |
|
| 62 | + $path = '/'.$path; |
|
| 64 | 63 | } |
| 65 | 64 | |
| 66 | 65 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
@@ -91,15 +91,15 @@ discard block |
||
| 91 | 91 | <body> |
| 92 | 92 | <?php |
| 93 | 93 | |
| 94 | -include __DIR__ . '/common.php'; |
|
| 94 | +include __DIR__.'/common.php'; |
|
| 95 | 95 | if ($action) { |
| 96 | 96 | |
| 97 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
| 97 | + include_once __DIR__."/../src/Autoloader.php"; |
|
| 98 | 98 | PhpXmlRpc\Autoloader::register(); |
| 99 | 99 | |
| 100 | 100 | // make sure the script waits long enough for the call to complete... |
| 101 | 101 | if ($timeout) { |
| 102 | - set_time_limit($timeout + 10); |
|
| 102 | + set_time_limit($timeout+10); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | if ($wstype == 1) { |
@@ -124,13 +124,13 @@ discard block |
||
| 124 | 124 | $server = "$host$path"; |
| 125 | 125 | } |
| 126 | 126 | if ($protocol == 2) { |
| 127 | - $server = 'https://' . $server; |
|
| 127 | + $server = 'https://'.$server; |
|
| 128 | 128 | } else { |
| 129 | - $server = 'http://' . $server; |
|
| 129 | + $server = 'http://'.$server; |
|
| 130 | 130 | } |
| 131 | 131 | if ($proxy != '') { |
| 132 | 132 | $pproxy = explode(':', $proxy); |
| 133 | - if (count($pproxy) > 1) { |
|
| 133 | + if (count($pproxy)>1) { |
|
| 134 | 134 | $pport = $pproxy[1]; |
| 135 | 135 | } else { |
| 136 | 136 | $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(), $id + 1); |
|
| 202 | + $msg[1] = new $requestClass('system.methodSignature', array(), $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 xml payload by hand |
| 216 | 216 | if ($wstype == 1) { |
| 217 | - $msg[0]->payload = "{\n" . |
|
| 218 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 219 | - $payload . |
|
| 217 | + $msg[0]->payload = "{\n". |
|
| 218 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 219 | + $payload. |
|
| 220 | 220 | "\n],\n\"id\": "; |
| 221 | 221 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 222 | 222 | if ($id == "") { |
@@ -229,20 +229,20 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | } else { |
| 232 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
| 233 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 234 | - $payload . |
|
| 235 | - "</params>\n" . $msg[0]->xml_footer(); |
|
| 232 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
| 233 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 234 | + $payload. |
|
| 235 | + "</params>\n".$msg[0]->xml_footer(); |
|
| 236 | 236 | } |
| 237 | - $actionname = 'Execution of method ' . $method; |
|
| 237 | + $actionname = 'Execution of method '.$method; |
|
| 238 | 238 | break; |
| 239 | 239 | default: // give a warning |
| 240 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 240 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | 243 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 244 | 244 | // this gives good user feedback for long-running methods... |
| 245 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 245 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 246 | 246 | flush(); |
| 247 | 247 | |
| 248 | 248 | $response = null; |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | break; |
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | - $time = microtime(true) - $time; |
|
| 263 | + $time = microtime(true)-$time; |
|
| 264 | 264 | if ($debug) { |
| 265 | 265 | echo "</div>\n"; |
| 266 | 266 | } |
@@ -270,8 +270,8 @@ discard block |
||
| 270 | 270 | // call failed! echo out error msg! |
| 271 | 271 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 272 | 272 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 273 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 274 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 273 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 274 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 275 | 275 | echo(strftime("%d/%b/%Y:%H:%M:%S\n")); |
| 276 | 276 | } else { |
| 277 | 277 | // call succeeded: parse results |
@@ -287,36 +287,36 @@ discard block |
||
| 287 | 287 | $max = $v->count(); |
| 288 | 288 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 289 | 289 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 290 | - foreach($v as $i => $rec) { |
|
| 290 | + foreach ($v as $i => $rec) { |
|
| 291 | 291 | if ($i % 2) { |
| 292 | 292 | $class = ' class="oddrow"'; |
| 293 | 293 | } else { |
| 294 | 294 | $class = ' class="evenrow"'; |
| 295 | 295 | } |
| 296 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 297 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 298 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 299 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 300 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 301 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 302 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 296 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 297 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 298 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 299 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 300 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 301 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 302 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 320 | 320 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 321 | 321 | //echo("</tr>\n"); |
| 322 | 322 | |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | $r2 = $resp[1]->value(); |
| 344 | 344 | |
| 345 | 345 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 346 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 346 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 347 | 347 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 348 | 348 | if ($desc == "") { |
| 349 | 349 | $desc = "-"; |
@@ -353,41 +353,41 @@ discard block |
||
| 353 | 353 | if ($r2->kindOf() != "array") { |
| 354 | 354 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 355 | 355 | } else { |
| 356 | - foreach($r2 as $i => $x) { |
|
| 356 | + foreach ($r2 as $i => $x) { |
|
| 357 | 357 | $payload = ""; |
| 358 | 358 | $alt_payload = ""; |
| 359 | - if ($i + 1 % 2) { |
|
| 359 | + if ($i+1 % 2) { |
|
| 360 | 360 | $class = ' class="oddrow"'; |
| 361 | 361 | } else { |
| 362 | 362 | $class = ' class="evenrow"'; |
| 363 | 363 | } |
| 364 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 364 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 365 | 365 | if ($x->kindOf() == "array") { |
| 366 | 366 | $ret = $x[0]; |
| 367 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 368 | - if ($x->count() > 1) { |
|
| 369 | - foreach($x as $k => $y) { |
|
| 367 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 368 | + if ($x->count()>1) { |
|
| 369 | + foreach ($x as $k => $y) { |
|
| 370 | 370 | if ($k == 0) continue; |
| 371 | 371 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 372 | 372 | if ($wstype != 1) { |
| 373 | 373 | $type = $y->scalarval(); |
| 374 | 374 | $payload .= '<param><value>'; |
| 375 | - switch($type) { |
|
| 375 | + switch ($type) { |
|
| 376 | 376 | case 'undefined': |
| 377 | 377 | break; |
| 378 | 378 | case 'null'; |
| 379 | 379 | $type = 'nil'; |
| 380 | 380 | // fall thru intentionally |
| 381 | 381 | default: |
| 382 | - $payload .= '<' . |
|
| 383 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 384 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 382 | + $payload .= '<'. |
|
| 383 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 384 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 385 | 385 | '>'; |
| 386 | 386 | } |
| 387 | 387 | $payload .= "</value></param>\n"; |
| 388 | 388 | } |
| 389 | 389 | $alt_payload .= $y->scalarval(); |
| 390 | - if ($k < $x->count() - 1) { |
|
| 390 | + if ($k<$x->count()-1) { |
|
| 391 | 391 | $alt_payload .= ';'; |
| 392 | 392 | echo ", "; |
| 393 | 393 | } |
@@ -400,63 +400,63 @@ discard block |
||
| 400 | 400 | echo '</td>'; |
| 401 | 401 | // button to test this method |
| 402 | 402 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 403 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 404 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 405 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 406 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 407 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 408 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 409 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 410 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 411 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 412 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 413 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 414 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 415 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 416 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 417 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 418 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 419 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 420 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 421 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 422 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 423 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 424 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 425 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 426 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 403 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 404 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 405 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 406 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 407 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 408 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 409 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 410 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 411 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 412 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 413 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 414 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 415 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 416 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 417 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 418 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 419 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 420 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 421 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 422 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 423 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 424 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 425 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 426 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 427 | 427 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 428 | 428 | if ($wstype != 1) { |
| 429 | 429 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 430 | 430 | } |
| 431 | 431 | echo "</form></td>\n"; |
| 432 | 432 | |
| 433 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 434 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 435 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 436 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 437 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 438 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 439 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 440 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 441 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 433 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 434 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 435 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 436 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 437 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 438 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 439 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 440 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 441 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 460 | 460 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 461 | 461 | echo "</form></td></tr>\n"; |
| 462 | 462 | } |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | case 'wrap': |
| 469 | 469 | $r1 = $resp[0]->value(); |
| 470 | 470 | $r2 = $resp[1]->value(); |
| 471 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 471 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 472 | 472 | echo "Error: signature unknown\n"; |
| 473 | 473 | } else { |
| 474 | 474 | $mdesc = $r1->scalarval(); |
@@ -489,11 +489,11 @@ discard block |
||
| 489 | 489 | $prefix = 'xmlrpc'; |
| 490 | 490 | } |
| 491 | 491 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 492 | - $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc); |
|
| 492 | + $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc); |
|
| 493 | 493 | //if ($code) |
| 494 | 494 | //{ |
| 495 | 495 | echo "<div id=\"phpcode\">\n"; |
| 496 | - highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>'); |
|
| 496 | + highlight_string("<?php\n".$code['docstring'].$code['source'].'?>'); |
|
| 497 | 497 | echo "\n</div>"; |
| 498 | 498 | //} |
| 499 | 499 | //else |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | break; |
| 505 | 505 | |
| 506 | 506 | case 'execute': |
| 507 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 507 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 508 | 508 | break; |
| 509 | 509 | |
| 510 | 510 | default: // give a warning |
@@ -367,7 +367,9 @@ |
||
| 367 | 367 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
| 368 | 368 | if ($x->count() > 1) { |
| 369 | 369 | foreach($x as $k => $y) { |
| 370 | - if ($k == 0) continue; |
|
| 370 | + if ($k == 0) { |
|
| 371 | + continue; |
|
| 372 | + } |
|
| 371 | 373 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 372 | 374 | if ($wstype != 1) { |
| 373 | 375 | $type = $y->scalarval(); |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | if (isset($_GET['run'])) { |
| 4 | 4 | $path = parse_url($_GET['run']); |
| 5 | 5 | if (isset($path['query'])) { |
| 6 | - $query = '?' . $path['query']; |
|
| 6 | + $query = '?'.$path['query']; |
|
| 7 | 7 | } |
| 8 | 8 | } |
| 9 | 9 | ?> |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/parse_args.php'; |
|
| 3 | +include_once __DIR__.'/parse_args.php'; |
|
| 4 | 4 | |
| 5 | 5 | abstract class PhpXmlRpc_LocalFileTestCase extends PHPUnit_Framework_TestCase |
| 6 | 6 | { |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | public function run(PHPUnit_Framework_TestResult $result = NULL) |
| 17 | 17 | { |
| 18 | - $this->testId = get_class($this) . '__' . $this->getName(); |
|
| 18 | + $this->testId = get_class($this).'__'.$this->getName(); |
|
| 19 | 19 | |
| 20 | 20 | if ($result === NULL) { |
| 21 | 21 | $result = $this->createResult(); |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | protected function request($file, $method = 'GET', $payload = '', $emptyPageOk = false) |
| 45 | 45 | { |
| 46 | - $url = $this->baseUrl . $file; |
|
| 46 | + $url = $this->baseUrl.$file; |
|
| 47 | 47 | |
| 48 | 48 | $ch = curl_init($url); |
| 49 | 49 | curl_setopt_array($ch, array( |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | { |
| 62 | 62 | curl_setopt($ch, CURLOPT_COOKIE, 'PHPUNIT_SELENIUM_TEST_ID=true'); |
| 63 | 63 | } |
| 64 | - if ($this->args['DEBUG'] > 0) { |
|
| 64 | + if ($this->args['DEBUG']>0) { |
|
| 65 | 65 | curl_setopt($ch, CURLOPT_VERBOSE, 1); |
| 66 | 66 | } |
| 67 | 67 | $page = curl_exec($ch); |
@@ -17,8 +17,8 @@ discard block |
||
| 17 | 17 | // test for php version |
| 18 | 18 | $ver = phpversion(); |
| 19 | 19 | $tests['php_version'] = array(); |
| 20 | - $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n"; |
|
| 21 | - if (version_compare($ver, '5.3.0') < 0) { |
|
| 20 | + $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n"; |
|
| 21 | + if (version_compare($ver, '5.3.0')<0) { |
|
| 22 | 22 | $tests['php_version']['status'] = 0; |
| 23 | 23 | $tests['php_version']['description'] .= 'This version of PHP is not compatible with this release of the PHP XMLRPC library. Please upgrade to php 5.1.0 or later'; |
| 24 | 24 | } else { |
@@ -51,8 +51,8 @@ discard block |
||
| 51 | 51 | // test for php version |
| 52 | 52 | $ver = phpversion(); |
| 53 | 53 | $tests['php_version'] = array(); |
| 54 | - $tests['php_version']['description'] = 'PHP version found: ' . $ver . ".\n\n"; |
|
| 55 | - if (version_compare($ver, '5.3.0') < 0) { |
|
| 54 | + $tests['php_version']['description'] = 'PHP version found: '.$ver.".\n\n"; |
|
| 55 | + if (version_compare($ver, '5.3.0')<0) { |
|
| 56 | 56 | $tests['php_version']['status'] = 0; |
| 57 | 57 | $tests['php_version']['description'] .= 'This version of PHP is not compatible with the PHP XMLRPC library. Please upgrade to 5.1.0 or later'; |
| 58 | 58 | } else { |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $info = curl_version(); |
| 80 | 80 | $tests['curl']['status'] = 2; |
| 81 | 81 | $tests['curl']['description'] = "The cURL extension is enabled.\n\nYou will be able to send and receive messages using 'HTTPS' and 'HTTP 1.1' protocols"; |
| 82 | - if (version_compare($ver, '4.3.8') < 0) { |
|
| 82 | + if (version_compare($ver, '4.3.8')<0) { |
|
| 83 | 83 | $tests['curl']['status'] = 1; |
| 84 | 84 | $tests['curl']['description'] .= ".\nPlease note that the current cURL install does not support keep-alives"; |
| 85 | 85 | } |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | <?php |
| 168 | 168 | $res = phpxmlrpc_verify_compat('server'); |
| 169 | 169 | foreach ($res as $test => $result) { |
| 170 | - echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n"; |
|
| 170 | + echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n"; |
|
| 171 | 171 | } |
| 172 | 172 | ?> |
| 173 | 173 | </tbody> |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | <?php |
| 185 | 185 | $res = phpxmlrpc_verify_compat('client'); |
| 186 | 186 | foreach ($res as $test => $result) { |
| 187 | - echo '<tr><td class="res' . $result['status'] . '">' . htmlspecialchars($test) . '</td><td class="result">' . htmlspecialchars($result['description']) . "</td></tr>\n"; |
|
| 187 | + echo '<tr><td class="res'.$result['status'].'">'.htmlspecialchars($test).'</td><td class="result">'.htmlspecialchars($result['description'])."</td></tr>\n"; |
|
| 188 | 188 | } |
| 189 | 189 | ?> |
| 190 | 190 | </tbody> |
