gggeek /
phpxmlrpc
@@ -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>phpxmlrpc - Introspect demo</title></head> |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | function display_error($r) |
| 18 | 18 | { |
| 19 | 19 | output("An error occurred: "); |
| 20 | - output("Code: " . $r->faultCode() . " Reason: '" . $r->faultString() . "'<br/>"); |
|
| 20 | + output("Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>"); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | $client = new Client(XMLRPCSERVER); |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $client->setOption(Client::OPT_RETURN_TYPE, XMLRPCParser::RETURN_PHP); |
| 26 | 26 | |
| 27 | 27 | // First off, let's retrieve the list of methods available on the remote server |
| 28 | -output("<h3>methods available at http://" . $client->getUrl(PHP_URL_HOST) . $client->getUrl(PHP_URL_PATH) . "</h3>\n"); |
|
| 28 | +output("<h3>methods available at http://".$client->getUrl(PHP_URL_HOST).$client->getUrl(PHP_URL_PATH)."</h3>\n"); |
|
| 29 | 29 | $req = new Request('system.listMethods'); |
| 30 | 30 | $resp = $client->send($req); |
| 31 | 31 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | // Then, retrieve the signature and help text of each available method |
| 49 | 49 | foreach ($v as $methodName) { |
| 50 | - output("<h4>" . htmlspecialchars($methodName) . "</h4>\n"); |
|
| 50 | + output("<h4>".htmlspecialchars($methodName)."</h4>\n"); |
|
| 51 | 51 | // build requests first, add params later |
| 52 | 52 | $r1 = new PhpXmlRpc\Request('system.methodHelp'); |
| 53 | 53 | $r2 = new PhpXmlRpc\Request('system.methodSignature'); |
@@ -83,12 +83,12 @@ discard block |
||
| 83 | 83 | continue; |
| 84 | 84 | } |
| 85 | 85 | $ret = $sig[0]; |
| 86 | - output("<code>" . htmlspecialchars($ret) . " " |
|
| 87 | - . htmlspecialchars($methodName) . "("); |
|
| 88 | - if (count($sig) > 1) { |
|
| 89 | - for ($k = 1; $k < count($sig); $k++) { |
|
| 86 | + output("<code>".htmlspecialchars($ret)." " |
|
| 87 | + . htmlspecialchars($methodName)."("); |
|
| 88 | + if (count($sig)>1) { |
|
| 89 | + for ($k = 1; $k<count($sig); $k++) { |
|
| 90 | 90 | output(htmlspecialchars($sig[$k])); |
| 91 | - if ($k < count($sig) - 1) { |
|
| 91 | + if ($k<count($sig)-1) { |
|
| 92 | 92 | output(", "); |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | return; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - $this->getLogger()->warning('XML-RPC Deprecated: ' . $message); |
|
| 17 | + $this->getLogger()->warning('XML-RPC Deprecated: '.$message); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | return; |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - $this->getLogger()->warning('XML-RPC Deprecated: ' . $trace[1]['class'] . '::' . $trace[1]['function'] . |
|
| 38 | - ' is only supposed to be called by ' . $expectedCaller); |
|
| 37 | + $this->getLogger()->warning('XML-RPC Deprecated: '.$trace[1]['class'].'::'.$trace[1]['function']. |
|
| 38 | + ' is only supposed to be called by '.$expectedCaller); |
|
| 39 | 39 | } |
| 40 | 40 | } |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | // user declares the type of resp value: we "almost" trust it... but log errors just in case |
| 79 | 79 | if (($this->valtyp == 'xmlrpcvals' && (!is_a($this->val, 'PhpXmlRpc\Value'))) || |
| 80 | 80 | ($this->valtyp == 'xml' && (!is_string($this->val)))) { |
| 81 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': value passed in does not match type ' . $valType); |
|
| 81 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': value passed in does not match type '.$valType); |
|
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | } |
@@ -165,34 +165,34 @@ discard block |
||
| 165 | 165 | public function serialize($charsetEncoding = '') |
| 166 | 166 | { |
| 167 | 167 | if ($charsetEncoding != '') { |
| 168 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 168 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 169 | 169 | } else { |
| 170 | 170 | $this->content_type = 'text/xml'; |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 174 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 174 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 175 | 175 | } else { |
| 176 | 176 | $result = "<methodResponse>\n"; |
| 177 | 177 | } |
| 178 | 178 | if ($this->errno) { |
| 179 | 179 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 180 | - $result .= "<fault>\n" . |
|
| 181 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 182 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 183 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . |
|
| 180 | + $result .= "<fault>\n". |
|
| 181 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 182 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 183 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding). |
|
| 184 | 184 | "</string></value>\n</member>\n</struct>\n</value>\n</fault>"; |
| 185 | 185 | } else { |
| 186 | 186 | if (is_object($this->val) && is_a($this->val, 'PhpXmlRpc\Value')) { |
| 187 | - $result .= "<params>\n<param>\n" . $this->val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 187 | + $result .= "<params>\n<param>\n".$this->val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 188 | 188 | } else if (is_string($this->val) && $this->valtyp == 'xml') { |
| 189 | - $result .= "<params>\n<param>\n" . |
|
| 190 | - $this->val . |
|
| 189 | + $result .= "<params>\n<param>\n". |
|
| 190 | + $this->val. |
|
| 191 | 191 | "</param>\n</params>"; |
| 192 | 192 | } else if ($this->valtyp == 'phpvals') { |
| 193 | 193 | $encoder = new Encoder(); |
| 194 | 194 | $val = $encoder->encode($this->val); |
| 195 | - $result .= "<params>\n<param>\n" . $val->serialize($charsetEncoding) . "</param>\n</params>"; |
|
| 195 | + $result .= "<params>\n<param>\n".$val->serialize($charsetEncoding)."</param>\n</params>"; |
|
| 196 | 196 | } else { |
| 197 | 197 | throw new StateErrorException('cannot serialize xmlrpc response objects whose content is native php values'); |
| 198 | 198 | } |
@@ -211,9 +211,9 @@ discard block |
||
| 211 | 211 | public function xml_header($charsetEncoding = '') |
| 212 | 212 | { |
| 213 | 213 | if ($charsetEncoding != '') { |
| 214 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 214 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 215 | 215 | } else { |
| 216 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 216 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
@@ -229,21 +229,21 @@ discard block |
||
| 229 | 229 | case 'errstr': |
| 230 | 230 | case 'payload': |
| 231 | 231 | case 'content_type': |
| 232 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 232 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 233 | 233 | return $this->$name; |
| 234 | 234 | case 'hdrs': |
| 235 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 235 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 236 | 236 | return $this->httpResponse['headers']; |
| 237 | 237 | case '_cookies': |
| 238 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 238 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 239 | 239 | return $this->httpResponse['cookies']; |
| 240 | 240 | case 'raw_data': |
| 241 | - $this->logDeprecation('Getting property Response::' . $name . ' is deprecated'); |
|
| 241 | + $this->logDeprecation('Getting property Response::'.$name.' is deprecated'); |
|
| 242 | 242 | return $this->httpResponse['raw_data']; |
| 243 | 243 | default: |
| 244 | 244 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 245 | 245 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 246 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 246 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 247 | 247 | $result = null; |
| 248 | 248 | return $result; |
| 249 | 249 | } |
@@ -258,25 +258,25 @@ discard block |
||
| 258 | 258 | case 'errstr': |
| 259 | 259 | case 'payload': |
| 260 | 260 | case 'content_type': |
| 261 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 261 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 262 | 262 | $this->$name = $value; |
| 263 | 263 | break; |
| 264 | 264 | case 'hdrs': |
| 265 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 265 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 266 | 266 | $this->httpResponse['headers'] = $value; |
| 267 | 267 | break; |
| 268 | 268 | case '_cookies': |
| 269 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 269 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 270 | 270 | $this->httpResponse['cookies'] = $value; |
| 271 | 271 | break; |
| 272 | 272 | case 'raw_data': |
| 273 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 273 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 274 | 274 | $this->httpResponse['raw_data'] = $value; |
| 275 | 275 | break; |
| 276 | 276 | default: |
| 277 | 277 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 278 | 278 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 279 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 279 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 280 | 280 | } |
| 281 | 281 | } |
| 282 | 282 | |
@@ -289,16 +289,16 @@ discard block |
||
| 289 | 289 | case 'errstr': |
| 290 | 290 | case 'payload': |
| 291 | 291 | case 'content_type': |
| 292 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 292 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 293 | 293 | return isset($this->$name); |
| 294 | 294 | case 'hdrs': |
| 295 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 295 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 296 | 296 | return isset($this->httpResponse['headers']); |
| 297 | 297 | case '_cookies': |
| 298 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 298 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 299 | 299 | return isset($this->httpResponse['cookies']); |
| 300 | 300 | case 'raw_data': |
| 301 | - $this->logDeprecation('Checking property Response::' . $name . ' is deprecated'); |
|
| 301 | + $this->logDeprecation('Checking property Response::'.$name.' is deprecated'); |
|
| 302 | 302 | return isset($this->httpResponse['raw_data']); |
| 303 | 303 | default: |
| 304 | 304 | return false; |
@@ -314,25 +314,25 @@ discard block |
||
| 314 | 314 | case 'errstr': |
| 315 | 315 | case 'payload': |
| 316 | 316 | case 'content_type': |
| 317 | - $this->logDeprecation('Setting property Response::' . $name . ' is deprecated'); |
|
| 317 | + $this->logDeprecation('Setting property Response::'.$name.' is deprecated'); |
|
| 318 | 318 | unset($this->$name); |
| 319 | 319 | break; |
| 320 | 320 | case 'hdrs': |
| 321 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 321 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 322 | 322 | unset($this->httpResponse['headers']); |
| 323 | 323 | break; |
| 324 | 324 | case '_cookies': |
| 325 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 325 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 326 | 326 | unset($this->httpResponse['cookies']); |
| 327 | 327 | break; |
| 328 | 328 | case 'raw_data': |
| 329 | - $this->logDeprecation('Unsetting property Response::' . $name . ' is deprecated'); |
|
| 329 | + $this->logDeprecation('Unsetting property Response::'.$name.' is deprecated'); |
|
| 330 | 330 | unset($this->httpResponse['raw_data']); |
| 331 | 331 | break; |
| 332 | 332 | default: |
| 333 | 333 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 334 | 334 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 335 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 335 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 336 | 336 | } |
| 337 | 337 | } |
| 338 | 338 | } |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $this->me['struct'] = $val; |
| 99 | 99 | break; |
| 100 | 100 | default: |
| 101 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a known type ($type)"); |
|
| 101 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a known type ($type)"); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | } |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | if ($typeOf !== 1) { |
| 131 | - $this->getLogger()->error("XML-RPC: " . __METHOD__ . ": not a scalar type ($type)"); |
|
| 131 | + $this->getLogger()->error("XML-RPC: ".__METHOD__.": not a scalar type ($type)"); |
|
| 132 | 132 | return 0; |
| 133 | 133 | } |
| 134 | 134 | |
@@ -145,10 +145,10 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | switch ($this->mytype) { |
| 147 | 147 | case 1: |
| 148 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': scalar xmlrpc value can have only one value'); |
|
| 148 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': scalar xmlrpc value can have only one value'); |
|
| 149 | 149 | return 0; |
| 150 | 150 | case 3: |
| 151 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 151 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpc value'); |
|
| 152 | 152 | return 0; |
| 153 | 153 | case 2: |
| 154 | 154 | // we're adding a scalar value to an array here |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | return 1; |
| 194 | 194 | } else { |
| 195 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 195 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 196 | 196 | return 0; |
| 197 | 197 | } |
| 198 | 198 | } |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | |
| 224 | 224 | return 1; |
| 225 | 225 | } else { |
| 226 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': already initialized as a [' . $this->kindOf() . ']'); |
|
| 226 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']'); |
|
| 227 | 227 | return 0; |
| 228 | 228 | } |
| 229 | 229 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | $val = reset($this->me); |
| 289 | 289 | $typ = key($this->me); |
| 290 | 290 | |
| 291 | - return '<value>' . $this->serializeData($typ, $val, $charsetEncoding) . "</value>\n"; |
|
| 291 | + return '<value>'.$this->serializeData($typ, $val, $charsetEncoding)."</value>\n"; |
|
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | /** |
@@ -311,19 +311,19 @@ discard block |
||
| 311 | 311 | case 1: |
| 312 | 312 | switch ($typ) { |
| 313 | 313 | case static::$xmlrpcBase64: |
| 314 | - $rs = "<{$typ}>" . base64_encode($val) . "</{$typ}>"; |
|
| 314 | + $rs = "<{$typ}>".base64_encode($val)."</{$typ}>"; |
|
| 315 | 315 | break; |
| 316 | 316 | case static::$xmlrpcBoolean: |
| 317 | - $rs = "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>"; |
|
| 317 | + $rs = "<{$typ}>".($val ? '1' : '0')."</{$typ}>"; |
|
| 318 | 318 | break; |
| 319 | 319 | case static::$xmlrpcString: |
| 320 | 320 | // Do NOT use htmlentities, since it will produce named html entities, which are invalid xml |
| 321 | - $rs = "<{$typ}>" . $this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</{$typ}>"; |
|
| 321 | + $rs = "<{$typ}>".$this->getCharsetEncoder()->encodeEntities($val, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</{$typ}>"; |
|
| 322 | 322 | break; |
| 323 | 323 | case static::$xmlrpcInt: |
| 324 | 324 | case static::$xmlrpcI4: |
| 325 | 325 | case static::$xmlrpcI8: |
| 326 | - $rs = "<{$typ}>" . (int)$val . "</{$typ}>"; |
|
| 326 | + $rs = "<{$typ}>".(int) $val."</{$typ}>"; |
|
| 327 | 327 | break; |
| 328 | 328 | case static::$xmlrpcDouble: |
| 329 | 329 | // avoid using standard conversion of float to string because it is locale-dependent, |
@@ -331,16 +331,16 @@ discard block |
||
| 331 | 331 | // sprintf('%F') could be most likely ok, but it fails e.g. on 2e-14. |
| 332 | 332 | // The code below tries its best at keeping max precision while avoiding exp notation, |
| 333 | 333 | // but there is of course no limit in the number of decimal places to be used... |
| 334 | - $rs = "<{$typ}>" . preg_replace('/\\.?0+$/', '', number_format((double)$val, PhpXmlRpc::$xmlpc_double_precision, '.', '')) . "</{$typ}>"; |
|
| 334 | + $rs = "<{$typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, PhpXmlRpc::$xmlpc_double_precision, '.', ''))."</{$typ}>"; |
|
| 335 | 335 | break; |
| 336 | 336 | case static::$xmlrpcDateTime: |
| 337 | 337 | if (is_string($val)) { |
| 338 | 338 | $rs = "<{$typ}>{$val}</{$typ}>"; |
| 339 | 339 | // DateTimeInterface is not present in php 5.4... |
| 340 | 340 | } elseif (is_a($val, 'DateTimeInterface') || is_a($val, 'DateTime')) { |
| 341 | - $rs = "<{$typ}>" . $val->format('Ymd\TH:i:s') . "</{$typ}>"; |
|
| 341 | + $rs = "<{$typ}>".$val->format('Ymd\TH:i:s')."</{$typ}>"; |
|
| 342 | 342 | } elseif (is_int($val)) { |
| 343 | - $rs = "<{$typ}>" . date('Ymd\TH:i:s', $val) . "</{$typ}>"; |
|
| 343 | + $rs = "<{$typ}>".date('Ymd\TH:i:s', $val)."</{$typ}>"; |
|
| 344 | 344 | } else { |
| 345 | 345 | // not really a good idea here: but what should we output anyway? left for backward compat... |
| 346 | 346 | $rs = "<{$typ}>{$val}</{$typ}>"; |
@@ -362,14 +362,14 @@ discard block |
||
| 362 | 362 | case 3: |
| 363 | 363 | // struct |
| 364 | 364 | if ($this->_php_class) { |
| 365 | - $rs = '<struct php_class="' . $this->_php_class . "\">\n"; |
|
| 365 | + $rs = '<struct php_class="'.$this->_php_class."\">\n"; |
|
| 366 | 366 | } else { |
| 367 | 367 | $rs = "<struct>\n"; |
| 368 | 368 | } |
| 369 | 369 | $charsetEncoder = $this->getCharsetEncoder(); |
| 370 | 370 | /** @var Value $val2 */ |
| 371 | 371 | foreach ($val as $key2 => $val2) { |
| 372 | - $rs .= '<member><name>' . $charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</name>\n"; |
|
| 372 | + $rs .= '<member><name>'.$charsetEncoder->encodeEntities($key2, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</name>\n"; |
|
| 373 | 373 | $rs .= $val2->serialize($charsetEncoding); |
| 374 | 374 | $rs .= "</member>\n"; |
| 375 | 375 | } |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | */ |
| 584 | 584 | public function structMemExists($key) |
| 585 | 585 | { |
| 586 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 586 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 587 | 587 | |
| 588 | 588 | return array_key_exists($key, $this->me['struct']); |
| 589 | 589 | } |
@@ -599,7 +599,7 @@ discard block |
||
| 599 | 599 | */ |
| 600 | 600 | public function structMem($key) |
| 601 | 601 | { |
| 602 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 602 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 603 | 603 | |
| 604 | 604 | return $this->me['struct'][$key]; |
| 605 | 605 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | */ |
| 613 | 613 | public function structReset() |
| 614 | 614 | { |
| 615 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 615 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 616 | 616 | |
| 617 | 617 | reset($this->me['struct']); |
| 618 | 618 | } |
@@ -626,7 +626,7 @@ discard block |
||
| 626 | 626 | */ |
| 627 | 627 | public function structEach() |
| 628 | 628 | { |
| 629 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 629 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 630 | 630 | |
| 631 | 631 | $key = key($this->me['struct']); |
| 632 | 632 | $value = current($this->me['struct']); |
@@ -645,7 +645,7 @@ discard block |
||
| 645 | 645 | */ |
| 646 | 646 | public function arrayMem($key) |
| 647 | 647 | { |
| 648 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 648 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 649 | 649 | |
| 650 | 650 | return $this->me['array'][$key]; |
| 651 | 651 | } |
@@ -659,7 +659,7 @@ discard block |
||
| 659 | 659 | */ |
| 660 | 660 | public function arraySize() |
| 661 | 661 | { |
| 662 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 662 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 663 | 663 | |
| 664 | 664 | return count($this->me['array']); |
| 665 | 665 | } |
@@ -673,7 +673,7 @@ discard block |
||
| 673 | 673 | */ |
| 674 | 674 | public function structSize() |
| 675 | 675 | { |
| 676 | - $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated'); |
|
| 676 | + $this->logDeprecation('Method '.__METHOD__.' is deprecated'); |
|
| 677 | 677 | |
| 678 | 678 | return count($this->me['struct']); |
| 679 | 679 | } |
@@ -685,12 +685,12 @@ discard block |
||
| 685 | 685 | case 'me': |
| 686 | 686 | case 'mytype': |
| 687 | 687 | case '_php_class': |
| 688 | - $this->logDeprecation('Getting property Value::' . $name . ' is deprecated'); |
|
| 688 | + $this->logDeprecation('Getting property Value::'.$name.' is deprecated'); |
|
| 689 | 689 | return $this->$name; |
| 690 | 690 | default: |
| 691 | 691 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 692 | 692 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 693 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 693 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 694 | 694 | $result = null; |
| 695 | 695 | return $result; |
| 696 | 696 | } |
@@ -702,13 +702,13 @@ discard block |
||
| 702 | 702 | case 'me': |
| 703 | 703 | case 'mytype': |
| 704 | 704 | case '_php_class': |
| 705 | - $this->logDeprecation('Setting property Value::' . $name . ' is deprecated'); |
|
| 705 | + $this->logDeprecation('Setting property Value::'.$name.' is deprecated'); |
|
| 706 | 706 | $this->$name = $value; |
| 707 | 707 | break; |
| 708 | 708 | default: |
| 709 | 709 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 710 | 710 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 711 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 711 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 712 | 712 | } |
| 713 | 713 | } |
| 714 | 714 | |
@@ -718,7 +718,7 @@ discard block |
||
| 718 | 718 | case 'me': |
| 719 | 719 | case 'mytype': |
| 720 | 720 | case '_php_class': |
| 721 | - $this->logDeprecation('Checking property Value::' . $name . ' is deprecated'); |
|
| 721 | + $this->logDeprecation('Checking property Value::'.$name.' is deprecated'); |
|
| 722 | 722 | return isset($this->$name); |
| 723 | 723 | default: |
| 724 | 724 | return false; |
@@ -731,13 +731,13 @@ discard block |
||
| 731 | 731 | case 'me': |
| 732 | 732 | case 'mytype': |
| 733 | 733 | case '_php_class': |
| 734 | - $this->logDeprecation('Unsetting property Value::' . $name . ' is deprecated'); |
|
| 734 | + $this->logDeprecation('Unsetting property Value::'.$name.' is deprecated'); |
|
| 735 | 735 | unset($this->$name); |
| 736 | 736 | break; |
| 737 | 737 | default: |
| 738 | 738 | /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout... |
| 739 | 739 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1); |
| 740 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 740 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 741 | 741 | } |
| 742 | 742 | } |
| 743 | 743 | } |
@@ -57,13 +57,13 @@ discard block |
||
| 57 | 57 | 'scalar' => $val, |
| 58 | 58 | 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val) |
| 59 | 59 | ); |
| 60 | - return (object)$xmlrpcVal; |
|
| 60 | + return (object) $xmlrpcVal; |
|
| 61 | 61 | case 'base64': |
| 62 | 62 | $xmlrpcVal = array( |
| 63 | 63 | 'xmlrpc_type' => 'base64', |
| 64 | 64 | 'scalar' => $val |
| 65 | 65 | ); |
| 66 | - return (object)$xmlrpcVal; |
|
| 66 | + return (object) $xmlrpcVal; |
|
| 67 | 67 | case 'string': |
| 68 | 68 | if (isset($options['extension_api_encoding'])) { |
| 69 | 69 | // if iconv is not available, we use mb_convert_encoding |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | case 'msg': |
| 137 | 137 | $paramCount = $xmlrpcVal->getNumParams(); |
| 138 | 138 | $arr = array(); |
| 139 | - for ($i = 0; $i < $paramCount; $i++) { |
|
| 139 | + for ($i = 0; $i<$paramCount; $i++) { |
|
| 140 | 140 | $arr[] = $this->decode($xmlrpcVal->getParam($i), $options); |
| 141 | 141 | } |
| 142 | 142 | return $arr; |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | break; |
| 262 | 262 | case 'resource': |
| 263 | 263 | if (in_array('extension_api', $options)) { |
| 264 | - $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt); |
|
| 264 | + $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt); |
|
| 265 | 265 | } else { |
| 266 | 266 | $xmlrpcVal = new Value(); |
| 267 | 267 | } |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | if ($valEncoding == 'ISO-8859-1') { |
| 311 | 311 | $xmlVal = utf8_encode($xmlVal); |
| 312 | 312 | } else { |
| 313 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding); |
|
| 313 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding); |
|
| 314 | 314 | } |
| 315 | 315 | } |
| 316 | 316 | } |
@@ -336,10 +336,10 @@ discard block |
||
| 336 | 336 | $_xh = $xmlRpcParser->_xh; |
| 337 | 337 | } |
| 338 | 338 | |
| 339 | - if ($_xh['isf'] > 1) { |
|
| 339 | + if ($_xh['isf']>1) { |
|
| 340 | 340 | // test that $_xh['value'] is an obj, too??? |
| 341 | 341 | |
| 342 | - $this->getLogger()->error('XML-RPC: ' . $_xh['isf_reason']); |
|
| 342 | + $this->getLogger()->error('XML-RPC: '.$_xh['isf_reason']); |
|
| 343 | 343 | |
| 344 | 344 | return false; |
| 345 | 345 | } |
@@ -360,7 +360,7 @@ discard block |
||
| 360 | 360 | |
| 361 | 361 | case 'methodcall': |
| 362 | 362 | $req = new Request($_xh['method']); |
| 363 | - for ($i = 0; $i < count($_xh['params']); $i++) { |
|
| 363 | + for ($i = 0; $i<count($_xh['params']); $i++) { |
|
| 364 | 364 | $req->addParam($_xh['params'][$i]); |
| 365 | 365 | } |
| 366 | 366 | return $req; |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/client/_prepend.php"; |
|
| 2 | +require_once __DIR__."/client/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>phpxmlrpc</title></head> |
@@ -10,25 +10,25 @@ discard block |
||
| 10 | 10 | output("<p>Please note that in most cases you are better off using `new PhpXmlRpc\Encoder()->encode()` to create nested Value objects</p>\n"); |
| 11 | 11 | |
| 12 | 12 | $v = new PhpXmlRpc\Value(1234, 'int'); |
| 13 | -output("Int: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 13 | +output("Int: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 14 | 14 | |
| 15 | 15 | $v = new PhpXmlRpc\Value('Are the following characters escaped? < & >'); |
| 16 | -output("String <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 16 | +output("String <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 17 | 17 | |
| 18 | 18 | $v = new PhpXmlRpc\Value(true, 'boolean'); |
| 19 | -output("Boolean: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 19 | +output("Boolean: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 20 | 20 | |
| 21 | 21 | $v = new PhpXmlRpc\Value(1234.5678, 'double'); |
| 22 | -output("Double: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 22 | +output("Double: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 23 | 23 | |
| 24 | 24 | $v = new PhpXmlRpc\Value(time(), 'dateTime.iso8601'); |
| 25 | -output("Datetime (from timestamp): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 25 | +output("Datetime (from timestamp): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 26 | 26 | $v = new PhpXmlRpc\Value(new DateTime(), 'dateTime.iso8601'); |
| 27 | -output("Datetime (from php DateTime): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 27 | +output("Datetime (from php DateTime): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 28 | 28 | |
| 29 | 29 | $v = new PhpXmlRpc\Value('hello world', 'base64'); |
| 30 | -output("Base64: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 31 | -output("(value of base64 string is: '" . $v->scalarVal() . "')<BR><BR>"); |
|
| 30 | +output("Base64: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 31 | +output("(value of base64 string is: '".$v->scalarVal()."')<BR><BR>"); |
|
| 32 | 32 | |
| 33 | 33 | $v = new PhpXmlRpc\Value( |
| 34 | 34 | array( |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | ), |
| 42 | 42 | "array" |
| 43 | 43 | ); |
| 44 | -output("Array: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 44 | +output("Array: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 45 | 45 | |
| 46 | 46 | $v = new PhpXmlRpc\Value( |
| 47 | 47 | array( |
@@ -61,10 +61,10 @@ discard block |
||
| 61 | 61 | ), |
| 62 | 62 | "struct" |
| 63 | 63 | ); |
| 64 | -output("Struct: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 64 | +output("Struct: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 65 | 65 | |
| 66 | 66 | $w = new PhpXmlRpc\Value(array($v), 'array'); |
| 67 | -output("Array containing a struct: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
| 67 | +output("Array containing a struct: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
| 68 | 68 | |
| 69 | 69 | class MyClass |
| 70 | 70 | { |
@@ -76,49 +76,49 @@ discard block |
||
| 76 | 76 | // the public property is the only one which will be serialized. As such, it has to be of type Value |
| 77 | 77 | $myObject->public = new \PhpXmlRpc\Value('a public property, wrapped'); |
| 78 | 78 | $w = new PhpXmlRpc\Value($myObject, 'struct'); |
| 79 | -output("Struct encoding a php object: <PRE>" . htmlentities($w->serialize()) . "</PRE>"); |
|
| 79 | +output("Struct encoding a php object: <PRE>".htmlentities($w->serialize())."</PRE>"); |
|
| 80 | 80 | |
| 81 | 81 | output("<h3>Testing value serialization - xml-rpc extensions</h3>\n"); |
| 82 | 82 | $v = new PhpXmlRpc\Value(1234, 'i8'); |
| 83 | -output("I8: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 83 | +output("I8: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 84 | 84 | $v = new PhpXmlRpc\Value(null, 'null'); |
| 85 | -output("Null: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 85 | +output("Null: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 86 | 86 | \PhpXmlRpc\PhpXmlRpc::$xmlrpc_null_apache_encoding = true; |
| 87 | -output("Null, alternative: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 87 | +output("Null, alternative: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 88 | 88 | |
| 89 | 89 | output("<h3>Testing value serialization - character encoding</h3>\n"); |
| 90 | 90 | // The greek word 'kosme' |
| 91 | 91 | $v = new PhpXmlRpc\Value('κόσμε'); |
| 92 | -output("Greek (default encoding): <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 93 | -output("Greek (utf8 encoding): <PRE>" . htmlentities($v->serialize('UTF-8')) . "</PRE>"); |
|
| 92 | +output("Greek (default encoding): <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 93 | +output("Greek (utf8 encoding): <PRE>".htmlentities($v->serialize('UTF-8'))."</PRE>"); |
|
| 94 | 94 | if (function_exists('mb_convert_encoding')) { |
| 95 | - output("Greek (ISO-8859-7 encoding): <PRE>" . htmlentities($v->serialize('ISO-8859-7')) . "</PRE>"); |
|
| 95 | + output("Greek (ISO-8859-7 encoding): <PRE>".htmlentities($v->serialize('ISO-8859-7'))."</PRE>"); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | output("<h3>Testing request serialization</h3>\n"); |
| 99 | 99 | $req = new PhpXmlRpc\Request('examples.getStateName'); |
| 100 | 100 | $req->method('examples.getStateName'); |
| 101 | 101 | $req->addParam(new PhpXmlRpc\Value(42, 'int')); |
| 102 | -output("<PRE>" . htmlentities($req->serialize()) . "</PRE>"); |
|
| 102 | +output("<PRE>".htmlentities($req->serialize())."</PRE>"); |
|
| 103 | 103 | |
| 104 | 104 | output("<h3>Testing response serialization</h3>\n"); |
| 105 | 105 | $resp = new PhpXmlRpc\Response(new PhpXmlRpc\Value('The meaning of life')); |
| 106 | -output("<PRE>" . htmlentities($resp->serialize()) . "</PRE>"); |
|
| 106 | +output("<PRE>".htmlentities($resp->serialize())."</PRE>"); |
|
| 107 | 107 | |
| 108 | 108 | output("<h3>Testing ISO date formatting</h3><pre>\n"); |
| 109 | 109 | $t = time(); |
| 110 | 110 | $date = PhpXmlRpc\Helper\Date::iso8601Encode($t); |
| 111 | 111 | output("Now is $t --> $date\n"); |
| 112 | -output("Or in UTC, that is " . PhpXmlRpc\Helper\Date::iso8601Encode($t, 1) . "\n"); |
|
| 112 | +output("Or in UTC, that is ".PhpXmlRpc\Helper\Date::iso8601Encode($t, 1)."\n"); |
|
| 113 | 113 | $tb = PhpXmlRpc\Helper\Date::iso8601Decode($date); |
| 114 | 114 | output("That is to say $date --> $tb\n"); |
| 115 | -output("Which comes out at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb) . "\n"); |
|
| 116 | -output("Which was the time in UTC at " . PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1) . "\n"); |
|
| 115 | +output("Which comes out at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb)."\n"); |
|
| 116 | +output("Which was the time in UTC at ".PhpXmlRpc\Helper\Date::iso8601Encode($tb, 1)."\n"); |
|
| 117 | 117 | output("</pre>\n"); |
| 118 | 118 | |
| 119 | 119 | output("<h3>Testing reduced-precision formatting for doubles</h3><pre>\n"); |
| 120 | 120 | $v = new PhpXmlRpc\Value(1234.56789, 'double'); |
| 121 | 121 | \PhpXmlRpc\PhpXmlRpc::$xmlpc_double_precision = 2; |
| 122 | -output("Double, limited precision: <PRE>" . htmlentities($v->serialize()) . "</PRE>"); |
|
| 122 | +output("Double, limited precision: <PRE>".htmlentities($v->serialize())."</PRE>"); |
|
| 123 | 123 | |
| 124 | 124 | output('</body></html>'); |
@@ -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>phpxmlrpc - Getstatename demo</title></head> |
@@ -17,13 +17,13 @@ discard block |
||
| 17 | 17 | $stateNo = ""; |
| 18 | 18 | |
| 19 | 19 | if (isset($_POST['stateno']) && $_POST['stateno'] != "") { |
| 20 | - $stateNo = (integer)$_POST['stateno']; |
|
| 20 | + $stateNo = (integer) $_POST['stateno']; |
|
| 21 | 21 | $method = 'examples.getStateName'; |
| 22 | 22 | $arguments = array( |
| 23 | 23 | new Value($stateNo, Value::$xmlrpcInt), |
| 24 | 24 | ); |
| 25 | 25 | $req = new Request($method, $arguments); |
| 26 | - output("Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) . |
|
| 26 | + output("Sending the following request:<pre>\n\n".htmlentities($req->serialize()). |
|
| 27 | 27 | "\n\n</pre>Debug info of server data follows...\n\n"); |
| 28 | 28 | $client = new Client(XMLRPCSERVER); |
| 29 | 29 | $client->setOption(Client::OPT_DEBUG, 1); |
@@ -32,12 +32,12 @@ discard block |
||
| 32 | 32 | $val = $resp->value(); |
| 33 | 33 | // NB: we are _assuming_ that the server did return a scalar xml-rpc value here. |
| 34 | 34 | // If the server is not trusted, we might check that via `$val->kindOf() == 'scalar'` |
| 35 | - output('<br/>State number <b>' . $stateNo . '</b> is <b>' |
|
| 36 | - . htmlspecialchars($val->scalarVal()) . '</b><br/><br/>'); |
|
| 35 | + output('<br/>State number <b>'.$stateNo.'</b> is <b>' |
|
| 36 | + . htmlspecialchars($val->scalarVal()).'</b><br/><br/>'); |
|
| 37 | 37 | } else { |
| 38 | 38 | output('An error occurred: '); |
| 39 | - output('<pre>Code: ' . htmlspecialchars($resp->faultCode()) |
|
| 40 | - . " Reason: '" . htmlspecialchars($resp->faultString()) . "'</pre>"); |
|
| 39 | + output('<pre>Code: '.htmlspecialchars($resp->faultCode()) |
|
| 40 | + . " Reason: '".htmlspecialchars($resp->faultString())."'</pre>"); |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | * @license code licensed under the BSD License: see file license.txt |
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | -require_once __DIR__ . "/_prepend.php"; |
|
| 19 | +require_once __DIR__."/_prepend.php"; |
|
| 20 | 20 | |
| 21 | 21 | // *** NB: WE BLOCK THIS FROM RUNNING BY DEFAULT IN CASE ACCESS IS GRANTED TO IT IN PRODUCTION BY MISTAKE *** |
| 22 | 22 | // Comment out the following safeguard if you want to use it as is, but remember: this is an open relay !!! |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | // fe. any url using the 'file://' protocol might be considered a hacking attempt |
| 48 | 48 | $client = new Client($url); |
| 49 | 49 | |
| 50 | - if ($req->getNumParams() > 3) { |
|
| 50 | + if ($req->getNumParams()>3) { |
|
| 51 | 51 | // We have to set some options onto the client. |
| 52 | 52 | // Note that if we do not untaint the received values, warnings might be generated... |
| 53 | 53 | $options = $encoder->decode($req->getParam(3)); |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $client->setOption(Client::OPT_VERIFY_PEER, $val); |
| 88 | 88 | break; |
| 89 | 89 | case 'Timeout': |
| 90 | - $timeout = (integer)$val; |
|
| 90 | + $timeout = (integer) $val; |
|
| 91 | 91 | break; |
| 92 | 92 | } // switch |
| 93 | 93 | } |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | /// X-forwarded-for anyway, unless they consider this server as trusted...) |
| 101 | 101 | $reqMethod = $req->getParam(1)->scalarVal(); |
| 102 | 102 | $req = new Request($reqMethod); |
| 103 | - if ($req->getNumParams() > 1) { |
|
| 103 | + if ($req->getNumParams()>1) { |
|
| 104 | 104 | $pars = $req->getParam(2); |
| 105 | 105 | foreach ($pars as $par) { |
| 106 | 106 | $req->addParam($par); |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | // add debug info into response we give back to caller |
| 111 | - Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize()); |
|
| 111 | + Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize()); |
|
| 112 | 112 | |
| 113 | 113 | return $client->send($req, $timeout); |
| 114 | 114 | } |
@@ -54,11 +54,11 @@ discard block |
||
| 54 | 54 | $snv = $sno->scalarVal(); |
| 55 | 55 | |
| 56 | 56 | // look it up in our array (zero-based) |
| 57 | - if (isset(self::$stateNames[$snv - 1])) { |
|
| 58 | - $stateName = self::$stateNames[$snv - 1]; |
|
| 57 | + if (isset(self::$stateNames[$snv-1])) { |
|
| 58 | + $stateName = self::$stateNames[$snv-1]; |
|
| 59 | 59 | } else { |
| 60 | 60 | // not there, so complain |
| 61 | - $err = "I don't have a state for the index '" . $snv . "'"; |
|
| 61 | + $err = "I don't have a state for the index '".$snv."'"; |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | if ($err != '') { |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | $s = $req->getParam(0); |
| 133 | 133 | $t = $req->getParam(1); |
| 134 | 134 | |
| 135 | - return new Response(new Value($s->scalarVal() + $t->scalarVal(), Value::$xmlrpcInt)); |
|
| 135 | + return new Response(new Value($s->scalarVal()+$t->scalarVal(), Value::$xmlrpcInt)); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | public static $addtwodouble_sig = array(array('double', 'double', 'double')); |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | $s = $req->getParam(0); |
| 143 | 143 | $t = $req->getParam(1); |
| 144 | 144 | |
| 145 | - return new Response(new Value($s->scalarVal() + $t->scalarVal(), Value::$xmlrpcDouble)); |
|
| 145 | + return new Response(new Value($s->scalarVal()+$t->scalarVal(), Value::$xmlrpcDouble)); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | public static $stringecho_sig = array(array('string', 'string')); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | /// In fact, we miss some API (or extra data) in the Request... |
| 166 | 166 | //$payload = file_get_contents('php://input'); |
| 167 | 167 | $payload = $req->serialize(PhpXmlRpc::$xmlrpc_internalencoding); |
| 168 | - $s = "I got the following message:\n" . $payload; |
|
| 168 | + $s = "I got the following message:\n".$payload; |
|
| 169 | 169 | |
| 170 | 170 | return new Response(new Value($s)); |
| 171 | 171 | } |
@@ -238,17 +238,17 @@ discard block |
||
| 238 | 238 | |
| 239 | 239 | /// @todo in real life, we should check for presence of return characters to avoid header injection! |
| 240 | 240 | |
| 241 | - $msgHdr = "From: " . $mFrom->scalarVal() . "\n"; |
|
| 242 | - $msgHdr .= "To: " . $mTo->scalarVal() . "\n"; |
|
| 241 | + $msgHdr = "From: ".$mFrom->scalarVal()."\n"; |
|
| 242 | + $msgHdr .= "To: ".$mTo->scalarVal()."\n"; |
|
| 243 | 243 | |
| 244 | 244 | if ($mCc->scalarVal() != "") { |
| 245 | - $msgHdr .= "Cc: " . $mCc->scalarVal() . "\n"; |
|
| 245 | + $msgHdr .= "Cc: ".$mCc->scalarVal()."\n"; |
|
| 246 | 246 | } |
| 247 | 247 | if ($mBcc->scalarVal() != "") { |
| 248 | - $msgHdr .= "Bcc: " . $mBcc->scalarVal() . "\n"; |
|
| 248 | + $msgHdr .= "Bcc: ".$mBcc->scalarVal()."\n"; |
|
| 249 | 249 | } |
| 250 | 250 | if ($mMime->scalarVal() != "") { |
| 251 | - $msgHdr .= "Content-type: " . $mMime->scalarVal() . "\n"; |
|
| 251 | + $msgHdr .= "Content-type: ".$mMime->scalarVal()."\n"; |
|
| 252 | 252 | } |
| 253 | 253 | $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0"; |
| 254 | 254 | |
