@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | method)</p> |
| 21 | 21 | <?php |
| 22 | 22 | |
| 23 | -include_once __DIR__ . "/../../src/Autoloader.php"; |
|
| 23 | +include_once __DIR__."/../../src/Autoloader.php"; |
|
| 24 | 24 | PhpXmlRpc\Autoloader::register(); |
| 25 | 25 | |
| 26 | 26 | if (isset($_POST["mailto"]) && $_POST["mailto"]) { |
@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | print "<font color=\"red\">"; |
| 45 | 45 | print "Mail send failed<br/>\n"; |
| 46 | 46 | print "Fault: "; |
| 47 | - print "Code: " . htmlspecialchars($resp->faultCode()) . |
|
| 48 | - " Reason: '" . htmlspecialchars($resp->faultString()) . "'<br/>"; |
|
| 47 | + print "Code: ".htmlspecialchars($resp->faultCode()). |
|
| 48 | + " Reason: '".htmlspecialchars($resp->faultString())."'<br/>"; |
|
| 49 | 49 | print "</font><br/>"; |
| 50 | 50 | } |
| 51 | 51 | } |
@@ -136,10 +136,10 @@ discard block |
||
| 136 | 136 | $server = $parts['host']; |
| 137 | 137 | $path = isset($parts['path']) ? $parts['path'] : ''; |
| 138 | 138 | if (isset($parts['query'])) { |
| 139 | - $path .= '?' . $parts['query']; |
|
| 139 | + $path .= '?'.$parts['query']; |
|
| 140 | 140 | } |
| 141 | 141 | if (isset($parts['fragment'])) { |
| 142 | - $path .= '#' . $parts['fragment']; |
|
| 142 | + $path .= '#'.$parts['fragment']; |
|
| 143 | 143 | } |
| 144 | 144 | if (isset($parts['port'])) { |
| 145 | 145 | $port = $parts['port']; |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | 157 | if ($path == '' || $path[0] != '/') { |
| 158 | - $this->path = '/' . $path; |
|
| 158 | + $this->path = '/'.$path; |
|
| 159 | 159 | } else { |
| 160 | 160 | $this->path = $path; |
| 161 | 161 | } |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | }*/ |
| 194 | 194 | |
| 195 | 195 | // initialize user_agent string |
| 196 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
| 196 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | /** |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | */ |
| 566 | 566 | protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 567 | 567 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
| 568 | - $method='http') |
|
| 568 | + $method = 'http') |
|
| 569 | 569 | { |
| 570 | 570 | return $this->sendPayloadSocket($req, $server, $port, $timeout, $username, $password, $authType, null, null, |
| 571 | 571 | null, null, $proxyHost, $proxyPort, $proxyUsername, $proxyPassword, $proxyAuthType, $method); |
@@ -595,7 +595,7 @@ discard block |
||
| 595 | 595 | * @param int $sslVersion |
| 596 | 596 | * @return Response |
| 597 | 597 | */ |
| 598 | - protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 598 | + protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
| 599 | 599 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 600 | 600 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
| 601 | 601 | $sslVersion = 0) |
@@ -630,11 +630,11 @@ discard block |
||
| 630 | 630 | */ |
| 631 | 631 | protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '', |
| 632 | 632 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
| 633 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '', |
|
| 633 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '', |
|
| 634 | 634 | $sslVersion = 0) |
| 635 | 635 | { |
| 636 | 636 | if ($port == 0) { |
| 637 | - $port = ( $method === 'https' ) ? 443 : 80; |
|
| 637 | + $port = ($method === 'https') ? 443 : 80; |
|
| 638 | 638 | } |
| 639 | 639 | |
| 640 | 640 | // Only create the payload if it was not created previously |
@@ -664,15 +664,15 @@ discard block |
||
| 664 | 664 | // thanks to Grant Rauscher <[email protected]> for this |
| 665 | 665 | $credentials = ''; |
| 666 | 666 | if ($username != '') { |
| 667 | - $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n"; |
|
| 667 | + $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n"; |
|
| 668 | 668 | if ($authType != 1) { |
| 669 | - error_log('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 669 | + error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
| 670 | 670 | } |
| 671 | 671 | } |
| 672 | 672 | |
| 673 | 673 | $acceptedEncoding = ''; |
| 674 | 674 | if (is_array($this->accepted_compression) && count($this->accepted_compression)) { |
| 675 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n"; |
|
| 675 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n"; |
|
| 676 | 676 | } |
| 677 | 677 | |
| 678 | 678 | $proxyCredentials = ''; |
@@ -683,17 +683,17 @@ discard block |
||
| 683 | 683 | $connectServer = $proxyHost; |
| 684 | 684 | $connectPort = $proxyPort; |
| 685 | 685 | $transport = 'tcp'; |
| 686 | - $uri = 'http://' . $server . ':' . $port . $this->path; |
|
| 686 | + $uri = 'http://'.$server.':'.$port.$this->path; |
|
| 687 | 687 | if ($proxyUsername != '') { |
| 688 | 688 | if ($proxyAuthType != 1) { |
| 689 | - error_log('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 689 | + error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
| 690 | 690 | } |
| 691 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n"; |
|
| 691 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n"; |
|
| 692 | 692 | } |
| 693 | 693 | } else { |
| 694 | 694 | $connectServer = $server; |
| 695 | 695 | $connectPort = $port; |
| 696 | - $transport = ( $method === 'https' ) ? 'tls' : 'tcp'; |
|
| 696 | + $transport = ($method === 'https') ? 'tls' : 'tcp'; |
|
| 697 | 697 | $uri = $this->path; |
| 698 | 698 | } |
| 699 | 699 | |
@@ -704,45 +704,45 @@ discard block |
||
| 704 | 704 | $version = ''; |
| 705 | 705 | foreach ($this->cookies as $name => $cookie) { |
| 706 | 706 | if ($cookie['version']) { |
| 707 | - $version = ' $Version="' . $cookie['version'] . '";'; |
|
| 708 | - $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";'; |
|
| 707 | + $version = ' $Version="'.$cookie['version'].'";'; |
|
| 708 | + $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";'; |
|
| 709 | 709 | if ($cookie['path']) { |
| 710 | - $cookieHeader .= ' $Path="' . $cookie['path'] . '";'; |
|
| 710 | + $cookieHeader .= ' $Path="'.$cookie['path'].'";'; |
|
| 711 | 711 | } |
| 712 | 712 | if ($cookie['domain']) { |
| 713 | - $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";'; |
|
| 713 | + $cookieHeader .= ' $Domain="'.$cookie['domain'].'";'; |
|
| 714 | 714 | } |
| 715 | 715 | if ($cookie['port']) { |
| 716 | - $cookieHeader .= ' $Port="' . $cookie['port'] . '";'; |
|
| 716 | + $cookieHeader .= ' $Port="'.$cookie['port'].'";'; |
|
| 717 | 717 | } |
| 718 | 718 | } else { |
| 719 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
| 719 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
| 720 | 720 | } |
| 721 | 721 | } |
| 722 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
| 722 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
| 723 | 723 | } |
| 724 | 724 | |
| 725 | 725 | // omit port if default |
| 726 | 726 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
| 727 | - $port = ''; |
|
| 727 | + $port = ''; |
|
| 728 | 728 | } else { |
| 729 | - $port = ':' . $port; |
|
| 729 | + $port = ':'.$port; |
|
| 730 | 730 | } |
| 731 | 731 | |
| 732 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
| 733 | - 'User-Agent: ' . $this->user_agent . "\r\n" . |
|
| 734 | - 'Host: ' . $server . $port . "\r\n" . |
|
| 735 | - $credentials . |
|
| 736 | - $proxyCredentials . |
|
| 737 | - $acceptedEncoding . |
|
| 738 | - $encodingHdr . |
|
| 739 | - 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" . |
|
| 740 | - $cookieHeader . |
|
| 741 | - 'Content-Type: ' . $req->content_type . "\r\nContent-Length: " . |
|
| 742 | - strlen($payload) . "\r\n\r\n" . |
|
| 732 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
| 733 | + 'User-Agent: '.$this->user_agent."\r\n". |
|
| 734 | + 'Host: '.$server.$port."\r\n". |
|
| 735 | + $credentials. |
|
| 736 | + $proxyCredentials. |
|
| 737 | + $acceptedEncoding. |
|
| 738 | + $encodingHdr. |
|
| 739 | + 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n". |
|
| 740 | + $cookieHeader. |
|
| 741 | + 'Content-Type: '.$req->content_type."\r\nContent-Length: ". |
|
| 742 | + strlen($payload)."\r\n\r\n". |
|
| 743 | 743 | $payload; |
| 744 | 744 | |
| 745 | - if ($this->debug > 1) { |
|
| 745 | + if ($this->debug>1) { |
|
| 746 | 746 | Logger::instance()->debugMessage("---SENDING---\n$op\n---END---"); |
| 747 | 747 | } |
| 748 | 748 | |
@@ -768,7 +768,7 @@ discard block |
||
| 768 | 768 | } |
| 769 | 769 | $context = stream_context_create($contextOptions); |
| 770 | 770 | |
| 771 | - if ($timeout <= 0) { |
|
| 771 | + if ($timeout<=0) { |
|
| 772 | 772 | $connectTimeout = ini_get('default_socket_timeout'); |
| 773 | 773 | } else { |
| 774 | 774 | $connectTimeout = $timeout; |
@@ -780,7 +780,7 @@ discard block |
||
| 780 | 780 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
| 781 | 781 | STREAM_CLIENT_CONNECT, $context); |
| 782 | 782 | if ($fp) { |
| 783 | - if ($timeout > 0) { |
|
| 783 | + if ($timeout>0) { |
|
| 784 | 784 | stream_set_timeout($fp, $timeout); |
| 785 | 785 | } |
| 786 | 786 | } else { |
@@ -788,8 +788,8 @@ discard block |
||
| 788 | 788 | $err = error_get_last(); |
| 789 | 789 | $this->errstr = $err['message']; |
| 790 | 790 | } |
| 791 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
| 792 | - $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
| 791 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
| 792 | + $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
| 793 | 793 | |
| 794 | 794 | return $r; |
| 795 | 795 | } |
@@ -896,7 +896,7 @@ discard block |
||
| 896 | 896 | $encodingHdr = ''; |
| 897 | 897 | } |
| 898 | 898 | |
| 899 | - if ($this->debug > 1) { |
|
| 899 | + if ($this->debug>1) { |
|
| 900 | 900 | Logger::instance()->debugMessage("---SENDING---\n$payload\n---END---"); |
| 901 | 901 | } |
| 902 | 902 | |
@@ -906,7 +906,7 @@ discard block |
||
| 906 | 906 | } else { |
| 907 | 907 | $protocol = $method; |
| 908 | 908 | } |
| 909 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path); |
|
| 909 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path); |
|
| 910 | 910 | if ($keepAlive) { |
| 911 | 911 | $this->xmlrpc_curl_handle = $curl; |
| 912 | 912 | } |
@@ -917,7 +917,7 @@ discard block |
||
| 917 | 917 | // results into variable |
| 918 | 918 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
| 919 | 919 | |
| 920 | - if ($this->debug > 1) { |
|
| 920 | + if ($this->debug>1) { |
|
| 921 | 921 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
| 922 | 922 | /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered |
| 923 | 923 | } |
@@ -943,7 +943,7 @@ discard block |
||
| 943 | 943 | } |
| 944 | 944 | } |
| 945 | 945 | // extra headers |
| 946 | - $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings)); |
|
| 946 | + $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)); |
|
| 947 | 947 | // if no keepalive is wanted, let the server know it in advance |
| 948 | 948 | if (!$keepAlive) { |
| 949 | 949 | $headers[] = 'Connection: close'; |
@@ -960,7 +960,7 @@ discard block |
||
| 960 | 960 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
| 961 | 961 | // timeout is borked |
| 962 | 962 | if ($timeout) { |
| 963 | - curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1); |
|
| 963 | + curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1); |
|
| 964 | 964 | } |
| 965 | 965 | |
| 966 | 966 | if ($method == 'http10') { |
@@ -970,11 +970,11 @@ discard block |
||
| 970 | 970 | } |
| 971 | 971 | |
| 972 | 972 | if ($username && $password) { |
| 973 | - curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password); |
|
| 973 | + curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password); |
|
| 974 | 974 | if (defined('CURLOPT_HTTPAUTH')) { |
| 975 | 975 | curl_setopt($curl, CURLOPT_HTTPAUTH, $authType); |
| 976 | 976 | } elseif ($authType != 1) { |
| 977 | - error_log('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 977 | + error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
| 978 | 978 | } |
| 979 | 979 | } |
| 980 | 980 | |
@@ -1015,13 +1015,13 @@ discard block |
||
| 1015 | 1015 | if ($proxyPort == 0) { |
| 1016 | 1016 | $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080 |
| 1017 | 1017 | } |
| 1018 | - curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort); |
|
| 1018 | + curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort); |
|
| 1019 | 1019 | if ($proxyUsername) { |
| 1020 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword); |
|
| 1020 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword); |
|
| 1021 | 1021 | if (defined('CURLOPT_PROXYAUTH')) { |
| 1022 | 1022 | curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType); |
| 1023 | 1023 | } elseif ($proxyAuthType != 1) { |
| 1024 | - error_log('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1024 | + error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
| 1025 | 1025 | } |
| 1026 | 1026 | } |
| 1027 | 1027 | } |
@@ -1032,7 +1032,7 @@ discard block |
||
| 1032 | 1032 | if (count($this->cookies)) { |
| 1033 | 1033 | $cookieHeader = ''; |
| 1034 | 1034 | foreach ($this->cookies as $name => $cookie) { |
| 1035 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
| 1035 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
| 1036 | 1036 | } |
| 1037 | 1037 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
| 1038 | 1038 | } |
@@ -1043,13 +1043,13 @@ discard block |
||
| 1043 | 1043 | |
| 1044 | 1044 | $result = curl_exec($curl); |
| 1045 | 1045 | |
| 1046 | - if ($this->debug > 1) { |
|
| 1046 | + if ($this->debug>1) { |
|
| 1047 | 1047 | $message = "---CURL INFO---\n"; |
| 1048 | 1048 | foreach (curl_getinfo($curl) as $name => $val) { |
| 1049 | 1049 | if (is_array($val)) { |
| 1050 | 1050 | $val = implode("\n", $val); |
| 1051 | 1051 | } |
| 1052 | - $message .= $name . ': ' . $val . "\n"; |
|
| 1052 | + $message .= $name.': '.$val."\n"; |
|
| 1053 | 1053 | } |
| 1054 | 1054 | $message .= '---END---'; |
| 1055 | 1055 | Logger::instance()->debugMessage($message); |
@@ -1059,7 +1059,7 @@ discard block |
||
| 1059 | 1059 | /// @todo we should use a better check here - what if we get back '' or '0'? |
| 1060 | 1060 | |
| 1061 | 1061 | $this->errstr = 'no response'; |
| 1062 | - $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
| 1062 | + $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
| 1063 | 1063 | curl_close($curl); |
| 1064 | 1064 | if ($keepAlive) { |
| 1065 | 1065 | $this->xmlrpc_curl_handle = null; |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | $call['methodName'] = new Value($req->method(), 'string'); |
| 1170 | 1170 | $numParams = $req->getNumParams(); |
| 1171 | 1171 | $params = array(); |
| 1172 | - for ($i = 0; $i < $numParams; $i++) { |
|
| 1172 | + for ($i = 0; $i<$numParams; $i++) { |
|
| 1173 | 1173 | $params[$i] = $req->getParam($i); |
| 1174 | 1174 | } |
| 1175 | 1175 | $call['params'] = new Value($params, 'array'); |
@@ -1195,15 +1195,15 @@ discard block |
||
| 1195 | 1195 | /// @todo test this code branch... |
| 1196 | 1196 | $rets = $result->value(); |
| 1197 | 1197 | if (!is_array($rets)) { |
| 1198 | - return false; // bad return type from system.multicall |
|
| 1198 | + return false; // bad return type from system.multicall |
|
| 1199 | 1199 | } |
| 1200 | 1200 | $numRets = count($rets); |
| 1201 | 1201 | if ($numRets != count($reqs)) { |
| 1202 | - return false; // wrong number of return values. |
|
| 1202 | + return false; // wrong number of return values. |
|
| 1203 | 1203 | } |
| 1204 | 1204 | |
| 1205 | 1205 | $response = array(); |
| 1206 | - for ($i = 0; $i < $numRets; $i++) { |
|
| 1206 | + for ($i = 0; $i<$numRets; $i++) { |
|
| 1207 | 1207 | $val = $rets[$i]; |
| 1208 | 1208 | if (!is_array($val)) { |
| 1209 | 1209 | return false; |
@@ -1211,7 +1211,7 @@ discard block |
||
| 1211 | 1211 | switch (count($val)) { |
| 1212 | 1212 | case 1: |
| 1213 | 1213 | if (!isset($val[0])) { |
| 1214 | - return false; // Bad value |
|
| 1214 | + return false; // Bad value |
|
| 1215 | 1215 | } |
| 1216 | 1216 | // Normal return value |
| 1217 | 1217 | $response[$i] = new Response($val[0], 0, '', 'phpvals'); |
@@ -1239,19 +1239,19 @@ discard block |
||
| 1239 | 1239 | |
| 1240 | 1240 | $rets = $result->value(); |
| 1241 | 1241 | if ($rets->kindOf() != 'array') { |
| 1242 | - return false; // bad return type from system.multicall |
|
| 1242 | + return false; // bad return type from system.multicall |
|
| 1243 | 1243 | } |
| 1244 | 1244 | $numRets = $rets->count(); |
| 1245 | 1245 | if ($numRets != count($reqs)) { |
| 1246 | - return false; // wrong number of return values. |
|
| 1246 | + return false; // wrong number of return values. |
|
| 1247 | 1247 | } |
| 1248 | 1248 | |
| 1249 | 1249 | $response = array(); |
| 1250 | - foreach($rets as $val) { |
|
| 1250 | + foreach ($rets as $val) { |
|
| 1251 | 1251 | switch ($val->kindOf()) { |
| 1252 | 1252 | case 'array': |
| 1253 | 1253 | if ($val->count() != 1) { |
| 1254 | - return false; // Bad value |
|
| 1254 | + return false; // Bad value |
|
| 1255 | 1255 | } |
| 1256 | 1256 | // Normal return value |
| 1257 | 1257 | $response[] = new Response($val[0]); |
@@ -6,20 +6,20 @@ discard block |
||
| 6 | 6 | <h3>The code demonstrates usage of multicall and introspection methods</h3> |
| 7 | 7 | <?php |
| 8 | 8 | |
| 9 | -include_once __DIR__ . "/../../src/Autoloader.php"; |
|
| 9 | +include_once __DIR__."/../../src/Autoloader.php"; |
|
| 10 | 10 | PhpXmlRpc\Autoloader::register(); |
| 11 | 11 | |
| 12 | 12 | function display_error($r) |
| 13 | 13 | { |
| 14 | 14 | print "An error occurred: "; |
| 15 | - print "Code: " . $r->faultCode() |
|
| 16 | - . " Reason: '" . $r->faultString() . "'<br/>"; |
|
| 15 | + print "Code: ".$r->faultCode() |
|
| 16 | + . " Reason: '".$r->faultString()."'<br/>"; |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | $client = new PhpXmlRpc\Client("http://phpxmlrpc.sourceforge.net/server.php"); |
| 20 | 20 | |
| 21 | 21 | // First off, let's retrieve the list of methods available on the remote server |
| 22 | -print "<h3>methods available at http://" . $client->server . $client->path . "</h3>\n"; |
|
| 22 | +print "<h3>methods available at http://".$client->server.$client->path."</h3>\n"; |
|
| 23 | 23 | $req = new PhpXmlRpc\Request('system.listMethods'); |
| 24 | 24 | $resp = $client->send($req); |
| 25 | 25 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | // Then, retrieve the signature and help text of each available method |
| 32 | 32 | foreach ($v as $methodName) { |
| 33 | - print "<h4>" . $methodName->scalarval() . "</h4>\n"; |
|
| 33 | + print "<h4>".$methodName->scalarval()."</h4>\n"; |
|
| 34 | 34 | // build messages first, add params later |
| 35 | 35 | $m1 = new PhpXmlRpc\Request('system.methodHelp'); |
| 36 | 36 | $m2 = new PhpXmlRpc\Request('system.methodSignature'); |
@@ -61,13 +61,13 @@ discard block |
||
| 61 | 61 | if ($val->kindOf() == "array") { |
| 62 | 62 | foreach ($val as $x) { |
| 63 | 63 | $ret = $x[0]; |
| 64 | - print "<code>" . htmlspecialchars($ret->scalarval()) . " " |
|
| 65 | - . htmlspecialchars($methodName->scalarval()) . "("; |
|
| 66 | - if ($x->count() > 1) { |
|
| 67 | - for ($k = 1; $k < $x->count(); $k++) { |
|
| 64 | + print "<code>".htmlspecialchars($ret->scalarval())." " |
|
| 65 | + . htmlspecialchars($methodName->scalarval())."("; |
|
| 66 | + if ($x->count()>1) { |
|
| 67 | + for ($k = 1; $k<$x->count(); $k++) { |
|
| 68 | 68 | $y = $x[$k]; |
| 69 | 69 | print htmlspecialchars($y->scalarval()); |
| 70 | - if ($k < $x->count() - 1) { |
|
| 70 | + if ($k<$x->count()-1) { |
|
| 71 | 71 | print ", "; |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -17,9 +17,9 @@ discard block |
||
| 17 | 17 | use PhpXmlRpc\Response; |
| 18 | 18 | use PhpXmlRpc\Encoder; |
| 19 | 19 | |
| 20 | -include_once __DIR__ . '/../vendor/autoload.php'; |
|
| 20 | +include_once __DIR__.'/../vendor/autoload.php'; |
|
| 21 | 21 | |
| 22 | -include __DIR__ . '/parse_args.php'; |
|
| 22 | +include __DIR__.'/parse_args.php'; |
|
| 23 | 23 | $args = argParser::getArgs(); |
| 24 | 24 | |
| 25 | 25 | function begin_test($test_name, $test_case) |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | if (!isset($test_results[$test_name][$test_case])) { |
| 40 | 40 | trigger_error('ending test that was not started'); |
| 41 | 41 | } |
| 42 | - $test_results[$test_name][$test_case]['time'] = $end - $test_results[$test_name][$test_case]['time']; |
|
| 42 | + $test_results[$test_name][$test_case]['time'] = $end-$test_results[$test_name][$test_case]['time']; |
|
| 43 | 43 | $test_results[$test_name][$test_case]['result'] = $test_result; |
| 44 | 44 | echo '.'; |
| 45 | 45 | flush(); |
@@ -73,24 +73,24 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | if ($is_web) { |
| 76 | - echo "<h3>Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "</h3>\n"; |
|
| 76 | + echo "<h3>Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."</h3>\n"; |
|
| 77 | 77 | if ($xd) { |
| 78 | - echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: " . htmlspecialchars(xdebug_get_profiler_filename()) . "</h4>\n"; |
|
| 78 | + echo "<h4>XDEBUG profiling enabled: skipping remote tests. Trace file is: ".htmlspecialchars(xdebug_get_profiler_filename())."</h4>\n"; |
|
| 79 | 79 | } |
| 80 | 80 | flush(); |
| 81 | 81 | ob_flush(); |
| 82 | 82 | } else { |
| 83 | - echo "Using lib version: " . PhpXmlRpc::$xmlrpcVersion . " on PHP version: " . phpversion() . "\n"; |
|
| 83 | + echo "Using lib version: ".PhpXmlRpc::$xmlrpcVersion." on PHP version: ".phpversion()."\n"; |
|
| 84 | 84 | if ($xd) { |
| 85 | - echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: " . xdebug_get_profiler_filename() . "\n"; |
|
| 85 | + echo "XDEBUG profiling enabled: skipping remote tests\nTrace file is: ".xdebug_get_profiler_filename()."\n"; |
|
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | // test 'manual style' data encoding vs. 'automatic style' encoding |
| 90 | 90 | begin_test('Data encoding (large array)', 'manual encoding'); |
| 91 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 91 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 92 | 92 | $vals = array(); |
| 93 | - for ($j = 0; $j < 10; $j++) { |
|
| 93 | + for ($j = 0; $j<10; $j++) { |
|
| 94 | 94 | $valarray = array(); |
| 95 | 95 | foreach ($data[$j] as $key => $val) { |
| 96 | 96 | $values = array(); |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | |
| 116 | 116 | begin_test('Data encoding (large array)', 'automatic encoding'); |
| 117 | 117 | $encoder = new Encoder(); |
| 118 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 118 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 119 | 119 | $value = $encoder->encode($data, array('auto_dates')); |
| 120 | 120 | $out = $value->serialize(); |
| 121 | 121 | } |
@@ -123,8 +123,8 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | if (function_exists('xmlrpc_set_type')) { |
| 125 | 125 | begin_test('Data encoding (large array)', 'xmlrpc-epi encoding'); |
| 126 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 127 | - for ($j = 0; $j < 10; $j++) { |
|
| 126 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 127 | + for ($j = 0; $j<10; $j++) { |
|
| 128 | 128 | foreach ($keys as $k) { |
| 129 | 129 | xmlrpc_set_type($data[$j][$k][4], 'datetime'); |
| 130 | 130 | xmlrpc_set_type($data[$j][$k][8], 'datetime'); |
@@ -138,18 +138,18 @@ discard block |
||
| 138 | 138 | // test 'old style' data decoding vs. 'automatic style' decoding |
| 139 | 139 | $dummy = new Request(''); |
| 140 | 140 | $out = new Response($value); |
| 141 | -$in = '<?xml version="1.0" ?>' . "\n" . $out->serialize(); |
|
| 141 | +$in = '<?xml version="1.0" ?>'."\n".$out->serialize(); |
|
| 142 | 142 | |
| 143 | 143 | begin_test('Data decoding (large array)', 'manual decoding'); |
| 144 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 144 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 145 | 145 | $response = $dummy->ParseResponse($in, true); |
| 146 | 146 | $value = $response->value(); |
| 147 | 147 | $result = array(); |
| 148 | - foreach($value as $val1) { |
|
| 148 | + foreach ($value as $val1) { |
|
| 149 | 149 | $out = array(); |
| 150 | - foreach($val1 as $name => $val) { |
|
| 150 | + foreach ($val1 as $name => $val) { |
|
| 151 | 151 | $out[$name] = array(); |
| 152 | - foreach($val as $data) { |
|
| 152 | + foreach ($val as $data) { |
|
| 153 | 153 | $out[$name][] = $data->scalarval(); |
| 154 | 154 | } |
| 155 | 155 | } |
@@ -159,18 +159,18 @@ discard block |
||
| 159 | 159 | end_test('Data decoding (large array)', 'manual decoding', $result); |
| 160 | 160 | |
| 161 | 161 | begin_test('Data decoding (large array)', 'manual decoding deprecated'); |
| 162 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 162 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 163 | 163 | $response = $dummy->ParseResponse($in, true); |
| 164 | 164 | $value = $response->value(); |
| 165 | 165 | $result = array(); |
| 166 | 166 | $l = $value->arraysize(); |
| 167 | - for ($k = 0; $k < $l; $k++) { |
|
| 167 | + for ($k = 0; $k<$l; $k++) { |
|
| 168 | 168 | $val1 = $value->arraymem($k); |
| 169 | 169 | $out = array(); |
| 170 | - foreach($val1 as $name => $val) { |
|
| 170 | + foreach ($val1 as $name => $val) { |
|
| 171 | 171 | $out[$name] = array(); |
| 172 | 172 | $m = $val->arraysize(); |
| 173 | - for ($j = 0; $j < $m; $j++) { |
|
| 173 | + for ($j = 0; $j<$m; $j++) { |
|
| 174 | 174 | $data = $val->arraymem($j); |
| 175 | 175 | $out[$name][] = $data->scalarval(); |
| 176 | 176 | } |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | end_test('Data decoding (large array)', 'manual decoding deprecated', $result); |
| 182 | 182 | |
| 183 | 183 | begin_test('Data decoding (large array)', 'automatic decoding'); |
| 184 | -for ($i = 0; $i < $num_tests; $i++) { |
|
| 184 | +for ($i = 0; $i<$num_tests; $i++) { |
|
| 185 | 185 | $response = $dummy->ParseResponse($in, true, 'phpvals'); |
| 186 | 186 | $value = $response->value(); |
| 187 | 187 | } |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | |
| 190 | 190 | if (function_exists('xmlrpc_decode')) { |
| 191 | 191 | begin_test('Data decoding (large array)', 'xmlrpc-epi decoding'); |
| 192 | - for ($i = 0; $i < $num_tests; $i++) { |
|
| 192 | + for ($i = 0; $i<$num_tests; $i++) { |
|
| 193 | 193 | $response = $dummy->ParseResponse($in, true, 'xml'); |
| 194 | 194 | $value = xmlrpc_decode($response->value()); |
| 195 | 195 | } |
@@ -203,15 +203,15 @@ discard block |
||
| 203 | 203 | $value = $encoder->encode($data1, array('auto_dates')); |
| 204 | 204 | $req = new Request('interopEchoTests.echoValue', array($value)); |
| 205 | 205 | $reqs = array(); |
| 206 | - for ($i = 0; $i < 25; $i++) { |
|
| 206 | + for ($i = 0; $i<25; $i++) { |
|
| 207 | 207 | $reqs[] = $req; |
| 208 | 208 | } |
| 209 | 209 | $server = explode(':', $args['LOCALSERVER']); |
| 210 | - if (count($server) > 1) { |
|
| 211 | - $srv = $server[1] . '://' . $server[0] . $args['URI']; |
|
| 210 | + if (count($server)>1) { |
|
| 211 | + $srv = $server[1].'://'.$server[0].$args['URI']; |
|
| 212 | 212 | $c = new Client($args['URI'], $server[0], $server[1]); |
| 213 | 213 | } else { |
| 214 | - $srv = $args['LOCALSERVER'] . $args['URI']; |
|
| 214 | + $srv = $args['LOCALSERVER'].$args['URI']; |
|
| 215 | 215 | $c = new Client($args['URI'], $args['LOCALSERVER']); |
| 216 | 216 | } |
| 217 | 217 | // do not interfere with http compression |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | } |
| 226 | 226 | begin_test($testName, 'http 10'); |
| 227 | 227 | $response = array(); |
| 228 | - for ($i = 0; $i < 25; $i++) { |
|
| 228 | + for ($i = 0; $i<25; $i++) { |
|
| 229 | 229 | $resp = $c->send($req); |
| 230 | 230 | $response[] = $resp->value(); |
| 231 | 231 | } |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | if (function_exists('curl_init')) { |
| 235 | 235 | begin_test($testName, 'http 11 w. keep-alive'); |
| 236 | 236 | $response = array(); |
| 237 | - for ($i = 0; $i < 25; $i++) { |
|
| 237 | + for ($i = 0; $i<25; $i++) { |
|
| 238 | 238 | $resp = $c->send($req, 10, 'http11'); |
| 239 | 239 | $response[] = $resp->value(); |
| 240 | 240 | } |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | $c->keepalive = false; |
| 244 | 244 | begin_test($testName, 'http 11'); |
| 245 | 245 | $response = array(); |
| 246 | - for ($i = 0; $i < 25; $i++) { |
|
| 246 | + for ($i = 0; $i<25; $i++) { |
|
| 247 | 247 | $resp = $c->send($req, 10, 'http11'); |
| 248 | 248 | $response[] = $resp->value(); |
| 249 | 249 | } |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | |
| 264 | 264 | begin_test($testName, 'http 10 w. compression'); |
| 265 | 265 | $response = array(); |
| 266 | - for ($i = 0; $i < 25; $i++) { |
|
| 266 | + for ($i = 0; $i<25; $i++) { |
|
| 267 | 267 | $resp = $c->send($req); |
| 268 | 268 | $response[] = $resp->value(); |
| 269 | 269 | } |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | if (function_exists('curl_init')) { |
| 273 | 273 | begin_test($testName, 'http 11 w. keep-alive and compression'); |
| 274 | 274 | $response = array(); |
| 275 | - for ($i = 0; $i < 25; $i++) { |
|
| 275 | + for ($i = 0; $i<25; $i++) { |
|
| 276 | 276 | $resp = $c->send($req, 10, 'http11'); |
| 277 | 277 | $response[] = $resp->value(); |
| 278 | 278 | } |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | $c->keepalive = false; |
| 282 | 282 | begin_test($testName, 'http 11 w. compression'); |
| 283 | 283 | $response = array(); |
| 284 | - for ($i = 0; $i < 25; $i++) { |
|
| 284 | + for ($i = 0; $i<25; $i++) { |
|
| 285 | 285 | $resp = $c->send($req, 10, 'http11'); |
| 286 | 286 | $response[] = $resp->value(); |
| 287 | 287 | } |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | foreach ($test_results as $test => $results) { |
| 303 | 303 | echo "\nTEST: $test\n"; |
| 304 | 304 | foreach ($results as $case => $data) { |
| 305 | - echo " $case: {$data['time']} secs - Output data CRC: " . crc32(serialize($data['result'])) . "\n"; |
|
| 305 | + echo " $case: {$data['time']} secs - Output data CRC: ".crc32(serialize($data['result']))."\n"; |
|
| 306 | 306 | } |
| 307 | 307 | } |
| 308 | 308 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | * @param string $message |
| 29 | 29 | * @param string $encoding |
| 30 | 30 | */ |
| 31 | - public function debugMessage($message, $encoding=null) |
|
| 31 | + public function debugMessage($message, $encoding = null) |
|
| 32 | 32 | { |
| 33 | 33 | // US-ASCII is a warning for PHP and a fatal for HHVM |
| 34 | 34 | if ($encoding == 'US-ASCII') { |
@@ -39,10 +39,10 @@ discard block |
||
| 39 | 39 | $flags = ENT_COMPAT; |
| 40 | 40 | // avoid warnings on php < 5.4... |
| 41 | 41 | if (defined('ENT_HTML401')) { |
| 42 | - $flags = $flags | ENT_HTML401; |
|
| 42 | + $flags = $flags | ENT_HTML401; |
|
| 43 | 43 | } |
| 44 | 44 | if (defined('ENT_SUBSTITUTE')) { |
| 45 | - $flags = $flags | ENT_SUBSTITUTE; |
|
| 45 | + $flags = $flags | ENT_SUBSTITUTE; |
|
| 46 | 46 | } |
| 47 | 47 | if ($encoding != null) { |
| 48 | 48 | print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>"; |