@@ -24,12 +24,12 @@ discard block |
||
24 | 24 | |
25 | 25 | // read chunk-size, chunk-extension (if any) and crlf |
26 | 26 | // get the position of the linebreak |
27 | - $chunkEnd = strpos($buffer, "\r\n") + 2; |
|
27 | + $chunkEnd = strpos($buffer, "\r\n")+2; |
|
28 | 28 | $temp = substr($buffer, 0, $chunkEnd); |
29 | 29 | $chunkSize = hexdec(trim($temp)); |
30 | 30 | $chunkStart = $chunkEnd; |
31 | - while ($chunkSize > 0) { |
|
32 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize); |
|
31 | + while ($chunkSize>0) { |
|
32 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize); |
|
33 | 33 | |
34 | 34 | // just in case we got a broken connection |
35 | 35 | if ($chunkEnd == false) { |
@@ -41,19 +41,19 @@ discard block |
||
41 | 41 | } |
42 | 42 | |
43 | 43 | // read chunk-data and crlf |
44 | - $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
44 | + $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
45 | 45 | // append chunk-data to entity-body |
46 | 46 | $new .= $chunk; |
47 | 47 | // length := length + chunk-size |
48 | 48 | $length += strlen($chunk); |
49 | 49 | // read chunk-size and crlf |
50 | - $chunkStart = $chunkEnd + 2; |
|
50 | + $chunkStart = $chunkEnd+2; |
|
51 | 51 | |
52 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2; |
|
52 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2; |
|
53 | 53 | if ($chunkEnd == false) { |
54 | 54 | break; // just in case we got a broken connection |
55 | 55 | } |
56 | - $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
56 | + $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
57 | 57 | $chunkSize = hexdec(trim($temp)); |
58 | 58 | $chunkStart = $chunkEnd; |
59 | 59 | } |
@@ -83,11 +83,11 @@ discard block |
||
83 | 83 | // Look for CR/LF or simple LF as line separator (even though it is not valid http) |
84 | 84 | $pos = strpos($data, "\r\n\r\n"); |
85 | 85 | if ($pos || is_int($pos)) { |
86 | - $bd = $pos + 4; |
|
86 | + $bd = $pos+4; |
|
87 | 87 | } else { |
88 | 88 | $pos = strpos($data, "\n\n"); |
89 | 89 | if ($pos || is_int($pos)) { |
90 | - $bd = $pos + 2; |
|
90 | + $bd = $pos+2; |
|
91 | 91 | } else { |
92 | 92 | // No separation between response headers and body: fault? |
93 | 93 | $bd = 0; |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | // this filters out all http headers from proxy. maybe we could take them into account, too? |
98 | 98 | $data = substr($data, $bd); |
99 | 99 | } else { |
100 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed'); |
|
101 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
100 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed'); |
|
101 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
@@ -131,19 +131,19 @@ discard block |
||
131 | 131 | } |
132 | 132 | |
133 | 133 | if ($httpResponse['status_code'] !== '200') { |
134 | - $errstr = substr($data, 0, strpos($data, "\n") - 1); |
|
135 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr); |
|
136 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
134 | + $errstr = substr($data, 0, strpos($data, "\n")-1); |
|
135 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr); |
|
136 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http) |
140 | 140 | $pos = strpos($data, "\r\n\r\n"); |
141 | 141 | if ($pos || is_int($pos)) { |
142 | - $bd = $pos + 4; |
|
142 | + $bd = $pos+4; |
|
143 | 143 | } else { |
144 | 144 | $pos = strpos($data, "\n\n"); |
145 | 145 | if ($pos || is_int($pos)) { |
146 | - $bd = $pos + 2; |
|
146 | + $bd = $pos+2; |
|
147 | 147 | } else { |
148 | 148 | // No separation between response headers and body: fault? |
149 | 149 | // we could take some action here instead of going on... |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | foreach ($ar as $line) { |
158 | 158 | // take care of multi-line headers and cookies |
159 | 159 | $arr = explode(':', $line, 2); |
160 | - if (count($arr) > 1) { |
|
160 | + if (count($arr)>1) { |
|
161 | 161 | $headerName = strtolower(trim($arr[0])); |
162 | 162 | /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be |
163 | 163 | /// passed using multiple header lines. |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | foreach ($cookies as $cookie) { |
175 | 175 | // glue together all received cookies, using a comma to separate them (same as php does with getallheaders()) |
176 | 176 | if (isset($httpResponse['headers'][$headerName])) { |
177 | - $httpResponse['headers'][$headerName] .= ', ' . trim($cookie); |
|
177 | + $httpResponse['headers'][$headerName] .= ', '.trim($cookie); |
|
178 | 178 | } else { |
179 | 179 | $httpResponse['headers'][$headerName] = trim($cookie); |
180 | 180 | } |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | } |
204 | 204 | } elseif (isset($headerName)) { |
205 | 205 | /// @todo version1 cookies might span multiple lines, thus breaking the parsing above |
206 | - $httpResponse['headers'][$headerName] .= ' ' . trim($line); |
|
206 | + $httpResponse['headers'][$headerName] .= ' '.trim($line); |
|
207 | 207 | } |
208 | 208 | } |
209 | 209 | |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | // Decode chunked encoding sent by http 1.1 servers |
227 | 227 | if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') { |
228 | 228 | if (!$data = static::decodeChunked($data)) { |
229 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server'); |
|
229 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server'); |
|
230 | 230 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']); |
231 | 231 | } |
232 | 232 | } |
@@ -241,19 +241,19 @@ discard block |
||
241 | 241 | if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) { |
242 | 242 | $data = $degzdata; |
243 | 243 | if ($debug) { |
244 | - Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
244 | + Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
245 | 245 | } |
246 | 246 | } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
247 | 247 | $data = $degzdata; |
248 | 248 | if ($debug) { |
249 | - Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
249 | + Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
250 | 250 | } |
251 | 251 | } else { |
252 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server'); |
|
252 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server'); |
|
253 | 253 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']); |
254 | 254 | } |
255 | 255 | } else { |
256 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
256 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
257 | 257 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']); |
258 | 258 | } |
259 | 259 | } |
@@ -92,9 +92,9 @@ discard block |
||
92 | 92 | public function xml_header($charsetEncoding = '') |
93 | 93 | { |
94 | 94 | if ($charsetEncoding != '') { |
95 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n"; |
|
95 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n"; |
|
96 | 96 | } else { |
97 | - return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n"; |
|
97 | + return "<?xml version=\"1.0\"?".">\n<methodCall>\n"; |
|
98 | 98 | } |
99 | 99 | } |
100 | 100 | |
@@ -116,16 +116,16 @@ discard block |
||
116 | 116 | public function createPayload($charsetEncoding = '') |
117 | 117 | { |
118 | 118 | if ($charsetEncoding != '') { |
119 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
119 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
120 | 120 | } else { |
121 | 121 | $this->content_type = 'text/xml'; |
122 | 122 | } |
123 | 123 | $this->payload = $this->xml_header($charsetEncoding); |
124 | - $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities( |
|
125 | - $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n"; |
|
124 | + $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities( |
|
125 | + $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n"; |
|
126 | 126 | $this->payload .= "<params>\n"; |
127 | 127 | foreach ($this->params as $p) { |
128 | - $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) . |
|
128 | + $this->payload .= "<param>\n".$p->serialize($charsetEncoding). |
|
129 | 129 | "</param>\n"; |
130 | 130 | } |
131 | 131 | $this->payload .= "</params>\n"; |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array()); |
254 | 254 | |
255 | 255 | if ($data == '') { |
256 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.'); |
|
256 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.'); |
|
257 | 257 | return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']); |
258 | 258 | } |
259 | 259 | |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | // failed processing of HTTP response headers |
267 | 267 | // save into response obj the full payload received, for debugging |
268 | 268 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode())); |
269 | - } catch(\Exception $e) { |
|
269 | + } catch (\Exception $e) { |
|
270 | 270 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data)); |
271 | 271 | } |
272 | 272 | } |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | // idea from Luca Mariano <[email protected]> originally in PEARified version of the lib |
281 | 281 | $pos = strrpos($data, '</methodResponse>'); |
282 | 282 | if ($pos !== false) { |
283 | - $data = substr($data, 0, $pos + 17); |
|
283 | + $data = substr($data, 0, $pos+17); |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | // try to 'guestimate' the character encoding of the received response |
@@ -294,9 +294,9 @@ discard block |
||
294 | 294 | if ($start) { |
295 | 295 | $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
296 | 296 | $end = strpos($data, '-->', $start); |
297 | - $comments = substr($data, $start, $end - $start); |
|
298 | - $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" . |
|
299 | - str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding); |
|
297 | + $comments = substr($data, $start, $end-$start); |
|
298 | + $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t". |
|
299 | + str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding); |
|
300 | 300 | } |
301 | 301 | } |
302 | 302 | |
@@ -318,7 +318,7 @@ discard block |
||
318 | 318 | if ($respEncoding == 'ISO-8859-1') { |
319 | 319 | $data = utf8_encode($data); |
320 | 320 | } else { |
321 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received response: ' . $respEncoding); |
|
321 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$respEncoding); |
|
322 | 322 | } |
323 | 323 | } |
324 | 324 | } |
@@ -339,12 +339,12 @@ discard block |
||
339 | 339 | $xmlRpcParser->parse($data, $returnType, XMLParser::ACCEPT_RESPONSE, $options); |
340 | 340 | |
341 | 341 | // first error check: xml not well-formed |
342 | - if ($xmlRpcParser->_xh['isf'] > 2) { |
|
342 | + if ($xmlRpcParser->_xh['isf']>2) { |
|
343 | 343 | |
344 | 344 | // BC break: in the past for some cases we used the error message: 'XML error at line 1, check URL' |
345 | 345 | |
346 | 346 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'], |
347 | - PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', |
|
347 | + PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '', |
|
348 | 348 | $this->httpResponse |
349 | 349 | ); |
350 | 350 | |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | // second error check: xml well-formed but not xml-rpc compliant |
356 | 356 | elseif ($xmlRpcParser->_xh['isf'] == 2) { |
357 | 357 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'], |
358 | - PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', |
|
358 | + PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '', |
|
359 | 359 | $this->httpResponse |
360 | 360 | ); |
361 | 361 | |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | '', $this->httpResponse |
372 | 372 | ); |
373 | 373 | } else { |
374 | - if ($this->debug > 1) { |
|
374 | + if ($this->debug>1) { |
|
375 | 375 | $this->getLogger()->debugMessage( |
376 | 376 | "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---" |
377 | 377 | ); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | // Make sure we set the correct charset type for output, so that we can display all characters |
18 | 18 | header('Content-Type: text/html; charset=utf-8'); |
19 | 19 | |
20 | -include __DIR__ . '/common.php'; |
|
20 | +include __DIR__.'/common.php'; |
|
21 | 21 | if ($action == '') { |
22 | 22 | $action = 'list'; |
23 | 23 | } |
@@ -33,24 +33,24 @@ discard block |
||
33 | 33 | /// @const JSXMLRPC_PATH Path to the visual xmlrpc editing dialog's containing folder. Can be absolute, or |
34 | 34 | /// relative to this debugger's folder. |
35 | 35 | if (defined('JSXMLRPC_PATH')) { |
36 | - $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH)); |
|
36 | + $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH)); |
|
37 | 37 | } else { |
38 | 38 | $editorpaths = array( |
39 | - __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger |
|
40 | - __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger |
|
41 | - __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
42 | - __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
43 | - __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
39 | + __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger |
|
40 | + __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger |
|
41 | + __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
42 | + __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
43 | + __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
44 | 44 | ); |
45 | 45 | } |
46 | - foreach($editorpaths as $editorpath) { |
|
47 | - if (is_file(realpath($editorpath . 'visualeditor.html'))) { |
|
46 | + foreach ($editorpaths as $editorpath) { |
|
47 | + if (is_file(realpath($editorpath.'visualeditor.html'))) { |
|
48 | 48 | $haseditor = true; |
49 | 49 | break; |
50 | 50 | } |
51 | 51 | } |
52 | 52 | if ($haseditor) { |
53 | - $editorurlpath = preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath); |
|
53 | + $editorurlpath = preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath); |
|
54 | 54 | |
55 | 55 | /// @todo for cases 3, 4 and 5 above, look at `parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)` and check if the |
56 | 56 | /// web root is not pointing directly at this folder, as in that case the link to the visualeditor will not |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | } |
229 | 229 | |
230 | 230 | function activateeditor() { |
231 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>'; |
|
231 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
232 | 232 | if (document.frmaction.wstype.value == "1") |
233 | 233 | url += '&type=jsonrpc'; |
234 | 234 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -265,9 +265,9 @@ discard block |
||
265 | 265 | echo ' document.forms[2].submit();'; |
266 | 266 | } ?>"> |
267 | 267 | <h1>XMLRPC |
268 | - <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
268 | + <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
269 | 269 | / |
270 | - <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
270 | + <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
271 | 271 | JSONRPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a> library) |
272 | 272 | </h1> |
273 | 273 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | </select> |
331 | 331 | </td> |
332 | 332 | <td class="labelcell">Timeout:</td> |
333 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
333 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
334 | 334 | <td></td> |
335 | 335 | <td></td> |
336 | 336 | </tr> |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | */ |
203 | 203 | public static function xmlrpc_debugmsg($msg) |
204 | 204 | { |
205 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
205 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | */ |
214 | 214 | public static function error_occurred($msg) |
215 | 215 | { |
216 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
216 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | /** |
@@ -234,10 +234,10 @@ discard block |
||
234 | 234 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
235 | 235 | $out = ''; |
236 | 236 | if ($this->debug_info != '') { |
237 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
237 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
238 | 238 | } |
239 | 239 | if (static::$_xmlrpc_debuginfo != '') { |
240 | - $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
240 | + $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
241 | 241 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
242 | 242 | // into return payload AFTER the beginning tag |
243 | 243 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -266,8 +266,8 @@ discard block |
||
266 | 266 | $this->debug_info = ''; |
267 | 267 | |
268 | 268 | // Save what we received, before parsing it |
269 | - if ($this->debug > 1) { |
|
270 | - $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
269 | + if ($this->debug>1) { |
|
270 | + $this->debugmsg("+++GOT+++\n".$data."\n+++END+++"); |
|
271 | 271 | } |
272 | 272 | |
273 | 273 | $r = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -281,21 +281,21 @@ discard block |
||
281 | 281 | $r->raw_data = $rawData; |
282 | 282 | } |
283 | 283 | |
284 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') { |
|
285 | - $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
286 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
284 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') { |
|
285 | + $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
286 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
287 | 287 | } |
288 | 288 | |
289 | 289 | $payload = $this->xml_header($respCharset); |
290 | - if ($this->debug > 0) { |
|
291 | - $payload = $payload . $this->serializeDebug($respCharset); |
|
290 | + if ($this->debug>0) { |
|
291 | + $payload = $payload.$this->serializeDebug($respCharset); |
|
292 | 292 | } |
293 | 293 | |
294 | 294 | // Do not create response serialization if it has already happened. Helps building json magic |
295 | 295 | if (empty($r->payload)) { |
296 | 296 | $r->serialize($respCharset); |
297 | 297 | } |
298 | - $payload = $payload . $r->payload; |
|
298 | + $payload = $payload.$r->payload; |
|
299 | 299 | |
300 | 300 | if ($returnPayload) { |
301 | 301 | return $payload; |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | // if we get a warning/error that has output some text before here, then we cannot |
305 | 305 | // add a new header. We cannot say we are sending xml, either... |
306 | 306 | if (!headers_sent()) { |
307 | - header('Content-Type: ' . $r->content_type); |
|
307 | + header('Content-Type: '.$r->content_type); |
|
308 | 308 | // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did |
309 | 309 | header("Vary: Accept-Charset"); |
310 | 310 | |
@@ -330,10 +330,10 @@ discard block |
||
330 | 330 | // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for |
331 | 331 | // responses up to 8000 bytes |
332 | 332 | if ($phpNoSelfCompress) { |
333 | - header('Content-Length: ' . (int)strlen($payload)); |
|
333 | + header('Content-Length: '.(int) strlen($payload)); |
|
334 | 334 | } |
335 | 335 | } else { |
336 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
336 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
337 | 337 | } |
338 | 338 | |
339 | 339 | print $payload; |
@@ -388,9 +388,9 @@ discard block |
||
388 | 388 | $numParams = count($in); |
389 | 389 | } |
390 | 390 | foreach ($sigs as $curSig) { |
391 | - if (count($curSig) == $numParams + 1) { |
|
391 | + if (count($curSig) == $numParams+1) { |
|
392 | 392 | $itsOK = 1; |
393 | - for ($n = 0; $n < $numParams; $n++) { |
|
393 | + for ($n = 0; $n<$numParams; $n++) { |
|
394 | 394 | if (is_object($in)) { |
395 | 395 | $p = $in->getParam($n); |
396 | 396 | if ($p->kindOf() == 'scalar') { |
@@ -403,10 +403,10 @@ discard block |
||
403 | 403 | } |
404 | 404 | |
405 | 405 | // param index is $n+1, as first member of sig is return type |
406 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
406 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
407 | 407 | $itsOK = 0; |
408 | - $pno = $n + 1; |
|
409 | - $wanted = $curSig[$n + 1]; |
|
408 | + $pno = $n+1; |
|
409 | + $wanted = $curSig[$n+1]; |
|
410 | 410 | $got = $pt; |
411 | 411 | break; |
412 | 412 | } |
@@ -433,10 +433,10 @@ discard block |
||
433 | 433 | // check if $_SERVER is populated: it might have been disabled via ini file |
434 | 434 | // (this is true even when in CLI mode) |
435 | 435 | if (count($_SERVER) == 0) { |
436 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
436 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
437 | 437 | } |
438 | 438 | |
439 | - if ($this->debug > 1) { |
|
439 | + if ($this->debug>1) { |
|
440 | 440 | if (function_exists('getallheaders')) { |
441 | 441 | $this->debugmsg(''); // empty line |
442 | 442 | foreach (getallheaders() as $name => $val) { |
@@ -460,13 +460,13 @@ discard block |
||
460 | 460 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
461 | 461 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
462 | 462 | $data = $degzdata; |
463 | - if ($this->debug > 1) { |
|
464 | - $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
463 | + if ($this->debug>1) { |
|
464 | + $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
465 | 465 | } |
466 | 466 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
467 | 467 | $data = $degzdata; |
468 | - if ($this->debug > 1) { |
|
469 | - $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
468 | + if ($this->debug>1) { |
|
469 | + $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
470 | 470 | } |
471 | 471 | } else { |
472 | 472 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -560,7 +560,7 @@ discard block |
||
560 | 560 | if ($reqEncoding == 'ISO-8859-1') { |
561 | 561 | $data = utf8_encode($data); |
562 | 562 | } else { |
563 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding); |
|
563 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding); |
|
564 | 564 | } |
565 | 565 | } |
566 | 566 | } |
@@ -579,18 +579,18 @@ discard block |
||
579 | 579 | |
580 | 580 | $xmlRpcParser = $this->getParser(); |
581 | 581 | $xmlRpcParser->parse($data, $this->functions_parameters_type, XMLParser::ACCEPT_REQUEST, $options); |
582 | - if ($xmlRpcParser->_xh['isf'] > 2) { |
|
582 | + if ($xmlRpcParser->_xh['isf']>2) { |
|
583 | 583 | // (BC) we return XML error as a faultCode |
584 | 584 | preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches); |
585 | 585 | $r = new Response( |
586 | 586 | 0, |
587 | - PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1], |
|
587 | + PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1], |
|
588 | 588 | $xmlRpcParser->_xh['isf_reason']); |
589 | 589 | } elseif ($xmlRpcParser->_xh['isf']) { |
590 | 590 | $r = new Response( |
591 | 591 | 0, |
592 | 592 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
593 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']); |
|
593 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']); |
|
594 | 594 | } else { |
595 | 595 | // small layering violation in favor of speed and memory usage: |
596 | 596 | // we should allow the 'execute' method handle this, but in the |
@@ -601,20 +601,20 @@ discard block |
||
601 | 601 | ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals') |
602 | 602 | ) |
603 | 603 | ) { |
604 | - if ($this->debug > 1) { |
|
605 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++"); |
|
604 | + if ($this->debug>1) { |
|
605 | + $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++"); |
|
606 | 606 | } |
607 | 607 | $r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']); |
608 | 608 | } else { |
609 | 609 | // build a Request object with data parsed from xml |
610 | 610 | $req = new Request($xmlRpcParser->_xh['method']); |
611 | 611 | // now add parameters in |
612 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
612 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
613 | 613 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
614 | 614 | } |
615 | 615 | |
616 | - if ($this->debug > 1) { |
|
617 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
616 | + if ($this->debug>1) { |
|
617 | + $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
618 | 618 | } |
619 | 619 | $r = $this->execute($req); |
620 | 620 | } |
@@ -667,7 +667,7 @@ discard block |
||
667 | 667 | return new Response( |
668 | 668 | 0, |
669 | 669 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
670 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}" |
|
670 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}" |
|
671 | 671 | ); |
672 | 672 | } |
673 | 673 | } |
@@ -680,7 +680,7 @@ discard block |
||
680 | 680 | |
681 | 681 | if (is_array($func)) { |
682 | 682 | if (is_object($func[0])) { |
683 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
683 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
684 | 684 | } else { |
685 | 685 | $funcName = implode('::', $func); |
686 | 686 | } |
@@ -692,17 +692,17 @@ discard block |
||
692 | 692 | |
693 | 693 | // verify that function to be invoked is in fact callable |
694 | 694 | if (!is_callable($func)) { |
695 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
695 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
696 | 696 | return new Response( |
697 | 697 | 0, |
698 | 698 | PhpXmlRpc::$xmlrpcerr['server_error'], |
699 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
699 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
700 | 700 | ); |
701 | 701 | } |
702 | 702 | |
703 | 703 | // If debug level is 3, we should catch all errors generated during |
704 | 704 | // processing of user function, and log them as part of response |
705 | - if ($this->debug > 2) { |
|
705 | + if ($this->debug>2) { |
|
706 | 706 | self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler')); |
707 | 707 | } |
708 | 708 | |
@@ -715,14 +715,14 @@ discard block |
||
715 | 715 | $r = call_user_func($func, $req); |
716 | 716 | } |
717 | 717 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
718 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
718 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
719 | 719 | if (is_a($r, 'PhpXmlRpc\Value')) { |
720 | 720 | $r = new Response($r); |
721 | 721 | } else { |
722 | 722 | $r = new Response( |
723 | 723 | 0, |
724 | 724 | PhpXmlRpc::$xmlrpcerr['server_error'], |
725 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
725 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
726 | 726 | ); |
727 | 727 | } |
728 | 728 | } |
@@ -738,7 +738,7 @@ discard block |
||
738 | 738 | // mimic EPI behaviour: if we get an array that looks like an error, make it |
739 | 739 | // an error response |
740 | 740 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
741 | - $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
741 | + $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
742 | 742 | } else { |
743 | 743 | // functions using EPI api should NOT return resp objects, |
744 | 744 | // so make sure we encode the return type correctly |
@@ -761,7 +761,7 @@ discard block |
||
761 | 761 | // proper error-response |
762 | 762 | switch ($this->exception_handling) { |
763 | 763 | case 2: |
764 | - if ($this->debug > 2) { |
|
764 | + if ($this->debug>2) { |
|
765 | 765 | if (self::$_xmlrpcs_prev_ehandler) { |
766 | 766 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
767 | 767 | } else { |
@@ -776,7 +776,7 @@ discard block |
||
776 | 776 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_error'], PhpXmlRpc::$xmlrpcstr['server_error']); |
777 | 777 | } |
778 | 778 | } |
779 | - if ($this->debug > 2) { |
|
779 | + if ($this->debug>2) { |
|
780 | 780 | // note: restore the error handler we found before calling the |
781 | 781 | // user func, even if it has been changed inside the func itself |
782 | 782 | if (self::$_xmlrpcs_prev_ehandler) { |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | */ |
797 | 797 | protected function debugmsg($string) |
798 | 798 | { |
799 | - $this->debug_info .= $string . "\n"; |
|
799 | + $this->debug_info .= $string."\n"; |
|
800 | 800 | } |
801 | 801 | |
802 | 802 | /** |
@@ -807,9 +807,9 @@ discard block |
||
807 | 807 | protected function xml_header($charsetEncoding = '') |
808 | 808 | { |
809 | 809 | if ($charsetEncoding != '') { |
810 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
810 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
811 | 811 | } else { |
812 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
812 | + return "<?xml version=\"1.0\"?".">\n"; |
|
813 | 813 | } |
814 | 814 | } |
815 | 815 | |
@@ -1087,7 +1087,7 @@ discard block |
||
1087 | 1087 | $i++; // for error message, we count params from 1 |
1088 | 1088 | return static::_xmlrpcs_multicall_error(new Response(0, |
1089 | 1089 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
1090 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
1090 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
1091 | 1091 | } |
1092 | 1092 | } |
1093 | 1093 | |
@@ -1170,7 +1170,7 @@ discard block |
||
1170 | 1170 | } |
1171 | 1171 | } else { |
1172 | 1172 | $numCalls = count($req); |
1173 | - for ($i = 0; $i < $numCalls; $i++) { |
|
1173 | + for ($i = 0; $i<$numCalls; $i++) { |
|
1174 | 1174 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
1175 | 1175 | } |
1176 | 1176 | } |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $this->me['struct'] = $val; |
120 | 120 | break; |
121 | 121 | default: |
122 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
122 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
123 | 123 | } |
124 | 124 | } |
125 | 125 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | } |
145 | 145 | |
146 | 146 | if ($typeOf !== 1) { |
147 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
147 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
148 | 148 | return 0; |
149 | 149 | } |
150 | 150 | |
@@ -161,10 +161,10 @@ discard block |
||
161 | 161 | |
162 | 162 | switch ($this->mytype) { |
163 | 163 | case 1: |
164 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
164 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
165 | 165 | return 0; |
166 | 166 | case 3: |
167 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
167 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
168 | 168 | return 0; |
169 | 169 | case 2: |
170 | 170 | // we're adding a scalar value to an array here |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | |
207 | 207 | return 1; |
208 | 208 | } else { |
209 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
209 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
210 | 210 | return 0; |
211 | 211 | } |
212 | 212 | } |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | |
238 | 238 | return 1; |
239 | 239 | } else { |
240 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
240 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
241 | 241 | return 0; |
242 | 242 | } |
243 | 243 | } |
@@ -280,19 +280,19 @@ discard block |
||
280 | 280 | case 1: |
281 | 281 | switch ($typ) { |
282 | 282 | case static::$xmlrpcBase64: |
283 | - $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
283 | + $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
284 | 284 | break; |
285 | 285 | case static::$xmlrpcBoolean: |
286 | - $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
286 | + $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
287 | 287 | break; |
288 | 288 | case static::$xmlrpcString: |
289 | 289 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
290 | - $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
290 | + $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
291 | 291 | break; |
292 | 292 | case static::$xmlrpcInt: |
293 | 293 | case static::$xmlrpcI4: |
294 | 294 | case static::$xmlrpcI8: |
295 | - $rs .= "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
295 | + $rs .= "<{$typ}>".(int) $val."</{$typ}>"; |
|
296 | 296 | break; |
297 | 297 | case static::$xmlrpcDouble: |
298 | 298 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -300,16 +300,16 @@ discard block |
||
300 | 300 | // sprintf('%F') could be most likely ok, but it fails eg. on 2e-14. |
301 | 301 | // The code below tries its best at keeping max precision while avoiding exp notation, |
302 | 302 | // but there is of course no limit in the number of decimal places to be used... |
303 | - $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
303 | + $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
304 | 304 | break; |
305 | 305 | case static::$xmlrpcDateTime: |
306 | 306 | if (is_string($val)) { |
307 | 307 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
308 | 308 | // DateTimeInterface is not present in php 5.4... |
309 | 309 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
310 | - $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
310 | + $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
311 | 311 | } elseif (is_int($val)) { |
312 | - $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
312 | + $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
313 | 313 | } else { |
314 | 314 | // not really a good idea here: but what should we output anyway? left for backward compat... |
315 | 315 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
@@ -331,14 +331,14 @@ discard block |
||
331 | 331 | case 3: |
332 | 332 | // struct |
333 | 333 | if ($this->_php_class) { |
334 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
334 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
335 | 335 | } else { |
336 | 336 | $rs .= "<struct>\n"; |
337 | 337 | } |
338 | 338 | $charsetEncoder = $this->getCharsetEncoder(); |
339 | 339 | /** @var Value $val2 */ |
340 | 340 | foreach ($val as $key2 => $val2) { |
341 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
341 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
342 | 342 | //$rs.=$this->serializeval($val2); |
343 | 343 | $rs .= $val2->serialize($charsetEncoding); |
344 | 344 | $rs .= "</member>\n"; |
@@ -374,7 +374,7 @@ discard block |
||
374 | 374 | $val = reset($this->me); |
375 | 375 | $typ = key($this->me); |
376 | 376 | |
377 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
377 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
378 | 378 | } |
379 | 379 | |
380 | 380 | /** |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * Please _do not_ copy this file verbatim into your production server. |
10 | 10 | */ |
11 | 11 | |
12 | -require_once __DIR__ . "/_prepend.php"; |
|
12 | +require_once __DIR__."/_prepend.php"; |
|
13 | 13 | |
14 | 14 | use PhpXmlRpc\PhpXmlRpc; |
15 | 15 | use PhpXmlRpc\Response; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | ), |
62 | 62 | // Greek word 'kosme'. NB: NOT a valid ISO8859 string! |
63 | 63 | // NB: we can only register this when setting internal encoding to UTF-8, or it will break system.listMethods |
64 | - "tests.utf8methodname." . 'κόσμε' => array( |
|
64 | + "tests.utf8methodname.".'κόσμε' => array( |
|
65 | 65 | "function" => "stringEcho", |
66 | 66 | "signature" => $stringecho_sig, |
67 | 67 | "docstring" => $stringecho_doc, |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | } elseif ($_GET['FORCE_AUTH'] == 'Digest') { |
114 | 114 | if (empty($_SERVER['PHP_AUTH_DIGEST'])) { |
115 | 115 | header('HTTP/1.1 401 Unauthorized'); |
116 | - header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"'); |
|
116 | + header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"'); |
|
117 | 117 | die('Text visible if user hits Cancel button'); |
118 | 118 | } |
119 | 119 | } |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | * @license code licensed under the BSD License: see file license.txt |
11 | 11 | */ |
12 | 12 | |
13 | -require_once __DIR__ . "/_prepend.php"; |
|
13 | +require_once __DIR__."/_prepend.php"; |
|
14 | 14 | |
15 | 15 | // *** NB: WE BLOCK THIS FROM RUNNING BY DEFAULT IN CASE ACCESS IS GRANTED TO IT IN PRODUCTION BY MISTAKE *** |
16 | 16 | // Comment out the following safeguard if you want to use it as is, but remember: this is an open relay !!! |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | // NB: here we should validate the received url, using f.e. a whitelist... |
36 | 36 | $client = new PhpXmlRpc\Client($url); |
37 | 37 | |
38 | - if ($req->getNumParams() > 3) { |
|
38 | + if ($req->getNumParams()>3) { |
|
39 | 39 | // we have to set some options onto the client. |
40 | 40 | // Note that if we do not untaint the received values, warnings might be generated... |
41 | 41 | $options = $encoder->decode($req->getParam(3)); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $client->setSSLVerifyPeer($val); |
58 | 58 | break; |
59 | 59 | case 'Timeout': |
60 | - $timeout = (integer)$val; |
|
60 | + $timeout = (integer) $val; |
|
61 | 61 | break; |
62 | 62 | } // switch |
63 | 63 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | // add debug info into response we give back to caller |
78 | - PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize()); |
|
78 | + PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize()); |
|
79 | 79 | |
80 | 80 | return $client->send($req, $timeout); |
81 | 81 | } |
@@ -71,14 +71,14 @@ discard block |
||
71 | 71 | if (count($this->xml_iso88591_Entities['in'])) { |
72 | 72 | return; |
73 | 73 | } |
74 | - for ($i = 0; $i < 32; $i++) { |
|
74 | + for ($i = 0; $i<32; $i++) { |
|
75 | 75 | $this->xml_iso88591_Entities["in"][] = chr($i); |
76 | 76 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
77 | 77 | } |
78 | 78 | |
79 | 79 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
80 | 80 | |
81 | - for ($i = 160; $i < 256; $i++) { |
|
81 | + for ($i = 160; $i<256; $i++) { |
|
82 | 82 | $this->xml_iso88591_Entities["in"][] = chr($i); |
83 | 83 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
84 | 84 | } |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | break;*/ |
107 | 107 | |
108 | 108 | default: |
109 | - throw new \Exception('Unsupported table: ' . $tableName); |
|
109 | + throw new \Exception('Unsupported table: '.$tableName); |
|
110 | 110 | } |
111 | 111 | } |
112 | 112 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $destEncoding = 'US-ASCII'; |
150 | 150 | } |
151 | 151 | |
152 | - $conversion = strtoupper($srcEncoding . '_' . $destEncoding); |
|
152 | + $conversion = strtoupper($srcEncoding.'_'.$destEncoding); |
|
153 | 153 | |
154 | 154 | // list ordered with (expected) most common scenarios first |
155 | 155 | switch ($conversion) { |
@@ -167,20 +167,20 @@ discard block |
||
167 | 167 | // NB: this will choke on invalid UTF-8, going most likely beyond EOF |
168 | 168 | $escapedData = ''; |
169 | 169 | // be kind to users creating string xmlrpc values out of different php types |
170 | - $data = (string)$data; |
|
170 | + $data = (string) $data; |
|
171 | 171 | $ns = strlen($data); |
172 | - for ($nn = 0; $nn < $ns; $nn++) { |
|
172 | + for ($nn = 0; $nn<$ns; $nn++) { |
|
173 | 173 | $ch = $data[$nn]; |
174 | 174 | $ii = ord($ch); |
175 | 175 | // 7 bits in 1 byte: 0bbbbbbb (127) |
176 | - if ($ii < 32) { |
|
176 | + if ($ii<32) { |
|
177 | 177 | if ($conversion == 'UTF-8_US-ASCII') { |
178 | 178 | $escapedData .= sprintf('&#%d;', $ii); |
179 | 179 | } else { |
180 | 180 | $escapedData .= $ch; |
181 | 181 | } |
182 | 182 | } |
183 | - else if ($ii < 128) { |
|
183 | + else if ($ii<128) { |
|
184 | 184 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
185 | 185 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
186 | 186 | switch ($ii) { |
@@ -205,25 +205,25 @@ discard block |
||
205 | 205 | } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047) |
206 | 206 | elseif ($ii >> 5 == 6) { |
207 | 207 | $b1 = ($ii & 31); |
208 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
209 | - $ii = ($b1 * 64) + $b2; |
|
208 | + $b2 = (ord($data[$nn+1]) & 63); |
|
209 | + $ii = ($b1 * 64)+$b2; |
|
210 | 210 | $escapedData .= sprintf('&#%d;', $ii); |
211 | 211 | $nn += 1; |
212 | 212 | } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb |
213 | 213 | elseif ($ii >> 4 == 14) { |
214 | 214 | $b1 = ($ii & 15); |
215 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
216 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
217 | - $ii = ((($b1 * 64) + $b2) * 64) + $b3; |
|
215 | + $b2 = (ord($data[$nn+1]) & 63); |
|
216 | + $b3 = (ord($data[$nn+2]) & 63); |
|
217 | + $ii = ((($b1 * 64)+$b2) * 64)+$b3; |
|
218 | 218 | $escapedData .= sprintf('&#%d;', $ii); |
219 | 219 | $nn += 2; |
220 | 220 | } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb |
221 | 221 | elseif ($ii >> 3 == 30) { |
222 | 222 | $b1 = ($ii & 7); |
223 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
224 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
225 | - $b4 = (ord($data[$nn + 3]) & 63); |
|
226 | - $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4; |
|
223 | + $b2 = (ord($data[$nn+1]) & 63); |
|
224 | + $b3 = (ord($data[$nn+2]) & 63); |
|
225 | + $b4 = (ord($data[$nn+3]) & 63); |
|
226 | + $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4; |
|
227 | 227 | $escapedData .= sprintf('&#%d;', $ii); |
228 | 228 | $nn += 3; |
229 | 229 | } |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | default: |
274 | 274 | $escapedData = ''; |
275 | 275 | /// @todo allow usage of a custom Logger via the DIC(ish) pattern we use in other classes |
276 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
276 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | return $escapedData; |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | case 'iso88591': |
327 | 327 | return $this->xml_iso88591_Entities; |
328 | 328 | default: |
329 | - throw new \Exception('Unsupported charset: ' . $charset); |
|
329 | + throw new \Exception('Unsupported charset: '.$charset); |
|
330 | 330 | } |
331 | 331 | } |
332 | 332 | } |
@@ -182,20 +182,20 @@ discard block |
||
182 | 182 | $callable = explode('::', $callable); |
183 | 183 | } |
184 | 184 | if (is_array($callable)) { |
185 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
186 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
185 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
186 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
187 | 187 | return false; |
188 | 188 | } |
189 | 189 | if (is_string($callable[0])) { |
190 | 190 | $plainFuncName = implode('::', $callable); |
191 | 191 | } elseif (is_object($callable[0])) { |
192 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
192 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
193 | 193 | } |
194 | 194 | $exists = method_exists($callable[0], $callable[1]); |
195 | 195 | } else if ($callable instanceof \Closure) { |
196 | 196 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
197 | 197 | if (!$buildIt) { |
198 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
198 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
199 | 199 | return false; |
200 | 200 | } |
201 | 201 | |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | } |
208 | 208 | |
209 | 209 | if (!$exists) { |
210 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
210 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
211 | 211 | return false; |
212 | 212 | } |
213 | 213 | |
@@ -251,23 +251,23 @@ discard block |
||
251 | 251 | if (is_array($callable)) { |
252 | 252 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
253 | 253 | if ($func->isPrivate()) { |
254 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
254 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
255 | 255 | return false; |
256 | 256 | } |
257 | 257 | if ($func->isProtected()) { |
258 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
258 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
259 | 259 | return false; |
260 | 260 | } |
261 | 261 | if ($func->isConstructor()) { |
262 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
262 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
263 | 263 | return false; |
264 | 264 | } |
265 | 265 | if ($func->isDestructor()) { |
266 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
266 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
267 | 267 | return false; |
268 | 268 | } |
269 | 269 | if ($func->isAbstract()) { |
270 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
270 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
271 | 271 | return false; |
272 | 272 | } |
273 | 273 | /// @todo add more checks for static vs. nonstatic? |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | if ($func->isInternal()) { |
278 | 278 | /// @todo from PHP 5.1.0 onward, we should be able to use invokeargs instead of getparameters to fully |
279 | 279 | /// reflect internal php functions |
280 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
280 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
281 | 281 | return false; |
282 | 282 | } |
283 | 283 | |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | $i = 0; |
330 | 330 | foreach ($func->getParameters() as $paramObj) { |
331 | 331 | $params[$i] = array(); |
332 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
332 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
333 | 333 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
334 | 334 | $i++; |
335 | 335 | } |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | // build a signature |
394 | 394 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
395 | 395 | $pSig = array($funcDesc['returnsDocs']); |
396 | - for ($i = 0; $i < count($pars); $i++) { |
|
396 | + for ($i = 0; $i<count($pars); $i++) { |
|
397 | 397 | $name = strtolower($funcDesc['params'][$i]['name']); |
398 | 398 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
399 | 399 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | } |
451 | 451 | } |
452 | 452 | $numPars = $req->getNumParams(); |
453 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
453 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
454 | 454 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
455 | 455 | } |
456 | 456 | |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | |
464 | 464 | $result = call_user_func_array($callable, $params); |
465 | 465 | |
466 | - if (! is_a($result, $responseClass)) { |
|
466 | + if (!is_a($result, $responseClass)) { |
|
467 | 467 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
468 | 468 | $result = new $valueClass($result, $funcDesc['returns']); |
469 | 469 | } else { |
@@ -498,9 +498,9 @@ discard block |
||
498 | 498 | if ($newFuncName == '') { |
499 | 499 | if (is_array($callable)) { |
500 | 500 | if (is_string($callable[0])) { |
501 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
501 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
502 | 502 | } else { |
503 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
503 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
504 | 504 | } |
505 | 505 | } else { |
506 | 506 | if ($callable instanceof \Closure) { |
@@ -536,8 +536,8 @@ discard block |
||
536 | 536 | { |
537 | 537 | $namespace = '\\PhpXmlRpc\\'; |
538 | 538 | |
539 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
540 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
539 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
540 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
541 | 541 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
542 | 542 | |
543 | 543 | $i = 0; |
@@ -572,7 +572,7 @@ discard block |
||
572 | 572 | // build body of new function |
573 | 573 | |
574 | 574 | $innerCode = "\$paramCount = \$req->getNumParams();\n"; |
575 | - $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
575 | + $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
576 | 576 | |
577 | 577 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
578 | 578 | if ($decodePhpObjects) { |
@@ -586,13 +586,13 @@ discard block |
||
586 | 586 | if (is_array($callable) && is_object($callable[0])) { |
587 | 587 | self::$objHolder[$newFuncName] = $callable[0]; |
588 | 588 | $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n"; |
589 | - $realFuncName = '$obj->' . $callable[1]; |
|
589 | + $realFuncName = '$obj->'.$callable[1]; |
|
590 | 590 | } else { |
591 | 591 | $realFuncName = $plainFuncName; |
592 | 592 | } |
593 | 593 | foreach ($parsVariations as $i => $pars) { |
594 | - $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
595 | - if ($i < (count($parsVariations) - 1)) |
|
594 | + $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
595 | + if ($i<(count($parsVariations)-1)) |
|
596 | 596 | $innerCode .= "else\n"; |
597 | 597 | } |
598 | 598 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
@@ -609,7 +609,7 @@ discard block |
||
609 | 609 | // if ($func->returnsReference()) |
610 | 610 | // return false; |
611 | 611 | |
612 | - $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}"; |
|
612 | + $code = "function $newFuncName(\$req) {\n".$innerCode."\n}"; |
|
613 | 613 | |
614 | 614 | return $code; |
615 | 615 | } |
@@ -663,7 +663,7 @@ discard block |
||
663 | 663 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
664 | 664 | { |
665 | 665 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
666 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
666 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
667 | 667 | } |
668 | 668 | |
669 | 669 | if (is_object($className)) { |
@@ -671,7 +671,7 @@ discard block |
||
671 | 671 | } else { |
672 | 672 | $realClassName = $className; |
673 | 673 | } |
674 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
674 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
675 | 675 | } |
676 | 676 | |
677 | 677 | /** |
@@ -752,21 +752,21 @@ discard block |
||
752 | 752 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
753 | 753 | { |
754 | 754 | $namespace = '\\PhpXmlRpc\\'; |
755 | - $reqClass = $namespace . 'Request'; |
|
756 | - $valClass = $namespace . 'Value'; |
|
757 | - $decoderClass = $namespace . 'Encoder'; |
|
755 | + $reqClass = $namespace.'Request'; |
|
756 | + $valClass = $namespace.'Value'; |
|
757 | + $decoderClass = $namespace.'Encoder'; |
|
758 | 758 | |
759 | 759 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
760 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
760 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
761 | 761 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
762 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
762 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
763 | 763 | |
764 | 764 | $req = new $reqClass('system.methodSignature'); |
765 | 765 | $req->addparam(new $valClass($methodName)); |
766 | 766 | $client->setDebug($debug); |
767 | 767 | $response = $client->send($req, $timeout, $protocol); |
768 | 768 | if ($response->faultCode()) { |
769 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
769 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
770 | 770 | return false; |
771 | 771 | } |
772 | 772 | |
@@ -777,8 +777,8 @@ discard block |
||
777 | 777 | $mSig = $decoder->decode($mSig); |
778 | 778 | } |
779 | 779 | |
780 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
781 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
780 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
781 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
782 | 782 | return false; |
783 | 783 | } |
784 | 784 | |
@@ -794,11 +794,11 @@ discard block |
||
794 | 794 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
795 | 795 | { |
796 | 796 | $namespace = '\\PhpXmlRpc\\'; |
797 | - $reqClass = $namespace . 'Request'; |
|
798 | - $valClass = $namespace . 'Value'; |
|
797 | + $reqClass = $namespace.'Request'; |
|
798 | + $valClass = $namespace.'Value'; |
|
799 | 799 | |
800 | 800 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
801 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
801 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
802 | 802 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
803 | 803 | |
804 | 804 | $mDesc = ''; |
@@ -832,10 +832,10 @@ discard block |
||
832 | 832 | $clientClone = clone $client; |
833 | 833 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
834 | 834 | { |
835 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
835 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
836 | 836 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
837 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
838 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
837 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
838 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
839 | 839 | if (isset($extraOptions['return_on_fault'])) { |
840 | 840 | $decodeFault = true; |
841 | 841 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -844,9 +844,9 @@ discard block |
||
844 | 844 | } |
845 | 845 | |
846 | 846 | $namespace = '\\PhpXmlRpc\\'; |
847 | - $reqClass = $namespace . 'Request'; |
|
848 | - $encoderClass = $namespace . 'Encoder'; |
|
849 | - $valueClass = $namespace . 'Value'; |
|
847 | + $reqClass = $namespace.'Request'; |
|
848 | + $encoderClass = $namespace.'Encoder'; |
|
849 | + $valueClass = $namespace.'Value'; |
|
850 | 850 | |
851 | 851 | $encoder = new $encoderClass(); |
852 | 852 | $encodeOptions = array(); |
@@ -919,13 +919,13 @@ discard block |
||
919 | 919 | * @param string $mDesc |
920 | 920 | * @return string[] keys: source, docstring |
921 | 921 | */ |
922 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
922 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
923 | 923 | { |
924 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
924 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
925 | 925 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
926 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
927 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
928 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
926 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
927 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
928 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
929 | 929 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
930 | 930 | if (isset($extraOptions['return_on_fault'])) { |
931 | 931 | $decodeFault = true; |
@@ -938,7 +938,7 @@ discard block |
||
938 | 938 | $namespace = '\\PhpXmlRpc\\'; |
939 | 939 | |
940 | 940 | $code = "function $newFuncName ("; |
941 | - if ($clientCopyMode < 2) { |
|
941 | + if ($clientCopyMode<2) { |
|
942 | 942 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
943 | 943 | $verbatimClientCopy = !$clientCopyMode; |
944 | 944 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -953,7 +953,7 @@ discard block |
||
953 | 953 | |
954 | 954 | if ($mDesc != '') { |
955 | 955 | // take care that PHP comment is not terminated unwillingly by method description |
956 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
956 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
957 | 957 | } else { |
958 | 958 | $mDesc = "/**\nFunction $newFuncName\n"; |
959 | 959 | } |
@@ -962,7 +962,7 @@ discard block |
||
962 | 962 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
963 | 963 | $plist = array(); |
964 | 964 | $pCount = count($mSig); |
965 | - for ($i = 1; $i < $pCount; $i++) { |
|
965 | + for ($i = 1; $i<$pCount; $i++) { |
|
966 | 966 | $plist[] = "\$p$i"; |
967 | 967 | $pType = $mSig[$i]; |
968 | 968 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -978,19 +978,19 @@ discard block |
||
978 | 978 | } |
979 | 979 | } |
980 | 980 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
981 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
981 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
982 | 982 | } |
983 | - if ($clientCopyMode < 2) { |
|
983 | + if ($clientCopyMode<2) { |
|
984 | 984 | $plist[] = '$debug=0'; |
985 | 985 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
986 | 986 | } |
987 | 987 | $plist = implode(', ', $plist); |
988 | - $mDesc .= "* @return {$namespace}Response|" . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
988 | + $mDesc .= "* @return {$namespace}Response|".$this->xmlrpc2PhpType($mSig[0])." (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
989 | 989 | |
990 | 990 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
991 | 991 | if ($decodeFault) { |
992 | 992 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
993 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
993 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
994 | 994 | } else { |
995 | 995 | $respCode = var_export($faultResponse, true); |
996 | 996 | } |
@@ -1003,7 +1003,7 @@ discard block |
||
1003 | 1003 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
1004 | 1004 | } |
1005 | 1005 | |
1006 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
1006 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
1007 | 1007 | |
1008 | 1008 | return array('source' => $code, 'docstring' => $mDesc); |
1009 | 1009 | } |
@@ -1030,24 +1030,24 @@ discard block |
||
1030 | 1030 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
1031 | 1031 | { |
1032 | 1032 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
1033 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
1033 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
1034 | 1034 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
1035 | 1035 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
1036 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
1037 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
1036 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
1037 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
1038 | 1038 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
1039 | 1039 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
1040 | 1040 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
1041 | 1041 | $namespace = '\\PhpXmlRpc\\'; |
1042 | 1042 | |
1043 | - $reqClass = $namespace . 'Request'; |
|
1044 | - $decoderClass = $namespace . 'Encoder'; |
|
1043 | + $reqClass = $namespace.'Request'; |
|
1044 | + $decoderClass = $namespace.'Encoder'; |
|
1045 | 1045 | |
1046 | 1046 | // retrieve the list of methods |
1047 | 1047 | $req = new $reqClass('system.listMethods'); |
1048 | 1048 | $response = $client->send($req, $timeout, $protocol); |
1049 | 1049 | if ($response->faultCode()) { |
1050 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
1050 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
1051 | 1051 | |
1052 | 1052 | return false; |
1053 | 1053 | } |
@@ -1058,7 +1058,7 @@ discard block |
||
1058 | 1058 | $mList = $decoder->decode($mList); |
1059 | 1059 | } |
1060 | 1060 | if (!is_array($mList) || !count($mList)) { |
1061 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
1061 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
1062 | 1062 | |
1063 | 1063 | return false; |
1064 | 1064 | } |
@@ -1067,8 +1067,8 @@ discard block |
||
1067 | 1067 | if ($newClassName != '') { |
1068 | 1068 | $xmlrpcClassName = $newClassName; |
1069 | 1069 | } else { |
1070 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
1071 | - array('_', ''), $client->server) . '_client'; |
|
1070 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
1071 | + array('_', ''), $client->server).'_client'; |
|
1072 | 1072 | } |
1073 | 1073 | while ($buildIt && class_exists($xmlrpcClassName)) { |
1074 | 1074 | $xmlrpcClassName .= 'x'; |
@@ -1099,20 +1099,20 @@ discard block |
||
1099 | 1099 | if (!$buildIt) { |
1100 | 1100 | $source .= $methodWrap['docstring']; |
1101 | 1101 | } |
1102 | - $source .= $methodWrap['source'] . "\n"; |
|
1102 | + $source .= $methodWrap['source']."\n"; |
|
1103 | 1103 | } else { |
1104 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
1104 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
1105 | 1105 | } |
1106 | 1106 | } |
1107 | 1107 | } |
1108 | 1108 | $source .= "}\n"; |
1109 | 1109 | if ($buildIt) { |
1110 | 1110 | $allOK = 0; |
1111 | - eval($source . '$allOK=1;'); |
|
1111 | + eval($source.'$allOK=1;'); |
|
1112 | 1112 | if ($allOK) { |
1113 | 1113 | return $xmlrpcClassName; |
1114 | 1114 | } else { |
1115 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
1115 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
1116 | 1116 | return false; |
1117 | 1117 | } |
1118 | 1118 | } else { |
@@ -1131,8 +1131,8 @@ discard block |
||
1131 | 1131 | */ |
1132 | 1132 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
1133 | 1133 | { |
1134 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) . |
|
1135 | - "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n"; |
|
1134 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path). |
|
1135 | + "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server)."', $client->port);\n"; |
|
1136 | 1136 | |
1137 | 1137 | // copy all client fields to the client that will be generated runtime |
1138 | 1138 | // (this provides for future expansion or subclassing of client obj) |