gggeek /
phpxmlrpc
@@ -1,5 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>xmlrpc - Proxy demo</title></head> |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>xmlrpc - Mail demo</title></head> |
@@ -35,8 +35,8 @@ discard block |
||
| 35 | 35 | output("<font color=\"red\">"); |
| 36 | 36 | output("Mail send failed<br/>\n"); |
| 37 | 37 | output("Fault: "); |
| 38 | - output("Code: " . htmlspecialchars($resp->faultCode()) . |
|
| 39 | - " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>"); |
|
| 38 | + output("Code: ".htmlspecialchars($resp->faultCode()). |
|
| 39 | + " Reason: '".htmlspecialchars($resp->faultString())."'<br/>"); |
|
| 40 | 40 | output("</font><br/>"); |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777); |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 18 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php"; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | $targetFile = null; |
@@ -38,5 +38,5 @@ discard block |
||
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
| 41 | - include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 41 | + include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
| 42 | 42 | } |
@@ -151,35 +151,35 @@ discard block |
||
| 151 | 151 | public function serialize($charsetEncoding = '') |
| 152 | 152 | { |
| 153 | 153 | if ($charsetEncoding != '') { |
| 154 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 154 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 155 | 155 | } else { |
| 156 | 156 | $this->content_type = 'text/xml'; |
| 157 | 157 | } |
| 158 | 158 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 159 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 159 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 160 | 160 | } else { |
| 161 | 161 | $result = "<methodResponse>\n"; |
| 162 | 162 | } |
| 163 | 163 | if ($this->errno) { |
| 164 | 164 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 165 | - $result .= "<fault>\n" . |
|
| 166 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 167 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 168 | - Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" . |
|
| 165 | + $result .= "<fault>\n". |
|
| 166 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 167 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 168 | + Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n". |
|
| 169 | 169 | "</struct>\n</value>\n</fault>"; |
| 170 | 170 | } else { |
| 171 | 171 | if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) { |
| 172 | 172 | if (is_string($this->val) && $this->valtyp == 'xml') { |
| 173 | - $result .= "<params>\n<param>\n" . |
|
| 174 | - $this->val . |
|
| 173 | + $result .= "<params>\n<param>\n". |
|
| 174 | + $this->val. |
|
| 175 | 175 | "</param>\n</params>"; |
| 176 | 176 | } else { |
| 177 | 177 | /// @todo try to build something serializable using the Encoder... |
| 178 | 178 | throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values'); |
| 179 | 179 | } |
| 180 | 180 | } else { |
| 181 | - $result .= "<params>\n<param>\n" . |
|
| 182 | - $this->val->serialize($charsetEncoding) . |
|
| 181 | + $result .= "<params>\n<param>\n". |
|
| 182 | + $this->val->serialize($charsetEncoding). |
|
| 183 | 183 | "</param>\n</params>"; |
| 184 | 184 | } |
| 185 | 185 | } |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | return $this->httpResponse['raw_data']; |
| 205 | 205 | default: |
| 206 | 206 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 207 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 207 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 208 | 208 | return null; |
| 209 | 209 | } |
| 210 | 210 | } |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | break; |
| 226 | 226 | default: |
| 227 | 227 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 228 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 228 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | break; |
| 258 | 258 | default: |
| 259 | 259 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 260 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 260 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -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 | } |
@@ -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 | /** |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | * It uses a Berkeley DB database for storage. |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | -require_once __DIR__ . "/_prepend.php"; |
|
| 7 | +require_once __DIR__."/_prepend.php"; |
|
| 8 | 8 | |
| 9 | 9 | use PhpXmlRpc\Value; |
| 10 | 10 | |
@@ -35,8 +35,8 @@ discard block |
||
| 35 | 35 | $count = 0; |
| 36 | 36 | } |
| 37 | 37 | // add the new comment in |
| 38 | - dba_insert($msgID . "_comment_{$count}", $comment, $dbh); |
|
| 39 | - dba_insert($msgID . "_name_{$count}", $name, $dbh); |
|
| 38 | + dba_insert($msgID."_comment_{$count}", $comment, $dbh); |
|
| 39 | + dba_insert($msgID."_name_{$count}", $name, $dbh); |
|
| 40 | 40 | $count++; |
| 41 | 41 | dba_replace($countID, $count, $dbh); |
| 42 | 42 | dba_close($dbh); |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | $countID = "{$msgID}_count"; |
| 70 | 70 | if (dba_exists($countID, $dbh)) { |
| 71 | 71 | $count = dba_fetch($countID, $dbh); |
| 72 | - for ($i = 0; $i < $count; $i++) { |
|
| 72 | + for ($i = 0; $i<$count; $i++) { |
|
| 73 | 73 | $name = dba_fetch("{$msgID}_name_{$i}", $dbh); |
| 74 | 74 | $comment = dba_fetch("{$msgID}_comment_{$i}", $dbh); |
| 75 | 75 | // push a new struct onto the return array |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | */ |
| 204 | 204 | public static function xmlrpc_debugmsg($msg) |
| 205 | 205 | { |
| 206 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
| 206 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | /** |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | */ |
| 216 | 216 | public static function error_occurred($msg) |
| 217 | 217 | { |
| 218 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
| 218 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
| 219 | 219 | } |
| 220 | 220 | |
| 221 | 221 | /** |
@@ -234,10 +234,10 @@ discard block |
||
| 234 | 234 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
| 235 | 235 | $out = ''; |
| 236 | 236 | if ($this->debug_info != '') { |
| 237 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
| 237 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
| 238 | 238 | } |
| 239 | 239 | if (static::$_xmlrpc_debuginfo != '') { |
| 240 | - $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
| 240 | + $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
| 241 | 241 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
| 242 | 242 | // into return payload AFTER the beginning tag |
| 243 | 243 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -267,8 +267,8 @@ discard block |
||
| 267 | 267 | $this->debug_info = ''; |
| 268 | 268 | |
| 269 | 269 | // Save what we received, before parsing it |
| 270 | - if ($this->debug > 1) { |
|
| 271 | - $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
| 270 | + if ($this->debug>1) { |
|
| 271 | + $this->debugmsg("+++GOT+++\n".$data."\n+++END+++"); |
|
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | $r = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -282,21 +282,21 @@ discard block |
||
| 282 | 282 | $r->raw_data = $rawData; |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors) { |
|
| 286 | - $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
| 287 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
| 285 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors) { |
|
| 286 | + $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
| 287 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | $payload = $this->xml_header($respCharset); |
| 291 | - if ($this->debug > 0) { |
|
| 292 | - $payload = $payload . $this->serializeDebug($respCharset); |
|
| 291 | + if ($this->debug>0) { |
|
| 292 | + $payload = $payload.$this->serializeDebug($respCharset); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | // Do not create response serialization if it has already happened. Helps building json magic |
| 296 | 296 | if (empty($r->payload)) { |
| 297 | 297 | $r->serialize($respCharset); |
| 298 | 298 | } |
| 299 | - $payload = $payload . $r->payload; |
|
| 299 | + $payload = $payload.$r->payload; |
|
| 300 | 300 | |
| 301 | 301 | if ($returnPayload) { |
| 302 | 302 | return $payload; |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | // if we get a warning/error that has output some text before here, then we cannot |
| 306 | 306 | // add a new header. We cannot say we are sending xml, either... |
| 307 | 307 | if (!headers_sent()) { |
| 308 | - header('Content-Type: ' . $r->content_type); |
|
| 308 | + header('Content-Type: '.$r->content_type); |
|
| 309 | 309 | // we do not know if client actually told us an accepted charset, but if he did |
| 310 | 310 | // we have to tell him what we did |
| 311 | 311 | header("Vary: Accept-Charset"); |
@@ -334,10 +334,10 @@ discard block |
||
| 334 | 334 | // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for |
| 335 | 335 | // responses up to 8000 bytes |
| 336 | 336 | if ($phpNoSelfCompress) { |
| 337 | - header('Content-Length: ' . (int)strlen($payload)); |
|
| 337 | + header('Content-Length: '.(int) strlen($payload)); |
|
| 338 | 338 | } |
| 339 | 339 | } else { |
| 340 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 340 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | print $payload; |
@@ -392,9 +392,9 @@ discard block |
||
| 392 | 392 | $numParams = count($in); |
| 393 | 393 | } |
| 394 | 394 | foreach ($sigs as $curSig) { |
| 395 | - if (count($curSig) == $numParams + 1) { |
|
| 395 | + if (count($curSig) == $numParams+1) { |
|
| 396 | 396 | $itsOK = 1; |
| 397 | - for ($n = 0; $n < $numParams; $n++) { |
|
| 397 | + for ($n = 0; $n<$numParams; $n++) { |
|
| 398 | 398 | if (is_object($in)) { |
| 399 | 399 | $p = $in->getParam($n); |
| 400 | 400 | if ($p->kindOf() == 'scalar') { |
@@ -407,10 +407,10 @@ discard block |
||
| 407 | 407 | } |
| 408 | 408 | |
| 409 | 409 | // param index is $n+1, as first member of sig is return type |
| 410 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
| 410 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
| 411 | 411 | $itsOK = 0; |
| 412 | - $pno = $n + 1; |
|
| 413 | - $wanted = $curSig[$n + 1]; |
|
| 412 | + $pno = $n+1; |
|
| 413 | + $wanted = $curSig[$n+1]; |
|
| 414 | 414 | $got = $pt; |
| 415 | 415 | break; |
| 416 | 416 | } |
@@ -437,10 +437,10 @@ discard block |
||
| 437 | 437 | // check if $_SERVER is populated: it might have been disabled via ini file |
| 438 | 438 | // (this is true even when in CLI mode) |
| 439 | 439 | if (count($_SERVER) == 0) { |
| 440 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
| 440 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
| 441 | 441 | } |
| 442 | 442 | |
| 443 | - if ($this->debug > 1) { |
|
| 443 | + if ($this->debug>1) { |
|
| 444 | 444 | if (function_exists('getallheaders')) { |
| 445 | 445 | $this->debugmsg(''); // empty line |
| 446 | 446 | foreach (getallheaders() as $name => $val) { |
@@ -464,13 +464,13 @@ discard block |
||
| 464 | 464 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
| 465 | 465 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 466 | 466 | $data = $degzdata; |
| 467 | - if ($this->debug > 1) { |
|
| 468 | - $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 467 | + if ($this->debug>1) { |
|
| 468 | + $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 469 | 469 | } |
| 470 | 470 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 471 | 471 | $data = $degzdata; |
| 472 | - if ($this->debug > 1) { |
|
| 473 | - $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 472 | + if ($this->debug>1) { |
|
| 473 | + $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 474 | 474 | } |
| 475 | 475 | } else { |
| 476 | 476 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | if ($reqEncoding == 'ISO-8859-1') { |
| 565 | 565 | $data = utf8_encode($data); |
| 566 | 566 | } else { |
| 567 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding); |
|
| 567 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding); |
|
| 568 | 568 | } |
| 569 | 569 | } |
| 570 | 570 | } |
@@ -583,16 +583,16 @@ discard block |
||
| 583 | 583 | |
| 584 | 584 | $xmlRpcParser = $this->getParser(); |
| 585 | 585 | $xmlRpcParser->parse($data, $this->functions_parameters_type, XMLParser::ACCEPT_REQUEST, $options); |
| 586 | - if ($xmlRpcParser->_xh['isf'] > 2) { |
|
| 586 | + if ($xmlRpcParser->_xh['isf']>2) { |
|
| 587 | 587 | // (BC) we return XML error as a faultCode |
| 588 | 588 | preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches); |
| 589 | 589 | $r = new Response(0, |
| 590 | - PhpXmlRpc::$xmlrpcerrxml + $matches[1], |
|
| 590 | + PhpXmlRpc::$xmlrpcerrxml+$matches[1], |
|
| 591 | 591 | $xmlRpcParser->_xh['isf_reason']); |
| 592 | 592 | } elseif ($xmlRpcParser->_xh['isf']) { |
| 593 | 593 | $r = new Response(0, |
| 594 | 594 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
| 595 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']); |
|
| 595 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']); |
|
| 596 | 596 | } else { |
| 597 | 597 | // small layering violation in favor of speed and memory usage: |
| 598 | 598 | // we should allow the 'execute' method handle this, but in the |
@@ -603,20 +603,20 @@ discard block |
||
| 603 | 603 | ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals') |
| 604 | 604 | ) |
| 605 | 605 | ) { |
| 606 | - if ($this->debug > 1) { |
|
| 607 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++"); |
|
| 606 | + if ($this->debug>1) { |
|
| 607 | + $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++"); |
|
| 608 | 608 | } |
| 609 | 609 | $r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']); |
| 610 | 610 | } else { |
| 611 | 611 | // build a Request object with data parsed from xml |
| 612 | 612 | $req = new Request($xmlRpcParser->_xh['method']); |
| 613 | 613 | // now add parameters in |
| 614 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
| 614 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
| 615 | 615 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
| 616 | 616 | } |
| 617 | 617 | |
| 618 | - if ($this->debug > 1) { |
|
| 619 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
| 618 | + if ($this->debug>1) { |
|
| 619 | + $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
| 620 | 620 | } |
| 621 | 621 | $r = $this->execute($req); |
| 622 | 622 | } |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | return new Response( |
| 670 | 670 | 0, |
| 671 | 671 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 672 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}" |
|
| 672 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}" |
|
| 673 | 673 | ); |
| 674 | 674 | } |
| 675 | 675 | } |
@@ -682,7 +682,7 @@ discard block |
||
| 682 | 682 | |
| 683 | 683 | if (is_array($func)) { |
| 684 | 684 | if (is_object($func[0])) { |
| 685 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
| 685 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
| 686 | 686 | } else { |
| 687 | 687 | $funcName = implode('::', $func); |
| 688 | 688 | } |
@@ -694,17 +694,17 @@ discard block |
||
| 694 | 694 | |
| 695 | 695 | // verify that function to be invoked is in fact callable |
| 696 | 696 | if (!is_callable($func)) { |
| 697 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
| 697 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
| 698 | 698 | return new Response( |
| 699 | 699 | 0, |
| 700 | 700 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 701 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
| 701 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
| 702 | 702 | ); |
| 703 | 703 | } |
| 704 | 704 | |
| 705 | 705 | // If debug level is 3, we should catch all errors generated during |
| 706 | 706 | // processing of user function, and log them as part of response |
| 707 | - if ($this->debug > 2) { |
|
| 707 | + if ($this->debug>2) { |
|
| 708 | 708 | self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler')); |
| 709 | 709 | } |
| 710 | 710 | |
@@ -717,14 +717,14 @@ discard block |
||
| 717 | 717 | $r = call_user_func($func, $req); |
| 718 | 718 | } |
| 719 | 719 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
| 720 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
| 720 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
| 721 | 721 | if (is_a($r, 'PhpXmlRpc\Value')) { |
| 722 | 722 | $r = new Response($r); |
| 723 | 723 | } else { |
| 724 | 724 | $r = new Response( |
| 725 | 725 | 0, |
| 726 | 726 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 727 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
| 727 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
| 728 | 728 | ); |
| 729 | 729 | } |
| 730 | 730 | } |
@@ -740,7 +740,7 @@ discard block |
||
| 740 | 740 | // mimic EPI behaviour: if we get an array that looks like an error, make it |
| 741 | 741 | // an error response |
| 742 | 742 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
| 743 | - $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
| 743 | + $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
| 744 | 744 | } else { |
| 745 | 745 | // functions using EPI api should NOT return resp objects, |
| 746 | 746 | // so make sure we encode the return type correctly |
@@ -764,7 +764,7 @@ discard block |
||
| 764 | 764 | // in the called function, we wrap it in a proper error-response |
| 765 | 765 | switch ($this->exception_handling) { |
| 766 | 766 | case 2: |
| 767 | - if ($this->debug > 2) { |
|
| 767 | + if ($this->debug>2) { |
|
| 768 | 768 | if (self::$_xmlrpcs_prev_ehandler) { |
| 769 | 769 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
| 770 | 770 | } else { |
@@ -779,7 +779,7 @@ discard block |
||
| 779 | 779 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_error'], PhpXmlRpc::$xmlrpcstr['server_error']); |
| 780 | 780 | } |
| 781 | 781 | } |
| 782 | - if ($this->debug > 2) { |
|
| 782 | + if ($this->debug>2) { |
|
| 783 | 783 | // note: restore the error handler we found before calling the |
| 784 | 784 | // user func, even if it has been changed inside the func itself |
| 785 | 785 | if (self::$_xmlrpcs_prev_ehandler) { |
@@ -799,7 +799,7 @@ discard block |
||
| 799 | 799 | */ |
| 800 | 800 | protected function debugmsg($string) |
| 801 | 801 | { |
| 802 | - $this->debug_info .= $string . "\n"; |
|
| 802 | + $this->debug_info .= $string."\n"; |
|
| 803 | 803 | } |
| 804 | 804 | |
| 805 | 805 | /** |
@@ -809,9 +809,9 @@ discard block |
||
| 809 | 809 | protected function xml_header($charsetEncoding = '') |
| 810 | 810 | { |
| 811 | 811 | if ($charsetEncoding != '') { |
| 812 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 812 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 813 | 813 | } else { |
| 814 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 814 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 815 | 815 | } |
| 816 | 816 | } |
| 817 | 817 | |
@@ -1068,7 +1068,7 @@ discard block |
||
| 1068 | 1068 | $i++; // for error message, we count params from 1 |
| 1069 | 1069 | return static::_xmlrpcs_multicall_error(new Response(0, |
| 1070 | 1070 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 1071 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
| 1071 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
| 1072 | 1072 | } |
| 1073 | 1073 | } |
| 1074 | 1074 | |
@@ -1145,7 +1145,7 @@ discard block |
||
| 1145 | 1145 | } |
| 1146 | 1146 | } else { |
| 1147 | 1147 | $numCalls = count($req); |
| 1148 | - for ($i = 0; $i < $numCalls; $i++) { |
|
| 1148 | + for ($i = 0; $i<$numCalls; $i++) { |
|
| 1149 | 1149 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
| 1150 | 1150 | } |
| 1151 | 1151 | } |
