gggeek /
phpxmlrpc
@@ -24,12 +24,12 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | // read chunk-size, chunk-extension (if any) and crlf |
| 26 | 26 | // get the position of the linebreak |
| 27 | - $chunkEnd = strpos($buffer, "\r\n") + 2; |
|
| 27 | + $chunkEnd = strpos($buffer, "\r\n")+2; |
|
| 28 | 28 | $temp = substr($buffer, 0, $chunkEnd); |
| 29 | 29 | $chunkSize = hexdec(trim($temp)); |
| 30 | 30 | $chunkStart = $chunkEnd; |
| 31 | - while ($chunkSize > 0) { |
|
| 32 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize); |
|
| 31 | + while ($chunkSize>0) { |
|
| 32 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize); |
|
| 33 | 33 | |
| 34 | 34 | // just in case we got a broken connection |
| 35 | 35 | if ($chunkEnd == false) { |
@@ -41,19 +41,19 @@ discard block |
||
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | // read chunk-data and crlf |
| 44 | - $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 44 | + $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 45 | 45 | // append chunk-data to entity-body |
| 46 | 46 | $new .= $chunk; |
| 47 | 47 | // length := length + chunk-size |
| 48 | 48 | $length += strlen($chunk); |
| 49 | 49 | // read chunk-size and crlf |
| 50 | - $chunkStart = $chunkEnd + 2; |
|
| 50 | + $chunkStart = $chunkEnd+2; |
|
| 51 | 51 | |
| 52 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2; |
|
| 52 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2; |
|
| 53 | 53 | if ($chunkEnd == false) { |
| 54 | 54 | break; //just in case we got a broken connection |
| 55 | 55 | } |
| 56 | - $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 56 | + $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 57 | 57 | $chunkSize = hexdec(trim($temp)); |
| 58 | 58 | $chunkStart = $chunkEnd; |
| 59 | 59 | } |
@@ -84,11 +84,11 @@ discard block |
||
| 84 | 84 | // (even though it is not valid http) |
| 85 | 85 | $pos = strpos($data, "\r\n\r\n"); |
| 86 | 86 | if ($pos || is_int($pos)) { |
| 87 | - $bd = $pos + 4; |
|
| 87 | + $bd = $pos+4; |
|
| 88 | 88 | } else { |
| 89 | 89 | $pos = strpos($data, "\n\n"); |
| 90 | 90 | if ($pos || is_int($pos)) { |
| 91 | - $bd = $pos + 2; |
|
| 91 | + $bd = $pos+2; |
|
| 92 | 92 | } else { |
| 93 | 93 | // No separation between response headers and body: fault? |
| 94 | 94 | $bd = 0; |
@@ -99,8 +99,8 @@ discard block |
||
| 99 | 99 | // maybe we could take them into account, too? |
| 100 | 100 | $data = substr($data, $bd); |
| 101 | 101 | } else { |
| 102 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 103 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 102 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 103 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | |
@@ -131,20 +131,20 @@ discard block |
||
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | if ($httpResponse['status_code'] !== '200') { |
| 134 | - $errstr = substr($data, 0, strpos($data, "\n") - 1); |
|
| 135 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr); |
|
| 136 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 134 | + $errstr = substr($data, 0, strpos($data, "\n")-1); |
|
| 135 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr); |
|
| 136 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | // be tolerant to usage of \n instead of \r\n to separate headers and data |
| 140 | 140 | // (even though it is not valid http) |
| 141 | 141 | $pos = strpos($data, "\r\n\r\n"); |
| 142 | 142 | if ($pos || is_int($pos)) { |
| 143 | - $bd = $pos + 4; |
|
| 143 | + $bd = $pos+4; |
|
| 144 | 144 | } else { |
| 145 | 145 | $pos = strpos($data, "\n\n"); |
| 146 | 146 | if ($pos || is_int($pos)) { |
| 147 | - $bd = $pos + 2; |
|
| 147 | + $bd = $pos+2; |
|
| 148 | 148 | } else { |
| 149 | 149 | // No separation between response headers and body: fault? |
| 150 | 150 | // we could take some action here instead of going on... |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | foreach ($ar as $line) { |
| 159 | 159 | // take care of multi-line headers and cookies |
| 160 | 160 | $arr = explode(':', $line, 2); |
| 161 | - if (count($arr) > 1) { |
|
| 161 | + if (count($arr)>1) { |
|
| 162 | 162 | $headerName = strtolower(trim($arr[0])); |
| 163 | 163 | /// @todo some other headers (the ones that allow a CSV list of values) |
| 164 | 164 | /// do allow many values to be passed using multiple header lines. |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | // glue together all received cookies, using a comma to separate them |
| 178 | 178 | // (same as php does with getallheaders()) |
| 179 | 179 | if (isset($httpResponse['headers'][$headerName])) { |
| 180 | - $httpResponse['headers'][$headerName] .= ', ' . trim($cookie); |
|
| 180 | + $httpResponse['headers'][$headerName] .= ', '.trim($cookie); |
|
| 181 | 181 | } else { |
| 182 | 182 | $httpResponse['headers'][$headerName] = trim($cookie); |
| 183 | 183 | } |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | } |
| 207 | 207 | } elseif (isset($headerName)) { |
| 208 | 208 | /// @todo version1 cookies might span multiple lines, thus breaking the parsing above |
| 209 | - $httpResponse['headers'][$headerName] .= ' ' . trim($line); |
|
| 209 | + $httpResponse['headers'][$headerName] .= ' '.trim($line); |
|
| 210 | 210 | } |
| 211 | 211 | } |
| 212 | 212 | |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | // Decode chunked encoding sent by http 1.1 servers |
| 231 | 231 | if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') { |
| 232 | 232 | if (!$data = static::decodeChunked($data)) { |
| 233 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 233 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 234 | 234 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']); |
| 235 | 235 | } |
| 236 | 236 | } |
@@ -245,19 +245,19 @@ discard block |
||
| 245 | 245 | if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 246 | 246 | $data = $degzdata; |
| 247 | 247 | if ($debug) { |
| 248 | - Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 248 | + Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 249 | 249 | } |
| 250 | 250 | } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 251 | 251 | $data = $degzdata; |
| 252 | 252 | if ($debug) { |
| 253 | - Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 253 | + Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 254 | 254 | } |
| 255 | 255 | } else { |
| 256 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server'); |
|
| 256 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server'); |
|
| 257 | 257 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']); |
| 258 | 258 | } |
| 259 | 259 | } else { |
| 260 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 260 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 261 | 261 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']); |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -154,10 +154,10 @@ discard block |
||
| 154 | 154 | $this->accept = $accept; |
| 155 | 155 | |
| 156 | 156 | // @see ticket #70 - we have to parse big xml docks in chunks to avoid errors |
| 157 | - for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) { |
|
| 157 | + for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) { |
|
| 158 | 158 | $chunk = substr($data, $offset, $this->maxChunkLength); |
| 159 | 159 | // error handling: xml not well formed |
| 160 | - if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) { |
|
| 160 | + if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) { |
|
| 161 | 161 | $errCode = xml_get_error_code($parser); |
| 162 | 162 | $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode), |
| 163 | 163 | xml_get_current_line_number($parser), xml_get_current_column_number($parser)); |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
| 183 | 183 | { |
| 184 | 184 | // if invalid xmlrpc already detected, skip all processing |
| 185 | - if ($this->_xh['isf'] < 2) { |
|
| 185 | + if ($this->_xh['isf']<2) { |
|
| 186 | 186 | |
| 187 | 187 | // check for correct element nesting |
| 188 | 188 | if (count($this->_xh['stack']) == 0) { |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | $this->_xh['rt'] = strtolower($name); |
| 203 | 203 | } else { |
| 204 | 204 | $this->_xh['isf'] = 2; |
| 205 | - $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name; |
|
| 205 | + $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name; |
|
| 206 | 206 | |
| 207 | 207 | return; |
| 208 | 208 | } |
@@ -296,7 +296,7 @@ discard block |
||
| 296 | 296 | break; |
| 297 | 297 | case 'MEMBER': |
| 298 | 298 | // set member name to null, in case we do not find in the xml later on |
| 299 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = ''; |
|
| 299 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = ''; |
|
| 300 | 300 | //$this->_xh['ac']=''; |
| 301 | 301 | // Drop trough intentionally |
| 302 | 302 | case 'PARAM': |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | */ |
| 358 | 358 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1) |
| 359 | 359 | { |
| 360 | - if ($this->_xh['isf'] < 2) { |
|
| 360 | + if ($this->_xh['isf']<2) { |
|
| 361 | 361 | // push this element name from stack |
| 362 | 362 | // NB: if XML validates, correct opening/closing is guaranteed and |
| 363 | 363 | // we do not have to check for $name == $currElem. |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | $this->_xh['vt'] = Value::$xmlrpcString; |
| 373 | 373 | } |
| 374 | 374 | |
| 375 | - if ($rebuildXmlrpcvals > 0) { |
|
| 375 | + if ($rebuildXmlrpcvals>0) { |
|
| 376 | 376 | // build the xmlrpc val out of the data received, and substitute it |
| 377 | 377 | $temp = new Value($this->_xh['value'], $this->_xh['vt']); |
| 378 | 378 | // in case we got info about underlying php class, save it |
@@ -381,15 +381,15 @@ discard block |
||
| 381 | 381 | $temp->_php_class = $this->_xh['php_class']; |
| 382 | 382 | } |
| 383 | 383 | $this->_xh['value'] = $temp; |
| 384 | - } elseif ($rebuildXmlrpcvals < 0) { |
|
| 384 | + } elseif ($rebuildXmlrpcvals<0) { |
|
| 385 | 385 | if ($this->_xh['vt'] == Value::$xmlrpcDateTime) { |
| 386 | - $this->_xh['value'] = (object)array( |
|
| 386 | + $this->_xh['value'] = (object) array( |
|
| 387 | 387 | 'xmlrpc_type' => 'datetime', |
| 388 | 388 | 'scalar' => $this->_xh['value'], |
| 389 | 389 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value']) |
| 390 | 390 | ); |
| 391 | 391 | } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) { |
| 392 | - $this->_xh['value'] = (object)array( |
|
| 392 | + $this->_xh['value'] = (object) array( |
|
| 393 | 393 | 'xmlrpc_type' => 'base64', |
| 394 | 394 | 'scalar' => $this->_xh['value'] |
| 395 | 395 | ); |
@@ -405,8 +405,8 @@ discard block |
||
| 405 | 405 | // check if we are inside an array or struct: |
| 406 | 406 | // if value just built is inside an array, let's move it into array on the stack |
| 407 | 407 | $vscount = count($this->_xh['valuestack']); |
| 408 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
| 409 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
| 408 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
| 409 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
| 410 | 410 | } |
| 411 | 411 | break; |
| 412 | 412 | case 'BOOLEAN': |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | $this->_xh['value'] = $this->_xh['ac']; |
| 426 | 426 | } elseif ($name == 'DATETIME.ISO8601') { |
| 427 | 427 | if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) { |
| 428 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']); |
|
| 428 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']); |
|
| 429 | 429 | } |
| 430 | 430 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
| 431 | 431 | $this->_xh['value'] = $this->_xh['ac']; |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | } else { |
| 445 | 445 | // log if receiving something strange, even though we set the value to false anyway |
| 446 | 446 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) { |
| 447 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']); |
|
| 447 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']); |
|
| 448 | 448 | } |
| 449 | 449 | $this->_xh['value'] = false; |
| 450 | 450 | } |
@@ -454,37 +454,37 @@ discard block |
||
| 454 | 454 | // NOTE: regexp could be much stricter than this... |
| 455 | 455 | if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) { |
| 456 | 456 | /// @todo: find a better way of throwing an error than this! |
| 457 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']); |
|
| 457 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']); |
|
| 458 | 458 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 459 | 459 | } else { |
| 460 | 460 | // it's ok, add it on |
| 461 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
| 461 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
| 462 | 462 | } |
| 463 | 463 | } else { |
| 464 | 464 | // we have an I4/I8/INT |
| 465 | 465 | // we must check that only 0123456789-<space> are characters here |
| 466 | 466 | if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) { |
| 467 | 467 | /// @todo find a better way of throwing an error than this! |
| 468 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']); |
|
| 468 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']); |
|
| 469 | 469 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
| 470 | 470 | } else { |
| 471 | 471 | // it's ok, add it on |
| 472 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
| 472 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
| 473 | 473 | } |
| 474 | 474 | } |
| 475 | 475 | $this->_xh['lv'] = 3; // indicate we've found a value |
| 476 | 476 | break; |
| 477 | 477 | case 'NAME': |
| 478 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
| 478 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
| 479 | 479 | break; |
| 480 | 480 | case 'MEMBER': |
| 481 | 481 | // add to array in the stack the last element built, |
| 482 | 482 | // unless no VALUE was found |
| 483 | 483 | if ($this->_xh['vt']) { |
| 484 | 484 | $vscount = count($this->_xh['valuestack']); |
| 485 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
| 485 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
| 486 | 486 | } else { |
| 487 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml'); |
|
| 487 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml'); |
|
| 488 | 488 | } |
| 489 | 489 | break; |
| 490 | 490 | case 'DATA': |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | $this->_xh['params'][] = $this->_xh['value']; |
| 508 | 508 | $this->_xh['pt'][] = $this->_xh['vt']; |
| 509 | 509 | } else { |
| 510 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml'); |
|
| 510 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml'); |
|
| 511 | 511 | } |
| 512 | 512 | break; |
| 513 | 513 | case 'METHODNAME': |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | public function xmlrpc_cd($parser, $data) |
| 567 | 567 | { |
| 568 | 568 | // skip processing if xml fault already detected |
| 569 | - if ($this->_xh['isf'] < 2) { |
|
| 569 | + if ($this->_xh['isf']<2) { |
|
| 570 | 570 | // "lookforvalue==3" means that we've found an entire value |
| 571 | 571 | // and should discard any further character data |
| 572 | 572 | if ($this->_xh['lv'] != 3) { |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | public function xmlrpc_dh($parser, $data) |
| 586 | 586 | { |
| 587 | 587 | // skip processing if xml fault already detected |
| 588 | - if ($this->_xh['isf'] < 2) { |
|
| 588 | + if ($this->_xh['isf']<2) { |
|
| 589 | 589 | if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') { |
| 590 | 590 | $this->_xh['ac'] .= $data; |
| 591 | 591 | } |
@@ -659,8 +659,8 @@ discard block |
||
| 659 | 659 | // Details: |
| 660 | 660 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 661 | 661 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 662 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 663 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 662 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 663 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 664 | 664 | $xmlChunk, $matches)) { |
| 665 | 665 | return strtoupper(substr($matches[2], 1, -1)); |
| 666 | 666 | } |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
| 679 | 679 | // IANA also likes better US-ASCII, so go with it |
| 680 | 680 | if ($enc == 'ASCII') { |
| 681 | - $enc = 'US-' . $enc; |
|
| 681 | + $enc = 'US-'.$enc; |
|
| 682 | 682 | } |
| 683 | 683 | |
| 684 | 684 | return $enc; |
@@ -713,8 +713,8 @@ discard block |
||
| 713 | 713 | // Details: |
| 714 | 714 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
| 715 | 715 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
| 716 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
| 717 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 716 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
| 717 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
| 718 | 718 | $xmlChunk, $matches)) { |
| 719 | 719 | return true; |
| 720 | 720 | } |
@@ -68,14 +68,14 @@ discard block |
||
| 68 | 68 | if (count($this->xml_iso88591_Entities['in'])) { |
| 69 | 69 | return; |
| 70 | 70 | } |
| 71 | - for ($i = 0; $i < 32; $i++) { |
|
| 71 | + for ($i = 0; $i<32; $i++) { |
|
| 72 | 72 | $this->xml_iso88591_Entities["in"][] = chr($i); |
| 73 | 73 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 77 | 77 | |
| 78 | - for ($i = 160; $i < 256; $i++) { |
|
| 78 | + for ($i = 160; $i<256; $i++) { |
|
| 79 | 79 | $this->xml_iso88591_Entities["in"][] = chr($i); |
| 80 | 80 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
| 81 | 81 | } |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | break;*/ |
| 104 | 104 | |
| 105 | 105 | default: |
| 106 | - throw new \Exception('Unsupported table: ' . $tableName); |
|
| 106 | + throw new \Exception('Unsupported table: '.$tableName); |
|
| 107 | 107 | } |
| 108 | 108 | } |
| 109 | 109 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $destEncoding = 'US-ASCII'; |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - $conversion = strtoupper($srcEncoding . '_' . $destEncoding); |
|
| 149 | + $conversion = strtoupper($srcEncoding.'_'.$destEncoding); |
|
| 150 | 150 | |
| 151 | 151 | // list ordered with (expected) most common scenarios first |
| 152 | 152 | switch ($conversion) { |
@@ -164,20 +164,20 @@ discard block |
||
| 164 | 164 | // NB: this will choke on invalid UTF-8, going most likely beyond EOF |
| 165 | 165 | $escapedData = ''; |
| 166 | 166 | // be kind to users creating string xmlrpc values out of different php types |
| 167 | - $data = (string)$data; |
|
| 167 | + $data = (string) $data; |
|
| 168 | 168 | $ns = strlen($data); |
| 169 | - for ($nn = 0; $nn < $ns; $nn++) { |
|
| 169 | + for ($nn = 0; $nn<$ns; $nn++) { |
|
| 170 | 170 | $ch = $data[$nn]; |
| 171 | 171 | $ii = ord($ch); |
| 172 | 172 | // 7 bits in 1 byte: 0bbbbbbb (127) |
| 173 | - if ($ii < 32) { |
|
| 173 | + if ($ii<32) { |
|
| 174 | 174 | if ($conversion == 'UTF-8_US-ASCII') { |
| 175 | 175 | $escapedData .= sprintf('&#%d;', $ii); |
| 176 | 176 | } else { |
| 177 | 177 | $escapedData .= $ch; |
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | - else if ($ii < 128) { |
|
| 180 | + else if ($ii<128) { |
|
| 181 | 181 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
| 182 | 182 | /// @todo to be 'print safe', should we encode as well character 127 (DEL) ? |
| 183 | 183 | switch ($ii) { |
@@ -202,25 +202,25 @@ discard block |
||
| 202 | 202 | } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047) |
| 203 | 203 | elseif ($ii >> 5 == 6) { |
| 204 | 204 | $b1 = ($ii & 31); |
| 205 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 206 | - $ii = ($b1 * 64) + $b2; |
|
| 205 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 206 | + $ii = ($b1 * 64)+$b2; |
|
| 207 | 207 | $escapedData .= sprintf('&#%d;', $ii); |
| 208 | 208 | $nn += 1; |
| 209 | 209 | } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb |
| 210 | 210 | elseif ($ii >> 4 == 14) { |
| 211 | 211 | $b1 = ($ii & 15); |
| 212 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 213 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
| 214 | - $ii = ((($b1 * 64) + $b2) * 64) + $b3; |
|
| 212 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 213 | + $b3 = (ord($data[$nn+2]) & 63); |
|
| 214 | + $ii = ((($b1 * 64)+$b2) * 64)+$b3; |
|
| 215 | 215 | $escapedData .= sprintf('&#%d;', $ii); |
| 216 | 216 | $nn += 2; |
| 217 | 217 | } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb |
| 218 | 218 | elseif ($ii >> 3 == 30) { |
| 219 | 219 | $b1 = ($ii & 7); |
| 220 | - $b2 = (ord($data[$nn + 1]) & 63); |
|
| 221 | - $b3 = (ord($data[$nn + 2]) & 63); |
|
| 222 | - $b4 = (ord($data[$nn + 3]) & 63); |
|
| 223 | - $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4; |
|
| 220 | + $b2 = (ord($data[$nn+1]) & 63); |
|
| 221 | + $b3 = (ord($data[$nn+2]) & 63); |
|
| 222 | + $b4 = (ord($data[$nn+3]) & 63); |
|
| 223 | + $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4; |
|
| 224 | 224 | $escapedData .= sprintf('&#%d;', $ii); |
| 225 | 225 | $nn += 3; |
| 226 | 226 | } |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | default: |
| 270 | 270 | $escapedData = ''; |
| 271 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
| 271 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | return $escapedData; |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | case 'iso88591': |
| 323 | 323 | return $this->xml_iso88591_Entities; |
| 324 | 324 | default: |
| 325 | - throw new \Exception('Unsupported charset: ' . $charset); |
|
| 325 | + throw new \Exception('Unsupported charset: '.$charset); |
|
| 326 | 326 | } |
| 327 | 327 | } |
| 328 | 328 | } |
@@ -92,13 +92,13 @@ discard block |
||
| 92 | 92 | <body> |
| 93 | 93 | <?php |
| 94 | 94 | |
| 95 | -include __DIR__ . '/common.php'; |
|
| 95 | +include __DIR__.'/common.php'; |
|
| 96 | 96 | |
| 97 | 97 | if ($action) { |
| 98 | 98 | |
| 99 | 99 | // make sure the script waits long enough for the call to complete... |
| 100 | 100 | if ($timeout) { |
| 101 | - set_time_limit($timeout + 10); |
|
| 101 | + set_time_limit($timeout+10); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | if ($wstype == 1) { |
@@ -123,13 +123,13 @@ discard block |
||
| 123 | 123 | $server = "$host$path"; |
| 124 | 124 | } |
| 125 | 125 | if ($protocol == 2 || $protocol == 3) { |
| 126 | - $server = 'https://' . $server; |
|
| 126 | + $server = 'https://'.$server; |
|
| 127 | 127 | } else { |
| 128 | - $server = 'http://' . $server; |
|
| 128 | + $server = 'http://'.$server; |
|
| 129 | 129 | } |
| 130 | 130 | if ($proxy != '') { |
| 131 | 131 | $pproxy = explode(':', $proxy); |
| 132 | - if (count($pproxy) > 1) { |
|
| 132 | + if (count($pproxy)>1) { |
|
| 133 | 133 | $pport = $pproxy[1]; |
| 134 | 134 | } else { |
| 135 | 135 | $pport = 8080; |
@@ -204,9 +204,9 @@ discard block |
||
| 204 | 204 | case 'wrap': |
| 205 | 205 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 206 | 206 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 207 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 207 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 208 | 208 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 209 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 209 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 210 | 210 | break; |
| 211 | 211 | case 'list': |
| 212 | 212 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -219,9 +219,9 @@ discard block |
||
| 219 | 219 | $msg[0] = new $requestClass($method, array(), $id); |
| 220 | 220 | // hack! build xml payload by hand |
| 221 | 221 | if ($wstype == 1) { |
| 222 | - $msg[0]->payload = "{\n" . |
|
| 223 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 224 | - $payload . |
|
| 222 | + $msg[0]->payload = "{\n". |
|
| 223 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 224 | + $payload. |
|
| 225 | 225 | "\n],\n\"id\": "; |
| 226 | 226 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 227 | 227 | if ($id == "") { |
@@ -234,20 +234,20 @@ discard block |
||
| 234 | 234 | } |
| 235 | 235 | } |
| 236 | 236 | } else { |
| 237 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
| 238 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 239 | - $payload . |
|
| 240 | - "</params>\n" . $msg[0]->xml_footer(); |
|
| 237 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
| 238 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 239 | + $payload. |
|
| 240 | + "</params>\n".$msg[0]->xml_footer(); |
|
| 241 | 241 | } |
| 242 | - $actionname = 'Execution of method ' . $method; |
|
| 242 | + $actionname = 'Execution of method '.$method; |
|
| 243 | 243 | break; |
| 244 | 244 | default: // give a warning |
| 245 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 245 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 249 | 249 | // this gives good user feedback for long-running methods... |
| 250 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 250 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 251 | 251 | flush(); |
| 252 | 252 | |
| 253 | 253 | $response = null; |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | break; |
| 266 | 266 | } |
| 267 | 267 | } |
| 268 | - $time = microtime(true) - $time; |
|
| 268 | + $time = microtime(true)-$time; |
|
| 269 | 269 | if ($debug) { |
| 270 | 270 | echo "</div>\n"; |
| 271 | 271 | } |
@@ -275,8 +275,8 @@ discard block |
||
| 275 | 275 | // call failed! echo out error msg! |
| 276 | 276 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 277 | 277 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 278 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 279 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 278 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 279 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 280 | 280 | echo(date("d/M/Y:H:i:s\n")); |
| 281 | 281 | } else { |
| 282 | 282 | // call succeeded: parse results |
@@ -292,36 +292,36 @@ discard block |
||
| 292 | 292 | $max = $v->count(); |
| 293 | 293 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 294 | 294 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 295 | - foreach($v as $i => $rec) { |
|
| 295 | + foreach ($v as $i => $rec) { |
|
| 296 | 296 | if ($i % 2) { |
| 297 | 297 | $class = ' class="oddrow"'; |
| 298 | 298 | } else { |
| 299 | 299 | $class = ' class="evenrow"'; |
| 300 | 300 | } |
| 301 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 302 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 320 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 321 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 322 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 323 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 324 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 301 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 302 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 320 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 321 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 322 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 323 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 324 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 325 | 325 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 326 | 326 | //echo("</tr>\n"); |
| 327 | 327 | |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | $r2 = $resp[1]->value(); |
| 349 | 349 | |
| 350 | 350 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 351 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 351 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 352 | 352 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 353 | 353 | if ($desc == "") { |
| 354 | 354 | $desc = "-"; |
@@ -358,41 +358,41 @@ discard block |
||
| 358 | 358 | if ($r2->kindOf() != "array") { |
| 359 | 359 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 360 | 360 | } else { |
| 361 | - foreach($r2 as $i => $x) { |
|
| 361 | + foreach ($r2 as $i => $x) { |
|
| 362 | 362 | $payload = ""; |
| 363 | 363 | $alt_payload = ""; |
| 364 | - if ($i + 1 % 2) { |
|
| 364 | + if ($i+1 % 2) { |
|
| 365 | 365 | $class = ' class="oddrow"'; |
| 366 | 366 | } else { |
| 367 | 367 | $class = ' class="evenrow"'; |
| 368 | 368 | } |
| 369 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 369 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 370 | 370 | if ($x->kindOf() == "array") { |
| 371 | 371 | $ret = $x[0]; |
| 372 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 373 | - if ($x->count() > 1) { |
|
| 374 | - foreach($x as $k => $y) { |
|
| 372 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 373 | + if ($x->count()>1) { |
|
| 374 | + foreach ($x as $k => $y) { |
|
| 375 | 375 | if ($k == 0) continue; |
| 376 | 376 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 377 | 377 | if ($wstype != 1) { |
| 378 | 378 | $type = $y->scalarval(); |
| 379 | 379 | $payload .= '<param><value>'; |
| 380 | - switch($type) { |
|
| 380 | + switch ($type) { |
|
| 381 | 381 | case 'undefined': |
| 382 | 382 | break; |
| 383 | 383 | case 'null'; |
| 384 | 384 | $type = 'nil'; |
| 385 | 385 | // fall thru intentionally |
| 386 | 386 | default: |
| 387 | - $payload .= '<' . |
|
| 388 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 389 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 387 | + $payload .= '<'. |
|
| 388 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 389 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 390 | 390 | '>'; |
| 391 | 391 | } |
| 392 | 392 | $payload .= "</value></param>\n"; |
| 393 | 393 | } |
| 394 | 394 | $alt_payload .= $y->scalarval(); |
| 395 | - if ($k < $x->count() - 1) { |
|
| 395 | + if ($k<$x->count()-1) { |
|
| 396 | 396 | $alt_payload .= ';'; |
| 397 | 397 | echo ", "; |
| 398 | 398 | } |
@@ -405,63 +405,63 @@ discard block |
||
| 405 | 405 | echo '</td>'; |
| 406 | 406 | // button to test this method |
| 407 | 407 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 408 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 409 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 410 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 411 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 412 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 413 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 414 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 415 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 416 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 417 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 418 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 419 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 420 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 421 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 422 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 423 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 424 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 425 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 426 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 427 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 428 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 429 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 430 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 431 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 408 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 409 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 410 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 411 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 412 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 413 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 414 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 415 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 416 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 417 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 418 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 419 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 420 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 421 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 422 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 423 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 424 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 425 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 426 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 427 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 428 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 429 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 430 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 431 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 432 | 432 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 433 | 433 | if ($wstype != 1) { |
| 434 | 434 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 435 | 435 | } |
| 436 | 436 | echo "</form></td>\n"; |
| 437 | 437 | |
| 438 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 439 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 440 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 441 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 461 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 462 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 463 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 464 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 438 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 439 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 440 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 441 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 461 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 462 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 463 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 464 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 465 | 465 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 466 | 466 | echo "</form></td></tr>\n"; |
| 467 | 467 | } |
@@ -473,14 +473,14 @@ discard block |
||
| 473 | 473 | case 'wrap': |
| 474 | 474 | $r1 = $resp[0]->value(); |
| 475 | 475 | $r2 = $resp[1]->value(); |
| 476 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 476 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 477 | 477 | echo "Error: signature unknown\n"; |
| 478 | 478 | } else { |
| 479 | 479 | $mdesc = $r1->scalarval(); |
| 480 | 480 | $encoder = new PhpXmlRpc\Encoder(); |
| 481 | 481 | $msig = $encoder->decode($r2); |
| 482 | 482 | $msig = $msig[$methodsig]; |
| 483 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 483 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 484 | 484 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 485 | 485 | $clientcookies == '' |
| 486 | 486 | ) { |
@@ -494,11 +494,11 @@ discard block |
||
| 494 | 494 | $prefix = 'xmlrpc'; |
| 495 | 495 | } |
| 496 | 496 | $wrapper = new PhpXmlRpc\Wrapper(); |
| 497 | - $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc); |
|
| 497 | + $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc); |
|
| 498 | 498 | //if ($code) |
| 499 | 499 | //{ |
| 500 | 500 | echo "<div id=\"phpcode\">\n"; |
| 501 | - highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>'); |
|
| 501 | + highlight_string("<?php\n".$code['docstring'].$code['source'].'?>'); |
|
| 502 | 502 | echo "\n</div>"; |
| 503 | 503 | //} |
| 504 | 504 | //else |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | break; |
| 510 | 510 | |
| 511 | 511 | case 'execute': |
| 512 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 512 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 513 | 513 | break; |
| 514 | 514 | |
| 515 | 515 | default: // give a warning |
@@ -183,20 +183,20 @@ discard block |
||
| 183 | 183 | $callable = explode('::', $callable); |
| 184 | 184 | } |
| 185 | 185 | if (is_array($callable)) { |
| 186 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 186 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 188 | 188 | return false; |
| 189 | 189 | } |
| 190 | 190 | if (is_string($callable[0])) { |
| 191 | 191 | $plainFuncName = implode('::', $callable); |
| 192 | 192 | } elseif (is_object($callable[0])) { |
| 193 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 193 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 194 | 194 | } |
| 195 | 195 | $exists = method_exists($callable[0], $callable[1]); |
| 196 | 196 | } else if ($callable instanceof \Closure) { |
| 197 | 197 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 198 | 198 | if (!$buildIt) { |
| 199 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 199 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 200 | 200 | return false; |
| 201 | 201 | } |
| 202 | 202 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | if (!$exists) { |
| 211 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 211 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 212 | 212 | return false; |
| 213 | 213 | } |
| 214 | 214 | |
@@ -252,23 +252,23 @@ discard block |
||
| 252 | 252 | if (is_array($callable)) { |
| 253 | 253 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 254 | 254 | if ($func->isPrivate()) { |
| 255 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 255 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 256 | 256 | return false; |
| 257 | 257 | } |
| 258 | 258 | if ($func->isProtected()) { |
| 259 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 259 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 260 | 260 | return false; |
| 261 | 261 | } |
| 262 | 262 | if ($func->isConstructor()) { |
| 263 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 263 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 264 | 264 | return false; |
| 265 | 265 | } |
| 266 | 266 | if ($func->isDestructor()) { |
| 267 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 267 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 268 | 268 | return false; |
| 269 | 269 | } |
| 270 | 270 | if ($func->isAbstract()) { |
| 271 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 271 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 272 | 272 | return false; |
| 273 | 273 | } |
| 274 | 274 | /// @todo add more checks for static vs. nonstatic? |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | if ($func->isInternal()) { |
| 279 | 279 | // Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs |
| 280 | 280 | // instead of getparameters to fully reflect internal php functions ? |
| 281 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 281 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 282 | 282 | return false; |
| 283 | 283 | } |
| 284 | 284 | |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | $i = 0; |
| 331 | 331 | foreach ($func->getParameters() as $paramObj) { |
| 332 | 332 | $params[$i] = array(); |
| 333 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 333 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 334 | 334 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 335 | 335 | $i++; |
| 336 | 336 | } |
@@ -395,7 +395,7 @@ discard block |
||
| 395 | 395 | // build a signature |
| 396 | 396 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 397 | 397 | $pSig = array($funcDesc['returnsDocs']); |
| 398 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 398 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 399 | 399 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 400 | 400 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 401 | 401 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | } |
| 452 | 452 | $numPars = $req->getNumParams(); |
| 453 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 453 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 454 | 454 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 455 | 455 | } |
| 456 | 456 | |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | |
| 464 | 464 | $result = call_user_func_array($callable, $params); |
| 465 | 465 | |
| 466 | - if (! is_a($result, $responseClass)) { |
|
| 466 | + if (!is_a($result, $responseClass)) { |
|
| 467 | 467 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 468 | 468 | $result = new $valueClass($result, $funcDesc['returns']); |
| 469 | 469 | } else { |
@@ -498,9 +498,9 @@ discard block |
||
| 498 | 498 | if ($newFuncName == '') { |
| 499 | 499 | if (is_array($callable)) { |
| 500 | 500 | if (is_string($callable[0])) { |
| 501 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 501 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 502 | 502 | } else { |
| 503 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 503 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 504 | 504 | } |
| 505 | 505 | } else { |
| 506 | 506 | if ($callable instanceof \Closure) { |
@@ -536,8 +536,8 @@ discard block |
||
| 536 | 536 | { |
| 537 | 537 | $namespace = '\\PhpXmlRpc\\'; |
| 538 | 538 | |
| 539 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 540 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 539 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 540 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 541 | 541 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 542 | 542 | |
| 543 | 543 | $i = 0; |
@@ -572,7 +572,7 @@ discard block |
||
| 572 | 572 | // build body of new function |
| 573 | 573 | |
| 574 | 574 | $innerCode = "\$paramCount = \$req->getNumParams();\n"; |
| 575 | - $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 575 | + $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 576 | 576 | |
| 577 | 577 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 578 | 578 | if ($decodePhpObjects) { |
@@ -586,13 +586,13 @@ discard block |
||
| 586 | 586 | if (is_array($callable) && is_object($callable[0])) { |
| 587 | 587 | self::$objHolder[$newFuncName] = $callable[0]; |
| 588 | 588 | $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n"; |
| 589 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 589 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 590 | 590 | } else { |
| 591 | 591 | $realFuncName = $plainFuncName; |
| 592 | 592 | } |
| 593 | 593 | foreach ($parsVariations as $i => $pars) { |
| 594 | - $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 595 | - if ($i < (count($parsVariations) - 1)) |
|
| 594 | + $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 595 | + if ($i<(count($parsVariations)-1)) |
|
| 596 | 596 | $innerCode .= "else\n"; |
| 597 | 597 | } |
| 598 | 598 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
@@ -609,7 +609,7 @@ discard block |
||
| 609 | 609 | // if ($func->returnsReference()) |
| 610 | 610 | // return false; |
| 611 | 611 | |
| 612 | - $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}"; |
|
| 612 | + $code = "function $newFuncName(\$req) {\n".$innerCode."\n}"; |
|
| 613 | 613 | |
| 614 | 614 | return $code; |
| 615 | 615 | } |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 664 | 664 | { |
| 665 | 665 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 666 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 666 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | if (is_object($className)) { |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | } else { |
| 672 | 672 | $realClassName = $className; |
| 673 | 673 | } |
| 674 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 674 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | /** |
@@ -761,21 +761,21 @@ discard block |
||
| 761 | 761 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 762 | 762 | { |
| 763 | 763 | $namespace = '\\PhpXmlRpc\\'; |
| 764 | - $reqClass = $namespace . 'Request'; |
|
| 765 | - $valClass = $namespace . 'Value'; |
|
| 766 | - $decoderClass = $namespace . 'Encoder'; |
|
| 764 | + $reqClass = $namespace.'Request'; |
|
| 765 | + $valClass = $namespace.'Value'; |
|
| 766 | + $decoderClass = $namespace.'Encoder'; |
|
| 767 | 767 | |
| 768 | 768 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 769 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 769 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 770 | 770 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 771 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 771 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 772 | 772 | |
| 773 | 773 | $req = new $reqClass('system.methodSignature'); |
| 774 | 774 | $req->addparam(new $valClass($methodName)); |
| 775 | 775 | $client->setDebug($debug); |
| 776 | 776 | $response = $client->send($req, $timeout, $protocol); |
| 777 | 777 | if ($response->faultCode()) { |
| 778 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 778 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 779 | 779 | return false; |
| 780 | 780 | } |
| 781 | 781 | |
@@ -785,8 +785,8 @@ discard block |
||
| 785 | 785 | $mSig = $decoder->decode($mSig); |
| 786 | 786 | } |
| 787 | 787 | |
| 788 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 789 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 788 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 789 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 790 | 790 | return false; |
| 791 | 791 | } |
| 792 | 792 | |
@@ -802,11 +802,11 @@ discard block |
||
| 802 | 802 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 803 | 803 | { |
| 804 | 804 | $namespace = '\\PhpXmlRpc\\'; |
| 805 | - $reqClass = $namespace . 'Request'; |
|
| 806 | - $valClass = $namespace . 'Value'; |
|
| 805 | + $reqClass = $namespace.'Request'; |
|
| 806 | + $valClass = $namespace.'Value'; |
|
| 807 | 807 | |
| 808 | 808 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 809 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 809 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 810 | 810 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 811 | 811 | |
| 812 | 812 | $mDesc = ''; |
@@ -840,10 +840,10 @@ discard block |
||
| 840 | 840 | $clientClone = clone $client; |
| 841 | 841 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 842 | 842 | { |
| 843 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 843 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 844 | 844 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 845 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 846 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 845 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 846 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 847 | 847 | if (isset($extraOptions['return_on_fault'])) { |
| 848 | 848 | $decodeFault = true; |
| 849 | 849 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -852,9 +852,9 @@ discard block |
||
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | $namespace = '\\PhpXmlRpc\\'; |
| 855 | - $reqClass = $namespace . 'Request'; |
|
| 856 | - $encoderClass = $namespace . 'Encoder'; |
|
| 857 | - $valueClass = $namespace . 'Value'; |
|
| 855 | + $reqClass = $namespace.'Request'; |
|
| 856 | + $encoderClass = $namespace.'Encoder'; |
|
| 857 | + $valueClass = $namespace.'Value'; |
|
| 858 | 858 | |
| 859 | 859 | $encoder = new $encoderClass(); |
| 860 | 860 | $encodeOptions = array(); |
@@ -925,13 +925,13 @@ discard block |
||
| 925 | 925 | * @param string $mDesc |
| 926 | 926 | * @return string[] keys: source, docstring |
| 927 | 927 | */ |
| 928 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 928 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 929 | 929 | { |
| 930 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 930 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 931 | 931 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 932 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 933 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 934 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 932 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 933 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 934 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 935 | 935 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 936 | 936 | if (isset($extraOptions['return_on_fault'])) { |
| 937 | 937 | $decodeFault = true; |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | $namespace = '\\PhpXmlRpc\\'; |
| 945 | 945 | |
| 946 | 946 | $code = "function $newFuncName ("; |
| 947 | - if ($clientCopyMode < 2) { |
|
| 947 | + if ($clientCopyMode<2) { |
|
| 948 | 948 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 949 | 949 | $verbatimClientCopy = !$clientCopyMode; |
| 950 | 950 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -959,7 +959,7 @@ discard block |
||
| 959 | 959 | |
| 960 | 960 | if ($mDesc != '') { |
| 961 | 961 | // take care that PHP comment is not terminated unwillingly by method description |
| 962 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 962 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 963 | 963 | } else { |
| 964 | 964 | $mDesc = "/**\nFunction $newFuncName\n"; |
| 965 | 965 | } |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 969 | 969 | $plist = array(); |
| 970 | 970 | $pCount = count($mSig); |
| 971 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 971 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 972 | 972 | $plist[] = "\$p$i"; |
| 973 | 973 | $pType = $mSig[$i]; |
| 974 | 974 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -984,19 +984,19 @@ discard block |
||
| 984 | 984 | } |
| 985 | 985 | } |
| 986 | 986 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 987 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 987 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 988 | 988 | } |
| 989 | - if ($clientCopyMode < 2) { |
|
| 989 | + if ($clientCopyMode<2) { |
|
| 990 | 990 | $plist[] = '$debug=0'; |
| 991 | 991 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 992 | 992 | } |
| 993 | 993 | $plist = implode(', ', $plist); |
| 994 | - $mDesc .= '* @return {$namespace}Response|' . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 994 | + $mDesc .= '* @return {$namespace}Response|'.$this->xmlrpc2PhpType($mSig[0])." (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 995 | 995 | |
| 996 | 996 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 997 | 997 | if ($decodeFault) { |
| 998 | 998 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 999 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 999 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 1000 | 1000 | } else { |
| 1001 | 1001 | $respCode = var_export($faultResponse, true); |
| 1002 | 1002 | } |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 1010 | 1010 | } |
| 1011 | 1011 | |
| 1012 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 1012 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 1013 | 1013 | |
| 1014 | 1014 | return array('source' => $code, 'docstring' => $mDesc); |
| 1015 | 1015 | } |
@@ -1035,23 +1035,23 @@ discard block |
||
| 1035 | 1035 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1036 | 1036 | { |
| 1037 | 1037 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1038 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1038 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1039 | 1039 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1040 | 1040 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1041 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1042 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1041 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1042 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1043 | 1043 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1044 | 1044 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1045 | 1045 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1046 | 1046 | $namespace = '\\PhpXmlRpc\\'; |
| 1047 | 1047 | |
| 1048 | - $reqClass = $namespace . 'Request'; |
|
| 1049 | - $decoderClass = $namespace . 'Encoder'; |
|
| 1048 | + $reqClass = $namespace.'Request'; |
|
| 1049 | + $decoderClass = $namespace.'Encoder'; |
|
| 1050 | 1050 | |
| 1051 | 1051 | $req = new $reqClass('system.listMethods'); |
| 1052 | 1052 | $response = $client->send($req, $timeout, $protocol); |
| 1053 | 1053 | if ($response->faultCode()) { |
| 1054 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1054 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1055 | 1055 | |
| 1056 | 1056 | return false; |
| 1057 | 1057 | } else { |
@@ -1061,7 +1061,7 @@ discard block |
||
| 1061 | 1061 | $mList = $decoder->decode($mList); |
| 1062 | 1062 | } |
| 1063 | 1063 | if (!is_array($mList) || !count($mList)) { |
| 1064 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1064 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1065 | 1065 | |
| 1066 | 1066 | return false; |
| 1067 | 1067 | } else { |
@@ -1069,8 +1069,8 @@ discard block |
||
| 1069 | 1069 | if ($newClassName != '') { |
| 1070 | 1070 | $xmlrpcClassName = $newClassName; |
| 1071 | 1071 | } else { |
| 1072 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1073 | - array('_', ''), $client->server) . '_client'; |
|
| 1072 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1073 | + array('_', ''), $client->server).'_client'; |
|
| 1074 | 1074 | } |
| 1075 | 1075 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1076 | 1076 | $xmlrpcClassName .= 'x'; |
@@ -1101,20 +1101,20 @@ discard block |
||
| 1101 | 1101 | if (!$buildIt) { |
| 1102 | 1102 | $source .= $methodWrap['docstring']; |
| 1103 | 1103 | } |
| 1104 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1104 | + $source .= $methodWrap['source']."\n"; |
|
| 1105 | 1105 | } else { |
| 1106 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1106 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1107 | 1107 | } |
| 1108 | 1108 | } |
| 1109 | 1109 | } |
| 1110 | 1110 | $source .= "}\n"; |
| 1111 | 1111 | if ($buildIt) { |
| 1112 | 1112 | $allOK = 0; |
| 1113 | - eval($source . '$allOK=1;'); |
|
| 1113 | + eval($source.'$allOK=1;'); |
|
| 1114 | 1114 | if ($allOK) { |
| 1115 | 1115 | return $xmlrpcClassName; |
| 1116 | 1116 | } else { |
| 1117 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1117 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1118 | 1118 | return false; |
| 1119 | 1119 | } |
| 1120 | 1120 | } else { |
@@ -1136,8 +1136,8 @@ discard block |
||
| 1136 | 1136 | */ |
| 1137 | 1137 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1138 | 1138 | { |
| 1139 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) . |
|
| 1140 | - "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n"; |
|
| 1139 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path). |
|
| 1140 | + "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server)."', $client->port);\n"; |
|
| 1141 | 1141 | |
| 1142 | 1142 | // copy all client fields to the client that will be generated runtime |
| 1143 | 1143 | // (this provides for future expansion or subclassing of client obj) |
@@ -157,10 +157,10 @@ discard block |
||
| 157 | 157 | $server = $parts['host']; |
| 158 | 158 | $path = isset($parts['path']) ? $parts['path'] : ''; |
| 159 | 159 | if (isset($parts['query'])) { |
| 160 | - $path .= '?' . $parts['query']; |
|
| 160 | + $path .= '?'.$parts['query']; |
|
| 161 | 161 | } |
| 162 | 162 | if (isset($parts['fragment'])) { |
| 163 | - $path .= '#' . $parts['fragment']; |
|
| 163 | + $path .= '#'.$parts['fragment']; |
|
| 164 | 164 | } |
| 165 | 165 | if (isset($parts['port'])) { |
| 166 | 166 | $port = $parts['port']; |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | 178 | if ($path == '' || $path[0] != '/') { |
| 179 | - $this->path = '/' . $path; |
|
| 179 | + $this->path = '/'.$path; |
|
| 180 | 180 | } else { |
| 181 | 181 | $this->path = $path; |
| 182 | 182 | } |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | }*/ |
| 215 | 215 | |
| 216 | 216 | // initialize user_agent string |
| 217 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
| 217 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | /** |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | */ |
| 593 | 593 | protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 594 | 594 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 595 | - $method='http') |
|
| 595 | + $method = 'http') |
|
| 596 | 596 | { |
| 597 | 597 | //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED); |
| 598 | 598 | |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | * @param int $sslVersion |
| 625 | 625 | * @return Response |
| 626 | 626 | */ |
| 627 | - protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 627 | + protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 628 | 628 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 629 | 629 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 630 | 630 | $sslVersion = 0) |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | */ |
| 664 | 664 | protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 665 | 665 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 666 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '', |
|
| 666 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '', |
|
| 667 | 667 | $sslVersion = 0) |
| 668 | 668 | { |
| 669 | 669 | /// @todo log a warning if passed an unsupported method |
@@ -699,15 +699,15 @@ discard block |
||
| 699 | 699 | // thanks to Grant Rauscher <[email protected]> for this |
| 700 | 700 | $credentials = ''; |
| 701 | 701 | if ($username != '') { |
| 702 | - $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n"; |
|
| 702 | + $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n"; |
|
| 703 | 703 | if ($authType != 1) { |
| 704 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 704 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 705 | 705 | } |
| 706 | 706 | } |
| 707 | 707 | |
| 708 | 708 | $acceptedEncoding = ''; |
| 709 | 709 | if (is_array($this->accepted_compression) && count($this->accepted_compression)) { |
| 710 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n"; |
|
| 710 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n"; |
|
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | $proxyCredentials = ''; |
@@ -718,12 +718,12 @@ discard block |
||
| 718 | 718 | $connectServer = $proxyHost; |
| 719 | 719 | $connectPort = $proxyPort; |
| 720 | 720 | $transport = 'tcp'; |
| 721 | - $uri = 'http://' . $server . ':' . $port . $this->path; |
|
| 721 | + $uri = 'http://'.$server.':'.$port.$this->path; |
|
| 722 | 722 | if ($proxyUsername != '') { |
| 723 | 723 | if ($proxyAuthType != 1) { |
| 724 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 724 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 725 | 725 | } |
| 726 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n"; |
|
| 726 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n"; |
|
| 727 | 727 | } |
| 728 | 728 | } else { |
| 729 | 729 | $connectServer = $server; |
@@ -738,45 +738,45 @@ discard block |
||
| 738 | 738 | $version = ''; |
| 739 | 739 | foreach ($this->cookies as $name => $cookie) { |
| 740 | 740 | if ($cookie['version']) { |
| 741 | - $version = ' $Version="' . $cookie['version'] . '";'; |
|
| 742 | - $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";'; |
|
| 741 | + $version = ' $Version="'.$cookie['version'].'";'; |
|
| 742 | + $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";'; |
|
| 743 | 743 | if ($cookie['path']) { |
| 744 | - $cookieHeader .= ' $Path="' . $cookie['path'] . '";'; |
|
| 744 | + $cookieHeader .= ' $Path="'.$cookie['path'].'";'; |
|
| 745 | 745 | } |
| 746 | 746 | if ($cookie['domain']) { |
| 747 | - $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";'; |
|
| 747 | + $cookieHeader .= ' $Domain="'.$cookie['domain'].'";'; |
|
| 748 | 748 | } |
| 749 | 749 | if ($cookie['port']) { |
| 750 | - $cookieHeader .= ' $Port="' . $cookie['port'] . '";'; |
|
| 750 | + $cookieHeader .= ' $Port="'.$cookie['port'].'";'; |
|
| 751 | 751 | } |
| 752 | 752 | } else { |
| 753 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 753 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 754 | 754 | } |
| 755 | 755 | } |
| 756 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 756 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 757 | 757 | } |
| 758 | 758 | |
| 759 | 759 | // omit port if default |
| 760 | 760 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
| 761 | - $port = ''; |
|
| 761 | + $port = ''; |
|
| 762 | 762 | } else { |
| 763 | - $port = ':' . $port; |
|
| 763 | + $port = ':'.$port; |
|
| 764 | 764 | } |
| 765 | 765 | |
| 766 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 767 | - 'User-Agent: ' . $this->user_agent . "\r\n" . |
|
| 768 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 769 | - $credentials . |
|
| 770 | - $proxyCredentials . |
|
| 771 | - $acceptedEncoding . |
|
| 772 | - $encodingHdr . |
|
| 773 | - 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" . |
|
| 774 | - $cookieHeader . |
|
| 775 | - 'Content-Type: ' . $req->content_type . "\r\nContent-Length: " . |
|
| 776 | - strlen($payload) . "\r\n\r\n" . |
|
| 766 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 767 | + 'User-Agent: '.$this->user_agent."\r\n". |
|
| 768 | + 'Host: '.$server.$port."\r\n". |
|
| 769 | + $credentials. |
|
| 770 | + $proxyCredentials. |
|
| 771 | + $acceptedEncoding. |
|
| 772 | + $encodingHdr. |
|
| 773 | + 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n". |
|
| 774 | + $cookieHeader. |
|
| 775 | + 'Content-Type: '.$req->content_type."\r\nContent-Length: ". |
|
| 776 | + strlen($payload)."\r\n\r\n". |
|
| 777 | 777 | $payload; |
| 778 | 778 | |
| 779 | - if ($this->debug > 1) { |
|
| 779 | + if ($this->debug>1) { |
|
| 780 | 780 | $this->getLogger()->debugMessage("---SENDING---\n$op\n---END---"); |
| 781 | 781 | } |
| 782 | 782 | |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | |
| 804 | 804 | $context = stream_context_create($contextOptions); |
| 805 | 805 | |
| 806 | - if ($timeout <= 0) { |
|
| 806 | + if ($timeout<=0) { |
|
| 807 | 807 | $connectTimeout = ini_get('default_socket_timeout'); |
| 808 | 808 | } else { |
| 809 | 809 | $connectTimeout = $timeout; |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 816 | 816 | STREAM_CLIENT_CONNECT, $context); |
| 817 | 817 | if ($fp) { |
| 818 | - if ($timeout > 0) { |
|
| 818 | + if ($timeout>0) { |
|
| 819 | 819 | stream_set_timeout($fp, $timeout); |
| 820 | 820 | } |
| 821 | 821 | } else { |
@@ -824,8 +824,8 @@ discard block |
||
| 824 | 824 | $this->errstr = $err['message']; |
| 825 | 825 | } |
| 826 | 826 | |
| 827 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 828 | - $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 827 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 828 | + $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 829 | 829 | |
| 830 | 830 | return $r; |
| 831 | 831 | } |
@@ -913,18 +913,18 @@ discard block |
||
| 913 | 913 | $keyPass, $sslVersion); |
| 914 | 914 | |
| 915 | 915 | if (!$curl) { |
| 916 | - return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': error during curl initialization. Check php error log for details'); |
|
| 916 | + return new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': error during curl initialization. Check php error log for details'); |
|
| 917 | 917 | } |
| 918 | 918 | |
| 919 | 919 | $result = curl_exec($curl); |
| 920 | 920 | |
| 921 | - if ($this->debug > 1) { |
|
| 921 | + if ($this->debug>1) { |
|
| 922 | 922 | $message = "---CURL INFO---\n"; |
| 923 | 923 | foreach (curl_getinfo($curl) as $name => $val) { |
| 924 | 924 | if (is_array($val)) { |
| 925 | 925 | $val = implode("\n", $val); |
| 926 | 926 | } |
| 927 | - $message .= $name . ': ' . $val . "\n"; |
|
| 927 | + $message .= $name.': '.$val."\n"; |
|
| 928 | 928 | } |
| 929 | 929 | $message .= '---END---'; |
| 930 | 930 | $this->getLogger()->debugMessage($message); |
@@ -934,7 +934,7 @@ discard block |
||
| 934 | 934 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 935 | 935 | |
| 936 | 936 | $this->errstr = 'no response'; |
| 937 | - $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
| 937 | + $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
| 938 | 938 | curl_close($curl); |
| 939 | 939 | if ($keepAlive) { |
| 940 | 940 | $this->xmlrpc_curl_handle = null; |
@@ -1004,12 +1004,12 @@ discard block |
||
| 1004 | 1004 | // http, https |
| 1005 | 1005 | $protocol = $method; |
| 1006 | 1006 | if (strpos($protocol, ':') !== false) { |
| 1007 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1007 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'"); |
|
| 1008 | 1008 | return false; |
| 1009 | 1009 | } |
| 1010 | 1010 | } |
| 1011 | 1011 | } |
| 1012 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path); |
|
| 1012 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path); |
|
| 1013 | 1013 | if (!$curl) { |
| 1014 | 1014 | return false; |
| 1015 | 1015 | } |
@@ -1023,7 +1023,7 @@ discard block |
||
| 1023 | 1023 | // results into variable |
| 1024 | 1024 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 1025 | 1025 | |
| 1026 | - if ($this->debug > 1) { |
|
| 1026 | + if ($this->debug>1) { |
|
| 1027 | 1027 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 1028 | 1028 | /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered |
| 1029 | 1029 | } |
@@ -1048,7 +1048,7 @@ discard block |
||
| 1048 | 1048 | } |
| 1049 | 1049 | } |
| 1050 | 1050 | // extra headers |
| 1051 | - $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings)); |
|
| 1051 | + $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)); |
|
| 1052 | 1052 | // if no keepalive is wanted, let the server know it in advance |
| 1053 | 1053 | if (!$keepAlive) { |
| 1054 | 1054 | $headers[] = 'Connection: close'; |
@@ -1065,7 +1065,7 @@ discard block |
||
| 1065 | 1065 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
| 1066 | 1066 | // timeout is borked |
| 1067 | 1067 | if ($timeout) { |
| 1068 | - curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1); |
|
| 1068 | + curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1); |
|
| 1069 | 1069 | } |
| 1070 | 1070 | |
| 1071 | 1071 | switch ($method) { |
@@ -1084,11 +1084,11 @@ discard block |
||
| 1084 | 1084 | } |
| 1085 | 1085 | |
| 1086 | 1086 | if ($username && $password) { |
| 1087 | - curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password); |
|
| 1087 | + curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password); |
|
| 1088 | 1088 | if (defined('CURLOPT_HTTPAUTH')) { |
| 1089 | 1089 | curl_setopt($curl, CURLOPT_HTTPAUTH, $authType); |
| 1090 | 1090 | } elseif ($authType != 1) { |
| 1091 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1091 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 1092 | 1092 | } |
| 1093 | 1093 | } |
| 1094 | 1094 | |
@@ -1130,13 +1130,13 @@ discard block |
||
| 1130 | 1130 | if ($proxyPort == 0) { |
| 1131 | 1131 | $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1132 | 1132 | } |
| 1133 | - curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort); |
|
| 1133 | + curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort); |
|
| 1134 | 1134 | if ($proxyUsername) { |
| 1135 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword); |
|
| 1135 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword); |
|
| 1136 | 1136 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1137 | 1137 | curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType); |
| 1138 | 1138 | } elseif ($proxyAuthType != 1) { |
| 1139 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1139 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1140 | 1140 | } |
| 1141 | 1141 | } |
| 1142 | 1142 | } |
@@ -1146,7 +1146,7 @@ discard block |
||
| 1146 | 1146 | if (count($this->cookies)) { |
| 1147 | 1147 | $cookieHeader = ''; |
| 1148 | 1148 | foreach ($this->cookies as $name => $cookie) { |
| 1149 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1149 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1150 | 1150 | } |
| 1151 | 1151 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1152 | 1152 | } |
@@ -1155,7 +1155,7 @@ discard block |
||
| 1155 | 1155 | curl_setopt($curl, $opt, $val); |
| 1156 | 1156 | } |
| 1157 | 1157 | |
| 1158 | - if ($this->debug > 1) { |
|
| 1158 | + if ($this->debug>1) { |
|
| 1159 | 1159 | $this->getLogger()->debugMessage("---SENDING---\n$payload\n---END---"); |
| 1160 | 1160 | } |
| 1161 | 1161 | |
@@ -1253,7 +1253,7 @@ discard block |
||
| 1253 | 1253 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1254 | 1254 | $numParams = $req->getNumParams(); |
| 1255 | 1255 | $params = array(); |
| 1256 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1256 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1257 | 1257 | $params[$i] = $req->getParam($i); |
| 1258 | 1258 | } |
| 1259 | 1259 | $call['params'] = new Value($params, 'array'); |
@@ -1279,15 +1279,15 @@ discard block |
||
| 1279 | 1279 | /// @todo test this code branch... |
| 1280 | 1280 | $rets = $result->value(); |
| 1281 | 1281 | if (!is_array($rets)) { |
| 1282 | - return false; // bad return type from system.multicall |
|
| 1282 | + return false; // bad return type from system.multicall |
|
| 1283 | 1283 | } |
| 1284 | 1284 | $numRets = count($rets); |
| 1285 | 1285 | if ($numRets != count($reqs)) { |
| 1286 | - return false; // wrong number of return values. |
|
| 1286 | + return false; // wrong number of return values. |
|
| 1287 | 1287 | } |
| 1288 | 1288 | |
| 1289 | 1289 | $response = array(); |
| 1290 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1290 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1291 | 1291 | $val = $rets[$i]; |
| 1292 | 1292 | if (!is_array($val)) { |
| 1293 | 1293 | return false; |
@@ -1295,7 +1295,7 @@ discard block |
||
| 1295 | 1295 | switch (count($val)) { |
| 1296 | 1296 | case 1: |
| 1297 | 1297 | if (!isset($val[0])) { |
| 1298 | - return false; // Bad value |
|
| 1298 | + return false; // Bad value |
|
| 1299 | 1299 | } |
| 1300 | 1300 | // Normal return value |
| 1301 | 1301 | $response[$i] = new Response($val[0], 0, '', 'phpvals'); |
@@ -1323,11 +1323,11 @@ discard block |
||
| 1323 | 1323 | |
| 1324 | 1324 | $rets = $result->value(); |
| 1325 | 1325 | if ($rets->kindOf() != 'array') { |
| 1326 | - return false; // bad return type from system.multicall |
|
| 1326 | + return false; // bad return type from system.multicall |
|
| 1327 | 1327 | } |
| 1328 | 1328 | $numRets = $rets->count(); |
| 1329 | 1329 | if ($numRets != count($reqs)) { |
| 1330 | - return false; // wrong number of return values. |
|
| 1330 | + return false; // wrong number of return values. |
|
| 1331 | 1331 | } |
| 1332 | 1332 | |
| 1333 | 1333 | $response = array(); |
@@ -1335,7 +1335,7 @@ discard block |
||
| 1335 | 1335 | switch ($val->kindOf()) { |
| 1336 | 1336 | case 'array': |
| 1337 | 1337 | if ($val->count() != 1) { |
| 1338 | - return false; // Bad value |
|
| 1338 | + return false; // Bad value |
|
| 1339 | 1339 | } |
| 1340 | 1340 | // Normal return value |
| 1341 | 1341 | $response[] = new Response($val[0]); |
@@ -64,9 +64,9 @@ discard block |
||
| 64 | 64 | ); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public static function getOpts($args=array(), $cliOpts=array()) |
|
| 67 | + public static function getOpts($args = array(), $cliOpts = array()) |
|
| 68 | 68 | { |
| 69 | - if (count($args) > 0) |
|
| 69 | + if (count($args)>0) |
|
| 70 | 70 | // throw new \Exception('Missing library version argument'); |
| 71 | 71 | self::$libVersion = $args[0]; |
| 72 | 72 | |
@@ -169,17 +169,17 @@ discard block |
||
| 169 | 169 | $out = ''; |
| 170 | 170 | while (($start = strpos($content, $startTag, $last)) !== false) { |
| 171 | 171 | $end = strpos($content, $endTag, $start); |
| 172 | - $code = substr($content, $start + strlen($startTag), $end - $start - strlen($startTag)); |
|
| 173 | - if ($code[strlen($code) - 1] == "\n") { |
|
| 172 | + $code = substr($content, $start+strlen($startTag), $end-$start-strlen($startTag)); |
|
| 173 | + if ($code[strlen($code)-1] == "\n") { |
|
| 174 | 174 | $code = substr($code, 0, -1); |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | $code = str_replace(array('>', '<'), array('>', '<'), $code); |
| 178 | - $code = highlight_string('<?php ' . $code, true); |
|
| 178 | + $code = highlight_string('<?php '.$code, true); |
|
| 179 | 179 | $code = str_replace('<span style="color: #0000BB"><?php <br />', '<span style="color: #0000BB">', $code); |
| 180 | 180 | |
| 181 | - $out = $out . substr($content, $last, $start + strlen($startTag) - $last) . $code . $endTag; |
|
| 182 | - $last = $end + strlen($endTag); |
|
| 181 | + $out = $out.substr($content, $last, $start+strlen($startTag)-$last).$code.$endTag; |
|
| 182 | + $last = $end+strlen($endTag); |
|
| 183 | 183 | } |
| 184 | 184 | $out .= substr($content, $last, strlen($content)); |
| 185 | 185 | |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | |
| 194 | 194 | use PhpXmlRpc\Builder; |
| 195 | 195 | |
| 196 | -function run_default($task=null, $args=array(), $cliOpts=array()) |
|
| 196 | +function run_default($task = null, $args = array(), $cliOpts = array()) |
|
| 197 | 197 | { |
| 198 | 198 | echo "Syntax: pake {\$pake-options} \$task \$lib-version [\$git-tag] {\$task-options}\n"; |
| 199 | 199 | echo "\n"; |
@@ -211,7 +211,7 @@ discard block |
||
| 211 | 211 | echo " --zip=ZIP Location of the zip tool\n"; |
| 212 | 212 | } |
| 213 | 213 | |
| 214 | -function run_getopts($task=null, $args=array(), $cliOpts=array()) |
|
| 214 | +function run_getopts($task = null, $args = array(), $cliOpts = array()) |
|
| 215 | 215 | { |
| 216 | 216 | Builder::getOpts($args, $cliOpts); |
| 217 | 217 | } |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | * Downloads source code in the build workspace directory, optionally checking out the given branch/tag |
| 221 | 221 | * @todo allow using current installation / dir as source, bypassing git clone in workspace - at least for doc generation |
| 222 | 222 | */ |
| 223 | -function run_init($task=null, $args=array(), $cliOpts=array()) |
|
| 223 | +function run_init($task = null, $args = array(), $cliOpts = array()) |
|
| 224 | 224 | { |
| 225 | 225 | // download the current version into the workspace |
| 226 | 226 | $targetDir = Builder::workspaceDir(); |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | * |
| 250 | 250 | * (does nothing by itself, as all the steps are managed via task dependencies) |
| 251 | 251 | */ |
| 252 | -function run_build($task=null, $args=array(), $cliOpts=array()) |
|
| 252 | +function run_build($task = null, $args = array(), $cliOpts = array()) |
|
| 253 | 253 | { |
| 254 | 254 | } |
| 255 | 255 | |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | /** |
| 266 | 266 | * Generates documentation in all formats |
| 267 | 267 | */ |
| 268 | -function run_doc($task=null, $args=array(), $cliOpts=array()) |
|
| 268 | +function run_doc($task = null, $args = array(), $cliOpts = array()) |
|
| 269 | 269 | { |
| 270 | 270 | // in |
| 271 | 271 | $srcDir = Builder::workspaceDir(); |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | |
| 277 | 277 | // from phpdoc comments using phpdocumentor |
| 278 | 278 | $cmd = Builder::tool('php'); |
| 279 | - pake_sh("$cmd " . Builder::toolsDir(). "/vendor/bin/phpdoc run --cache-folder ".Builder::buildDir()."/.phpdoc -d ".$srcDir.'/src'." -t ".$docDir.'/api --title PHP-XMLRPC --defaultpackagename PHPXMLRPC'); |
|
| 279 | + pake_sh("$cmd ".Builder::toolsDir()."/vendor/bin/phpdoc run --cache-folder ".Builder::buildDir()."/.phpdoc -d ".$srcDir.'/src'." -t ".$docDir.'/api --title PHP-XMLRPC --defaultpackagename PHPXMLRPC'); |
|
| 280 | 280 | |
| 281 | 281 | // from phpdoc comments using Sami |
| 282 | 282 | // deprecated on 2021/12, as Sami is abandonware |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | /** |
| 358 | 358 | * Creates the tarballs for a release |
| 359 | 359 | */ |
| 360 | -function run_dist($task=null, $args=array(), $cliOpts=array()) |
|
| 360 | +function run_dist($task = null, $args = array(), $cliOpts = array()) |
|
| 361 | 361 | { |
| 362 | 362 | // copy workspace dir into dist dir, without git |
| 363 | 363 | pake_mkdirs(Builder::distDir()); |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | // create tarballs |
| 373 | 373 | $cwd = getcwd(); |
| 374 | 374 | chdir(dirname(Builder::distDir())); |
| 375 | - foreach(Builder::distFiles() as $distFile) { |
|
| 375 | + foreach (Builder::distFiles() as $distFile) { |
|
| 376 | 376 | // php can not really create good zip files via phar: they are not compressed! |
| 377 | 377 | if (substr($distFile, -4) == '.zip') { |
| 378 | 378 | $cmd = Builder::tool('zip'); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | chdir($cwd); |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | -function run_clean_workspace($task=null, $args=array(), $cliOpts=array()) |
|
| 393 | +function run_clean_workspace($task = null, $args = array(), $cliOpts = array()) |
|
| 394 | 394 | { |
| 395 | 395 | if (realpath(__DIR__) === realpath(Builder::workspaceDir())) { |
| 396 | 396 | throw new \Exception("Can not remove workspace dir, as it is where pakefile is located!"); |
@@ -402,13 +402,13 @@ discard block |
||
| 402 | 402 | * Cleans up the whole build directory |
| 403 | 403 | * @todo 'make clean' usually just removes the results of the build, distclean removes all but sources |
| 404 | 404 | */ |
| 405 | -function run_clean($task=null, $args=array(), $cliOpts=array()) |
|
| 405 | +function run_clean($task = null, $args = array(), $cliOpts = array()) |
|
| 406 | 406 | { |
| 407 | 407 | pake_remove_dir(Builder::buildDir()); |
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | // helper task: display help text |
| 411 | -pake_task( 'default' ); |
|
| 411 | +pake_task('default'); |
|
| 412 | 412 | // internal task: parse cli options |
| 413 | 413 | pake_task('getopts'); |
| 414 | 414 | pake_task('init', 'getopts'); |
@@ -17,15 +17,15 @@ 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 | } |
| 24 | 24 | |
| 25 | 25 | // Relative path to the visual xmlrpc editing dialog |
| 26 | 26 | // We allow to easily configure this path via defines |
| 27 | -$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/debugger/'; |
|
| 28 | -$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/lib/'; |
|
| 27 | +$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/debugger/'; |
|
| 28 | +$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/lib/'; |
|
| 29 | 29 | ?> |
| 30 | 30 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
| 31 | 31 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
@@ -231,9 +231,9 @@ discard block |
||
| 231 | 231 | echo ' document.forms[2].submit();'; |
| 232 | 232 | } ?>"> |
| 233 | 233 | <h1>XMLRPC |
| 234 | - <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
| 234 | + <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
| 235 | 235 | / |
| 236 | - <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
| 236 | + <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
| 237 | 237 | JSONRPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHP-XMLRPC</a> library) |
| 238 | 238 | </h1> |
| 239 | 239 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | </select> |
| 289 | 289 | </td> |
| 290 | 290 | <td class="labelcell">Timeout:</td> |
| 291 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 291 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 292 | 292 | <td class="labelcell">Protocol:</td> |
| 293 | 293 | <td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();"> |
| 294 | 294 | <option value="0"<?php if ($protocol == 0) { echo ' selected="selected"'; } ?>>HTTP 1.0</option> |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $this->me['struct'] = $val; |
| 120 | 120 | break; |
| 121 | 121 | default: |
| 122 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
| 122 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | if ($typeOf !== 1) { |
| 147 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
| 147 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
| 148 | 148 | return 0; |
| 149 | 149 | } |
| 150 | 150 | |
@@ -161,10 +161,10 @@ discard block |
||
| 161 | 161 | |
| 162 | 162 | switch ($this->mytype) { |
| 163 | 163 | case 1: |
| 164 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
| 164 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
| 165 | 165 | return 0; |
| 166 | 166 | case 3: |
| 167 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 167 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 168 | 168 | return 0; |
| 169 | 169 | case 2: |
| 170 | 170 | // we're adding a scalar value to an array here |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | return 1; |
| 208 | 208 | } else { |
| 209 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 209 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 210 | 210 | return 0; |
| 211 | 211 | } |
| 212 | 212 | } |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | |
| 238 | 238 | return 1; |
| 239 | 239 | } else { |
| 240 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 240 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 241 | 241 | return 0; |
| 242 | 242 | } |
| 243 | 243 | } |
@@ -279,19 +279,19 @@ discard block |
||
| 279 | 279 | case 1: |
| 280 | 280 | switch ($typ) { |
| 281 | 281 | case static::$xmlrpcBase64: |
| 282 | - $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
| 282 | + $rs .= "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
| 283 | 283 | break; |
| 284 | 284 | case static::$xmlrpcBoolean: |
| 285 | - $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
| 285 | + $rs .= "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
| 286 | 286 | break; |
| 287 | 287 | case static::$xmlrpcString: |
| 288 | 288 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
| 289 | - $rs .= "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
| 289 | + $rs .= "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
| 290 | 290 | break; |
| 291 | 291 | case static::$xmlrpcInt: |
| 292 | 292 | case static::$xmlrpcI4: |
| 293 | 293 | case static::$xmlrpcI8: |
| 294 | - $rs .= "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
| 294 | + $rs .= "<{$typ}>".(int) $val."</{$typ}>"; |
|
| 295 | 295 | break; |
| 296 | 296 | case static::$xmlrpcDouble: |
| 297 | 297 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -299,16 +299,16 @@ discard block |
||
| 299 | 299 | // sprintf('%F') could be most likely ok but it fails eg. on 2e-14. |
| 300 | 300 | // The code below tries its best at keeping max precision while avoiding exp notation, |
| 301 | 301 | // but there is of course no limit in the number of decimal places to be used... |
| 302 | - $rs .= "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
| 302 | + $rs .= "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
| 303 | 303 | break; |
| 304 | 304 | case static::$xmlrpcDateTime: |
| 305 | 305 | if (is_string($val)) { |
| 306 | 306 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
| 307 | 307 | // DateTimeInterface is not present in php 5.4... |
| 308 | 308 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
| 309 | - $rs .= "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
| 309 | + $rs .= "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
| 310 | 310 | } elseif (is_int($val)) { |
| 311 | - $rs .= "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
| 311 | + $rs .= "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
| 312 | 312 | } else { |
| 313 | 313 | // not really a good idea here: but what should we output anyway? left for backward compat... |
| 314 | 314 | $rs .= "<{$typ}>{$val}</{$typ}>"; |
@@ -330,14 +330,14 @@ discard block |
||
| 330 | 330 | case 3: |
| 331 | 331 | // struct |
| 332 | 332 | if ($this->_php_class) { |
| 333 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
| 333 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
| 334 | 334 | } else { |
| 335 | 335 | $rs .= "<struct>\n"; |
| 336 | 336 | } |
| 337 | 337 | $charsetEncoder = $this->getCharsetEncoder(); |
| 338 | 338 | /** @var Value $val2 */ |
| 339 | 339 | foreach ($val as $key2 => $val2) { |
| 340 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
| 340 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
| 341 | 341 | //$rs.=$this->serializeval($val2); |
| 342 | 342 | $rs .= $val2->serialize($charsetEncoding); |
| 343 | 343 | $rs .= "</member>\n"; |
@@ -373,7 +373,7 @@ discard block |
||
| 373 | 373 | $val = reset($this->me); |
| 374 | 374 | $typ = key($this->me); |
| 375 | 375 | |
| 376 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
| 376 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | /** |
