@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | return $xmlrpcVal->scalarval(); |
73 | 73 | case 'array': |
74 | 74 | $arr = array(); |
75 | - foreach($xmlrpcVal as $value) { |
|
75 | + foreach ($xmlrpcVal as $value) { |
|
76 | 76 | $arr[] = $this->decode($value, $options); |
77 | 77 | } |
78 | 78 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | case 'msg': |
103 | 103 | $paramCount = $xmlrpcVal->getNumParams(); |
104 | 104 | $arr = array(); |
105 | - for ($i = 0; $i < $paramCount; $i++) { |
|
105 | + for ($i = 0; $i<$paramCount; $i++) { |
|
106 | 106 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
107 | 107 | } |
108 | 108 | |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | break; |
204 | 204 | case 'resource': |
205 | 205 | if (in_array('extension_api', $options)) { |
206 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
206 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
207 | 207 | } else { |
208 | 208 | $xmlrpcVal = new Value(); |
209 | 209 | } |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | if (extension_loaded('mbstring')) { |
247 | 247 | $xmlVal = mb_convert_encoding($xmlVal, 'UTF-8', $valEncoding); |
248 | 248 | } else { |
249 | - error_log('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
249 | + error_log('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding); |
|
250 | 250 | } |
251 | 251 | } |
252 | 252 | } |
@@ -278,7 +278,7 @@ discard block |
||
278 | 278 | return false; |
279 | 279 | } |
280 | 280 | xml_parser_free($parser); |
281 | - if ($xmlRpcParser->_xh['isf'] > 1) { |
|
281 | + if ($xmlRpcParser->_xh['isf']>1) { |
|
282 | 282 | // test that $xmlrpc->_xh['value'] is an obj, too??? |
283 | 283 | |
284 | 284 | error_log($xmlRpcParser->_xh['isf_reason']); |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | return $r; |
300 | 300 | case 'methodcall': |
301 | 301 | $req = new Request($xmlRpcParser->_xh['method']); |
302 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
302 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
303 | 303 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
304 | 304 | } |
305 | 305 |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $this->me['struct'] = $val; |
74 | 74 | break; |
75 | 75 | default: |
76 | - error_log("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
76 | + error_log("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
77 | 77 | } |
78 | 78 | } |
79 | 79 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | } |
95 | 95 | |
96 | 96 | if ($typeOf !== 1) { |
97 | - error_log("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
97 | + error_log("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
98 | 98 | return 0; |
99 | 99 | } |
100 | 100 | |
@@ -111,10 +111,10 @@ discard block |
||
111 | 111 | |
112 | 112 | switch ($this->mytype) { |
113 | 113 | case 1: |
114 | - error_log('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
114 | + error_log('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
115 | 115 | return 0; |
116 | 116 | case 3: |
117 | - error_log('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
117 | + error_log('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
118 | 118 | return 0; |
119 | 119 | case 2: |
120 | 120 | // we're adding a scalar value to an array here |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | return 1; |
154 | 154 | } else { |
155 | - error_log('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
155 | + error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
156 | 156 | return 0; |
157 | 157 | } |
158 | 158 | } |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | |
180 | 180 | return 1; |
181 | 181 | } else { |
182 | - error_log('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
182 | + error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
183 | 183 | return 0; |
184 | 184 | } |
185 | 185 | } |
@@ -218,19 +218,19 @@ discard block |
||
218 | 218 | case 1: |
219 | 219 | switch ($typ) { |
220 | 220 | case static::$xmlrpcBase64: |
221 | - $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>"; |
|
221 | + $rs .= "<${typ}>".base64_encode($val)."</${typ}>"; |
|
222 | 222 | break; |
223 | 223 | case static::$xmlrpcBoolean: |
224 | - $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>"; |
|
224 | + $rs .= "<${typ}>".($val ? '1' : '0')."</${typ}>"; |
|
225 | 225 | break; |
226 | 226 | case static::$xmlrpcString: |
227 | 227 | // G. Giunta 2005/2/13: do NOT use htmlentities, since |
228 | 228 | // it will produce named html entities, which are invalid xml |
229 | - $rs .= "<${typ}>" . Charset::instance()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</${typ}>"; |
|
229 | + $rs .= "<${typ}>".Charset::instance()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</${typ}>"; |
|
230 | 230 | break; |
231 | 231 | case static::$xmlrpcInt: |
232 | 232 | case static::$xmlrpcI4: |
233 | - $rs .= "<${typ}>" . (int)$val . "</${typ}>"; |
|
233 | + $rs .= "<${typ}>".(int) $val."</${typ}>"; |
|
234 | 234 | break; |
235 | 235 | case static::$xmlrpcDouble: |
236 | 236 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -238,15 +238,15 @@ discard block |
||
238 | 238 | // sprintf('%F') could be most likely ok but it fails eg. on 2e-14. |
239 | 239 | // The code below tries its best at keeping max precision while avoiding exp notation, |
240 | 240 | // but there is of course no limit in the number of decimal places to be used... |
241 | - $rs .= "<${typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, 128, '.', '')) . "</${typ}>"; |
|
241 | + $rs .= "<${typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, 128, '.', ''))."</${typ}>"; |
|
242 | 242 | break; |
243 | 243 | case static::$xmlrpcDateTime: |
244 | 244 | if (is_string($val)) { |
245 | 245 | $rs .= "<${typ}>${val}</${typ}>"; |
246 | 246 | } elseif (is_a($val, 'DateTime')) { |
247 | - $rs .= "<${typ}>" . $val->format('Ymd\TH:i:s') . "</${typ}>"; |
|
247 | + $rs .= "<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>"; |
|
248 | 248 | } elseif (is_int($val)) { |
249 | - $rs .= "<${typ}>" . strftime("%Y%m%dT%H:%M:%S", $val) . "</${typ}>"; |
|
249 | + $rs .= "<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>"; |
|
250 | 250 | } else { |
251 | 251 | // not really a good idea here: but what shall we output anyway? left for backward compat... |
252 | 252 | $rs .= "<${typ}>${val}</${typ}>"; |
@@ -268,13 +268,13 @@ discard block |
||
268 | 268 | case 3: |
269 | 269 | // struct |
270 | 270 | if ($this->_php_class) { |
271 | - $rs .= '<struct php_class="' . $this->_php_class . "\">\n"; |
|
271 | + $rs .= '<struct php_class="'.$this->_php_class."\">\n"; |
|
272 | 272 | } else { |
273 | 273 | $rs .= "<struct>\n"; |
274 | 274 | } |
275 | 275 | $charsetEncoder = Charset::instance(); |
276 | 276 | foreach ($val as $key2 => $val2) { |
277 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
277 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
278 | 278 | //$rs.=$this->serializeval($val2); |
279 | 279 | $rs .= $val2->serialize($charsetEncoding); |
280 | 280 | $rs .= "</member>\n"; |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | reset($this->me); |
313 | 313 | list($typ, $val) = each($this->me); |
314 | 314 | |
315 | - return '<value>' . $this->serializedata($typ, $val, $charsetEncoding) . "</value>\n"; |
|
315 | + return '<value>'.$this->serializedata($typ, $val, $charsetEncoding)."</value>\n"; |
|
316 | 316 | //} |
317 | 317 | } |
318 | 318 |
@@ -44,7 +44,7 @@ |
||
44 | 44 | * |
45 | 45 | * When no value or type is passed in, the value is left uninitialized, and the value can be added later. |
46 | 46 | * |
47 | - * @param mixed $val if passing in an array, all array elements should be PhpXmlRpc\Value themselves |
|
47 | + * @param integer $val if passing in an array, all array elements should be PhpXmlRpc\Value themselves |
|
48 | 48 | * @param string $type any valid xmlrpc type name (lowercase): i4, int, boolean, string, double, dateTime.iso8601, |
49 | 49 | * base64, array, struct, null. |
50 | 50 | * If null, 'string' is assumed. |
@@ -110,36 +110,36 @@ |
||
110 | 110 | public function serialize($charsetEncoding = '') |
111 | 111 | { |
112 | 112 | if ($charsetEncoding != '') { |
113 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
113 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
114 | 114 | } else { |
115 | 115 | $this->content_type = 'text/xml'; |
116 | 116 | } |
117 | 117 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
118 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
118 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
119 | 119 | } else { |
120 | 120 | $result = "<methodResponse>\n"; |
121 | 121 | } |
122 | 122 | if ($this->errno) { |
123 | 123 | // G. Giunta 2005/2/13: let non-ASCII response messages be tolerated by clients |
124 | 124 | // by xml-encoding non ascii chars |
125 | - $result .= "<fault>\n" . |
|
126 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
127 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
128 | - Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" . |
|
125 | + $result .= "<fault>\n". |
|
126 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
127 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
128 | + Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n". |
|
129 | 129 | "</struct>\n</value>\n</fault>"; |
130 | 130 | } else { |
131 | 131 | if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) { |
132 | 132 | if (is_string($this->val) && $this->valtyp == 'xml') { |
133 | - $result .= "<params>\n<param>\n" . |
|
134 | - $this->val . |
|
133 | + $result .= "<params>\n<param>\n". |
|
134 | + $this->val. |
|
135 | 135 | "</param>\n</params>"; |
136 | 136 | } else { |
137 | 137 | /// @todo try to build something serializable? |
138 | 138 | throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values'); |
139 | 139 | } |
140 | 140 | } else { |
141 | - $result .= "<params>\n<param>\n" . |
|
142 | - $this->val->serialize($charsetEncoding) . |
|
141 | + $result .= "<params>\n<param>\n". |
|
142 | + $this->val->serialize($charsetEncoding). |
|
143 | 143 | "</param>\n</params>"; |
144 | 144 | } |
145 | 145 | } |
@@ -29,7 +29,7 @@ |
||
29 | 29 | return; |
30 | 30 | } |
31 | 31 | |
32 | - if (is_file($file = __DIR__ . str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { |
|
32 | + if (is_file($file = __DIR__.str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { |
|
33 | 33 | require $file; |
34 | 34 | } |
35 | 35 | } |
@@ -22,12 +22,12 @@ discard block |
||
22 | 22 | |
23 | 23 | // read chunk-size, chunk-extension (if any) and crlf |
24 | 24 | // get the position of the linebreak |
25 | - $chunkEnd = strpos($buffer, "\r\n") + 2; |
|
25 | + $chunkEnd = strpos($buffer, "\r\n")+2; |
|
26 | 26 | $temp = substr($buffer, 0, $chunkEnd); |
27 | 27 | $chunkSize = hexdec(trim($temp)); |
28 | 28 | $chunkStart = $chunkEnd; |
29 | - while ($chunkSize > 0) { |
|
30 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize); |
|
29 | + while ($chunkSize>0) { |
|
30 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize); |
|
31 | 31 | |
32 | 32 | // just in case we got a broken connection |
33 | 33 | if ($chunkEnd == false) { |
@@ -39,19 +39,19 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | // read chunk-data and crlf |
42 | - $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
42 | + $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
43 | 43 | // append chunk-data to entity-body |
44 | 44 | $new .= $chunk; |
45 | 45 | // length := length + chunk-size |
46 | 46 | $length += strlen($chunk); |
47 | 47 | // read chunk-size and crlf |
48 | - $chunkStart = $chunkEnd + 2; |
|
48 | + $chunkStart = $chunkEnd+2; |
|
49 | 49 | |
50 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2; |
|
50 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2; |
|
51 | 51 | if ($chunkEnd == false) { |
52 | 52 | break; //just in case we got a broken connection |
53 | 53 | } |
54 | - $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
54 | + $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
55 | 55 | $chunkSize = hexdec(trim($temp)); |
56 | 56 | $chunkStart = $chunkEnd; |
57 | 57 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @return array with keys 'headers' and 'cookies' |
69 | 69 | * @throws \Exception |
70 | 70 | */ |
71 | - public function parseResponseHeaders(&$data, $headersProcessed = false, $debug=0) |
|
71 | + public function parseResponseHeaders(&$data, $headersProcessed = false, $debug = 0) |
|
72 | 72 | { |
73 | 73 | $httpResponse = array('raw_data' => $data, 'headers'=> array(), 'cookies' => array()); |
74 | 74 | |
@@ -78,11 +78,11 @@ discard block |
||
78 | 78 | // (even though it is not valid http) |
79 | 79 | $pos = strpos($data, "\r\n\r\n"); |
80 | 80 | if ($pos || is_int($pos)) { |
81 | - $bd = $pos + 4; |
|
81 | + $bd = $pos+4; |
|
82 | 82 | } else { |
83 | 83 | $pos = strpos($data, "\n\n"); |
84 | 84 | if ($pos || is_int($pos)) { |
85 | - $bd = $pos + 2; |
|
85 | + $bd = $pos+2; |
|
86 | 86 | } else { |
87 | 87 | // No separation between response headers and body: fault? |
88 | 88 | $bd = 0; |
@@ -93,8 +93,8 @@ discard block |
||
93 | 93 | // maybe we could take them into account, too? |
94 | 94 | $data = substr($data, $bd); |
95 | 95 | } else { |
96 | - error_log('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed'); |
|
97 | - throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
96 | + error_log('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed'); |
|
97 | + throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
98 | 98 | } |
99 | 99 | } |
100 | 100 | |
@@ -111,20 +111,20 @@ discard block |
||
111 | 111 | $data = substr($data, $pos); |
112 | 112 | } |
113 | 113 | if (!preg_match('/^HTTP\/[0-9.]+ 200 /', $data)) { |
114 | - $errstr = substr($data, 0, strpos($data, "\n") - 1); |
|
115 | - error_log('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr); |
|
116 | - throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
114 | + $errstr = substr($data, 0, strpos($data, "\n")-1); |
|
115 | + error_log('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr); |
|
116 | + throw new \Exception(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | // be tolerant to usage of \n instead of \r\n to separate headers and data |
120 | 120 | // (even though it is not valid http) |
121 | 121 | $pos = strpos($data, "\r\n\r\n"); |
122 | 122 | if ($pos || is_int($pos)) { |
123 | - $bd = $pos + 4; |
|
123 | + $bd = $pos+4; |
|
124 | 124 | } else { |
125 | 125 | $pos = strpos($data, "\n\n"); |
126 | 126 | if ($pos || is_int($pos)) { |
127 | - $bd = $pos + 2; |
|
127 | + $bd = $pos+2; |
|
128 | 128 | } else { |
129 | 129 | // No separation between response headers and body: fault? |
130 | 130 | // we could take some action here instead of going on... |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | while (list(, $line) = @each($ar)) { |
137 | 137 | // take care of multi-line headers and cookies |
138 | 138 | $arr = explode(':', $line, 2); |
139 | - if (count($arr) > 1) { |
|
139 | + if (count($arr)>1) { |
|
140 | 140 | $headerName = strtolower(trim($arr[0])); |
141 | 141 | /// @todo some other headers (the ones that allow a CSV list of values) |
142 | 142 | /// do allow many values to be passed using multiple header lines. |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | // glue together all received cookies, using a comma to separate them |
155 | 155 | // (same as php does with getallheaders()) |
156 | 156 | if (isset($httpResponse['headers'][$headerName])) { |
157 | - $httpResponse['headers'][$headerName] .= ', ' . trim($cookie); |
|
157 | + $httpResponse['headers'][$headerName] .= ', '.trim($cookie); |
|
158 | 158 | } else { |
159 | 159 | $httpResponse['headers'][$headerName] = trim($cookie); |
160 | 160 | } |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | } |
184 | 184 | } elseif (isset($headerName)) { |
185 | 185 | /// @todo version1 cookies might span multiple lines, thus breaking the parsing above |
186 | - $httpResponse['headers'][$headerName] .= ' ' . trim($line); |
|
186 | + $httpResponse['headers'][$headerName] .= ' '.trim($line); |
|
187 | 187 | } |
188 | 188 | } |
189 | 189 | |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | // Decode chunked encoding sent by http 1.1 servers |
207 | 207 | if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') { |
208 | 208 | if (!$data = Http::decodeChunked($data)) { |
209 | - error_log('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server'); |
|
209 | + error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server'); |
|
210 | 210 | throw new \Exception(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail']); |
211 | 211 | } |
212 | 212 | } |
@@ -221,19 +221,19 @@ discard block |
||
221 | 221 | if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) { |
222 | 222 | $data = $degzdata; |
223 | 223 | if ($debug) { |
224 | - Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
224 | + Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
225 | 225 | } |
226 | 226 | } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
227 | 227 | $data = $degzdata; |
228 | 228 | if ($debug) { |
229 | - Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
229 | + Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
230 | 230 | } |
231 | 231 | } else { |
232 | - error_log('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server'); |
|
232 | + error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server'); |
|
233 | 233 | throw new \Exception(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail']); |
234 | 234 | } |
235 | 235 | } else { |
236 | - error_log('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
236 | + error_log('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
237 | 237 | throw new \Exception(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress']); |
238 | 238 | } |
239 | 239 | } |
@@ -51,12 +51,12 @@ discard block |
||
51 | 51 | |
52 | 52 | private function __construct() |
53 | 53 | { |
54 | - for ($i = 0; $i < 32; $i++) { |
|
54 | + for ($i = 0; $i<32; $i++) { |
|
55 | 55 | $this->xml_iso88591_Entities["in"][] = chr($i); |
56 | 56 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
57 | 57 | } |
58 | 58 | |
59 | - for ($i = 160; $i < 256; $i++) { |
|
59 | + for ($i = 160; $i<256; $i++) { |
|
60 | 60 | $this->xml_iso88591_Entities["in"][] = chr($i); |
61 | 61 | $this->xml_iso88591_Entities["out"][] = "&#{$i};"; |
62 | 62 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $srcEncoding = PhpXmlRpc::$xmlrpc_internalencoding; |
95 | 95 | } |
96 | 96 | |
97 | - switch (strtoupper($srcEncoding . '_' . $destEncoding)) { |
|
97 | + switch (strtoupper($srcEncoding.'_'.$destEncoding)) { |
|
98 | 98 | case 'ISO-8859-1_': |
99 | 99 | case 'ISO-8859-1_US-ASCII': |
100 | 100 | $escapedData = str_replace(array('&', '"', "'", '<', '>'), array('&', '"', ''', '<', '>'), $data); |
@@ -119,13 +119,13 @@ discard block |
||
119 | 119 | // NB: this will choke on invalid UTF-8, going most likely beyond EOF |
120 | 120 | $escapedData = ''; |
121 | 121 | // be kind to users creating string xmlrpc values out of different php types |
122 | - $data = (string)$data; |
|
122 | + $data = (string) $data; |
|
123 | 123 | $ns = strlen($data); |
124 | - for ($nn = 0; $nn < $ns; $nn++) { |
|
124 | + for ($nn = 0; $nn<$ns; $nn++) { |
|
125 | 125 | $ch = $data[$nn]; |
126 | 126 | $ii = ord($ch); |
127 | 127 | //1 7 0bbbbbbb (127) |
128 | - if ($ii < 128) { |
|
128 | + if ($ii<128) { |
|
129 | 129 | /// @todo shall we replace this with a (supposedly) faster str_replace? |
130 | 130 | switch ($ii) { |
131 | 131 | case 34: |
@@ -149,33 +149,33 @@ discard block |
||
149 | 149 | } //2 11 110bbbbb 10bbbbbb (2047) |
150 | 150 | elseif ($ii >> 5 == 6) { |
151 | 151 | $b1 = ($ii & 31); |
152 | - $ii = ord($data[$nn + 1]); |
|
152 | + $ii = ord($data[$nn+1]); |
|
153 | 153 | $b2 = ($ii & 63); |
154 | - $ii = ($b1 * 64) + $b2; |
|
154 | + $ii = ($b1 * 64)+$b2; |
|
155 | 155 | $ent = sprintf('&#%d;', $ii); |
156 | 156 | $escapedData .= $ent; |
157 | 157 | $nn += 1; |
158 | 158 | } //3 16 1110bbbb 10bbbbbb 10bbbbbb |
159 | 159 | elseif ($ii >> 4 == 14) { |
160 | 160 | $b1 = ($ii & 15); |
161 | - $ii = ord($data[$nn + 1]); |
|
161 | + $ii = ord($data[$nn+1]); |
|
162 | 162 | $b2 = ($ii & 63); |
163 | - $ii = ord($data[$nn + 2]); |
|
163 | + $ii = ord($data[$nn+2]); |
|
164 | 164 | $b3 = ($ii & 63); |
165 | - $ii = ((($b1 * 64) + $b2) * 64) + $b3; |
|
165 | + $ii = ((($b1 * 64)+$b2) * 64)+$b3; |
|
166 | 166 | $ent = sprintf('&#%d;', $ii); |
167 | 167 | $escapedData .= $ent; |
168 | 168 | $nn += 2; |
169 | 169 | } //4 21 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb |
170 | 170 | elseif ($ii >> 3 == 30) { |
171 | 171 | $b1 = ($ii & 7); |
172 | - $ii = ord($data[$nn + 1]); |
|
172 | + $ii = ord($data[$nn+1]); |
|
173 | 173 | $b2 = ($ii & 63); |
174 | - $ii = ord($data[$nn + 2]); |
|
174 | + $ii = ord($data[$nn+2]); |
|
175 | 175 | $b3 = ($ii & 63); |
176 | - $ii = ord($data[$nn + 3]); |
|
176 | + $ii = ord($data[$nn+3]); |
|
177 | 177 | $b4 = ($ii & 63); |
178 | - $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4; |
|
178 | + $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4; |
|
179 | 179 | $ent = sprintf('&#%d;', $ii); |
180 | 180 | $escapedData .= $ent; |
181 | 181 | $nn += 3; |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | */ |
204 | 204 | default: |
205 | 205 | $escapedData = ''; |
206 | - error_log('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
206 | + error_log('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported..."); |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | return $escapedData; |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | case 'iso88591': |
256 | 256 | return $this->xml_iso88591_Entities; |
257 | 257 | default: |
258 | - throw new \Exception('Unsupported charset: ' . $charset); |
|
258 | + throw new \Exception('Unsupported charset: '.$charset); |
|
259 | 259 | } |
260 | 260 | } |
261 | 261 |
@@ -32,7 +32,7 @@ |
||
32 | 32 | // of PHP |
33 | 33 | $t = gmstrftime("%Y%m%dT%H:%M:%S", $timet); |
34 | 34 | } else { |
35 | - $t = strftime("%Y%m%dT%H:%M:%S", $timet - date('Z')); |
|
35 | + $t = strftime("%Y%m%dT%H:%M:%S", $timet-date('Z')); |
|
36 | 36 | } |
37 | 37 | } |
38 | 38 |
@@ -28,7 +28,7 @@ |
||
28 | 28 | * @param string $message |
29 | 29 | * @param string $encoding |
30 | 30 | */ |
31 | - public function debugMessage($message, $encoding=null) |
|
31 | + public function debugMessage($message, $encoding = null) |
|
32 | 32 | { |
33 | 33 | // US-ASCII is a warning for PHP and a fatal for HHVM |
34 | 34 | if ($encoding == 'US-ASCII') { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false) |
65 | 65 | { |
66 | 66 | // if invalid xmlrpc already detected, skip all processing |
67 | - if ($this->_xh['isf'] < 2) { |
|
67 | + if ($this->_xh['isf']<2) { |
|
68 | 68 | // check for correct element nesting |
69 | 69 | // top level element can only be of 2 types |
70 | 70 | /// @todo optimization creep: save this check into a bool variable, instead of using count() every time: |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | $this->_xh['isf'] = 1; |
160 | 160 | break; |
161 | 161 | case 'MEMBER': |
162 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = ''; // set member name to null, in case we do not find in the xml later on |
|
162 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = ''; // set member name to null, in case we do not find in the xml later on |
|
163 | 163 | //$this->_xh['ac']=''; |
164 | 164 | // Drop trough intentionally |
165 | 165 | case 'PARAM': |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | */ |
212 | 212 | public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = true) |
213 | 213 | { |
214 | - if ($this->_xh['isf'] < 2) { |
|
214 | + if ($this->_xh['isf']<2) { |
|
215 | 215 | // push this element name from stack |
216 | 216 | // NB: if XML validates, correct opening/closing is guaranteed and |
217 | 217 | // we do not have to check for $name == $currElem. |
@@ -237,8 +237,8 @@ discard block |
||
237 | 237 | // check if we are inside an array or struct: |
238 | 238 | // if value just built is inside an array, let's move it into array on the stack |
239 | 239 | $vscount = count($this->_xh['valuestack']); |
240 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
241 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $temp; |
|
240 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
241 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $temp; |
|
242 | 242 | } else { |
243 | 243 | $this->_xh['value'] = $temp; |
244 | 244 | } |
@@ -252,8 +252,8 @@ discard block |
||
252 | 252 | // check if we are inside an array or struct: |
253 | 253 | // if value just built is inside an array, let's move it into array on the stack |
254 | 254 | $vscount = count($this->_xh['valuestack']); |
255 | - if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') { |
|
256 | - $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value']; |
|
255 | + if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') { |
|
256 | + $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value']; |
|
257 | 257 | } |
258 | 258 | } |
259 | 259 | break; |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | $this->_xh['value'] = $this->_xh['ac']; |
272 | 272 | } elseif ($name == 'DATETIME.ISO8601') { |
273 | 273 | if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) { |
274 | - error_log('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']); |
|
274 | + error_log('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']); |
|
275 | 275 | } |
276 | 276 | $this->_xh['vt'] = Value::$xmlrpcDateTime; |
277 | 277 | $this->_xh['value'] = $this->_xh['ac']; |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | } else { |
291 | 291 | // log if receiving something strange, even though we set the value to false anyway |
292 | 292 | if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) { |
293 | - error_log('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']); |
|
293 | + error_log('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']); |
|
294 | 294 | } |
295 | 295 | $this->_xh['value'] = false; |
296 | 296 | } |
@@ -300,37 +300,37 @@ discard block |
||
300 | 300 | // NOTE: regexp could be much stricter than this... |
301 | 301 | if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) { |
302 | 302 | /// @todo: find a better way of throwing an error than this! |
303 | - error_log('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']); |
|
303 | + error_log('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']); |
|
304 | 304 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
305 | 305 | } else { |
306 | 306 | // it's ok, add it on |
307 | - $this->_xh['value'] = (double)$this->_xh['ac']; |
|
307 | + $this->_xh['value'] = (double) $this->_xh['ac']; |
|
308 | 308 | } |
309 | 309 | } else { |
310 | 310 | // we have an I4/INT |
311 | 311 | // we must check that only 0123456789-<space> are characters here |
312 | 312 | if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) { |
313 | 313 | /// @todo find a better way of throwing an error than this! |
314 | - error_log('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']); |
|
314 | + error_log('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']); |
|
315 | 315 | $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND'; |
316 | 316 | } else { |
317 | 317 | // it's ok, add it on |
318 | - $this->_xh['value'] = (int)$this->_xh['ac']; |
|
318 | + $this->_xh['value'] = (int) $this->_xh['ac']; |
|
319 | 319 | } |
320 | 320 | } |
321 | 321 | $this->_xh['lv'] = 3; // indicate we've found a value |
322 | 322 | break; |
323 | 323 | case 'NAME': |
324 | - $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac']; |
|
324 | + $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac']; |
|
325 | 325 | break; |
326 | 326 | case 'MEMBER': |
327 | 327 | // add to array in the stack the last element built, |
328 | 328 | // unless no VALUE was found |
329 | 329 | if ($this->_xh['vt']) { |
330 | 330 | $vscount = count($this->_xh['valuestack']); |
331 | - $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value']; |
|
331 | + $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value']; |
|
332 | 332 | } else { |
333 | - error_log('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml'); |
|
333 | + error_log('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml'); |
|
334 | 334 | } |
335 | 335 | break; |
336 | 336 | case 'DATA': |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | $this->_xh['params'][] = $this->_xh['value']; |
354 | 354 | $this->_xh['pt'][] = $this->_xh['vt']; |
355 | 355 | } else { |
356 | - error_log('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml'); |
|
356 | + error_log('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml'); |
|
357 | 357 | } |
358 | 358 | break; |
359 | 359 | case 'METHODNAME': |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | public function xmlrpc_cd($parser, $data) |
396 | 396 | { |
397 | 397 | // skip processing if xml fault already detected |
398 | - if ($this->_xh['isf'] < 2) { |
|
398 | + if ($this->_xh['isf']<2) { |
|
399 | 399 | // "lookforvalue==3" means that we've found an entire value |
400 | 400 | // and should discard any further character data |
401 | 401 | if ($this->_xh['lv'] != 3) { |
@@ -411,7 +411,7 @@ discard block |
||
411 | 411 | public function xmlrpc_dh($parser, $data) |
412 | 412 | { |
413 | 413 | // skip processing if xml fault already detected |
414 | - if ($this->_xh['isf'] < 2) { |
|
414 | + if ($this->_xh['isf']<2) { |
|
415 | 415 | if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') { |
416 | 416 | $this->_xh['ac'] .= $data; |
417 | 417 | } |
@@ -482,8 +482,8 @@ discard block |
||
482 | 482 | // Details: |
483 | 483 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
484 | 484 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
485 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
486 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
485 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
486 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
487 | 487 | $xmlChunk, $matches)) { |
488 | 488 | return strtoupper(substr($matches[2], 1, -1)); |
489 | 489 | } |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII... |
502 | 502 | // IANA also likes better US-ASCII, so go with it |
503 | 503 | if ($enc == 'ASCII') { |
504 | - $enc = 'US-' . $enc; |
|
504 | + $enc = 'US-'.$enc; |
|
505 | 505 | } |
506 | 506 | |
507 | 507 | return $enc; |
@@ -536,8 +536,8 @@ discard block |
||
536 | 536 | // Details: |
537 | 537 | // SPACE: (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+ |
538 | 538 | // EQ: SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]* |
539 | - if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" . |
|
540 | - '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
539 | + if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))". |
|
540 | + '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/", |
|
541 | 541 | $xmlChunk, $matches)) { |
542 | 542 | return true; |
543 | 543 | } |