@@ -6,7 +6,7 @@ |
||
| 6 | 6 | <h3>The code demonstrates usage for the terminally lazy. For a more complete proxy, look at at the Wrapper class</h3> |
| 7 | 7 | <?php |
| 8 | 8 | |
| 9 | -include_once __DIR__ . "/../../src/Autoloader.php"; |
|
| 9 | +include_once __DIR__."/../../src/Autoloader.php"; |
|
| 10 | 10 | PhpXmlRpc\Autoloader::register(); |
| 11 | 11 | |
| 12 | 12 | class PhpXmlRpcProxy |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | <h3>The code demonstrates usage of the PhpXmlRpc\Encoder class</h3> |
| 7 | 7 | <?php |
| 8 | 8 | |
| 9 | -include_once __DIR__ . "/../../src/Autoloader.php"; |
|
| 9 | +include_once __DIR__."/../../src/Autoloader.php"; |
|
| 10 | 10 | PhpXmlRpc\Autoloader::register(); |
| 11 | 11 | |
| 12 | 12 | $req = new PhpXmlRpc\Request('interopEchoTests.whichToolkit', array()); |
@@ -16,14 +16,14 @@ discard block |
||
| 16 | 16 | $encoder = new PhpXmlRpc\Encoder(); |
| 17 | 17 | $value = $encoder->decode($resp->value()); |
| 18 | 18 | print "<pre>"; |
| 19 | - print "name: " . htmlspecialchars($value["toolkitName"]) . "\n"; |
|
| 20 | - print "version: " . htmlspecialchars($value["toolkitVersion"]) . "\n"; |
|
| 21 | - print "docs: " . htmlspecialchars($value["toolkitDocsUrl"]) . "\n"; |
|
| 22 | - print "os: " . htmlspecialchars($value["toolkitOperatingSystem"]) . "\n"; |
|
| 19 | + print "name: ".htmlspecialchars($value["toolkitName"])."\n"; |
|
| 20 | + print "version: ".htmlspecialchars($value["toolkitVersion"])."\n"; |
|
| 21 | + print "docs: ".htmlspecialchars($value["toolkitDocsUrl"])."\n"; |
|
| 22 | + print "os: ".htmlspecialchars($value["toolkitOperatingSystem"])."\n"; |
|
| 23 | 23 | print "</pre>"; |
| 24 | 24 | } else { |
| 25 | 25 | print "An error occurred: "; |
| 26 | - print "Code: " . htmlspecialchars($resp->faultCode()) . " Reason: '" . htmlspecialchars($resp->faultString()) . "'\n"; |
|
| 26 | + print "Code: ".htmlspecialchars($resp->faultCode())." Reason: '".htmlspecialchars($resp->faultString())."'\n"; |
|
| 27 | 27 | } |
| 28 | 28 | ?> |
| 29 | 29 | </body> |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | method)</p> |
| 21 | 21 | <?php |
| 22 | 22 | |
| 23 | -include_once __DIR__ . "/../../src/Autoloader.php"; |
|
| 23 | +include_once __DIR__."/../../src/Autoloader.php"; |
|
| 24 | 24 | PhpXmlRpc\Autoloader::register(); |
| 25 | 25 | |
| 26 | 26 | if (isset($_POST["mailto"]) && $_POST["mailto"]) { |
@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | print "<fonr color=\"red\">"; |
| 45 | 45 | print "Mail send failed<br/>\n"; |
| 46 | 46 | print "Fault: "; |
| 47 | - print "Code: " . htmlspecialchars($resp->faultCode()) . |
|
| 48 | - " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>"; |
|
| 47 | + print "Code: ".htmlspecialchars($resp->faultCode()). |
|
| 48 | + " Reason: '".htmlspecialchars($resp->faultString())."'<br/>"; |
|
| 49 | 49 | print "</font><br/>"; |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -8,34 +8,34 @@ |
||
| 8 | 8 | <h3>The code demonstrates usage of automatic encoding/decoding of php variables into xmlrpc values</h3> |
| 9 | 9 | <?php |
| 10 | 10 | |
| 11 | -include_once __DIR__ . "/../../src/Autoloader.php"; |
|
| 11 | +include_once __DIR__."/../../src/Autoloader.php"; |
|
| 12 | 12 | PhpXmlRpc\Autoloader::register(); |
| 13 | 13 | |
| 14 | 14 | if (isset($_POST["stateno"]) && $_POST["stateno"] != "") { |
| 15 | - $stateNo = (integer)$_POST["stateno"]; |
|
| 15 | + $stateNo = (integer) $_POST["stateno"]; |
|
| 16 | 16 | $encoder = new PhpXmlRpc\Encoder(); |
| 17 | 17 | $req = new PhpXmlRpc\Request('examples.getStateName', |
| 18 | 18 | array($encoder->encode($stateNo)) |
| 19 | 19 | ); |
| 20 | - print "Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) . "\n\n</pre>Debug info of server data follows...\n\n"; |
|
| 20 | + print "Sending the following request:<pre>\n\n".htmlentities($req->serialize())."\n\n</pre>Debug info of server data follows...\n\n"; |
|
| 21 | 21 | $client = new PhpXmlRpc\Client("http://phpxmlrpc.sourceforge.net/server.php"); |
| 22 | 22 | $client->setDebug(1); |
| 23 | 23 | $r = $client->send($req); |
| 24 | 24 | if (!$r->faultCode()) { |
| 25 | 25 | $v = $r->value(); |
| 26 | - print "<br/>State number <b>" . $stateNo . "</b> is <b>" |
|
| 27 | - . htmlspecialchars($encoder->decode($v)) . "</b><br/>"; |
|
| 26 | + print "<br/>State number <b>".$stateNo."</b> is <b>" |
|
| 27 | + . htmlspecialchars($encoder->decode($v))."</b><br/>"; |
|
| 28 | 28 | } else { |
| 29 | 29 | print "An error occurred: "; |
| 30 | - print "Code: " . htmlspecialchars($r->faultCode()) |
|
| 31 | - . " Reason: '" . htmlspecialchars($r->faultString()) . "'</pre><br/>"; |
|
| 30 | + print "Code: ".htmlspecialchars($r->faultCode()) |
|
| 31 | + . " Reason: '".htmlspecialchars($r->faultString())."'</pre><br/>"; |
|
| 32 | 32 | } |
| 33 | 33 | } else { |
| 34 | 34 | $stateNo = ""; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | print "<form action=\"getstatename.php\" method=\"POST\"> |
| 38 | -<input name=\"stateno\" value=\"" . $stateNo . "\"><input type=\"submit\" value=\"go\" name=\"submit\"></form> |
|
| 38 | +<input name=\"stateno\" value=\"" . $stateNo."\"><input type=\"submit\" value=\"go\" name=\"submit\"></form> |
|
| 39 | 39 | <p>Enter a state number to query its name</p>"; |
| 40 | 40 | |
| 41 | 41 | ?> |
@@ -110,36 +110,36 @@ |
||
| 110 | 110 | public function serialize($charsetEncoding = '') |
| 111 | 111 | { |
| 112 | 112 | if ($charsetEncoding != '') { |
| 113 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 113 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 114 | 114 | } else { |
| 115 | 115 | $this->content_type = 'text/xml'; |
| 116 | 116 | } |
| 117 | 117 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 118 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 118 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 119 | 119 | } else { |
| 120 | 120 | $result = "<methodResponse>\n"; |
| 121 | 121 | } |
| 122 | 122 | if ($this->errno) { |
| 123 | 123 | // G. Giunta 2005/2/13: let non-ASCII response messages be tolerated by clients |
| 124 | 124 | // by xml-encoding non ascii chars |
| 125 | - $result .= "<fault>\n" . |
|
| 126 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 127 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 128 | - Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" . |
|
| 125 | + $result .= "<fault>\n". |
|
| 126 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 127 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 128 | + Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n". |
|
| 129 | 129 | "</struct>\n</value>\n</fault>"; |
| 130 | 130 | } else { |
| 131 | 131 | if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) { |
| 132 | 132 | if (is_string($this->val) && $this->valtyp == 'xml') { |
| 133 | - $result .= "<params>\n<param>\n" . |
|
| 134 | - $this->val . |
|
| 133 | + $result .= "<params>\n<param>\n". |
|
| 134 | + $this->val. |
|
| 135 | 135 | "</param>\n</params>"; |
| 136 | 136 | } else { |
| 137 | 137 | /// @todo try to build something serializable? |
| 138 | 138 | throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values'); |
| 139 | 139 | } |
| 140 | 140 | } else { |
| 141 | - $result .= "<params>\n<param>\n" . |
|
| 142 | - $this->val->serialize($charsetEncoding) . |
|
| 141 | + $result .= "<params>\n<param>\n". |
|
| 142 | + $this->val->serialize($charsetEncoding). |
|
| 143 | 143 | "</param>\n</params>"; |
| 144 | 144 | } |
| 145 | 145 | } |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | return; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - if (is_file($file = __DIR__ . str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { |
|
| 32 | + if (is_file($file = __DIR__.str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { |
|
| 33 | 33 | require $file; |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -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 | } |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | // of PHP |
| 33 | 33 | $t = gmstrftime("%Y%m%dT%H:%M:%S", $timet); |
| 34 | 34 | } else { |
| 35 | - $t = strftime("%Y%m%dT%H:%M:%S", $timet - date('Z')); |
|
| 35 | + $t = strftime("%Y%m%dT%H:%M:%S", $timet-date('Z')); |
|
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * @param string $message |
| 29 | 29 | * @param string $encoding |
| 30 | 30 | */ |
| 31 | - public function debugMessage($message, $encoding=null) |
|
| 31 | + public function debugMessage($message, $encoding = null) |
|
| 32 | 32 | { |
| 33 | 33 | // US-ASCII is a warning for PHP and a fatal for HHVM |
| 34 | 34 | if ($encoding == 'US-ASCII') { |