Passed
Push — master ( f50d88...43485e )
by Gaetano
05:55
created
src/Client.php 2 patches
Spacing   +115 added lines, -115 removed lines patch added patch discarded remove patch
@@ -338,10 +338,10 @@  discard block
 block discarded – undo
338 338
             $server = $parts['host'];
339 339
             $path = isset($parts['path']) ? $parts['path'] : '';
340 340
             if (isset($parts['query'])) {
341
-                $path .= '?' . $parts['query'];
341
+                $path .= '?'.$parts['query'];
342 342
             }
343 343
             if (isset($parts['fragment'])) {
344
-                $path .= '#' . $parts['fragment'];
344
+                $path .= '#'.$parts['fragment'];
345 345
             }
346 346
             if (isset($parts['port'])) {
347 347
                 $port = $parts['port'];
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
             }
358 358
         }
359 359
         if ($path == '' || $path[0] != '/') {
360
-            $this->path = '/' . $path;
360
+            $this->path = '/'.$path;
361 361
         } else {
362 362
             $this->path = $path;
363 363
         }
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
         //$this->accepted_charset_encodings = $ch->knownCharsets();
390 390
 
391 391
         // initialize user_agent string
392
-        $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion;
392
+        $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion;
393 393
     }
394 394
 
395 395
     /**
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
      */
562 562
     public function setSSLVerifyPeer($i)
563 563
     {
564
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
564
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
565 565
 
566 566
         $this->verifypeer = $i;
567 567
         return $this;
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
      */
579 579
     public function setSSLVerifyHost($i)
580 580
     {
581
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
581
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
582 582
 
583 583
         $this->verifyhost = $i;
584 584
         return $this;
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
      */
597 597
     public function setSSLVersion($i)
598 598
     {
599
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
599
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
600 600
 
601 601
         $this->sslversion = $i;
602 602
         return $this;
@@ -661,7 +661,7 @@  discard block
 block discarded – undo
661 661
      */
662 662
     public function setRequestCompression($compMethod)
663 663
     {
664
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
664
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
665 665
 
666 666
         $this->request_compression = $compMethod;
667 667
         return $this;
@@ -711,7 +711,7 @@  discard block
 block discarded – undo
711 711
      */
712 712
     public function setCurlOptions($options)
713 713
     {
714
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
714
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
715 715
 
716 716
         $this->extracurlopts = $options;
717 717
         return $this;
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
      */
726 726
     public function setUseCurl($useCurlMode)
727 727
     {
728
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
728
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
729 729
 
730 730
         $this->use_curl = $useCurlMode;
731 731
         return $this;
@@ -742,7 +742,7 @@  discard block
 block discarded – undo
742 742
      */
743 743
     public function setUserAgent($agentString)
744 744
     {
745
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
745
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
746 746
 
747 747
         $this->user_agent = $agentString;
748 748
         return $this;
@@ -774,12 +774,12 @@  discard block
 block discarded – undo
774 774
             }
775 775
         }
776 776
 
777
-        $url = $this->method . '://' . $this->server;
778
-        if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11',  'http11_only', 'h2c'))) ||
777
+        $url = $this->method.'://'.$this->server;
778
+        if ($this->port == 0 || ($this->port == 80 && in_array($this->method, array('http', 'http10', 'http11', 'http11_only', 'h2c'))) ||
779 779
             ($this->port == 443 && in_array($this->method, array('https', 'h2')))) {
780
-            return $url . $this->path;
780
+            return $url.$this->path;
781 781
         } else {
782
-            return $url . ':' . $this->port . $this->path;
782
+            return $url.':'.$this->port.$this->path;
783 783
         }
784 784
     }
785 785
 
@@ -823,7 +823,7 @@  discard block
 block discarded – undo
823 823
     public function send($req, $timeout = 0, $method = '')
824 824
     {
825 825
         if ($method !== '' || $timeout !== 0) {
826
-            $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method " . __METHOD__ . ' is deprecated');
826
+            $this->logDeprecation("Using non-default values for arguments 'method' and 'timeout' when calling method ".__METHOD__.' is deprecated');
827 827
         }
828 828
 
829 829
         // if user does not specify http protocol, use native method of this client
@@ -948,7 +948,7 @@  discard block
 block discarded – undo
948 948
                     $payload = $a;
949 949
                     $encodingHdr = "Content-Encoding: gzip\r\n";
950 950
                 } else {
951
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request');
951
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request');
952 952
                 }
953 953
             } else if (function_exists('gzcompress')) {
954 954
                 $a = @gzcompress($payload);
@@ -956,14 +956,14 @@  discard block
 block discarded – undo
956 956
                     $payload = $a;
957 957
                     $encodingHdr = "Content-Encoding: deflate\r\n";
958 958
                 } else {
959
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request');
959
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request');
960 960
                 }
961 961
             } else {
962
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install');
962
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install');
963 963
             }
964 964
         } else {
965 965
             if ($opts['request_compression'] != '') {
966
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported');
966
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported');
967 967
             }
968 968
         }
969 969
 
@@ -971,16 +971,16 @@  discard block
 block discarded – undo
971 971
         $credentials = '';
972 972
         if ($opts['username'] != '') {
973 973
             if ($opts['authtype'] != 1) {
974
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0');
974
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
975 975
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
976
-                    PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth is supported with HTTP 1.0');
976
+                    PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth is supported with HTTP 1.0');
977 977
             }
978
-            $credentials = 'Authorization: Basic ' . base64_encode($opts['username'] . ':' . $opts['password']) . "\r\n";
978
+            $credentials = 'Authorization: Basic '.base64_encode($opts['username'].':'.$opts['password'])."\r\n";
979 979
         }
980 980
 
981 981
         $acceptedEncoding = '';
982 982
         if (is_array($opts['accepted_compression']) && count($opts['accepted_compression'])) {
983
-            $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $opts['accepted_compression']) . "\r\n";
983
+            $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $opts['accepted_compression'])."\r\n";
984 984
         }
985 985
 
986 986
         if ($port == 0) {
@@ -1001,21 +1001,21 @@  discard block
 block discarded – undo
1001 1001
             } elseif ($method === 'h2') {
1002 1002
                 $protocol = 'https';
1003 1003
             } else if (strpos($protocol, ':') !== false) {
1004
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The protocol requested for the call is: '$protocol'");
1005
-                return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], PhpXmlRpc::$xmlrpcerr['unsupported_option'] .
1004
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The protocol requested for the call is: '$protocol'");
1005
+                return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'], PhpXmlRpc::$xmlrpcerr['unsupported_option'].
1006 1006
                     " attempted hacking attempt?. The protocol requested for the call is: '$protocol'");
1007 1007
             }
1008 1008
             /// @todo this does not work atm (tested at least with an http proxy forwarding to an https server) - we
1009 1009
             ///       should implement the CONNECT protocol
1010
-            $uri = $protocol . '://' . $server . ':' . $port . $path;
1010
+            $uri = $protocol.'://'.$server.':'.$port.$path;
1011 1011
             if ($opts['proxy_user'] != '') {
1012 1012
                 if ($opts['proxy_authtype'] != 1) {
1013
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0');
1013
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
1014 1014
                     return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
1015
-                        PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': only Basic auth to proxy is supported with socket transport');
1015
+                        PhpXmlRpc::$xmlrpcerr['unsupported_option'].': only Basic auth to proxy is supported with socket transport');
1016 1016
                 }
1017
-                $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($opts['proxy_user'] . ':' .
1018
-                    $opts['proxy_pass']) . "\r\n";
1017
+                $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($opts['proxy_user'].':'.
1018
+                    $opts['proxy_pass'])."\r\n";
1019 1019
             }
1020 1020
         } else {
1021 1021
             $connectServer = $server;
@@ -1032,14 +1032,14 @@  discard block
 block discarded – undo
1032 1032
             $version = '';
1033 1033
             foreach ($opts['cookies'] as $name => $cookie) {
1034 1034
                 /// @todo should we sanitize the cookie value on behalf of the user? See setCookie comments
1035
-                $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";";
1035
+                $cookieHeader .= ' '.$name.'='.$cookie['value'].";";
1036 1036
             }
1037
-            $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n";
1037
+            $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n";
1038 1038
         }
1039 1039
 
1040 1040
         $extraHeaders = '';
1041 1041
         if (is_array($this->extra_headers) && $this->extra_headers) {
1042
-            $extraHeaders = implode("\r\n", $this->extra_headers) . "\r\n";
1042
+            $extraHeaders = implode("\r\n", $this->extra_headers)."\r\n";
1043 1043
         }
1044 1044
 
1045 1045
         // omit port if default
@@ -1047,24 +1047,24 @@  discard block
 block discarded – undo
1047 1047
         if (($port == 80 && in_array($method, array('http', 'http10', 'http11'))) || ($port == 443 && $method == 'https')) {
1048 1048
             $port = '';
1049 1049
         } else {
1050
-            $port = ':' . $port;
1051
-        }
1052
-
1053
-        $op = 'POST ' . $uri . " HTTP/1.0\r\n" .
1054
-            'User-Agent: ' . $opts['user_agent'] . "\r\n" .
1055
-            'Host: ' . $server . $port . "\r\n" .
1056
-            $credentials .
1057
-            $proxyCredentials .
1058
-            $acceptedEncoding .
1059
-            $encodingHdr .
1060
-            'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']) . "\r\n" .
1061
-            $cookieHeader .
1062
-            'Content-Type: ' . $req->getContentType() . "\r\n" .
1063
-            $extraHeaders .
1064
-            'Content-Length: ' . strlen($payload) . "\r\n\r\n" .
1050
+            $port = ':'.$port;
1051
+        }
1052
+
1053
+        $op = 'POST '.$uri." HTTP/1.0\r\n".
1054
+            'User-Agent: '.$opts['user_agent']."\r\n".
1055
+            'Host: '.$server.$port."\r\n".
1056
+            $credentials.
1057
+            $proxyCredentials.
1058
+            $acceptedEncoding.
1059
+            $encodingHdr.
1060
+            'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings'])."\r\n".
1061
+            $cookieHeader.
1062
+            'Content-Type: '.$req->getContentType()."\r\n".
1063
+            $extraHeaders.
1064
+            'Content-Length: '.strlen($payload)."\r\n\r\n".
1065 1065
             $payload;
1066 1066
 
1067
-        if ($opts['debug'] > 1) {
1067
+        if ($opts['debug']>1) {
1068 1068
             $this->getLogger()->debug("---SENDING---\n$op\n---END---");
1069 1069
         }
1070 1070
 
@@ -1093,13 +1093,13 @@  discard block
 block discarded – undo
1093 1093
                 ///      https://www.php.net/manual/en/function.stream-socket-enable-crypto.php
1094 1094
                 ///      https://www.php.net/manual/en/migration56.openssl.php,
1095 1095
                 ///      https://wiki.php.net/rfc/improved-tls-constants
1096
-                switch($opts['sslversion']) {
1096
+                switch ($opts['sslversion']) {
1097 1097
                     case 1: // TLSv1x
1098 1098
                         if (version_compare(PHP_VERSION, '7.2.0', '>=')) {
1099 1099
                             $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLS_CLIENT;
1100 1100
                         } else {
1101 1101
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
1102
-                                PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-any only is supported with PHP 7.2 or later');
1102
+                                PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-any only is supported with PHP 7.2 or later');
1103 1103
                         }
1104 1104
                         break;
1105 1105
                     case 2: // SSLv2
@@ -1122,12 +1122,12 @@  discard block
 block discarded – undo
1122 1122
                             $contextOptions['ssl']['crypto_method'] = STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
1123 1123
                         } else {
1124 1124
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
1125
-                                PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': TLS-1.3 only is supported with PHP 7.4 or later');
1125
+                                PhpXmlRpc::$xmlrpcerr['unsupported_option'].': TLS-1.3 only is supported with PHP 7.4 or later');
1126 1126
                         }
1127 1127
                         break;
1128 1128
                     default:
1129 1129
                         return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['unsupported_option'],
1130
-                            PhpXmlRpc::$xmlrpcerr['unsupported_option'] . ': Unsupported required TLS version');
1130
+                            PhpXmlRpc::$xmlrpcerr['unsupported_option'].': Unsupported required TLS version');
1131 1131
                 }
1132 1132
             }
1133 1133
         }
@@ -1140,7 +1140,7 @@  discard block
 block discarded – undo
1140 1140
 
1141 1141
         $context = stream_context_create($contextOptions);
1142 1142
 
1143
-        if ($opts['timeout'] <= 0) {
1143
+        if ($opts['timeout']<=0) {
1144 1144
             $connectTimeout = ini_get('default_socket_timeout');
1145 1145
         } else {
1146 1146
             $connectTimeout = $opts['timeout'];
@@ -1159,7 +1159,7 @@  discard block
 block discarded – undo
1159 1159
         $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout,
1160 1160
             STREAM_CLIENT_CONNECT, $context);
1161 1161
         if ($fp) {
1162
-            if ($opts['timeout'] > 0) {
1162
+            if ($opts['timeout']>0) {
1163 1163
                 stream_set_timeout($fp, $opts['timeout'], 0);
1164 1164
             }
1165 1165
         } else {
@@ -1168,8 +1168,8 @@  discard block
 block discarded – undo
1168 1168
                 $this->errstr = $err['message'];
1169 1169
             }
1170 1170
 
1171
-            $this->errstr = 'Connect error: ' . $this->errstr;
1172
-            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')');
1171
+            $this->errstr = 'Connect error: '.$this->errstr;
1172
+            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')');
1173 1173
         }
1174 1174
 
1175 1175
         /// @todo from here onwards, we can inject the results of stream_get_meta_data in the response. We could
@@ -1252,19 +1252,19 @@  discard block
 block discarded – undo
1252 1252
             $opts['keepalive'], $opts['key'], $opts['keypass'], $opts['sslversion']);
1253 1253
 
1254 1254
         if (!$curl) {
1255
-            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
1255
+            return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].
1256 1256
                 ': error during curl initialization. Check php error log for details');
1257 1257
         }
1258 1258
 
1259 1259
         $result = curl_exec($curl);
1260 1260
 
1261
-        if ($opts['debug'] > 1) {
1261
+        if ($opts['debug']>1) {
1262 1262
             $message = "---CURL INFO---\n";
1263 1263
             foreach (curl_getinfo($curl) as $name => $val) {
1264 1264
                 if (is_array($val)) {
1265 1265
                     $val = implode("\n", $val);
1266 1266
                 }
1267
-                $message .= $name . ': ' . $val . "\n";
1267
+                $message .= $name.': '.$val."\n";
1268 1268
             }
1269 1269
             $message .= '---END---';
1270 1270
             $this->getLogger()->debug($message);
@@ -1274,21 +1274,21 @@  discard block
 block discarded – undo
1274 1274
             /// @todo we should use a better check here - what if we get back '' or '0'?
1275 1275
 
1276 1276
             $this->errstr = 'no response';
1277
-            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
1278
-                ': ' . curl_error($curl));
1279
-            if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1277
+            $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].
1278
+                ': '.curl_error($curl));
1279
+            if (PHP_MAJOR_VERSION<8) curl_close($curl);
1280 1280
             if ($opts['keepalive']) {
1281 1281
                 $this->xmlrpc_curl_handle = null;
1282 1282
             }
1283 1283
         } else {
1284 1284
             if (!$opts['keepalive']) {
1285
-                if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1285
+                if (PHP_MAJOR_VERSION<8) curl_close($curl);
1286 1286
             }
1287 1287
             $resp = $req->parseResponse($result, true, $opts['return_type']);
1288 1288
             if ($opts['keepalive']) {
1289 1289
                 /// @todo if we got back a 302 or 308, we should not reuse the curl handle for later calls
1290 1290
                 if (is_object($resp) && $resp->faultCode() == PhpXmlRpc::$xmlrpcerr['http_error']) {
1291
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1291
+                    if (PHP_MAJOR_VERSION<8) curl_close($curl);
1292 1292
                     $this->xmlrpc_curl_handle = null;
1293 1293
                 }
1294 1294
             }
@@ -1333,7 +1333,7 @@  discard block
 block discarded – undo
1333 1333
                     $payload = $a;
1334 1334
                     $encodingHdr = 'Content-Encoding: gzip';
1335 1335
                 } else {
1336
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzencode failure in compressing request');
1336
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzencode failure in compressing request');
1337 1337
                 }
1338 1338
             } else if (function_exists('gzcompress')) {
1339 1339
                 $a = @gzcompress($payload);
@@ -1341,14 +1341,14 @@  discard block
 block discarded – undo
1341 1341
                     $payload = $a;
1342 1342
                     $encodingHdr = 'Content-Encoding: deflate';
1343 1343
                 } else {
1344
-                    $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': gzcompress failure in compressing request');
1344
+                    $this->getLogger()->warning('XML-RPC: '.__METHOD__.': gzcompress failure in compressing request');
1345 1345
                 }
1346 1346
             } else {
1347
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported by this PHP install');
1347
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported by this PHP install');
1348 1348
             }
1349 1349
         } else {
1350 1350
             if ($opts['request_compression'] != '') {
1351
-                $this->getLogger()->warning('XML-RPC: ' . __METHOD__ . ': desired request compression method is unsupported');
1351
+                $this->getLogger()->warning('XML-RPC: '.__METHOD__.': desired request compression method is unsupported');
1352 1352
             }
1353 1353
         }
1354 1354
 
@@ -1362,12 +1362,12 @@  discard block
 block discarded – undo
1362 1362
                     // http, https
1363 1363
                     $protocol = $method;
1364 1364
                     if (strpos($protocol, ':') !== false) {
1365
-                        $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
1365
+                        $this->getLogger()->error('XML-RPC: '.__METHOD__.": warning - attempted hacking attempt?. The curl protocol requested for the call is: '$protocol'");
1366 1366
                         return false;
1367 1367
                     }
1368 1368
                 }
1369 1369
             }
1370
-            $curl = curl_init($protocol . '://' . $server . ':' . $port . $path);
1370
+            $curl = curl_init($protocol.'://'.$server.':'.$port.$path);
1371 1371
             if (!$curl) {
1372 1372
                 return false;
1373 1373
             }
@@ -1381,7 +1381,7 @@  discard block
 block discarded – undo
1381 1381
         // results into variable
1382 1382
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
1383 1383
 
1384
-        if ($opts['debug'] > 1) {
1384
+        if ($opts['debug']>1) {
1385 1385
             curl_setopt($curl, CURLOPT_VERBOSE, true);
1386 1386
             /// @todo redirect curlopt_stderr to some stream which can be piped to the logger
1387 1387
         }
@@ -1406,7 +1406,7 @@  discard block
 block discarded – undo
1406 1406
             }
1407 1407
         }
1408 1408
         // extra headers
1409
-        $headers = array('Content-Type: ' . $req->getContentType(), 'Accept-Charset: ' . implode(',', $opts['accepted_charset_encodings']));
1409
+        $headers = array('Content-Type: '.$req->getContentType(), 'Accept-Charset: '.implode(',', $opts['accepted_charset_encodings']));
1410 1410
         // if no keepalive is wanted, let the server know it in advance
1411 1411
         if (!$opts['keepalive']) {
1412 1412
             $headers[] = 'Connection: close';
@@ -1446,8 +1446,8 @@  discard block
 block discarded – undo
1446 1446
                 if (defined('CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE')) {
1447 1447
                     curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
1448 1448
                 } else {
1449
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install');
1450
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1449
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. HTTP2 is not supported by the current PHP/curl install');
1450
+                    if (PHP_MAJOR_VERSION<8) curl_close($curl);
1451 1451
                     return false;
1452 1452
                 }
1453 1453
                 break;
@@ -1457,12 +1457,12 @@  discard block
 block discarded – undo
1457 1457
         }
1458 1458
 
1459 1459
         if ($opts['username'] && $opts['password']) {
1460
-            curl_setopt($curl, CURLOPT_USERPWD, $opts['username'] . ':' . $opts['password']);
1460
+            curl_setopt($curl, CURLOPT_USERPWD, $opts['username'].':'.$opts['password']);
1461 1461
             if (defined('CURLOPT_HTTPAUTH')) {
1462 1462
                 curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']);
1463 1463
             } elseif ($opts['authtype'] != 1) {
1464
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
1465
-                if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1464
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
1465
+                if (PHP_MAJOR_VERSION<8) curl_close($curl);
1466 1466
                 return false;
1467 1467
             }
1468 1468
         }
@@ -1506,14 +1506,14 @@  discard block
 block discarded – undo
1506 1506
             if ($opts['proxyport'] == 0) {
1507 1507
                 $opts['proxyport'] = 8080; // NB: even for HTTPS, local connection is on port 8080
1508 1508
             }
1509
-            curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'] . ':' . $opts['proxyport']);
1509
+            curl_setopt($curl, CURLOPT_PROXY, $opts['proxy'].':'.$opts['proxyport']);
1510 1510
             if ($opts['proxy_user']) {
1511
-                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'] . ':' . $opts['proxy_pass']);
1511
+                curl_setopt($curl, CURLOPT_PROXYUSERPWD, $opts['proxy_user'].':'.$opts['proxy_pass']);
1512 1512
                 if (defined('CURLOPT_PROXYAUTH')) {
1513 1513
                     curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']);
1514 1514
                 } elseif ($opts['proxy_authtype'] != 1) {
1515
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
1516
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1515
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
1516
+                    if (PHP_MAJOR_VERSION<8) curl_close($curl);
1517 1517
                     return false;
1518 1518
                 }
1519 1519
             }
@@ -1524,7 +1524,7 @@  discard block
 block discarded – undo
1524 1524
         if (count($opts['cookies'])) {
1525 1525
             $cookieHeader = '';
1526 1526
             foreach ($opts['cookies'] as $name => $cookie) {
1527
-                $cookieHeader .= $name . '=' . $cookie['value'] . '; ';
1527
+                $cookieHeader .= $name.'='.$cookie['value'].'; ';
1528 1528
             }
1529 1529
             curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2));
1530 1530
         }
@@ -1533,7 +1533,7 @@  discard block
 block discarded – undo
1533 1533
             curl_setopt($curl, $opt, $val);
1534 1534
         }
1535 1535
 
1536
-        if ($opts['debug'] > 1) {
1536
+        if ($opts['debug']>1) {
1537 1537
             $this->getLogger()->debug("---SENDING---\n$payload\n---END---");
1538 1538
         }
1539 1539
 
@@ -1634,7 +1634,7 @@  discard block
 block discarded – undo
1634 1634
             $call['methodName'] = new Value($req->method(), 'string');
1635 1635
             $numParams = $req->getNumParams();
1636 1636
             $params = array();
1637
-            for ($i = 0; $i < $numParams; $i++) {
1637
+            for ($i = 0; $i<$numParams; $i++) {
1638 1638
                 $params[$i] = $req->getParam($i);
1639 1639
             }
1640 1640
             $call['params'] = new Value($params, 'array');
@@ -1656,7 +1656,7 @@  discard block
 block discarded – undo
1656 1656
         $response = array();
1657 1657
 
1658 1658
         if ($this->return_type == 'xml') {
1659
-            for ($i = 0; $i < count($reqs); $i++) {
1659
+            for ($i = 0; $i<count($reqs); $i++) {
1660 1660
                 $response[] = new static::$responseClass($rets, 0, '', 'xml', $result->httpResponse());
1661 1661
             }
1662 1662
 
@@ -1664,21 +1664,21 @@  discard block
 block discarded – undo
1664 1664
             if (!is_array($rets)) {
1665 1665
                 // bad return type from system.multicall
1666 1666
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1667
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': not an array', 'phpvals', $result->httpResponse());
1667
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': not an array', 'phpvals', $result->httpResponse());
1668 1668
             }
1669 1669
             $numRets = count($rets);
1670 1670
             if ($numRets != count($reqs)) {
1671 1671
                 // wrong number of return values.
1672 1672
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1673
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'phpvals',
1673
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'phpvals',
1674 1674
                     $result->httpResponse());
1675 1675
             }
1676 1676
 
1677
-            for ($i = 0; $i < $numRets; $i++) {
1677
+            for ($i = 0; $i<$numRets; $i++) {
1678 1678
                 $val = $rets[$i];
1679 1679
                 if (!is_array($val)) {
1680 1680
                     return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1681
-                        PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct",
1681
+                        PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct",
1682 1682
                         'phpvals', $result->httpResponse());
1683 1683
                 }
1684 1684
                 switch (count($val)) {
@@ -1686,7 +1686,7 @@  discard block
 block discarded – undo
1686 1686
                         if (!isset($val[0])) {
1687 1687
                             // Bad value
1688 1688
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1689
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has no value",
1689
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has no value",
1690 1690
                                 'phpvals', $result->httpResponse());
1691 1691
                         }
1692 1692
                         // Normal return value
@@ -1698,20 +1698,20 @@  discard block
 block discarded – undo
1698 1698
                         if (!is_int($code)) {
1699 1699
                             /// @todo should we check that it is != 0?
1700 1700
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1701
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
1701
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
1702 1702
                                 'phpvals', $result->httpResponse());
1703 1703
                         }
1704 1704
                         $str = @$val['faultString'];
1705 1705
                         if (!is_string($str)) {
1706 1706
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1707
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no FaultString",
1707
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no FaultString",
1708 1708
                                 'phpvals', $result->httpResponse());
1709 1709
                         }
1710 1710
                         $response[$i] = new static::$responseClass(0, $code, $str, 'phpvals', $result->httpResponse());
1711 1711
                         break;
1712 1712
                     default:
1713 1713
                         return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1714
-                            PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
1714
+                            PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
1715 1715
                             'phpvals', $result->httpResponse());
1716 1716
                 }
1717 1717
             }
@@ -1720,14 +1720,14 @@  discard block
 block discarded – undo
1720 1720
             // return type == 'xmlrpcvals'
1721 1721
             if ($rets->kindOf() != 'array') {
1722 1722
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1723
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array", 'xmlrpcvals',
1723
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array", 'xmlrpcvals',
1724 1724
                     $result->httpResponse());
1725 1725
             }
1726 1726
             $numRets = $rets->count();
1727 1727
             if ($numRets != count($reqs)) {
1728 1728
                 // wrong number of return values.
1729 1729
                 return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1730
-                    PhpXmlRpc::$xmlrpcstr['multicall_error'] . ': incorrect number of responses', 'xmlrpcvals',
1730
+                    PhpXmlRpc::$xmlrpcstr['multicall_error'].': incorrect number of responses', 'xmlrpcvals',
1731 1731
                     $result->httpResponse());
1732 1732
             }
1733 1733
 
@@ -1736,7 +1736,7 @@  discard block
 block discarded – undo
1736 1736
                     case 'array':
1737 1737
                         if ($val->count() != 1) {
1738 1738
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1739
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
1739
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
1740 1740
                                 'phpvals', $result->httpResponse());
1741 1741
                         }
1742 1742
                         // Normal return value
@@ -1745,28 +1745,28 @@  discard block
 block discarded – undo
1745 1745
                     case 'struct':
1746 1746
                         if ($val->count() != 2) {
1747 1747
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1748
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has too many items",
1748
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has too many items",
1749 1749
                                 'phpvals', $result->httpResponse());
1750 1750
                         }
1751 1751
                         /** @var Value $code */
1752 1752
                         $code = $val['faultCode'];
1753 1753
                         if ($code->kindOf() != 'scalar' || $code->scalarTyp() != 'int') {
1754 1754
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1755
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
1755
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
1756 1756
                                 'xmlrpcvals', $result->httpResponse());
1757 1757
                         }
1758 1758
                         /** @var Value $str */
1759 1759
                         $str = $val['faultString'];
1760 1760
                         if ($str->kindOf() != 'scalar' || $str->scalarTyp() != 'string') {
1761 1761
                             return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1762
-                                PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i has invalid or no faultCode",
1762
+                                PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i has invalid or no faultCode",
1763 1763
                                 'xmlrpcvals', $result->httpResponse());
1764 1764
                         }
1765 1765
                         $response[] = new static::$responseClass(0, $code->scalarVal(), $str->scalarVal(), 'xmlrpcvals', $result->httpResponse());
1766 1766
                         break;
1767 1767
                     default:
1768 1768
                         return new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['multicall_error'],
1769
-                            PhpXmlRpc::$xmlrpcstr['multicall_error'] . ": response element $i is not an array or struct",
1769
+                            PhpXmlRpc::$xmlrpcstr['multicall_error'].": response element $i is not an array or struct",
1770 1770
                             'xmlrpcvals', $result->httpResponse());
1771 1771
                 }
1772 1772
             }
@@ -1801,7 +1801,7 @@  discard block
 block discarded – undo
1801 1801
         $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1,
1802 1802
         $method = 'http')
1803 1803
     {
1804
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
1804
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
1805 1805
 
1806 1806
         return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null,
1807 1807
             null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType, $method);
@@ -1839,7 +1839,7 @@  discard block
 block discarded – undo
1839 1839
         $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '',
1840 1840
         $sslVersion = 0)
1841 1841
     {
1842
-        $this->logDeprecation('Method ' . __METHOD__ . ' is deprecated');
1842
+        $this->logDeprecation('Method '.__METHOD__.' is deprecated');
1843 1843
 
1844 1844
         return $this->sendPayloadCURL($req, $server, $port, $timeout, $username,
1845 1845
             $password, $authType, $cert, $certPass, $caCert, $caCertDir, $proxyHost, $proxyPort,
@@ -2052,7 +2052,7 @@  discard block
 block discarded – undo
2052 2052
     public function &__get($name)
2053 2053
     {
2054 2054
         if (in_array($name, static::$options)) {
2055
-            $this->logDeprecation('Getting property Client::' . $name . ' is deprecated');
2055
+            $this->logDeprecation('Getting property Client::'.$name.' is deprecated');
2056 2056
             return $this->$name;
2057 2057
         }
2058 2058
 
@@ -2063,12 +2063,12 @@  discard block
 block discarded – undo
2063 2063
             case 'server':
2064 2064
             case 'port':
2065 2065
             case 'path':
2066
-                $this->logDeprecation('Getting property Client::' . $name . ' is deprecated');
2066
+                $this->logDeprecation('Getting property Client::'.$name.' is deprecated');
2067 2067
                 return $this->$name;
2068 2068
             default:
2069 2069
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
2070 2070
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
2071
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
2071
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
2072 2072
                 $result = null;
2073 2073
                 return $result;
2074 2074
         }
@@ -2077,7 +2077,7 @@  discard block
 block discarded – undo
2077 2077
     public function __set($name, $value)
2078 2078
     {
2079 2079
         if (in_array($name, static::$options)) {
2080
-            $this->logDeprecation('Setting property Client::' . $name . ' is deprecated');
2080
+            $this->logDeprecation('Setting property Client::'.$name.' is deprecated');
2081 2081
             $this->$name = $value;
2082 2082
             return;
2083 2083
         }
@@ -2089,20 +2089,20 @@  discard block
 block discarded – undo
2089 2089
             case 'server':
2090 2090
             case 'port':
2091 2091
             case 'path':
2092
-                $this->logDeprecation('Setting property Client::' . $name . ' is deprecated');
2092
+                $this->logDeprecation('Setting property Client::'.$name.' is deprecated');
2093 2093
                 $this->$name = $value;
2094 2094
                 return;
2095 2095
             default:
2096 2096
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
2097 2097
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
2098
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
2098
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
2099 2099
         }
2100 2100
     }
2101 2101
 
2102 2102
     public function __isset($name)
2103 2103
     {
2104 2104
         if (in_array($name, static::$options)) {
2105
-            $this->logDeprecation('Checking property Client::' . $name . ' is deprecated');
2105
+            $this->logDeprecation('Checking property Client::'.$name.' is deprecated');
2106 2106
             return isset($this->$name);
2107 2107
         }
2108 2108
 
@@ -2113,7 +2113,7 @@  discard block
 block discarded – undo
2113 2113
             case 'server':
2114 2114
             case 'port':
2115 2115
             case 'path':
2116
-                $this->logDeprecation('Checking property Client::' . $name . ' is deprecated');
2116
+                $this->logDeprecation('Checking property Client::'.$name.' is deprecated');
2117 2117
                 return isset($this->$name);
2118 2118
             default:
2119 2119
                 return false;
@@ -2123,7 +2123,7 @@  discard block
 block discarded – undo
2123 2123
     public function __unset($name)
2124 2124
     {
2125 2125
         if (in_array($name, static::$options)) {
2126
-            $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated');
2126
+            $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated');
2127 2127
             unset($this->$name);
2128 2128
             return;
2129 2129
         }
@@ -2135,13 +2135,13 @@  discard block
 block discarded – undo
2135 2135
             case 'server':
2136 2136
             case 'port':
2137 2137
             case 'path':
2138
-                $this->logDeprecation('Unsetting property Client::' . $name . ' is deprecated');
2138
+                $this->logDeprecation('Unsetting property Client::'.$name.' is deprecated');
2139 2139
                 unset($this->$name);
2140 2140
                 return;
2141 2141
             default:
2142 2142
                 /// @todo throw instead? There are very few other places where the lib trigger errors which can potentially reach stdout...
2143 2143
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
2144
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
2144
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
2145 2145
         }
2146 2146
     }
2147 2147
 }
Please login to merge, or discard this patch.
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1276,19 +1276,25 @@  discard block
 block discarded – undo
1276 1276
             $this->errstr = 'no response';
1277 1277
             $resp = new static::$responseClass(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] .
1278 1278
                 ': ' . curl_error($curl));
1279
-            if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1279
+            if (PHP_MAJOR_VERSION < 8) {
1280
+                curl_close($curl);
1281
+            }
1280 1282
             if ($opts['keepalive']) {
1281 1283
                 $this->xmlrpc_curl_handle = null;
1282 1284
             }
1283 1285
         } else {
1284 1286
             if (!$opts['keepalive']) {
1285
-                if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1287
+                if (PHP_MAJOR_VERSION < 8) {
1288
+                    curl_close($curl);
1289
+                }
1286 1290
             }
1287 1291
             $resp = $req->parseResponse($result, true, $opts['return_type']);
1288 1292
             if ($opts['keepalive']) {
1289 1293
                 /// @todo if we got back a 302 or 308, we should not reuse the curl handle for later calls
1290 1294
                 if (is_object($resp) && $resp->faultCode() == PhpXmlRpc::$xmlrpcerr['http_error']) {
1291
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1295
+                    if (PHP_MAJOR_VERSION < 8) {
1296
+                        curl_close($curl);
1297
+                    }
1292 1298
                     $this->xmlrpc_curl_handle = null;
1293 1299
                 }
1294 1300
             }
@@ -1447,7 +1453,9 @@  discard block
 block discarded – undo
1447 1453
                     curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE);
1448 1454
                 } else {
1449 1455
                     $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. HTTP2 is not supported by the current PHP/curl install');
1450
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1456
+                    if (PHP_MAJOR_VERSION < 8) {
1457
+                        curl_close($curl);
1458
+                    }
1451 1459
                     return false;
1452 1460
                 }
1453 1461
                 break;
@@ -1462,7 +1470,9 @@  discard block
 block discarded – undo
1462 1470
                 curl_setopt($curl, CURLOPT_HTTPAUTH, $opts['authtype']);
1463 1471
             } elseif ($opts['authtype'] != 1) {
1464 1472
                 $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install');
1465
-                if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1473
+                if (PHP_MAJOR_VERSION < 8) {
1474
+                    curl_close($curl);
1475
+                }
1466 1476
                 return false;
1467 1477
             }
1468 1478
         }
@@ -1513,7 +1523,9 @@  discard block
 block discarded – undo
1513 1523
                     curl_setopt($curl, CURLOPT_PROXYAUTH, $opts['proxy_authtype']);
1514 1524
                 } elseif ($opts['proxy_authtype'] != 1) {
1515 1525
                     $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
1516
-                    if (PHP_MAJOR_VERSION < 8) curl_close($curl);
1526
+                    if (PHP_MAJOR_VERSION < 8) {
1527
+                        curl_close($curl);
1528
+                    }
1517 1529
                     return false;
1518 1530
                 }
1519 1531
             }
Please login to merge, or discard this patch.
debugger/controller.php 2 patches
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
22 22
     $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
23 23
 
24
-include __DIR__ . '/common.php';
24
+include __DIR__.'/common.php';
25 25
 
26 26
 if ($action == '') {
27 27
     $action = 'list';
@@ -38,30 +38,30 @@  discard block
 block discarded – undo
38 38
     /// @const JSXMLRPC_PATH Path to the visual xml-rpc editing dialog's containing folder. Can be absolute, or
39 39
     ///         relative to this debugger's folder.
40 40
     if (defined('JSXMLRPC_PATH')) {
41
-        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH));
41
+        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH));
42 42
     } else {
43 43
         $editorpaths = array(
44
-            __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile
45
-            __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger
46
-            __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger
47
-            __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
48
-            __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
49
-            __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
50
-            __DIR__ . '/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc)
51
-            __DIR__ . '/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer
52
-            __DIR__ . '/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm
53
-            __DIR__ . '/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project
44
+            __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile
45
+            __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger
46
+            __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger
47
+            __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
48
+            __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
49
+            __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
50
+            __DIR__.'/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc)
51
+            __DIR__.'/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer
52
+            __DIR__.'/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm
53
+            __DIR__.'/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project
54 54
         );
55 55
     }
56
-    foreach($editorpaths as $editorpath) {
57
-        if (is_file(realpath($editorpath . 'visualeditor.html'))) {
56
+    foreach ($editorpaths as $editorpath) {
57
+        if (is_file(realpath($editorpath.'visualeditor.html'))) {
58 58
             $haseditor = true;
59 59
             break;
60 60
         }
61 61
     }
62 62
     if ($haseditor) {
63
-        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'],  PHP_URL_PATH));
64
-        $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath);
63
+        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
64
+        $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath);
65 65
         /// @todo for cases above 4 and up, look at $controllerRootUrl and check if the web root is not pointing directly
66 66
         ///       at this folder, as in that case the link to the visualeditor will not
67 67
         ///       work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
         }
276 276
 
277 277
         function activateeditor() {
278
-            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\", "\\'"), $alt_payload); ?>';
278
+            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>';
279 279
             if (document.frmaction.wstype.value == "1" || document.frmaction.wstype.value == "2")
280 280
                 url += '&type=jsonrpc';
281 281
             var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1');
@@ -313,16 +313,16 @@  discard block
 block discarded – undo
313 313
     } ?>">
314 314
 <h1>XML-RPC
315 315
 <?php if ($hasjsonrpcclient) {
316
-    echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"' .
316
+    echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"'.
317 317
         // q: does this check make sense at all?
318
-        (!class_exists('\PhpXmlRpc\Client') ? ' disabled="disabled"' : '') . ' /></form>';
318
+        (!class_exists('\PhpXmlRpc\Client') ? ' disabled="disabled"' : '').' /></form>';
319 319
     if ($hasjsonrpc2) {
320 320
         echo ' / <form name="frmjsonrpc2" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(2);"/></form>JSON-RPC 2.0 ';
321 321
     }
322 322
     echo ' / <form name="frmjsonrpc1" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSON-RPC 1.0 ';
323 323
 } ?>
324 324
 Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
325
-<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
325
+<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. '.htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
326 326
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
327 327
 
328 328
     <table id="serverblock">
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
                 </select>
385 385
             </td>
386 386
             <td class="labelcell">Timeout:</td>
387
-            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
387
+            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
388 388
             <td></td>
389 389
             <td></td>
390 390
         </tr>
Please login to merge, or discard this patch.
Braces   +13 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,12 @@  discard block
 block discarded – undo
71 71
 <html lang="en">
72 72
 <head>
73 73
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
74
-    <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
74
+    <title><?php if (defined('DEFAULT_WSTYPE') && (DEFAULT_WSTYPE == 1 || DEFAULT_WSTYPE == 2)) {
75
+    echo 'JSON-RPC';
76
+} else {
77
+    echo 'XML-RPC';
78
+}
79
+?> Debugger</title>
75 80
     <meta name="robots" content="index,nofollow"/>
76 81
     <script type="text/javascript" language="Javascript">
77 82
         if (window.name != 'frmcontroller')
@@ -308,8 +313,10 @@  discard block
 block discarded – undo
308 313
     </script>
309 314
 </head>
310 315
 <body
311
-    onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
316
+    onload="<?php if ($hasjsonrpcclient) {
317
+    echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
312 318
         echo ' document.frmaction.submit();';
319
+}
313 320
     } ?>">
314 321
 <h1>XML-RPC
315 322
 <?php if ($hasjsonrpcclient) {
@@ -322,7 +329,10 @@  discard block
 block discarded – undo
322 329
     echo ' / <form name="frmjsonrpc1" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSON-RPC 1.0 ';
323 330
 } ?>
324 331
 Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
325
-<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3>
332
+<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) {
333
+    echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion);
334
+}
335
+?>)</h3>
326 336
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
327 337
 
328 338
     <table id="serverblock">
Please login to merge, or discard this patch.
debugger/common.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
     // assume this is either a standalone install, or installed as Composer dependency
21 21
     /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level
22 22
     ///       debugger include this one, taking care of autoloading?
23
-    include_once __DIR__ . "/../src/Autoloader.php";
23
+    include_once __DIR__."/../src/Autoloader.php";
24 24
     PhpXmlRpc\Autoloader::register();
25 25
 }
26 26
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
         }
35 35
 
36 36
         // Variables that shouldn't be unset
37
-        $noUnset = array('GLOBALS',  '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
37
+        $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
38 38
 
39 39
         $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES,
40 40
             isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array()
@@ -86,8 +86,8 @@  discard block
 block discarded – undo
86 86
 $wstype = defined('DEFAULT_WSTYPE') ? DEFAULT_WSTYPE : 0;
87 87
 $id = '';
88 88
 if (isset($_GET['action'])) {
89
-    if (isset($_GET['wstype']) && ($_GET['wstype'] == '2'  || $_GET['wstype'] == '1' || $_GET['wstype'] == '0')) {
90
-        $wstype = (int)$_GET['wstype'];
89
+    if (isset($_GET['wstype']) && ($_GET['wstype'] == '2' || $_GET['wstype'] == '1' || $_GET['wstype'] == '0')) {
90
+        $wstype = (int) $_GET['wstype'];
91 91
         if ($wstype === 1 || $wstype === 2) {
92 92
             if (!$hasjsonrpcclient) {
93 93
                 $wstype = 0;
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
     $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xml-rpc error...
103 103
     if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2' || $_GET['protocol'] == '3'
104 104
         || $_GET['protocol'] == '4')) {
105
-        $protocol = (int)$_GET['protocol'];
105
+        $protocol = (int) $_GET['protocol'];
106 106
     }
107 107
     if (strpos($host, 'http://') === 0) {
108 108
         // NB: if protocol is https or h2, it will override http://
@@ -114,18 +114,18 @@  discard block
 block discarded – undo
114 114
             $protocol = 2;
115 115
         }
116 116
     }
117
-    $port = isset($_GET['port']) ? (int)$_GET['port'] : '';
117
+    $port = isset($_GET['port']) ? (int) $_GET['port'] : '';
118 118
     if ($port === 0) {
119 119
         $port = '';
120 120
     }
121 121
     $path = isset($_GET['path']) ? $_GET['path'] : '';
122 122
     // in case user forgot initial '/' in xml-rpc server path, add it back
123 123
     if ($path && ($path[0]) != '/') {
124
-        $path = '/' . $path;
124
+        $path = '/'.$path;
125 125
     }
126 126
 
127 127
     if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) {
128
-        $debug = (int)$_GET['debug'];
128
+        $debug = (int) $_GET['debug'];
129 129
     }
130 130
 
131 131
     $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0;
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
     /// @todo what about an https proxy?
143 143
     $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
144 144
     $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : '';
145
-    $timeout = isset($_GET['timeout']) ? (int)$_GET['timeout'] : 0;
145
+    $timeout = isset($_GET['timeout']) ? (int) $_GET['timeout'] : 0;
146 146
     $action = $_GET['action'];
147 147
 
148 148
     $method = isset($_GET['method']) ? $_GET['method'] : '';
@@ -157,15 +157,15 @@  discard block
 block discarded – undo
157 157
     $username = isset($_GET['username']) ? $_GET['username'] : '';
158 158
     $password = isset($_GET['password']) ? $_GET['password'] : '';
159 159
 
160
-    $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int)$_GET['authtype'] : 1;
160
+    $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int) $_GET['authtype'] : 1;
161 161
 
162 162
     if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) {
163
-        (int)$requestcompression = $_GET['requestcompression'];
163
+        (int) $requestcompression = $_GET['requestcompression'];
164 164
     } else {
165 165
         $requestcompression = 0;
166 166
     }
167 167
     if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) {
168
-        $responsecompression = (int)$_GET['responsecompression'];
168
+        $responsecompression = (int) $_GET['responsecompression'];
169 169
     } else {
170 170
         $responsecompression = 0;
171 171
     }
Please login to merge, or discard this patch.
debugger/action.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,8 +79,8 @@
 block discarded – undo
79 79
 <?php
80 80
 
81 81
 global $inputcharset, $debug, $protocol, $run, $hasjsonrpcclient, $hasjsonrpc2, $wstype, $id, $host, $port, $path, $action,
82
-       $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
83
-       $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
82
+        $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
83
+        $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
84 84
 
85 85
 include __DIR__ . '/common.php';
86 86
 
Please login to merge, or discard this patch.
Spacing   +123 added lines, -123 removed lines patch added patch discarded remove patch
@@ -82,13 +82,13 @@  discard block
 block discarded – undo
82 82
        $method, $methodsig, $payload, $alt_payload, $username, $password, $authtype, $verifyhost, $verifypeer, $cainfo, $proxy,
83 83
        $proxyuser, $proxypwd, $timeout, $requestcompression, $responsecompression, $clientcookies;
84 84
 
85
-include __DIR__ . '/common.php';
85
+include __DIR__.'/common.php';
86 86
 
87 87
 if ($action) {
88 88
 
89 89
     // avoid php hanging when using the builtin webserver and sending requests to itself
90 90
     $skip = false;
91
-    if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) {
91
+    if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) {
92 92
         $localHost = explode(':', $_SERVER['HTTP_HOST']);
93 93
         /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters,
94 94
         ///       and that proxy is us
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
     if (!$skip) {
102 102
         // make sure the script waits long enough for the call to complete...
103 103
         if ($timeout) {
104
-            set_time_limit($timeout + 10);
104
+            set_time_limit($timeout+10);
105 105
         }
106 106
 
107 107
         if ($wstype == 1 || $wstype == 2) {
@@ -128,13 +128,13 @@  discard block
 block discarded – undo
128 128
             $server = "$host$path";
129 129
         }
130 130
         if ($protocol == 2 || $protocol == 3) {
131
-            $server = 'https://' . $server;
131
+            $server = 'https://'.$server;
132 132
         } else {
133
-            $server = 'http://' . $server;
133
+            $server = 'http://'.$server;
134 134
         }
135 135
         if ($proxy != '') {
136 136
             $pproxy = explode(':', $proxy);
137
-            if (count($pproxy) > 1) {
137
+            if (count($pproxy)>1) {
138 138
                 $pport = $pproxy[1];
139 139
             } else {
140 140
                 $pport = 8080;
@@ -207,9 +207,9 @@  discard block
 block discarded – undo
207 207
             // fall thru intentionally
208 208
             case 'describe':
209 209
             case 'wrap':
210
-                $msg[0] = new $requestClass('system.methodHelp', array(), (int)$id);
210
+                $msg[0] = new $requestClass('system.methodHelp', array(), (int) $id);
211 211
                 $msg[0]->addparam(new PhpXmlRpc\Value($method));
212
-                $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1);
212
+                $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1);
213 213
                 $msg[1]->addparam(new PhpXmlRpc\Value($method));
214 214
                 if ($wstype == 2) {
215 215
                     $msg[0]->setJsonRpcVersion('2.0');
@@ -218,10 +218,10 @@  discard block
 block discarded – undo
218 218
                     $msg[0]->setJsonRpcVersion('1.0');
219 219
                     $msg[1]->setJsonRpcVersion('1.0');
220 220
                 }
221
-                $actionname = 'Description of method "' . $method . '"';
221
+                $actionname = 'Description of method "'.$method.'"';
222 222
                 break;
223 223
             case 'list':
224
-                $msg[0] = new $requestClass('system.listMethods', array(), (int)$id);
224
+                $msg[0] = new $requestClass('system.listMethods', array(), (int) $id);
225 225
                 if ($wstype == 2) {
226 226
                     $msg[0]->setJsonRpcVersion('2.0');
227 227
                 } elseif ($wstype == 1 && $hasjsonrpc2) {
@@ -241,10 +241,10 @@  discard block
 block discarded – undo
241 241
                 }
242 242
                 // hack! build payload by hand
243 243
                 if ($wstype == 2) {
244
-                    $payload = "{\n" .
245
-                        '"jsonrpc": "2.0"' . ",\n" .
246
-                        '"method": "' . $method . "\",\n\"params\": [" .
247
-                        $payload .
244
+                    $payload = "{\n".
245
+                        '"jsonrpc": "2.0"'.",\n".
246
+                        '"method": "'.$method."\",\n\"params\": [".
247
+                        $payload.
248 248
                         "\n]";
249 249
                     if ($action == "notification") {
250 250
                         $payload .= "\n";
@@ -259,9 +259,9 @@  discard block
 block discarded – undo
259 259
                     $msg[0]->setPayload($payload);
260 260
                     $msg[0]->setJsonRpcVersion('2.0');
261 261
                 } elseif ($wstype == 1) {
262
-                    $payload = "{\n" .
263
-                        '"method": "' . $method . "\",\n\"params\": [" .
264
-                        $payload .
262
+                    $payload = "{\n".
263
+                        '"method": "'.$method."\",\n\"params\": [".
264
+                        $payload.
265 265
                         "\n],\n\"id\": ";
266 266
                     if ($action == "notification") {
267 267
                         $payload .= "null\n}";
@@ -279,26 +279,26 @@  discard block
 block discarded – undo
279 279
                     }
280 280
                 } else {
281 281
                     $msg[0]->setPayload(
282
-                        $msg[0]->xml_header($inputcharset) .
283
-                        '<methodName>' . $method . "</methodName>\n<params>" .
284
-                        $payload .
285
-                        "</params>\n" . $msg[0]->xml_footer()
282
+                        $msg[0]->xml_header($inputcharset).
283
+                        '<methodName>'.$method."</methodName>\n<params>".
284
+                        $payload.
285
+                        "</params>\n".$msg[0]->xml_footer()
286 286
                     );
287 287
                 }
288 288
                 if ($action == 'notification') {
289
-                    $actionname = 'Execution of notification ' . $method;
289
+                    $actionname = 'Execution of notification '.$method;
290 290
                 } else {
291
-                    $actionname = 'Execution of method ' . $method;
291
+                    $actionname = 'Execution of method '.$method;
292 292
                 }
293 293
                 break;
294 294
             default: // give a warning
295
-                $actionname = '[ERROR: unknown action] "' . $action . '"';
295
+                $actionname = '[ERROR: unknown action] "'.$action.'"';
296 296
         }
297 297
     }
298 298
 
299 299
     // Before calling execute, echo out brief description of action taken + date and time ???
300 300
     // this gives good user feedback for long-running methods...
301
-    echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n";
301
+    echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n";
302 302
     flush();
303 303
 
304 304
     $response = null;
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
             break;
317 317
         }
318 318
     }
319
-    $time = microtime(true) - $time;
319
+    $time = microtime(true)-$time;
320 320
     if ($debug) {
321 321
         echo "</div>\n";
322 322
     }
@@ -330,8 +330,8 @@  discard block
 block discarded – undo
330 330
             // call failed! echo out error msg!
331 331
             //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
332 332
             echo "<h3>$protoName call FAILED!</h3>\n";
333
-            echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
334
-                "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n";
333
+            echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
334
+                "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n";
335 335
             echo(date("d/M/Y:H:i:s\n"));
336 336
         } else {
337 337
             // call succeeded: parse results
@@ -347,36 +347,36 @@  discard block
 block discarded – undo
347 347
                         $max = $v->count();
348 348
                         echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
349 349
                         echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n";
350
-                        foreach($v as $i => $rec) {
350
+                        foreach ($v as $i => $rec) {
351 351
                             if ($i % 2) {
352 352
                                 $class = ' class="oddrow"';
353 353
                             } else {
354 354
                                 $class = ' class="evenrow"';
355 355
                             }
356
-                            echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" .
357
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
358
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
359
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
360
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
361
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
362
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
363
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
364
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
365
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
366
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
367
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
368
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
369
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
370
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
371
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
372
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
373
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
374
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
375
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
376
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" .
377
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
378
-                                "<input type=\"hidden\" name=\"action\" value=\"describe\" />" .
379
-                                "<input type=\"hidden\" name=\"run\" value=\"now\" />" .
356
+                            echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">".
357
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
358
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
359
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
360
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
361
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
362
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
363
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
364
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
365
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
366
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
367
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
368
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
369
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
370
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
371
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
372
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
373
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
374
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
375
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
376
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />".
377
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
378
+                                "<input type=\"hidden\" name=\"action\" value=\"describe\" />".
379
+                                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
380 380
                                 "<input type=\"submit\" value=\"Describe\" /></form></td>");
381 381
                             //echo("</tr>\n");
382 382
 
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
                     $r2 = $resp[1]->value();
404 404
 
405 405
                     echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
406
-                    echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
406
+                    echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
407 407
                     $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
408 408
                     if ($desc == "") {
409 409
                         $desc = "-";
@@ -413,24 +413,24 @@  discard block
 block discarded – undo
413 413
                     if ($r2->kindOf() != "array") {
414 414
                         echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
415 415
                     } else {
416
-                        foreach($r2 as $i => $x) {
416
+                        foreach ($r2 as $i => $x) {
417 417
                             $payload = "";
418 418
                             $alt_payload = "";
419
-                            if ($i + 1 % 2) {
419
+                            if ($i+1 % 2) {
420 420
                                 $class = ' class="oddrow"';
421 421
                             } else {
422 422
                                 $class = ' class="evenrow"';
423 423
                             }
424
-                            echo "<tr><td$class>Signature&nbsp;" . ($i + 1) . "</td><td$class>";
424
+                            echo "<tr><td$class>Signature&nbsp;".($i+1)."</td><td$class>";
425 425
                             if ($x->kindOf() == "array") {
426 426
                                 $ret = $x[0];
427
-                                echo "<code>OUT:&nbsp;" . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: (";
428
-                                if ($x->count() > 1) {
429
-                                    foreach($x as $k => $y) {
427
+                                echo "<code>OUT:&nbsp;".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: (";
428
+                                if ($x->count()>1) {
429
+                                    foreach ($x as $k => $y) {
430 430
                                         if ($k == 0) continue;
431 431
                                         echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
432 432
                                         if ($wstype == 1 || $wstype == 2) {
433
-                                            switch($y->scalarval()) {
433
+                                            switch ($y->scalarval()) {
434 434
                                                 case 'string':
435 435
                                                 case 'dateTime.iso8601':
436 436
                                                 case 'base64':
@@ -463,22 +463,22 @@  discard block
 block discarded – undo
463 463
                                         } else {
464 464
                                             $type = $y->scalarval();
465 465
                                             $payload .= '<param><value>';
466
-                                            switch($type) {
466
+                                            switch ($type) {
467 467
                                                 case 'undefined':
468 468
                                                     break;
469 469
                                                 case 'null':
470 470
                                                     $type = 'nil';
471 471
                                                     // fall thru intentionally
472 472
                                                 default:
473
-                                                    $payload .= '<' .
474
-                                                        htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
475
-                                                        '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
473
+                                                    $payload .= '<'.
474
+                                                        htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
475
+                                                        '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
476 476
                                                         '>';
477 477
                                             }
478 478
                                             $payload .= "</value></param>\n";
479 479
                                         }
480 480
                                         $alt_payload .= $y->scalarval();
481
-                                        if ($k < $x->count() - 1) {
481
+                                        if ($k<$x->count()-1) {
482 482
                                             $alt_payload .= ';';
483 483
                                             if ($wstype == 1 || $wstype == 2) {
484 484
                                                 $payload .= ', ';
@@ -494,63 +494,63 @@  discard block
 block discarded – undo
494 494
                             echo '</td>';
495 495
                             // button to test this method
496 496
                             //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>";
497
-                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" .
498
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
499
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
500
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
501
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
502
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
503
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
504
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
505
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
506
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
507
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
508
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
509
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
510
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
511
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
512
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
513
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
514
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
515
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
516
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
517
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" .
518
-                                "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" .
519
-                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" .
520
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
497
+                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
498
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
499
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
500
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
501
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
502
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
503
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
504
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
505
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
506
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
507
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
508
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
509
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
510
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
511
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
512
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
513
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
514
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
515
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
516
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
517
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />".
518
+                                "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />".
519
+                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />".
520
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
521 521
                                 "<input type=\"hidden\" name=\"action\" value=\"execute\" />";
522 522
                             //if ($wstype != 1) {
523 523
                                 echo "<input type=\"submit\" value=\"Load method synopsis\" />";
524 524
                             //}
525 525
                             echo "</form></td>\n";
526 526
 
527
-                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" .
528
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
529
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
530
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
531
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
532
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
533
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
534
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
535
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
536
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
537
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
538
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
539
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
540
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
541
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
542
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
543
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
544
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
545
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
546
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
547
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" .
548
-                                "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" .
549
-                                "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" .
550
-                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" .
551
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
552
-                                "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" .
553
-                                "<input type=\"hidden\" name=\"run\" value=\"now\" />" .
527
+                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
528
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
529
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
530
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
531
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
532
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
533
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
534
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
535
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
536
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
537
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
538
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
539
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
540
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
541
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
542
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
543
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
544
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
545
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
546
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
547
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />".
548
+                                "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />".
549
+                                "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />".
550
+                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />".
551
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
552
+                                "<input type=\"hidden\" name=\"action\" value=\"wrap\" />".
553
+                                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
554 554
                                 "<input type=\"submit\" value=\"Generate method call stub code\" />";
555 555
                             echo "</form></td></tr>\n";
556 556
                         }
@@ -562,14 +562,14 @@  discard block
 block discarded – undo
562 562
                 case 'wrap':
563 563
                     $r1 = $resp[0]->value();
564 564
                     $r2 = $resp[1]->value();
565
-                    if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) {
565
+                    if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) {
566 566
                         echo "Error: signature unknown\n";
567 567
                     } else {
568 568
                         $mdesc = $r1->scalarval();
569 569
                         $encoder = new PhpXmlRpc\Encoder();
570 570
                         $msig = $encoder->decode($r2);
571 571
                         $msig = $msig[$methodsig];
572
-                        $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) );
572
+                        $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : '')));
573 573
                         if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression &&
574 574
                             $clientcookies == '') {
575 575
                             $opts = 1; // simple client copy in stub code
@@ -590,12 +590,12 @@  discard block
 block discarded – undo
590 590
                             $client,
591 591
                             $method,
592 592
                             array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true),
593
-                            str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc
593
+                            str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc
594 594
                         );
595 595
                         //if ($code)
596 596
                         //{
597 597
                         echo "<div id=\"phpcode\">\n";
598
-                        highlight_string("<?php\n" . $code['docstring'] . $code['source']);
598
+                        highlight_string("<?php\n".$code['docstring'].$code['source']);
599 599
                         echo "\n</div>";
600 600
                         //}
601 601
                         //else
@@ -606,11 +606,11 @@  discard block
 block discarded – undo
606 606
                     break;
607 607
 
608 608
                 case 'execute':
609
-                    echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>';
609
+                    echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>';
610 610
                     break;
611 611
 
612 612
                 case 'notification':
613
-                    echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>';
613
+                    echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>';
614 614
                     break;
615 615
 
616 616
                 default: // give a warning
Please login to merge, or discard this patch.