gggeek /
phpxmlrpc
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | $this->me['struct'] = $val; |
| 130 | 130 | break; |
| 131 | 131 | default: |
| 132 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
| 132 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | } |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | if ($typeOf !== 1) { |
| 156 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
| 156 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
| 157 | 157 | return 0; |
| 158 | 158 | } |
| 159 | 159 | |
@@ -170,10 +170,10 @@ discard block |
||
| 170 | 170 | |
| 171 | 171 | switch ($this->mytype) { |
| 172 | 172 | case 1: |
| 173 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
| 173 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
| 174 | 174 | return 0; |
| 175 | 175 | case 3: |
| 176 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 176 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 177 | 177 | return 0; |
| 178 | 178 | case 2: |
| 179 | 179 | // we're adding a scalar value to an array here |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | return 1; |
| 216 | 216 | } else { |
| 217 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 217 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 218 | 218 | return 0; |
| 219 | 219 | } |
| 220 | 220 | } |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | |
| 245 | 245 | return 1; |
| 246 | 246 | } else { |
| 247 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 247 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 248 | 248 | return 0; |
| 249 | 249 | } |
| 250 | 250 | } |
@@ -286,19 +286,19 @@ discard block |
||
| 286 | 286 | case 1: |
| 287 | 287 | switch ($typ) { |
| 288 | 288 | case static::$xmlrpcBase64: |
| 289 | - $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
| 289 | + $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
| 290 | 290 | break; |
| 291 | 291 | case static::$xmlrpcBoolean: |
| 292 | - $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
| 292 | + $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
| 293 | 293 | break; |
| 294 | 294 | case static::$xmlrpcString: |
| 295 | 295 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
| 296 | - $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
| 296 | + $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
| 297 | 297 | break; |
| 298 | 298 | case static::$xmlrpcInt: |
| 299 | 299 | case static::$xmlrpcI4: |
| 300 | 300 | case static::$xmlrpcI8: |
| 301 | - $rs .= "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
| 301 | + $rs .= "<{$typ}>".(int) $val."</{$typ}>"; |
|
| 302 | 302 | break; |
| 303 | 303 | case static::$xmlrpcDouble: |
| 304 | 304 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -306,16 +306,16 @@ discard block |
||
| 306 | 306 | // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14. |
| 307 | 307 | // The code below tries its best at keeping max precision while avoiding exp notation, |
| 308 | 308 | // but there is of course no limit in the number of decimal places to be used... |
| 309 | - $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
| 309 | + $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
| 310 | 310 | break; |
| 311 | 311 | case static::$xmlrpcDateTime: |
| 312 | 312 | if (is_string($val)) { |
| 313 | 313 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
| 314 | 314 | // DateTimeInterface is not present in php 5.4... |
| 315 | 315 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
| 316 | - $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
| 316 | + $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
| 317 | 317 | } elseif (is_int($val)) { |
| 318 | - $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
| 318 | + $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
| 319 | 319 | } else { |
| 320 | 320 | // not really a good idea here: but what should we output anyway? left for backward compat... |
| 321 | 321 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
@@ -337,14 +337,14 @@ discard block |
||
| 337 | 337 | case 3: |
| 338 | 338 | // struct |
| 339 | 339 | if ($this->_php_class) { |
| 340 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
| 340 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
| 341 | 341 | } else { |
| 342 | 342 | $rs .= "<struct>\n"; |
| 343 | 343 | } |
| 344 | 344 | $charsetEncoder = $this->getCharsetEncoder(); |
| 345 | 345 | /** @var Value $val2 */ |
| 346 | 346 | foreach ($val as $key2 => $val2) { |
| 347 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
| 347 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
| 348 | 348 | //$rs.=$this->serializeval($val2); |
| 349 | 349 | $rs .= $val2->serialize($charsetEncoding); |
| 350 | 350 | $rs .= "</member>\n"; |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | $val = reset($this->me); |
| 380 | 380 | $typ = key($this->me); |
| 381 | 381 | |
| 382 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
| 382 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
| 383 | 383 | } |
| 384 | 384 | |
| 385 | 385 | /** |
@@ -90,13 +90,13 @@ discard block |
||
| 90 | 90 | 'scalar' => $val, |
| 91 | 91 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val) |
| 92 | 92 | ); |
| 93 | - return (object)$xmlrpcVal; |
|
| 93 | + return (object) $xmlrpcVal; |
|
| 94 | 94 | case 'base64': |
| 95 | 95 | $xmlrpcVal = array( |
| 96 | 96 | 'xmlrpc_type' => 'base64', |
| 97 | 97 | 'scalar' => $val |
| 98 | 98 | ); |
| 99 | - return (object)$xmlrpcVal; |
|
| 99 | + return (object) $xmlrpcVal; |
|
| 100 | 100 | case 'string': |
| 101 | 101 | if (isset($options['extension_api_encoding'])) { |
| 102 | 102 | // if iconv is not available, we use mb_convert_encoding |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | case 'msg': |
| 166 | 166 | $paramCount = $xmlrpcVal->getNumParams(); |
| 167 | 167 | $arr = array(); |
| 168 | - for ($i = 0; $i < $paramCount; $i++) { |
|
| 168 | + for ($i = 0; $i<$paramCount; $i++) { |
|
| 169 | 169 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
| 170 | 170 | } |
| 171 | 171 | return $arr; |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | break; |
| 292 | 292 | case 'resource': |
| 293 | 293 | if (in_array('extension_api', $options)) { |
| 294 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
| 294 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
| 295 | 295 | } else { |
| 296 | 296 | $xmlrpcVal = new Value(); |
| 297 | 297 | } |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | if ($valEncoding == 'ISO-8859-1') { |
| 341 | 341 | $xmlVal = utf8_encode($xmlVal); |
| 342 | 342 | } else { |
| 343 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
| 343 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding); |
|
| 344 | 344 | } |
| 345 | 345 | } |
| 346 | 346 | } |
@@ -362,7 +362,7 @@ discard block |
||
| 362 | 362 | $parserOptions |
| 363 | 363 | ); |
| 364 | 364 | |
| 365 | - if ($xmlRpcParser->_xh['isf'] > 1) { |
|
| 365 | + if ($xmlRpcParser->_xh['isf']>1) { |
|
| 366 | 366 | // test that $xmlrpc->_xh['value'] is an obj, too??? |
| 367 | 367 | |
| 368 | 368 | $this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']); |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | |
| 387 | 387 | case 'methodcall': |
| 388 | 388 | $req = new Request($xmlRpcParser->_xh['method']); |
| 389 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
| 389 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
| 390 | 390 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
| 391 | 391 | } |
| 392 | 392 | return $req; |
@@ -45,12 +45,12 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | // read chunk-size, chunk-extension (if any) and crlf |
| 47 | 47 | // get the position of the linebreak |
| 48 | - $chunkEnd = strpos($buffer, "\r\n") + 2; |
|
| 48 | + $chunkEnd = strpos($buffer, "\r\n")+2; |
|
| 49 | 49 | $temp = substr($buffer, 0, $chunkEnd); |
| 50 | 50 | $chunkSize = hexdec(trim($temp)); |
| 51 | 51 | $chunkStart = $chunkEnd; |
| 52 | - while ($chunkSize > 0) { |
|
| 53 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize); |
|
| 52 | + while ($chunkSize>0) { |
|
| 53 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize); |
|
| 54 | 54 | |
| 55 | 55 | // just in case we got a broken connection |
| 56 | 56 | if ($chunkEnd == false) { |
@@ -62,19 +62,19 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | // read chunk-data and crlf |
| 65 | - $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 65 | + $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 66 | 66 | // append chunk-data to entity-body |
| 67 | 67 | $new .= $chunk; |
| 68 | 68 | // length := length + chunk-size |
| 69 | 69 | $length += strlen($chunk); |
| 70 | 70 | // read chunk-size and crlf |
| 71 | - $chunkStart = $chunkEnd + 2; |
|
| 71 | + $chunkStart = $chunkEnd+2; |
|
| 72 | 72 | |
| 73 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2; |
|
| 73 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2; |
|
| 74 | 74 | if ($chunkEnd == false) { |
| 75 | 75 | break; // just in case we got a broken connection |
| 76 | 76 | } |
| 77 | - $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 77 | + $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 78 | 78 | $chunkSize = hexdec(trim($temp)); |
| 79 | 79 | $chunkStart = $chunkEnd; |
| 80 | 80 | } |
@@ -103,11 +103,11 @@ discard block |
||
| 103 | 103 | // Look for CR/LF or simple LF as line separator (even though it is not valid http) |
| 104 | 104 | $pos = strpos($data, "\r\n\r\n"); |
| 105 | 105 | if ($pos || is_int($pos)) { |
| 106 | - $bd = $pos + 4; |
|
| 106 | + $bd = $pos+4; |
|
| 107 | 107 | } else { |
| 108 | 108 | $pos = strpos($data, "\n\n"); |
| 109 | 109 | if ($pos || is_int($pos)) { |
| 110 | - $bd = $pos + 2; |
|
| 110 | + $bd = $pos+2; |
|
| 111 | 111 | } else { |
| 112 | 112 | // No separation between response headers and body: fault? |
| 113 | 113 | $bd = 0; |
@@ -117,8 +117,8 @@ discard block |
||
| 117 | 117 | // this filters out all http headers from proxy. maybe we could take them into account, too? |
| 118 | 118 | $data = substr($data, $bd); |
| 119 | 119 | } else { |
| 120 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 121 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 120 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 121 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | |
@@ -151,19 +151,19 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | if ($httpResponse['status_code'] !== '200') { |
| 154 | - $errstr = substr($data, 0, strpos($data, "\n") - 1); |
|
| 155 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr); |
|
| 156 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 154 | + $errstr = substr($data, 0, strpos($data, "\n")-1); |
|
| 155 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr); |
|
| 156 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http) |
| 160 | 160 | $pos = strpos($data, "\r\n\r\n"); |
| 161 | 161 | if ($pos || is_int($pos)) { |
| 162 | - $bd = $pos + 4; |
|
| 162 | + $bd = $pos+4; |
|
| 163 | 163 | } else { |
| 164 | 164 | $pos = strpos($data, "\n\n"); |
| 165 | 165 | if ($pos || is_int($pos)) { |
| 166 | - $bd = $pos + 2; |
|
| 166 | + $bd = $pos+2; |
|
| 167 | 167 | } else { |
| 168 | 168 | // No separation between response headers and body: fault? |
| 169 | 169 | // we could take some action here instead of going on... |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | foreach ($ar as $line) { |
| 178 | 178 | // take care of multi-line headers and cookies |
| 179 | 179 | $arr = explode(':', $line, 2); |
| 180 | - if (count($arr) > 1) { |
|
| 180 | + if (count($arr)>1) { |
|
| 181 | 181 | $headerName = strtolower(trim($arr[0])); |
| 182 | 182 | /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be |
| 183 | 183 | /// passed using multiple header lines. |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | foreach ($cookies as $cookie) { |
| 195 | 195 | // glue together all received cookies, using a comma to separate them (same as php does with getallheaders()) |
| 196 | 196 | if (isset($httpResponse['headers'][$headerName])) { |
| 197 | - $httpResponse['headers'][$headerName] .= ', ' . trim($cookie); |
|
| 197 | + $httpResponse['headers'][$headerName] .= ', '.trim($cookie); |
|
| 198 | 198 | } else { |
| 199 | 199 | $httpResponse['headers'][$headerName] = trim($cookie); |
| 200 | 200 | } |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | } |
| 224 | 224 | } elseif (isset($headerName)) { |
| 225 | 225 | /// @todo version1 cookies might span multiple lines, thus breaking the parsing above |
| 226 | - $httpResponse['headers'][$headerName] .= ' ' . trim($line); |
|
| 226 | + $httpResponse['headers'][$headerName] .= ' '.trim($line); |
|
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | // Decode chunked encoding sent by http 1.1 servers |
| 247 | 247 | if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') { |
| 248 | 248 | if (!$data = static::decodeChunked($data)) { |
| 249 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 249 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 250 | 250 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']); |
| 251 | 251 | } |
| 252 | 252 | } |
@@ -261,19 +261,19 @@ discard block |
||
| 261 | 261 | if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 262 | 262 | $data = $degzdata; |
| 263 | 263 | if ($debug) { |
| 264 | - $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 264 | + $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 265 | 265 | } |
| 266 | 266 | } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 267 | 267 | $data = $degzdata; |
| 268 | 268 | if ($debug) { |
| 269 | - $this->getLogger()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 269 | + $this->getLogger()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 270 | 270 | } |
| 271 | 271 | } else { |
| 272 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server'); |
|
| 272 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server'); |
|
| 273 | 273 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']); |
| 274 | 274 | } |
| 275 | 275 | } else { |
| 276 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 276 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 277 | 277 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']); |
| 278 | 278 | } |
| 279 | 279 | } |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | public function parseAcceptHeader($header) |
| 294 | 294 | { |
| 295 | 295 | $accepted = array(); |
| 296 | - foreach(explode(',', $header) as $c) { |
|
| 296 | + foreach (explode(',', $header) as $c) { |
|
| 297 | 297 | if (preg_match('/^([^;]+); *q=([0-9.]+)/', $c, $matches)) { |
| 298 | 298 | $c = $matches[1]; |
| 299 | 299 | $w = $matches[2]; |
@@ -155,35 +155,35 @@ discard block |
||
| 155 | 155 | public function serialize($charsetEncoding = '') |
| 156 | 156 | { |
| 157 | 157 | if ($charsetEncoding != '') { |
| 158 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 158 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 159 | 159 | } else { |
| 160 | 160 | $this->content_type = 'text/xml'; |
| 161 | 161 | } |
| 162 | 162 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 163 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 163 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 164 | 164 | } else { |
| 165 | 165 | $result = "<methodResponse>\n"; |
| 166 | 166 | } |
| 167 | 167 | if ($this->errno) { |
| 168 | 168 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 169 | - $result .= "<fault>\n" . |
|
| 170 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 171 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 172 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" . |
|
| 169 | + $result .= "<fault>\n". |
|
| 170 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 171 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 172 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n". |
|
| 173 | 173 | "</struct>\n</value>\n</fault>"; |
| 174 | 174 | } else { |
| 175 | 175 | if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) { |
| 176 | 176 | if (is_string($this->val) && $this->valtyp == 'xml') { |
| 177 | - $result .= "<params>\n<param>\n" . |
|
| 178 | - $this->val . |
|
| 177 | + $result .= "<params>\n<param>\n". |
|
| 178 | + $this->val. |
|
| 179 | 179 | "</param>\n</params>"; |
| 180 | 180 | } else { |
| 181 | 181 | /// @todo try to build something serializable using the Encoder... |
| 182 | 182 | throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values'); |
| 183 | 183 | } |
| 184 | 184 | } else { |
| 185 | - $result .= "<params>\n<param>\n" . |
|
| 186 | - $this->val->serialize($charsetEncoding) . |
|
| 185 | + $result .= "<params>\n<param>\n". |
|
| 186 | + $this->val->serialize($charsetEncoding). |
|
| 187 | 187 | "</param>\n</params>"; |
| 188 | 188 | } |
| 189 | 189 | } |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | return $this->httpResponse['raw_data']; |
| 209 | 209 | default: |
| 210 | 210 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 211 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 211 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 212 | 212 | return null; |
| 213 | 213 | } |
| 214 | 214 | } |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | break; |
| 230 | 230 | default: |
| 231 | 231 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 232 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 232 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 233 | 233 | } |
| 234 | 234 | } |
| 235 | 235 | |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | break; |
| 264 | 264 | default: |
| 265 | 265 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 266 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 266 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 267 | 267 | } |
| 268 | 268 | } |
| 269 | 269 | } |
@@ -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,30 +33,30 @@ discard block |
||
| 33 | 33 | /// @const JSXMLRPC_PATH Path to the visual xml-rpc 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__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile |
|
| 40 | - __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger |
|
| 41 | - __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger |
|
| 42 | - __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 43 | - __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 44 | - __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 45 | - __DIR__ . '/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc) |
|
| 46 | - __DIR__ . '/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer |
|
| 47 | - __DIR__ . '/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm |
|
| 48 | - __DIR__ . '/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project |
|
| 39 | + __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile |
|
| 40 | + __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger |
|
| 41 | + __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger |
|
| 42 | + __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 43 | + __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 44 | + __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 45 | + __DIR__.'/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc) |
|
| 46 | + __DIR__.'/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer |
|
| 47 | + __DIR__.'/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm |
|
| 48 | + __DIR__.'/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project |
|
| 49 | 49 | ); |
| 50 | 50 | } |
| 51 | - foreach($editorpaths as $editorpath) { |
|
| 52 | - if (is_file(realpath($editorpath . 'visualeditor.html'))) { |
|
| 51 | + foreach ($editorpaths as $editorpath) { |
|
| 52 | + if (is_file(realpath($editorpath.'visualeditor.html'))) { |
|
| 53 | 53 | $haseditor = true; |
| 54 | 54 | break; |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | if ($haseditor) { |
| 58 | - $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
| 59 | - $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath); |
|
| 58 | + $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
| 59 | + $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath); |
|
| 60 | 60 | /// @todo for cases above 4 and up, look at $controllerRootUrl and check if the web root is not pointing directly |
| 61 | 61 | /// at this folder, as in that case the link to the visualeditor will not |
| 62 | 62 | /// work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | function activateeditor() { |
| 236 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\", "\\'"), $alt_payload); ?>'; |
|
| 236 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
| 237 | 237 | if (document.frmaction.wstype.value == "1") |
| 238 | 238 | url += '&type=jsonrpc'; |
| 239 | 239 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | JSON-RPC'; |
| 279 | 279 | } ?> |
| 280 | 280 | Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?> |
| 281 | -<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
| 281 | +<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. '.htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
| 282 | 282 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
| 283 | 283 | |
| 284 | 284 | <table id="serverblock"> |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | </select> |
| 340 | 340 | </td> |
| 341 | 341 | <td class="labelcell">Timeout:</td> |
| 342 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 342 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 343 | 343 | <td></td> |
| 344 | 344 | <td></td> |
| 345 | 345 | </tr> |
@@ -66,7 +66,12 @@ discard block |
||
| 66 | 66 | <html lang="en"> |
| 67 | 67 | <head> |
| 68 | 68 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 69 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
| 69 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 70 | + echo 'JSON-RPC'; |
|
| 71 | +} else { |
|
| 72 | + echo 'XML-RPC'; |
|
| 73 | +} |
|
| 74 | +?> Debugger</title> |
|
| 70 | 75 | <meta name="robots" content="index,nofollow"/> |
| 71 | 76 | <script type="text/javascript" language="Javascript"> |
| 72 | 77 | if (window.name != 'frmcontroller') |
@@ -266,19 +271,26 @@ discard block |
||
| 266 | 271 | </script> |
| 267 | 272 | </head> |
| 268 | 273 | <body |
| 269 | - onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) { |
|
| 274 | + onload="<?php if ($hasjsonrpcclient) { |
|
| 275 | + echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) { |
|
| 270 | 276 | echo ' document.frmaction.submit();'; |
| 277 | +} |
|
| 271 | 278 | } ?>"> |
| 272 | 279 | <h1>XML-RPC |
| 273 | 280 | <?php if ($hasjsonrpcclient) { |
| 274 | 281 | echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"'; |
| 275 | 282 | // q: does this if make sense at all? |
| 276 | - if (!class_exists('\PhpXmlRpc\Client')) echo ' disabled="disabled"'; |
|
| 283 | + if (!class_exists('\PhpXmlRpc\Client')) { |
|
| 284 | + echo ' disabled="disabled"'; |
|
| 285 | + } |
|
| 277 | 286 | echo ' /></form> / <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form> |
| 278 | 287 | JSON-RPC'; |
| 279 | 288 | } ?> |
| 280 | 289 | Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?> |
| 281 | -<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
| 290 | +<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) { |
|
| 291 | + echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); |
|
| 292 | +} |
|
| 293 | +?>)</h3> |
|
| 282 | 294 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
| 283 | 295 | |
| 284 | 296 | <table id="serverblock"> |
@@ -15,7 +15,12 @@ discard block |
||
| 15 | 15 | <html lang="en"> |
| 16 | 16 | <head> |
| 17 | 17 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 18 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
| 18 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 19 | + echo 'JSON-RPC'; |
|
| 20 | +} else { |
|
| 21 | + echo 'XML-RPC'; |
|
| 22 | +} |
|
| 23 | +?> Debugger</title> |
|
| 19 | 24 | <meta name="robots" content="index,nofollow"/> |
| 20 | 25 | <style type="text/css"> |
| 21 | 26 | <!-- |
@@ -367,7 +372,9 @@ discard block |
||
| 367 | 372 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
| 368 | 373 | if ($x->count() > 1) { |
| 369 | 374 | foreach($x as $k => $y) { |
| 370 | - if ($k == 0) continue; |
|
| 375 | + if ($k == 0) { |
|
| 376 | + continue; |
|
| 377 | + } |
|
| 371 | 378 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 372 | 379 | if ($wstype == 1) { |
| 373 | 380 | switch($y->scalarval()) { |
@@ -78,13 +78,13 @@ discard block |
||
| 78 | 78 | <body> |
| 79 | 79 | <?php |
| 80 | 80 | |
| 81 | -include __DIR__ . '/common.php'; |
|
| 81 | +include __DIR__.'/common.php'; |
|
| 82 | 82 | |
| 83 | 83 | if ($action) { |
| 84 | 84 | |
| 85 | 85 | // avoid php hanging when using the builtin webserver and sending requests to itself |
| 86 | 86 | $skip = false; |
| 87 | - if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) { |
|
| 87 | + if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) { |
|
| 88 | 88 | $localHost = explode(':', $_SERVER['HTTP_HOST']); |
| 89 | 89 | /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters, |
| 90 | 90 | /// and that proxy is us |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | if (!$skip) { |
| 98 | 98 | // make sure the script waits long enough for the call to complete... |
| 99 | 99 | if ($timeout) { |
| 100 | - set_time_limit($timeout + 10); |
|
| 100 | + set_time_limit($timeout+10); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | if ($wstype == 1) { |
@@ -118,13 +118,13 @@ discard block |
||
| 118 | 118 | $server = "$host$path"; |
| 119 | 119 | } |
| 120 | 120 | if ($protocol == 2 || $protocol == 3) { |
| 121 | - $server = 'https://' . $server; |
|
| 121 | + $server = 'https://'.$server; |
|
| 122 | 122 | } else { |
| 123 | - $server = 'http://' . $server; |
|
| 123 | + $server = 'http://'.$server; |
|
| 124 | 124 | } |
| 125 | 125 | if ($proxy != '') { |
| 126 | 126 | $pproxy = explode(':', $proxy); |
| 127 | - if (count($pproxy) > 1) { |
|
| 127 | + if (count($pproxy)>1) { |
|
| 128 | 128 | $pport = $pproxy[1]; |
| 129 | 129 | } else { |
| 130 | 130 | $pport = 8080; |
@@ -199,9 +199,9 @@ discard block |
||
| 199 | 199 | case 'wrap': |
| 200 | 200 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 201 | 201 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 202 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 202 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 203 | 203 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 204 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 204 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 205 | 205 | break; |
| 206 | 206 | case 'list': |
| 207 | 207 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | $msg[0] = new $requestClass($method, array(), $id); |
| 215 | 215 | // hack! build payload by hand |
| 216 | 216 | if ($wstype == 1) { |
| 217 | - $msg[0]->payload = "{\n" . |
|
| 218 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 219 | - $payload . |
|
| 217 | + $msg[0]->payload = "{\n". |
|
| 218 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 219 | + $payload. |
|
| 220 | 220 | "\n],\n\"id\": "; |
| 221 | 221 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 222 | 222 | if ($id == "") { |
@@ -229,21 +229,21 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | } else { |
| 232 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
| 233 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 234 | - $payload . |
|
| 235 | - "</params>\n" . $msg[0]->xml_footer(); |
|
| 232 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
| 233 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 234 | + $payload. |
|
| 235 | + "</params>\n".$msg[0]->xml_footer(); |
|
| 236 | 236 | } |
| 237 | - $actionname = 'Execution of method ' . $method; |
|
| 237 | + $actionname = 'Execution of method '.$method; |
|
| 238 | 238 | break; |
| 239 | 239 | default: // give a warning |
| 240 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 240 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 245 | 245 | // this gives good user feedback for long-running methods... |
| 246 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 246 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 247 | 247 | flush(); |
| 248 | 248 | |
| 249 | 249 | $response = null; |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | break; |
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | - $time = microtime(true) - $time; |
|
| 263 | + $time = microtime(true)-$time; |
|
| 264 | 264 | if ($debug) { |
| 265 | 265 | echo "</div>\n"; |
| 266 | 266 | } |
@@ -270,8 +270,8 @@ discard block |
||
| 270 | 270 | // call failed! echo out error msg! |
| 271 | 271 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 272 | 272 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 273 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 274 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 273 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 274 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 275 | 275 | echo(date("d/M/Y:H:i:s\n")); |
| 276 | 276 | } else { |
| 277 | 277 | // call succeeded: parse results |
@@ -287,36 +287,36 @@ discard block |
||
| 287 | 287 | $max = $v->count(); |
| 288 | 288 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 289 | 289 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 290 | - foreach($v as $i => $rec) { |
|
| 290 | + foreach ($v as $i => $rec) { |
|
| 291 | 291 | if ($i % 2) { |
| 292 | 292 | $class = ' class="oddrow"'; |
| 293 | 293 | } else { |
| 294 | 294 | $class = ' class="evenrow"'; |
| 295 | 295 | } |
| 296 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 297 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 298 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 299 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 300 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 301 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 302 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 296 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 297 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 298 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 299 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 300 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 301 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 302 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 320 | 320 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 321 | 321 | //echo("</tr>\n"); |
| 322 | 322 | |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | $r2 = $resp[1]->value(); |
| 344 | 344 | |
| 345 | 345 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 346 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 346 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 347 | 347 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 348 | 348 | if ($desc == "") { |
| 349 | 349 | $desc = "-"; |
@@ -353,24 +353,24 @@ discard block |
||
| 353 | 353 | if ($r2->kindOf() != "array") { |
| 354 | 354 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 355 | 355 | } else { |
| 356 | - foreach($r2 as $i => $x) { |
|
| 356 | + foreach ($r2 as $i => $x) { |
|
| 357 | 357 | $payload = ""; |
| 358 | 358 | $alt_payload = ""; |
| 359 | - if ($i + 1 % 2) { |
|
| 359 | + if ($i+1 % 2) { |
|
| 360 | 360 | $class = ' class="oddrow"'; |
| 361 | 361 | } else { |
| 362 | 362 | $class = ' class="evenrow"'; |
| 363 | 363 | } |
| 364 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 364 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 365 | 365 | if ($x->kindOf() == "array") { |
| 366 | 366 | $ret = $x[0]; |
| 367 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 368 | - if ($x->count() > 1) { |
|
| 369 | - foreach($x as $k => $y) { |
|
| 367 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 368 | + if ($x->count()>1) { |
|
| 369 | + foreach ($x as $k => $y) { |
|
| 370 | 370 | if ($k == 0) continue; |
| 371 | 371 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 372 | 372 | if ($wstype == 1) { |
| 373 | - switch($y->scalarval()) { |
|
| 373 | + switch ($y->scalarval()) { |
|
| 374 | 374 | case 'string': |
| 375 | 375 | case 'dateTime.iso8601': |
| 376 | 376 | case 'base64': |
@@ -403,22 +403,22 @@ discard block |
||
| 403 | 403 | } else { |
| 404 | 404 | $type = $y->scalarval(); |
| 405 | 405 | $payload .= '<param><value>'; |
| 406 | - switch($type) { |
|
| 406 | + switch ($type) { |
|
| 407 | 407 | case 'undefined': |
| 408 | 408 | break; |
| 409 | 409 | case 'null'; |
| 410 | 410 | $type = 'nil'; |
| 411 | 411 | // fall thru intentionally |
| 412 | 412 | default: |
| 413 | - $payload .= '<' . |
|
| 414 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 415 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 413 | + $payload .= '<'. |
|
| 414 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 415 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 416 | 416 | '>'; |
| 417 | 417 | } |
| 418 | 418 | $payload .= "</value></param>\n"; |
| 419 | 419 | } |
| 420 | 420 | $alt_payload .= $y->scalarval(); |
| 421 | - if ($k < $x->count() - 1) { |
|
| 421 | + if ($k<$x->count()-1) { |
|
| 422 | 422 | $alt_payload .= ';'; |
| 423 | 423 | if ($wstype == 1) { |
| 424 | 424 | $payload .= ', '; |
@@ -434,63 +434,63 @@ discard block |
||
| 434 | 434 | echo '</td>'; |
| 435 | 435 | // button to test this method |
| 436 | 436 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 437 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 438 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 439 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 440 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 441 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 437 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 438 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 439 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 440 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 441 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 461 | 461 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 462 | 462 | //if ($wstype != 1) { |
| 463 | 463 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 464 | 464 | //} |
| 465 | 465 | echo "</form></td>\n"; |
| 466 | 466 | |
| 467 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 468 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 469 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 470 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 471 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 472 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 473 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 474 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 475 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 476 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 477 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 478 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 479 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 480 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 481 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 482 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 483 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 484 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 485 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 486 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 487 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 488 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 489 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 490 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 491 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 492 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 493 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 467 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 468 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 469 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 470 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 471 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 472 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 473 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 474 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 475 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 476 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 477 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 478 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 479 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 480 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 481 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 482 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 483 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 484 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 485 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 486 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 487 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 488 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 489 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 490 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 491 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 492 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 493 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 494 | 494 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 495 | 495 | echo "</form></td></tr>\n"; |
| 496 | 496 | } |
@@ -502,14 +502,14 @@ discard block |
||
| 502 | 502 | case 'wrap': |
| 503 | 503 | $r1 = $resp[0]->value(); |
| 504 | 504 | $r2 = $resp[1]->value(); |
| 505 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 505 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 506 | 506 | echo "Error: signature unknown\n"; |
| 507 | 507 | } else { |
| 508 | 508 | $mdesc = $r1->scalarval(); |
| 509 | 509 | $encoder = new PhpXmlRpc\Encoder(); |
| 510 | 510 | $msig = $encoder->decode($r2); |
| 511 | 511 | $msig = $msig[$methodsig]; |
| 512 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 512 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 513 | 513 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 514 | 514 | $clientcookies == '') { |
| 515 | 515 | $opts = 1; // simple client copy in stub code |
@@ -530,12 +530,12 @@ discard block |
||
| 530 | 530 | $client, |
| 531 | 531 | $method, |
| 532 | 532 | array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true), |
| 533 | - str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc |
|
| 533 | + str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc |
|
| 534 | 534 | ); |
| 535 | 535 | //if ($code) |
| 536 | 536 | //{ |
| 537 | 537 | echo "<div id=\"phpcode\">\n"; |
| 538 | - highlight_string("<?php\n" . $code['docstring'] . $code['source']); |
|
| 538 | + highlight_string("<?php\n".$code['docstring'].$code['source']); |
|
| 539 | 539 | echo "\n</div>"; |
| 540 | 540 | //} |
| 541 | 541 | //else |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | break; |
| 547 | 547 | |
| 548 | 548 | case 'execute': |
| 549 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 549 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 550 | 550 | break; |
| 551 | 551 | |
| 552 | 552 | default: // give a warning |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | // assume this is either a standalone install, or installed as Composer dependency |
| 21 | 21 | /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level |
| 22 | 22 | /// debugger include this one, taking care of autoloading? |
| 23 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
| 23 | + include_once __DIR__."/../src/Autoloader.php"; |
|
| 24 | 24 | PhpXmlRpc\Autoloader::register(); |
| 25 | 25 | } |
| 26 | 26 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | // Variables that shouldn't be unset |
| 37 | - $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 37 | + $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
| 38 | 38 | |
| 39 | 39 | $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, |
| 40 | 40 | isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array() |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $id = ''; |
| 87 | 87 | if (isset($_GET['action'])) { |
| 88 | 88 | if (isset($_GET['wstype']) && ($_GET['wstype'] == '1' || $_GET['wstype'] == '0')) { |
| 89 | - $wstype = (int)$_GET['wstype']; |
|
| 89 | + $wstype = (int) $_GET['wstype']; |
|
| 90 | 90 | if ($wstype === 1 && !$hasjsonrpcclient) { |
| 91 | 91 | $wstype = 0; |
| 92 | 92 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xml-rpc error... |
| 98 | 98 | if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2' || $_GET['protocol'] == '3' |
| 99 | 99 | || $_GET['protocol'] == '4')) { |
| 100 | - $protocol = (int)$_GET['protocol']; |
|
| 100 | + $protocol = (int) $_GET['protocol']; |
|
| 101 | 101 | } |
| 102 | 102 | if (strpos($host, 'http://') === 0) { |
| 103 | 103 | // NB: if protocol is https or h2, it will override http:// |
@@ -109,18 +109,18 @@ discard block |
||
| 109 | 109 | $protocol = 2; |
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | - $port = isset($_GET['port']) ? (int)$_GET['port'] : ''; |
|
| 112 | + $port = isset($_GET['port']) ? (int) $_GET['port'] : ''; |
|
| 113 | 113 | if ($port === 0) { |
| 114 | 114 | $port = ''; |
| 115 | 115 | } |
| 116 | 116 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
| 117 | 117 | // in case user forgot initial '/' in xml-rpc server path, add it back |
| 118 | 118 | if ($path && ($path[0]) != '/') { |
| 119 | - $path = '/' . $path; |
|
| 119 | + $path = '/'.$path; |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
| 123 | - $debug = (int)$_GET['debug']; |
|
| 123 | + $debug = (int) $_GET['debug']; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0; |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | /// @todo what about an https proxy? |
| 138 | 138 | $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : ''; |
| 139 | 139 | $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : ''; |
| 140 | - $timeout = isset($_GET['timeout']) ? (int)$_GET['timeout'] : 0; |
|
| 140 | + $timeout = isset($_GET['timeout']) ? (int) $_GET['timeout'] : 0; |
|
| 141 | 141 | $action = $_GET['action']; |
| 142 | 142 | |
| 143 | 143 | $method = isset($_GET['method']) ? $_GET['method'] : ''; |
@@ -152,15 +152,15 @@ discard block |
||
| 152 | 152 | $username = isset($_GET['username']) ? $_GET['username'] : ''; |
| 153 | 153 | $password = isset($_GET['password']) ? $_GET['password'] : ''; |
| 154 | 154 | |
| 155 | - $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int)$_GET['authtype'] : 1; |
|
| 155 | + $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int) $_GET['authtype'] : 1; |
|
| 156 | 156 | |
| 157 | 157 | if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) { |
| 158 | - (int)$requestcompression = $_GET['requestcompression']; |
|
| 158 | + (int) $requestcompression = $_GET['requestcompression']; |
|
| 159 | 159 | } else { |
| 160 | 160 | $requestcompression = 0; |
| 161 | 161 | } |
| 162 | 162 | if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) { |
| 163 | - $responsecompression = (int)$_GET['responsecompression']; |
|
| 163 | + $responsecompression = (int) $_GET['responsecompression']; |
|
| 164 | 164 | } else { |
| 165 | 165 | $responsecompression = 0; |
| 166 | 166 | } |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | */ |
| 242 | 242 | public static function xmlrpc_debugmsg($msg) |
| 243 | 243 | { |
| 244 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
| 244 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | /** |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | */ |
| 254 | 254 | public static function error_occurred($msg) |
| 255 | 255 | { |
| 256 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
| 256 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | /** |
@@ -274,10 +274,10 @@ discard block |
||
| 274 | 274 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
| 275 | 275 | $out = ''; |
| 276 | 276 | if ($this->debug_info != '') { |
| 277 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
| 277 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
| 278 | 278 | } |
| 279 | 279 | if (static::$_xmlrpc_debuginfo != '') { |
| 280 | - $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
| 280 | + $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
| 281 | 281 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
| 282 | 282 | // into return payload AFTER the beginning tag |
| 283 | 283 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -306,8 +306,8 @@ discard block |
||
| 306 | 306 | $this->debug_info = ''; |
| 307 | 307 | |
| 308 | 308 | // Save what we received, before parsing it |
| 309 | - if ($this->debug > 1) { |
|
| 310 | - $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
| 309 | + if ($this->debug>1) { |
|
| 310 | + $this->debugmsg("+++GOT+++\n".$data."\n+++END+++"); |
|
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | $resp = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -324,14 +324,14 @@ discard block |
||
| 324 | 324 | $resp->raw_data = $rawData; |
| 325 | 325 | } |
| 326 | 326 | |
| 327 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') { |
|
| 328 | - $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
| 329 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
| 327 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') { |
|
| 328 | + $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
| 329 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | $payload = $this->xml_header($respCharset); |
| 333 | - if ($this->debug > 0) { |
|
| 334 | - $payload = $payload . $this->serializeDebug($respCharset); |
|
| 333 | + if ($this->debug>0) { |
|
| 334 | + $payload = $payload.$this->serializeDebug($respCharset); |
|
| 335 | 335 | } |
| 336 | 336 | |
| 337 | 337 | // Do not create response serialization if it has already happened. Helps to build json magic |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | if (empty($resp->payload)) { |
| 340 | 340 | $resp->serialize($respCharset); |
| 341 | 341 | } |
| 342 | - $payload = $payload . $resp->payload; |
|
| 342 | + $payload = $payload.$resp->payload; |
|
| 343 | 343 | |
| 344 | 344 | if ($returnPayload) { |
| 345 | 345 | return $payload; |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | // if we get a warning/error that has output some text before here, then we cannot |
| 349 | 349 | // add a new header. We cannot say we are sending xml, either... |
| 350 | 350 | if (!headers_sent()) { |
| 351 | - header('Content-Type: ' . $resp->content_type); |
|
| 351 | + header('Content-Type: '.$resp->content_type); |
|
| 352 | 352 | // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did |
| 353 | 353 | header("Vary: Accept-Charset"); |
| 354 | 354 | |
@@ -371,10 +371,10 @@ discard block |
||
| 371 | 371 | // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for |
| 372 | 372 | // responses up to 8000 bytes |
| 373 | 373 | if ($phpNoSelfCompress) { |
| 374 | - header('Content-Length: ' . (int)strlen($payload)); |
|
| 374 | + header('Content-Length: '.(int) strlen($payload)); |
|
| 375 | 375 | } |
| 376 | 376 | } else { |
| 377 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 377 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | print $payload; |
@@ -432,9 +432,9 @@ discard block |
||
| 432 | 432 | $numParams = count($in); |
| 433 | 433 | } |
| 434 | 434 | foreach ($sigs as $curSig) { |
| 435 | - if (count($curSig) == $numParams + 1) { |
|
| 435 | + if (count($curSig) == $numParams+1) { |
|
| 436 | 436 | $itsOK = 1; |
| 437 | - for ($n = 0; $n < $numParams; $n++) { |
|
| 437 | + for ($n = 0; $n<$numParams; $n++) { |
|
| 438 | 438 | if (is_object($in)) { |
| 439 | 439 | $p = $in->getParam($n); |
| 440 | 440 | if ($p->kindOf() == 'scalar') { |
@@ -447,10 +447,10 @@ discard block |
||
| 447 | 447 | } |
| 448 | 448 | |
| 449 | 449 | // param index is $n+1, as first member of sig is return type |
| 450 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
| 450 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
| 451 | 451 | $itsOK = 0; |
| 452 | - $pno = $n + 1; |
|
| 453 | - $wanted = $curSig[$n + 1]; |
|
| 452 | + $pno = $n+1; |
|
| 453 | + $wanted = $curSig[$n+1]; |
|
| 454 | 454 | $got = $pt; |
| 455 | 455 | break; |
| 456 | 456 | } |
@@ -477,10 +477,10 @@ discard block |
||
| 477 | 477 | // check if $_SERVER is populated: it might have been disabled via ini file |
| 478 | 478 | // (this is true even when in CLI mode) |
| 479 | 479 | if (count($_SERVER) == 0) { |
| 480 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
| 480 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
| 481 | 481 | } |
| 482 | 482 | |
| 483 | - if ($this->debug > 1) { |
|
| 483 | + if ($this->debug>1) { |
|
| 484 | 484 | if (function_exists('getallheaders')) { |
| 485 | 485 | $this->debugmsg(''); // empty line |
| 486 | 486 | foreach (getallheaders() as $name => $val) { |
@@ -505,13 +505,13 @@ discard block |
||
| 505 | 505 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
| 506 | 506 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 507 | 507 | $data = $degzdata; |
| 508 | - if ($this->debug > 1) { |
|
| 509 | - $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 508 | + if ($this->debug>1) { |
|
| 509 | + $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 510 | 510 | } |
| 511 | 511 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 512 | 512 | $data = $degzdata; |
| 513 | - if ($this->debug > 1) { |
|
| 514 | - $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 513 | + if ($this->debug>1) { |
|
| 514 | + $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 515 | 515 | } |
| 516 | 516 | } else { |
| 517 | 517 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -598,7 +598,7 @@ discard block |
||
| 598 | 598 | if ($reqEncoding == 'ISO-8859-1') { |
| 599 | 599 | $data = utf8_encode($data); |
| 600 | 600 | } else { |
| 601 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': unsupported charset encoding of received request: ' . $reqEncoding); |
|
| 601 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': unsupported charset encoding of received request: '.$reqEncoding); |
|
| 602 | 602 | } |
| 603 | 603 | } |
| 604 | 604 | } |
@@ -625,7 +625,7 @@ discard block |
||
| 625 | 625 | preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches); |
| 626 | 626 | return new Response( |
| 627 | 627 | 0, |
| 628 | - PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1], |
|
| 628 | + PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1], |
|
| 629 | 629 | $xmlRpcParser->_xh['isf_reason']); |
| 630 | 630 | } elseif ($xmlRpcParser->_xh['isf']) { |
| 631 | 631 | /// @todo separate better the various cases, as we have done in Request::parseResponse: invalid xml-rpc, |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | return new Response( |
| 634 | 634 | 0, |
| 635 | 635 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
| 636 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']); |
|
| 636 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']); |
|
| 637 | 637 | } else { |
| 638 | 638 | // small layering violation in favor of speed and memory usage: we should allow the 'execute' method handle |
| 639 | 639 | // this, but in the most common scenario (xml-rpc values type server with some methods registered as phpvals) |
@@ -643,20 +643,20 @@ discard block |
||
| 643 | 643 | ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals') |
| 644 | 644 | ) |
| 645 | 645 | ) { |
| 646 | - if ($this->debug > 1) { |
|
| 647 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++"); |
|
| 646 | + if ($this->debug>1) { |
|
| 647 | + $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++"); |
|
| 648 | 648 | } |
| 649 | 649 | |
| 650 | 650 | return $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']); |
| 651 | 651 | } else { |
| 652 | 652 | // build a Request object with data parsed from xml and add parameters in |
| 653 | 653 | $req = new Request($xmlRpcParser->_xh['method']); |
| 654 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
| 654 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
| 655 | 655 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
| 656 | 656 | } |
| 657 | 657 | |
| 658 | - if ($this->debug > 1) { |
|
| 659 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
| 658 | + if ($this->debug>1) { |
|
| 659 | + $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
| 660 | 660 | } |
| 661 | 661 | |
| 662 | 662 | return $this->execute($req); |
@@ -708,7 +708,7 @@ discard block |
||
| 708 | 708 | return new Response( |
| 709 | 709 | 0, |
| 710 | 710 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 711 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}" |
|
| 711 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}" |
|
| 712 | 712 | ); |
| 713 | 713 | } |
| 714 | 714 | } |
@@ -723,7 +723,7 @@ discard block |
||
| 723 | 723 | // build string representation of function 'name' |
| 724 | 724 | if (is_array($func)) { |
| 725 | 725 | if (is_object($func[0])) { |
| 726 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
| 726 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
| 727 | 727 | } else { |
| 728 | 728 | $funcName = implode('::', $func); |
| 729 | 729 | } |
@@ -735,17 +735,17 @@ discard block |
||
| 735 | 735 | |
| 736 | 736 | // verify that function to be invoked is in fact callable |
| 737 | 737 | if (!is_callable($func)) { |
| 738 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
| 738 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
| 739 | 739 | return new Response( |
| 740 | 740 | 0, |
| 741 | 741 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 742 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
| 742 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
| 743 | 743 | ); |
| 744 | 744 | } |
| 745 | 745 | |
| 746 | 746 | // If debug level is 3, we should catch all errors generated during processing of user function, and log them |
| 747 | 747 | // as part of response |
| 748 | - if ($this->debug > 2) { |
|
| 748 | + if ($this->debug>2) { |
|
| 749 | 749 | self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler')); |
| 750 | 750 | } |
| 751 | 751 | |
@@ -759,14 +759,14 @@ discard block |
||
| 759 | 759 | $r = call_user_func($func, $req); |
| 760 | 760 | } |
| 761 | 761 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
| 762 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
| 762 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
| 763 | 763 | if (is_a($r, 'PhpXmlRpc\Value')) { |
| 764 | 764 | $r = new Response($r); |
| 765 | 765 | } else { |
| 766 | 766 | $r = new Response( |
| 767 | 767 | 0, |
| 768 | 768 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 769 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
| 769 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
| 770 | 770 | ); |
| 771 | 771 | } |
| 772 | 772 | } |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | $r = call_user_func_array($func, array($methodName, $params, $this->user_data)); |
| 782 | 782 | // mimic EPI behaviour: if we get an array that looks like an error, make it an error response |
| 783 | 783 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
| 784 | - $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
| 784 | + $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
| 785 | 785 | } else { |
| 786 | 786 | // functions using EPI api should NOT return resp objects, so make sure we encode the |
| 787 | 787 | // return type correctly |
@@ -805,7 +805,7 @@ discard block |
||
| 805 | 805 | // proper error-response |
| 806 | 806 | switch ($this->exception_handling) { |
| 807 | 807 | case 2: |
| 808 | - if ($this->debug > 2) { |
|
| 808 | + if ($this->debug>2) { |
|
| 809 | 809 | if (self::$_xmlrpcs_prev_ehandler) { |
| 810 | 810 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
| 811 | 811 | } else { |
@@ -828,7 +828,7 @@ discard block |
||
| 828 | 828 | // proper error-response |
| 829 | 829 | switch ($this->exception_handling) { |
| 830 | 830 | case 2: |
| 831 | - if ($this->debug > 2) { |
|
| 831 | + if ($this->debug>2) { |
|
| 832 | 832 | if (self::$_xmlrpcs_prev_ehandler) { |
| 833 | 833 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
| 834 | 834 | } else { |
@@ -848,7 +848,7 @@ discard block |
||
| 848 | 848 | } |
| 849 | 849 | } |
| 850 | 850 | |
| 851 | - if ($this->debug > 2) { |
|
| 851 | + if ($this->debug>2) { |
|
| 852 | 852 | // note: restore the error handler we found before calling the user func, even if it has been changed |
| 853 | 853 | // inside the func itself |
| 854 | 854 | if (self::$_xmlrpcs_prev_ehandler) { |
@@ -914,7 +914,7 @@ discard block |
||
| 914 | 914 | */ |
| 915 | 915 | protected function debugmsg($string) |
| 916 | 916 | { |
| 917 | - $this->debug_info .= $string . "\n"; |
|
| 917 | + $this->debug_info .= $string."\n"; |
|
| 918 | 918 | } |
| 919 | 919 | |
| 920 | 920 | /** |
@@ -924,9 +924,9 @@ discard block |
||
| 924 | 924 | protected function xml_header($charsetEncoding = '') |
| 925 | 925 | { |
| 926 | 926 | if ($charsetEncoding != '') { |
| 927 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 927 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 928 | 928 | } else { |
| 929 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 929 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 930 | 930 | } |
| 931 | 931 | } |
| 932 | 932 | |
@@ -1219,7 +1219,7 @@ discard block |
||
| 1219 | 1219 | $i++; // for error message, we count params from 1 |
| 1220 | 1220 | return static::_xmlrpcs_multicall_error(new Response(0, |
| 1221 | 1221 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 1222 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
| 1222 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
| 1223 | 1223 | } |
| 1224 | 1224 | } |
| 1225 | 1225 | |
@@ -1300,7 +1300,7 @@ discard block |
||
| 1300 | 1300 | } |
| 1301 | 1301 | } else { |
| 1302 | 1302 | $numCalls = count($req); |
| 1303 | - for ($i = 0; $i < $numCalls; $i++) { |
|
| 1303 | + for ($i = 0; $i<$numCalls; $i++) { |
|
| 1304 | 1304 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
| 1305 | 1305 | } |
| 1306 | 1306 | } |
@@ -190,20 +190,20 @@ discard block |
||
| 190 | 190 | $callable = explode('::', $callable); |
| 191 | 191 | } |
| 192 | 192 | if (is_array($callable)) { |
| 193 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 194 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 193 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 194 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 195 | 195 | return false; |
| 196 | 196 | } |
| 197 | 197 | if (is_string($callable[0])) { |
| 198 | 198 | $plainFuncName = implode('::', $callable); |
| 199 | 199 | } elseif (is_object($callable[0])) { |
| 200 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 200 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 201 | 201 | } |
| 202 | 202 | $exists = method_exists($callable[0], $callable[1]); |
| 203 | 203 | } else if ($callable instanceof \Closure) { |
| 204 | 204 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 205 | 205 | if (!$buildIt) { |
| 206 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 206 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 207 | 207 | return false; |
| 208 | 208 | } |
| 209 | 209 | |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | if (!$exists) { |
| 218 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 218 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 219 | 219 | return false; |
| 220 | 220 | } |
| 221 | 221 | |
@@ -259,23 +259,23 @@ discard block |
||
| 259 | 259 | if (is_array($callable)) { |
| 260 | 260 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 261 | 261 | if ($func->isPrivate()) { |
| 262 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 262 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 263 | 263 | return false; |
| 264 | 264 | } |
| 265 | 265 | if ($func->isProtected()) { |
| 266 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 266 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 267 | 267 | return false; |
| 268 | 268 | } |
| 269 | 269 | if ($func->isConstructor()) { |
| 270 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 270 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 271 | 271 | return false; |
| 272 | 272 | } |
| 273 | 273 | if ($func->isDestructor()) { |
| 274 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 274 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 275 | 275 | return false; |
| 276 | 276 | } |
| 277 | 277 | if ($func->isAbstract()) { |
| 278 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 278 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 279 | 279 | return false; |
| 280 | 280 | } |
| 281 | 281 | /// @todo add more checks for static vs. nonstatic? |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | if ($func->isInternal()) { |
| 286 | 286 | /// @todo from PHP 5.1.0 onward, we should be able to use invokeargs instead of getparameters to fully |
| 287 | 287 | /// reflect internal php functions |
| 288 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 288 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 289 | 289 | return false; |
| 290 | 290 | } |
| 291 | 291 | |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | $i = 0; |
| 338 | 338 | foreach ($func->getParameters() as $paramObj) { |
| 339 | 339 | $params[$i] = array(); |
| 340 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 340 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 341 | 341 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 342 | 342 | $i++; |
| 343 | 343 | } |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | // build a signature |
| 402 | 402 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 403 | 403 | $pSig = array($funcDesc['returnsDocs']); |
| 404 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 404 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 405 | 405 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 406 | 406 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 407 | 407 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -457,7 +457,7 @@ discard block |
||
| 457 | 457 | } |
| 458 | 458 | } |
| 459 | 459 | $numPars = $req->getNumParams(); |
| 460 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 460 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 461 | 461 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 462 | 462 | } |
| 463 | 463 | |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | |
| 471 | 471 | $result = call_user_func_array($callable, $params); |
| 472 | 472 | |
| 473 | - if (! is_a($result, $responseClass)) { |
|
| 473 | + if (!is_a($result, $responseClass)) { |
|
| 474 | 474 | // q: why not do the same for int, float, bool, string? |
| 475 | 475 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 476 | 476 | $result = new $valueClass($result, $funcDesc['returns']); |
@@ -509,9 +509,9 @@ discard block |
||
| 509 | 509 | if ($newFuncName == '') { |
| 510 | 510 | if (is_array($callable)) { |
| 511 | 511 | if (is_string($callable[0])) { |
| 512 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 512 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 513 | 513 | } else { |
| 514 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 514 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 515 | 515 | } |
| 516 | 516 | } else { |
| 517 | 517 | if ($callable instanceof \Closure) { |
@@ -543,9 +543,9 @@ discard block |
||
| 543 | 543 | */ |
| 544 | 544 | protected function buildWrapFunctionSource($callable, $newFuncName, $extraOptions, $plainFuncName, $funcDesc) |
| 545 | 545 | { |
| 546 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 547 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 548 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 546 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 547 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 548 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 549 | 549 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 550 | 550 | |
| 551 | 551 | $i = 0; |
@@ -580,9 +580,9 @@ discard block |
||
| 580 | 580 | // build body of new function |
| 581 | 581 | |
| 582 | 582 | $innerCode = " \$paramCount = \$req->getNumParams();\n"; |
| 583 | - $innerCode .= " if (\$paramCount < $minPars || \$paramCount > $maxPars) return new " . static::$namespace . "Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 583 | + $innerCode .= " if (\$paramCount < $minPars || \$paramCount > $maxPars) return new ".static::$namespace."Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 584 | 584 | |
| 585 | - $innerCode .= " \$encoder = new " . static::$namespace . "Encoder();\n"; |
|
| 585 | + $innerCode .= " \$encoder = new ".static::$namespace."Encoder();\n"; |
|
| 586 | 586 | if ($decodePhpObjects) { |
| 587 | 587 | $innerCode .= " \$params = \$encoder->decode(\$req, array('decode_php_objs'));\n"; |
| 588 | 588 | } else { |
@@ -595,23 +595,23 @@ discard block |
||
| 595 | 595 | static::holdObject($newFuncName, $callable[0]); |
| 596 | 596 | $class = get_class($callable[0]); |
| 597 | 597 | if ($class[0] !== '\\') { |
| 598 | - $class = '\\' . $class; |
|
| 598 | + $class = '\\'.$class; |
|
| 599 | 599 | } |
| 600 | 600 | $innerCode .= " /// @var $class \$obj\n"; |
| 601 | 601 | $innerCode .= " \$obj = PhpXmlRpc\\Wrapper::getHeldObject('$newFuncName');\n"; |
| 602 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 602 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 603 | 603 | } else { |
| 604 | 604 | $realFuncName = $plainFuncName; |
| 605 | 605 | } |
| 606 | 606 | foreach ($parsVariations as $i => $pars) { |
| 607 | - $innerCode .= " if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 608 | - if ($i < (count($parsVariations) - 1)) |
|
| 607 | + $innerCode .= " if (\$paramCount == ".count($pars).") \$retVal = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 608 | + if ($i<(count($parsVariations)-1)) |
|
| 609 | 609 | $innerCode .= " else\n"; |
| 610 | 610 | } |
| 611 | - $innerCode .= " if (is_a(\$retVal, '" . static::$namespace . "Response'))\n return \$retVal;\n else\n"; |
|
| 611 | + $innerCode .= " if (is_a(\$retVal, '".static::$namespace."Response'))\n return \$retVal;\n else\n"; |
|
| 612 | 612 | /// q: why not do the same for int, float, bool, string? |
| 613 | 613 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 614 | - $innerCode .= " return new " . static::$namespace . "Response(new " . static::$namespace . "Value(\$retVal, '{$funcDesc['returns']}'));"; |
|
| 614 | + $innerCode .= " return new ".static::$namespace."Response(new ".static::$namespace."Value(\$retVal, '{$funcDesc['returns']}'));"; |
|
| 615 | 615 | } else { |
| 616 | 616 | $encodeOptions = array(); |
| 617 | 617 | if ($encodeNulls) { |
@@ -622,18 +622,18 @@ discard block |
||
| 622 | 622 | } |
| 623 | 623 | |
| 624 | 624 | if ($encodeOptions) { |
| 625 | - $innerCode .= " return new " . static::$namespace . "Response(\$encoder->encode(\$retVal, array('" . |
|
| 626 | - implode("', '", $encodeOptions) . "')));"; |
|
| 625 | + $innerCode .= " return new ".static::$namespace."Response(\$encoder->encode(\$retVal, array('". |
|
| 626 | + implode("', '", $encodeOptions)."')));"; |
|
| 627 | 627 | } else { |
| 628 | - $innerCode .= " return new " . static::$namespace . "Response(\$encoder->encode(\$retVal));"; |
|
| 628 | + $innerCode .= " return new ".static::$namespace."Response(\$encoder->encode(\$retVal));"; |
|
| 629 | 629 | } |
| 630 | 630 | } |
| 631 | 631 | // shall we exclude functions returning by ref? |
| 632 | 632 | // if ($func->returnsReference()) |
| 633 | 633 | // return false; |
| 634 | 634 | |
| 635 | - $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n" . |
|
| 636 | - "function $newFuncName(\$req)\n{\n" . $innerCode . "\n}"; |
|
| 635 | + $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n". |
|
| 636 | + "function $newFuncName(\$req)\n{\n".$innerCode."\n}"; |
|
| 637 | 637 | |
| 638 | 638 | return $code; |
| 639 | 639 | } |
@@ -687,7 +687,7 @@ discard block |
||
| 687 | 687 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 688 | 688 | { |
| 689 | 689 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 690 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 690 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 691 | 691 | } |
| 692 | 692 | |
| 693 | 693 | if (is_object($className)) { |
@@ -695,7 +695,7 @@ discard block |
||
| 695 | 695 | } else { |
| 696 | 696 | $realClassName = $className; |
| 697 | 697 | } |
| 698 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 698 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 699 | 699 | } |
| 700 | 700 | |
| 701 | 701 | /** |
@@ -778,21 +778,21 @@ discard block |
||
| 778 | 778 | */ |
| 779 | 779 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 780 | 780 | { |
| 781 | - $reqClass = static::$namespace . 'Request'; |
|
| 782 | - $valClass = static::$namespace . 'Value'; |
|
| 783 | - $decoderClass = static::$namespace . 'Encoder'; |
|
| 781 | + $reqClass = static::$namespace.'Request'; |
|
| 782 | + $valClass = static::$namespace.'Value'; |
|
| 783 | + $decoderClass = static::$namespace.'Encoder'; |
|
| 784 | 784 | |
| 785 | 785 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 786 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 786 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 787 | 787 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 788 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 788 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 789 | 789 | |
| 790 | 790 | $req = new $reqClass('system.methodSignature'); |
| 791 | 791 | $req->addparam(new $valClass($methodName)); |
| 792 | 792 | $client->setDebug($debug); |
| 793 | 793 | $response = $client->send($req, $timeout, $protocol); |
| 794 | 794 | if ($response->faultCode()) { |
| 795 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 795 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 796 | 796 | return false; |
| 797 | 797 | } |
| 798 | 798 | |
@@ -803,8 +803,8 @@ discard block |
||
| 803 | 803 | $mSig = $decoder->decode($mSig); |
| 804 | 804 | } |
| 805 | 805 | |
| 806 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 807 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 806 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 807 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 808 | 808 | return false; |
| 809 | 809 | } |
| 810 | 810 | |
@@ -819,11 +819,11 @@ discard block |
||
| 819 | 819 | */ |
| 820 | 820 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 821 | 821 | { |
| 822 | - $reqClass = static::$namespace . 'Request'; |
|
| 823 | - $valClass = static::$namespace . 'Value'; |
|
| 822 | + $reqClass = static::$namespace.'Request'; |
|
| 823 | + $valClass = static::$namespace.'Value'; |
|
| 824 | 824 | |
| 825 | 825 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 826 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 826 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 827 | 827 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 828 | 828 | |
| 829 | 829 | $mDesc = ''; |
@@ -857,11 +857,11 @@ discard block |
||
| 857 | 857 | $clientClone = clone $client; |
| 858 | 858 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 859 | 859 | { |
| 860 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 860 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 861 | 861 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 862 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 863 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 864 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 862 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 863 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 864 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 865 | 865 | $throwFault = false; |
| 866 | 866 | $decodeFault = false; |
| 867 | 867 | $faultResponse = null; |
@@ -872,9 +872,9 @@ discard block |
||
| 872 | 872 | $faultResponse = $extraOptions['return_on_fault']; |
| 873 | 873 | } |
| 874 | 874 | |
| 875 | - $reqClass = static::$namespace . 'Request'; |
|
| 876 | - $encoderClass = static::$namespace . 'Encoder'; |
|
| 877 | - $valueClass = static::$namespace . 'Value'; |
|
| 875 | + $reqClass = static::$namespace.'Request'; |
|
| 876 | + $encoderClass = static::$namespace.'Encoder'; |
|
| 877 | + $valueClass = static::$namespace.'Value'; |
|
| 878 | 878 | |
| 879 | 879 | $encoder = new $encoderClass(); |
| 880 | 880 | $encodeOptions = array(); |
@@ -956,14 +956,14 @@ discard block |
||
| 956 | 956 | * @param string $mDesc |
| 957 | 957 | * @return string[] keys: source, docstring |
| 958 | 958 | */ |
| 959 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 959 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 960 | 960 | { |
| 961 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 961 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 962 | 962 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 963 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 964 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 965 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 966 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 963 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 964 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 965 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 966 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 967 | 967 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 968 | 968 | $throwFault = false; |
| 969 | 969 | $decodeFault = false; |
@@ -976,10 +976,10 @@ discard block |
||
| 976 | 976 | } |
| 977 | 977 | |
| 978 | 978 | $code = "function $newFuncName("; |
| 979 | - if ($clientCopyMode < 2) { |
|
| 979 | + if ($clientCopyMode<2) { |
|
| 980 | 980 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 981 | 981 | $verbatimClientCopy = !$clientCopyMode; |
| 982 | - $innerCode = ' ' . str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 982 | + $innerCode = ' '.str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 983 | 983 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
| 984 | 984 | $this_ = ''; |
| 985 | 985 | } else { |
@@ -987,28 +987,28 @@ discard block |
||
| 987 | 987 | $innerCode = ''; |
| 988 | 988 | $this_ = 'this->'; |
| 989 | 989 | } |
| 990 | - $innerCode .= " \$req = new " . static::$namespace . "Request('$methodName');\n"; |
|
| 990 | + $innerCode .= " \$req = new ".static::$namespace."Request('$methodName');\n"; |
|
| 991 | 991 | |
| 992 | 992 | if ($mDesc != '') { |
| 993 | 993 | // take care that PHP comment is not terminated unwillingly by method description |
| 994 | 994 | /// @todo according to the spec, method desc can have html in it. We should run it through strip_tags... |
| 995 | - $mDesc = "/**\n * " . str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc) . "\n"; |
|
| 995 | + $mDesc = "/**\n * ".str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc)."\n"; |
|
| 996 | 996 | } else { |
| 997 | 997 | $mDesc = "/**\n * Function $newFuncName.\n"; |
| 998 | 998 | } |
| 999 | 999 | |
| 1000 | 1000 | // param parsing |
| 1001 | - $innerCode .= " \$encoder = new " . static::$namespace . "Encoder();\n"; |
|
| 1001 | + $innerCode .= " \$encoder = new ".static::$namespace."Encoder();\n"; |
|
| 1002 | 1002 | $plist = array(); |
| 1003 | 1003 | $pCount = count($mSig); |
| 1004 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 1004 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 1005 | 1005 | $plist[] = "\$p$i"; |
| 1006 | 1006 | $pType = $mSig[$i]; |
| 1007 | 1007 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
| 1008 | 1008 | $pType == 'string' || $pType == 'dateTime.iso8601' || $pType == 'base64' || $pType == 'null' |
| 1009 | 1009 | ) { |
| 1010 | 1010 | // only build directly xml-rpc values when type is known and scalar |
| 1011 | - $innerCode .= " \$p$i = new " . static::$namespace . "Value(\$p$i, '$pType');\n"; |
|
| 1011 | + $innerCode .= " \$p$i = new ".static::$namespace."Value(\$p$i, '$pType');\n"; |
|
| 1012 | 1012 | } else { |
| 1013 | 1013 | if ($encodePhpObjects || $encodeNulls) { |
| 1014 | 1014 | $encOpts = array(); |
@@ -1019,26 +1019,26 @@ discard block |
||
| 1019 | 1019 | $encOpts[] = 'null_extension'; |
| 1020 | 1020 | } |
| 1021 | 1021 | |
| 1022 | - $innerCode .= " \$p$i = \$encoder->encode(\$p$i, array( '" . implode("', '", $encOpts) . "'));\n"; |
|
| 1022 | + $innerCode .= " \$p$i = \$encoder->encode(\$p$i, array( '".implode("', '", $encOpts)."'));\n"; |
|
| 1023 | 1023 | } else { |
| 1024 | 1024 | $innerCode .= " \$p$i = \$encoder->encode(\$p$i);\n"; |
| 1025 | 1025 | } |
| 1026 | 1026 | } |
| 1027 | 1027 | $innerCode .= " \$req->addparam(\$p$i);\n"; |
| 1028 | - $mDesc .= " * @param " . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 1028 | + $mDesc .= " * @param ".$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 1029 | 1029 | } |
| 1030 | - if ($clientCopyMode < 2) { |
|
| 1030 | + if ($clientCopyMode<2) { |
|
| 1031 | 1031 | $plist[] = '$debug = 0'; |
| 1032 | 1032 | $mDesc .= " * @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 1033 | 1033 | } |
| 1034 | 1034 | $plist = implode(', ', $plist); |
| 1035 | - $mDesc .= ' * @return ' . $this->xmlrpc2PhpType($mSig[0]); |
|
| 1035 | + $mDesc .= ' * @return '.$this->xmlrpc2PhpType($mSig[0]); |
|
| 1036 | 1036 | if ($throwFault) { |
| 1037 | - $mDesc .= "\n * @throws " . (is_string($throwFault) ? $throwFault : '\\Exception'); |
|
| 1037 | + $mDesc .= "\n * @throws ".(is_string($throwFault) ? $throwFault : '\\Exception'); |
|
| 1038 | 1038 | } else if ($decodeFault) { |
| 1039 | - $mDesc .= '|' . gettype($faultResponse) . " (a " . gettype($faultResponse) . " if call fails)"; |
|
| 1039 | + $mDesc .= '|'.gettype($faultResponse)." (a ".gettype($faultResponse)." if call fails)"; |
|
| 1040 | 1040 | } else { |
| 1041 | - $mDesc .= '|' . static::$namespace . "Response (a " . static::$namespace . "Response obj instance if call fails)"; |
|
| 1041 | + $mDesc .= '|'.static::$namespace."Response (a ".static::$namespace."Response obj instance if call fails)"; |
|
| 1042 | 1042 | } |
| 1043 | 1043 | $mDesc .= "\n */\n"; |
| 1044 | 1044 | |
@@ -1050,9 +1050,9 @@ discard block |
||
| 1050 | 1050 | $respCode = "throw new $throwFault(\$res->faultString(), \$res->faultCode())"; |
| 1051 | 1051 | } else if ($decodeFault) { |
| 1052 | 1052 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 1053 | - $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 1053 | + $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 1054 | 1054 | } else { |
| 1055 | - $respCode = 'return ' . var_export($faultResponse, true); |
|
| 1055 | + $respCode = 'return '.var_export($faultResponse, true); |
|
| 1056 | 1056 | } |
| 1057 | 1057 | } else { |
| 1058 | 1058 | $respCode = 'return $res'; |
@@ -1063,7 +1063,7 @@ discard block |
||
| 1063 | 1063 | $innerCode .= " if (\$res->faultCode()) $respCode; else return \$encoder->decode(\$res->value());"; |
| 1064 | 1064 | } |
| 1065 | 1065 | |
| 1066 | - $code = $code . $plist . ")\n{\n" . $innerCode . "\n}\n"; |
|
| 1066 | + $code = $code.$plist.")\n{\n".$innerCode."\n}\n"; |
|
| 1067 | 1067 | |
| 1068 | 1068 | return array('source' => $code, 'docstring' => $mDesc); |
| 1069 | 1069 | } |
@@ -1090,25 +1090,25 @@ discard block |
||
| 1090 | 1090 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1091 | 1091 | { |
| 1092 | 1092 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1093 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1093 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1094 | 1094 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1095 | 1095 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1096 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 1097 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1098 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1096 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 1097 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1098 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1099 | 1099 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1100 | - $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool)$extraOptions['throw_on_fault'] : false; |
|
| 1100 | + $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool) $extraOptions['throw_on_fault'] : false; |
|
| 1101 | 1101 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1102 | 1102 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1103 | 1103 | |
| 1104 | - $reqClass = static::$namespace . 'Request'; |
|
| 1105 | - $decoderClass = static::$namespace . 'Encoder'; |
|
| 1104 | + $reqClass = static::$namespace.'Request'; |
|
| 1105 | + $decoderClass = static::$namespace.'Encoder'; |
|
| 1106 | 1106 | |
| 1107 | 1107 | // retrieve the list of methods |
| 1108 | 1108 | $req = new $reqClass('system.listMethods'); |
| 1109 | 1109 | $response = $client->send($req, $timeout, $protocol); |
| 1110 | 1110 | if ($response->faultCode()) { |
| 1111 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1111 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1112 | 1112 | |
| 1113 | 1113 | return false; |
| 1114 | 1114 | } |
@@ -1119,7 +1119,7 @@ discard block |
||
| 1119 | 1119 | $mList = $decoder->decode($mList); |
| 1120 | 1120 | } |
| 1121 | 1121 | if (!is_array($mList) || !count($mList)) { |
| 1122 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1122 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1123 | 1123 | |
| 1124 | 1124 | return false; |
| 1125 | 1125 | } |
@@ -1128,8 +1128,8 @@ discard block |
||
| 1128 | 1128 | if ($newClassName != '') { |
| 1129 | 1129 | $xmlrpcClassName = $newClassName; |
| 1130 | 1130 | } else { |
| 1131 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1132 | - array('_', ''), $client->server) . '_client'; |
|
| 1131 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1132 | + array('_', ''), $client->server).'_client'; |
|
| 1133 | 1133 | } |
| 1134 | 1134 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1135 | 1135 | $xmlrpcClassName .= 'x'; |
@@ -1138,7 +1138,7 @@ discard block |
||
| 1138 | 1138 | /// @todo add method setDebug() to new class, to enable/disable debugging |
| 1139 | 1139 | $source = "class $xmlrpcClassName\n{\n public \$client;\n\n"; |
| 1140 | 1140 | $source .= " function __construct()\n {\n"; |
| 1141 | - $source .= ' ' . str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 1141 | + $source .= ' '.str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 1142 | 1142 | $source .= "\$this->client = \$client;\n }\n\n"; |
| 1143 | 1143 | $opts = array( |
| 1144 | 1144 | 'return_source' => true, |
@@ -1161,26 +1161,26 @@ discard block |
||
| 1161 | 1161 | $methodWrap = $this->wrapXmlrpcMethod($client, $mName, $opts); |
| 1162 | 1162 | if ($methodWrap) { |
| 1163 | 1163 | if ($buildIt) { |
| 1164 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1164 | + $source .= $methodWrap['source']."\n"; |
|
| 1165 | 1165 | |
| 1166 | 1166 | } else { |
| 1167 | - $source .= ' ' . str_replace("\n", "\n ", $methodWrap['docstring']); |
|
| 1168 | - $source .= str_replace("\n", "\n ", $methodWrap['source']). "\n"; |
|
| 1167 | + $source .= ' '.str_replace("\n", "\n ", $methodWrap['docstring']); |
|
| 1168 | + $source .= str_replace("\n", "\n ", $methodWrap['source'])."\n"; |
|
| 1169 | 1169 | } |
| 1170 | 1170 | |
| 1171 | 1171 | } else { |
| 1172 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1172 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1173 | 1173 | } |
| 1174 | 1174 | } |
| 1175 | 1175 | } |
| 1176 | 1176 | $source .= "}\n"; |
| 1177 | 1177 | if ($buildIt) { |
| 1178 | 1178 | $allOK = 0; |
| 1179 | - eval($source . '$allOK=1;'); |
|
| 1179 | + eval($source.'$allOK=1;'); |
|
| 1180 | 1180 | if ($allOK) { |
| 1181 | 1181 | return $xmlrpcClassName; |
| 1182 | 1182 | } else { |
| 1183 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1183 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1184 | 1184 | return false; |
| 1185 | 1185 | } |
| 1186 | 1186 | } else { |
@@ -1199,8 +1199,8 @@ discard block |
||
| 1199 | 1199 | */ |
| 1200 | 1200 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1201 | 1201 | { |
| 1202 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) . |
|
| 1203 | - "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n"; |
|
| 1202 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path). |
|
| 1203 | + "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server)."', $client->port);\n"; |
|
| 1204 | 1204 | |
| 1205 | 1205 | // copy all client fields to the client that will be generated runtime |
| 1206 | 1206 | // (this provides for future expansion or subclassing of client obj) |
@@ -605,8 +605,9 @@ |
||
| 605 | 605 | } |
| 606 | 606 | foreach ($parsVariations as $i => $pars) { |
| 607 | 607 | $innerCode .= " if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
| 608 | - if ($i < (count($parsVariations) - 1)) |
|
| 609 | - $innerCode .= " else\n"; |
|
| 608 | + if ($i < (count($parsVariations) - 1)) { |
|
| 609 | + $innerCode .= " else\n"; |
|
| 610 | + } |
|
| 610 | 611 | } |
| 611 | 612 | $innerCode .= " if (is_a(\$retVal, '" . static::$namespace . "Response'))\n return \$retVal;\n else\n"; |
| 612 | 613 | /// q: why not do the same for int, float, bool, string? |
