@@ -135,10 +135,10 @@ discard block |
||
135 | 135 | $server = $parts['host']; |
136 | 136 | $path = isset($parts['path']) ? $parts['path'] : ''; |
137 | 137 | if (isset($parts['query'])) { |
138 | - $path .= '?' . $parts['query']; |
|
138 | + $path .= '?'.$parts['query']; |
|
139 | 139 | } |
140 | 140 | if (isset($parts['fragment'])) { |
141 | - $path .= '#' . $parts['fragment']; |
|
141 | + $path .= '#'.$parts['fragment']; |
|
142 | 142 | } |
143 | 143 | if (isset($parts['port'])) { |
144 | 144 | $port = $parts['port']; |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | } |
155 | 155 | } |
156 | 156 | if ($path == '' || $path[0] != '/') { |
157 | - $this->path = '/' . $path; |
|
157 | + $this->path = '/'.$path; |
|
158 | 158 | } else { |
159 | 159 | $this->path = $path; |
160 | 160 | } |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | }*/ |
193 | 193 | |
194 | 194 | // initialize user_agent string |
195 | - $this->user_agent = PhpXmlRpc::$xmlrpcName . ' ' . PhpXmlRpc::$xmlrpcVersion; |
|
195 | + $this->user_agent = PhpXmlRpc::$xmlrpcName.' '.PhpXmlRpc::$xmlrpcVersion; |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | /** |
@@ -564,7 +564,7 @@ discard block |
||
564 | 564 | */ |
565 | 565 | protected function sendPayloadHTTP10($req, $server, $port, $timeout = 0, $username = '', $password = '', |
566 | 566 | $authType = 1, $proxyHost = '', $proxyPort = 0, $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, |
567 | - $method='http') |
|
567 | + $method = 'http') |
|
568 | 568 | { |
569 | 569 | //trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED); |
570 | 570 | |
@@ -596,7 +596,7 @@ discard block |
||
596 | 596 | * @param int $sslVersion |
597 | 597 | * @return Response |
598 | 598 | */ |
599 | - protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
599 | + protected function sendPayloadHTTPS($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
600 | 600 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
601 | 601 | $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $keepAlive = false, $key = '', $keyPass = '', |
602 | 602 | $sslVersion = 0) |
@@ -633,11 +633,11 @@ discard block |
||
633 | 633 | */ |
634 | 634 | protected function sendPayloadSocket($req, $server, $port, $timeout = 0, $username = '', $password = '', |
635 | 635 | $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
636 | - $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method='http', $key = '', $keyPass = '', |
|
636 | + $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'http', $key = '', $keyPass = '', |
|
637 | 637 | $sslVersion = 0) |
638 | 638 | { |
639 | 639 | if ($port == 0) { |
640 | - $port = ( $method === 'https' ) ? 443 : 80; |
|
640 | + $port = ($method === 'https') ? 443 : 80; |
|
641 | 641 | } |
642 | 642 | |
643 | 643 | // Only create the payload if it was not created previously |
@@ -667,15 +667,15 @@ discard block |
||
667 | 667 | // thanks to Grant Rauscher <[email protected]> for this |
668 | 668 | $credentials = ''; |
669 | 669 | if ($username != '') { |
670 | - $credentials = 'Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n"; |
|
670 | + $credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n"; |
|
671 | 671 | if ($authType != 1) { |
672 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported with HTTP 1.0'); |
|
672 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0'); |
|
673 | 673 | } |
674 | 674 | } |
675 | 675 | |
676 | 676 | $acceptedEncoding = ''; |
677 | 677 | if (is_array($this->accepted_compression) && count($this->accepted_compression)) { |
678 | - $acceptedEncoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n"; |
|
678 | + $acceptedEncoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n"; |
|
679 | 679 | } |
680 | 680 | |
681 | 681 | $proxyCredentials = ''; |
@@ -686,17 +686,17 @@ discard block |
||
686 | 686 | $connectServer = $proxyHost; |
687 | 687 | $connectPort = $proxyPort; |
688 | 688 | $transport = 'tcp'; |
689 | - $uri = 'http://' . $server . ':' . $port . $this->path; |
|
689 | + $uri = 'http://'.$server.':'.$port.$this->path; |
|
690 | 690 | if ($proxyUsername != '') { |
691 | 691 | if ($proxyAuthType != 1) { |
692 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
692 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0'); |
|
693 | 693 | } |
694 | - $proxyCredentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyUsername . ':' . $proxyPassword) . "\r\n"; |
|
694 | + $proxyCredentials = 'Proxy-Authorization: Basic '.base64_encode($proxyUsername.':'.$proxyPassword)."\r\n"; |
|
695 | 695 | } |
696 | 696 | } else { |
697 | 697 | $connectServer = $server; |
698 | 698 | $connectPort = $port; |
699 | - $transport = ( $method === 'https' ) ? 'tls' : 'tcp'; |
|
699 | + $transport = ($method === 'https') ? 'tls' : 'tcp'; |
|
700 | 700 | $uri = $this->path; |
701 | 701 | } |
702 | 702 | |
@@ -706,45 +706,45 @@ discard block |
||
706 | 706 | $version = ''; |
707 | 707 | foreach ($this->cookies as $name => $cookie) { |
708 | 708 | if ($cookie['version']) { |
709 | - $version = ' $Version="' . $cookie['version'] . '";'; |
|
710 | - $cookieHeader .= ' ' . $name . '="' . $cookie['value'] . '";'; |
|
709 | + $version = ' $Version="'.$cookie['version'].'";'; |
|
710 | + $cookieHeader .= ' '.$name.'="'.$cookie['value'].'";'; |
|
711 | 711 | if ($cookie['path']) { |
712 | - $cookieHeader .= ' $Path="' . $cookie['path'] . '";'; |
|
712 | + $cookieHeader .= ' $Path="'.$cookie['path'].'";'; |
|
713 | 713 | } |
714 | 714 | if ($cookie['domain']) { |
715 | - $cookieHeader .= ' $Domain="' . $cookie['domain'] . '";'; |
|
715 | + $cookieHeader .= ' $Domain="'.$cookie['domain'].'";'; |
|
716 | 716 | } |
717 | 717 | if ($cookie['port']) { |
718 | - $cookieHeader .= ' $Port="' . $cookie['port'] . '";'; |
|
718 | + $cookieHeader .= ' $Port="'.$cookie['port'].'";'; |
|
719 | 719 | } |
720 | 720 | } else { |
721 | - $cookieHeader .= ' ' . $name . '=' . $cookie['value'] . ";"; |
|
721 | + $cookieHeader .= ' '.$name.'='.$cookie['value'].";"; |
|
722 | 722 | } |
723 | 723 | } |
724 | - $cookieHeader = 'Cookie:' . $version . substr($cookieHeader, 0, -1) . "\r\n"; |
|
724 | + $cookieHeader = 'Cookie:'.$version.substr($cookieHeader, 0, -1)."\r\n"; |
|
725 | 725 | } |
726 | 726 | |
727 | 727 | // omit port if default |
728 | 728 | if (($port == 80 && in_array($method, array('http', 'http10'))) || ($port == 443 && $method == 'https')) { |
729 | - $port = ''; |
|
729 | + $port = ''; |
|
730 | 730 | } else { |
731 | - $port = ':' . $port; |
|
731 | + $port = ':'.$port; |
|
732 | 732 | } |
733 | 733 | |
734 | - $op = 'POST ' . $uri . " HTTP/1.0\r\n" . |
|
735 | - 'User-Agent: ' . $this->user_agent . "\r\n" . |
|
736 | - 'Host: ' . $server . $port . "\r\n" . |
|
737 | - $credentials . |
|
738 | - $proxyCredentials . |
|
739 | - $acceptedEncoding . |
|
740 | - $encodingHdr . |
|
741 | - 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" . |
|
742 | - $cookieHeader . |
|
743 | - 'Content-Type: ' . $req->content_type . "\r\nContent-Length: " . |
|
744 | - strlen($payload) . "\r\n\r\n" . |
|
734 | + $op = 'POST '.$uri." HTTP/1.0\r\n". |
|
735 | + 'User-Agent: '.$this->user_agent."\r\n". |
|
736 | + 'Host: '.$server.$port."\r\n". |
|
737 | + $credentials. |
|
738 | + $proxyCredentials. |
|
739 | + $acceptedEncoding. |
|
740 | + $encodingHdr. |
|
741 | + 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n". |
|
742 | + $cookieHeader. |
|
743 | + 'Content-Type: '.$req->content_type."\r\nContent-Length: ". |
|
744 | + strlen($payload)."\r\n\r\n". |
|
745 | 745 | $payload; |
746 | 746 | |
747 | - if ($this->debug > 1) { |
|
747 | + if ($this->debug>1) { |
|
748 | 748 | Logger::instance()->debugMessage("---SENDING---\n$op\n---END---"); |
749 | 749 | } |
750 | 750 | |
@@ -770,7 +770,7 @@ discard block |
||
770 | 770 | } |
771 | 771 | $context = stream_context_create($contextOptions); |
772 | 772 | |
773 | - if ($timeout <= 0) { |
|
773 | + if ($timeout<=0) { |
|
774 | 774 | $connectTimeout = ini_get('default_socket_timeout'); |
775 | 775 | } else { |
776 | 776 | $connectTimeout = $timeout; |
@@ -782,7 +782,7 @@ discard block |
||
782 | 782 | $fp = @stream_socket_client("$transport://$connectServer:$connectPort", $this->errno, $this->errstr, $connectTimeout, |
783 | 783 | STREAM_CLIENT_CONNECT, $context); |
784 | 784 | if ($fp) { |
785 | - if ($timeout > 0) { |
|
785 | + if ($timeout>0) { |
|
786 | 786 | stream_set_timeout($fp, $timeout); |
787 | 787 | } |
788 | 788 | } else { |
@@ -790,8 +790,8 @@ discard block |
||
790 | 790 | $err = error_get_last(); |
791 | 791 | $this->errstr = $err['message']; |
792 | 792 | } |
793 | - $this->errstr = 'Connect error: ' . $this->errstr; |
|
794 | - $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr . ' (' . $this->errno . ')'); |
|
793 | + $this->errstr = 'Connect error: '.$this->errstr; |
|
794 | + $r = new Response(0, PhpXmlRpc::$xmlrpcerr['http_error'], $this->errstr.' ('.$this->errno.')'); |
|
795 | 795 | |
796 | 796 | return $r; |
797 | 797 | } |
@@ -898,7 +898,7 @@ discard block |
||
898 | 898 | $encodingHdr = ''; |
899 | 899 | } |
900 | 900 | |
901 | - if ($this->debug > 1) { |
|
901 | + if ($this->debug>1) { |
|
902 | 902 | Logger::instance()->debugMessage("---SENDING---\n$payload\n---END---"); |
903 | 903 | } |
904 | 904 | |
@@ -908,7 +908,7 @@ discard block |
||
908 | 908 | } else { |
909 | 909 | $protocol = $method; |
910 | 910 | } |
911 | - $curl = curl_init($protocol . '://' . $server . ':' . $port . $this->path); |
|
911 | + $curl = curl_init($protocol.'://'.$server.':'.$port.$this->path); |
|
912 | 912 | if ($keepAlive) { |
913 | 913 | $this->xmlrpc_curl_handle = $curl; |
914 | 914 | } |
@@ -919,7 +919,7 @@ discard block |
||
919 | 919 | // results into variable |
920 | 920 | curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); |
921 | 921 | |
922 | - if ($this->debug > 1) { |
|
922 | + if ($this->debug>1) { |
|
923 | 923 | curl_setopt($curl, CURLOPT_VERBOSE, true); |
924 | 924 | /// @todo allow callers to redirect curlopt_stderr to some stream which can be buffered |
925 | 925 | } |
@@ -944,7 +944,7 @@ discard block |
||
944 | 944 | } |
945 | 945 | } |
946 | 946 | // extra headers |
947 | - $headers = array('Content-Type: ' . $req->content_type, 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings)); |
|
947 | + $headers = array('Content-Type: '.$req->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)); |
|
948 | 948 | // if no keepalive is wanted, let the server know it in advance |
949 | 949 | if (!$keepAlive) { |
950 | 950 | $headers[] = 'Connection: close'; |
@@ -961,7 +961,7 @@ discard block |
||
961 | 961 | curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); |
962 | 962 | // timeout is borked |
963 | 963 | if ($timeout) { |
964 | - curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1); |
|
964 | + curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1); |
|
965 | 965 | } |
966 | 966 | |
967 | 967 | if ($method == 'http10') { |
@@ -971,11 +971,11 @@ discard block |
||
971 | 971 | } |
972 | 972 | |
973 | 973 | if ($username && $password) { |
974 | - curl_setopt($curl, CURLOPT_USERPWD, $username . ':' . $password); |
|
974 | + curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password); |
|
975 | 975 | if (defined('CURLOPT_HTTPAUTH')) { |
976 | 976 | curl_setopt($curl, CURLOPT_HTTPAUTH, $authType); |
977 | 977 | } elseif ($authType != 1) { |
978 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
978 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install'); |
|
979 | 979 | } |
980 | 980 | } |
981 | 981 | |
@@ -1017,13 +1017,13 @@ discard block |
||
1017 | 1017 | if ($proxyPort == 0) { |
1018 | 1018 | $proxyPort = 8080; // NB: even for HTTPS, local connection is on port 8080 |
1019 | 1019 | } |
1020 | - curl_setopt($curl, CURLOPT_PROXY, $proxyHost . ':' . $proxyPort); |
|
1020 | + curl_setopt($curl, CURLOPT_PROXY, $proxyHost.':'.$proxyPort); |
|
1021 | 1021 | if ($proxyUsername) { |
1022 | - curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername . ':' . $proxyPassword); |
|
1022 | + curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyUsername.':'.$proxyPassword); |
|
1023 | 1023 | if (defined('CURLOPT_PROXYAUTH')) { |
1024 | 1024 | curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyAuthType); |
1025 | 1025 | } elseif ($proxyAuthType != 1) { |
1026 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
1026 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install'); |
|
1027 | 1027 | } |
1028 | 1028 | } |
1029 | 1029 | } |
@@ -1033,7 +1033,7 @@ discard block |
||
1033 | 1033 | if (count($this->cookies)) { |
1034 | 1034 | $cookieHeader = ''; |
1035 | 1035 | foreach ($this->cookies as $name => $cookie) { |
1036 | - $cookieHeader .= $name . '=' . $cookie['value'] . '; '; |
|
1036 | + $cookieHeader .= $name.'='.$cookie['value'].'; '; |
|
1037 | 1037 | } |
1038 | 1038 | curl_setopt($curl, CURLOPT_COOKIE, substr($cookieHeader, 0, -2)); |
1039 | 1039 | } |
@@ -1044,13 +1044,13 @@ discard block |
||
1044 | 1044 | |
1045 | 1045 | $result = curl_exec($curl); |
1046 | 1046 | |
1047 | - if ($this->debug > 1) { |
|
1047 | + if ($this->debug>1) { |
|
1048 | 1048 | $message = "---CURL INFO---\n"; |
1049 | 1049 | foreach (curl_getinfo($curl) as $name => $val) { |
1050 | 1050 | if (is_array($val)) { |
1051 | 1051 | $val = implode("\n", $val); |
1052 | 1052 | } |
1053 | - $message .= $name . ': ' . $val . "\n"; |
|
1053 | + $message .= $name.': '.$val."\n"; |
|
1054 | 1054 | } |
1055 | 1055 | $message .= '---END---'; |
1056 | 1056 | Logger::instance()->debugMessage($message); |
@@ -1060,7 +1060,7 @@ discard block |
||
1060 | 1060 | /// @todo we should use a better check here - what if we get back '' or '0'? |
1061 | 1061 | |
1062 | 1062 | $this->errstr = 'no response'; |
1063 | - $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'] . ': ' . curl_error($curl)); |
|
1063 | + $resp = new Response(0, PhpXmlRpc::$xmlrpcerr['curl_fail'], PhpXmlRpc::$xmlrpcstr['curl_fail'].': '.curl_error($curl)); |
|
1064 | 1064 | curl_close($curl); |
1065 | 1065 | if ($keepAlive) { |
1066 | 1066 | $this->xmlrpc_curl_handle = null; |
@@ -1170,7 +1170,7 @@ discard block |
||
1170 | 1170 | $call['methodName'] = new Value($req->method(), 'string'); |
1171 | 1171 | $numParams = $req->getNumParams(); |
1172 | 1172 | $params = array(); |
1173 | - for ($i = 0; $i < $numParams; $i++) { |
|
1173 | + for ($i = 0; $i<$numParams; $i++) { |
|
1174 | 1174 | $params[$i] = $req->getParam($i); |
1175 | 1175 | } |
1176 | 1176 | $call['params'] = new Value($params, 'array'); |
@@ -1196,15 +1196,15 @@ discard block |
||
1196 | 1196 | /// @todo test this code branch... |
1197 | 1197 | $rets = $result->value(); |
1198 | 1198 | if (!is_array($rets)) { |
1199 | - return false; // bad return type from system.multicall |
|
1199 | + return false; // bad return type from system.multicall |
|
1200 | 1200 | } |
1201 | 1201 | $numRets = count($rets); |
1202 | 1202 | if ($numRets != count($reqs)) { |
1203 | - return false; // wrong number of return values. |
|
1203 | + return false; // wrong number of return values. |
|
1204 | 1204 | } |
1205 | 1205 | |
1206 | 1206 | $response = array(); |
1207 | - for ($i = 0; $i < $numRets; $i++) { |
|
1207 | + for ($i = 0; $i<$numRets; $i++) { |
|
1208 | 1208 | $val = $rets[$i]; |
1209 | 1209 | if (!is_array($val)) { |
1210 | 1210 | return false; |
@@ -1212,7 +1212,7 @@ discard block |
||
1212 | 1212 | switch (count($val)) { |
1213 | 1213 | case 1: |
1214 | 1214 | if (!isset($val[0])) { |
1215 | - return false; // Bad value |
|
1215 | + return false; // Bad value |
|
1216 | 1216 | } |
1217 | 1217 | // Normal return value |
1218 | 1218 | $response[$i] = new Response($val[0], 0, '', 'phpvals'); |
@@ -1240,19 +1240,19 @@ discard block |
||
1240 | 1240 | |
1241 | 1241 | $rets = $result->value(); |
1242 | 1242 | if ($rets->kindOf() != 'array') { |
1243 | - return false; // bad return type from system.multicall |
|
1243 | + return false; // bad return type from system.multicall |
|
1244 | 1244 | } |
1245 | 1245 | $numRets = $rets->count(); |
1246 | 1246 | if ($numRets != count($reqs)) { |
1247 | - return false; // wrong number of return values. |
|
1247 | + return false; // wrong number of return values. |
|
1248 | 1248 | } |
1249 | 1249 | |
1250 | 1250 | $response = array(); |
1251 | - foreach($rets as $val) { |
|
1251 | + foreach ($rets as $val) { |
|
1252 | 1252 | switch ($val->kindOf()) { |
1253 | 1253 | case 'array': |
1254 | 1254 | if ($val->count() != 1) { |
1255 | - return false; // Bad value |
|
1255 | + return false; // Bad value |
|
1256 | 1256 | } |
1257 | 1257 | // Normal return value |
1258 | 1258 | $response[] = new Response($val[0]); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | // check for command line (env vars) vs. web page input params |
45 | 45 | if (!isset($_SERVER['REQUEST_METHOD'])) { |
46 | - foreach($_SERVER as $key => $val) { |
|
46 | + foreach ($_SERVER as $key => $val) { |
|
47 | 47 | if (array_key_exists($key, $args)) { |
48 | 48 | $$key = $val; |
49 | 49 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | } |
88 | 88 | } |
89 | 89 | if ($HTTPURI[0] != '/') { |
90 | - $HTTPURI = '/' . $HTTPURI; |
|
90 | + $HTTPURI = '/'.$HTTPURI; |
|
91 | 91 | } |
92 | 92 | $args['HTTPURI'] = $HTTPURI; |
93 | 93 | |
@@ -101,21 +101,21 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | if (isset($HTTPSIGNOREPEER)) { |
104 | - $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER; |
|
104 | + $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER; |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | if (isset($HTTPSVERIFYHOST)) { |
108 | - $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST; |
|
108 | + $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST; |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | if (isset($SSLVERSION)) { |
112 | - $args['SSLVERSION'] = (int)$SSLVERSION; |
|
112 | + $args['SSLVERSION'] = (int) $SSLVERSION; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | if (isset($PROXYSERVER)) { |
116 | 116 | $arr = explode(':', $PROXYSERVER); |
117 | 117 | $args['PROXYSERVER'] = $arr[0]; |
118 | - if (count($arr) > 1) { |
|
118 | + if (count($arr)>1) { |
|
119 | 119 | $args['PROXYPORT'] = $arr[1]; |
120 | 120 | } else { |
121 | 121 | $args['PROXYPORT'] = 8080; |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once __DIR__ . "/_prepend.php"; |
|
3 | +require_once __DIR__."/_prepend.php"; |
|
4 | 4 | |
5 | 5 | use PhpXmlRpc\Value; |
6 | 6 | |
@@ -31,8 +31,8 @@ discard block |
||
31 | 31 | $count = 0; |
32 | 32 | } |
33 | 33 | // add the new comment in |
34 | - dba_insert($msgID . "_comment_${count}", $comment, $dbh); |
|
35 | - dba_insert($msgID . "_name_${count}", $name, $dbh); |
|
34 | + dba_insert($msgID."_comment_${count}", $comment, $dbh); |
|
35 | + dba_insert($msgID."_name_${count}", $name, $dbh); |
|
36 | 36 | $count++; |
37 | 37 | dba_replace($countID, $count, $dbh); |
38 | 38 | dba_close($dbh); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $countID = "${msgID}_count"; |
66 | 66 | if (dba_exists($countID, $dbh)) { |
67 | 67 | $count = dba_fetch($countID, $dbh); |
68 | - for ($i = 0; $i < $count; $i++) { |
|
68 | + for ($i = 0; $i<$count; $i++) { |
|
69 | 69 | $name = dba_fetch("${msgID}_name_${i}", $dbh); |
70 | 70 | $comment = dba_fetch("${msgID}_comment_${i}", $dbh); |
71 | 71 | // push a new struct onto the return array |
@@ -101,4 +101,4 @@ discard block |
||
101 | 101 | ), |
102 | 102 | )); |
103 | 103 | |
104 | -require_once __DIR__ . "/_append.php"; |
|
104 | +require_once __DIR__."/_append.php"; |
@@ -3,5 +3,5 @@ |
||
3 | 3 | // Out-of-band information: let the client manipulate the server operations. |
4 | 4 | // We do this to help the testsuite script: do not reproduce in production! |
5 | 5 | if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) { |
6 | - include_once __DIR__ . "/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
6 | + include_once __DIR__."/../../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php"; |
|
7 | 7 | } |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * @license code licensed under the BSD License: see file license.txt |
10 | 10 | */ |
11 | 11 | |
12 | -require_once __DIR__ . "/_prepend.php"; |
|
12 | +require_once __DIR__."/_prepend.php"; |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * Forward an xmlrpc request to another server, and return to client the response received. |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $url = $encoder->decode($req->getParam(0)); |
30 | 30 | $client = new PhpXmlRpc\Client($url); |
31 | 31 | |
32 | - if ($req->getNumParams() > 3) { |
|
32 | + if ($req->getNumParams()>3) { |
|
33 | 33 | // we have to set some options onto the client. |
34 | 34 | // Note that if we do not untaint the received values, warnings might be generated... |
35 | 35 | $options = $encoder->decode($req->getParam(3)); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $client->setSSLVerifyPeer($val); |
50 | 50 | break; |
51 | 51 | case 'Timeout': |
52 | - $timeout = (integer)$val; |
|
52 | + $timeout = (integer) $val; |
|
53 | 53 | break; |
54 | 54 | } // switch |
55 | 55 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | // add debug info into response we give back to caller |
70 | - PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize()); |
|
70 | + PhpXmlRpc\Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize()); |
|
71 | 71 | |
72 | 72 | return $client->send($req, $timeout); |
73 | 73 | } |
@@ -88,4 +88,4 @@ discard block |
||
88 | 88 | ) |
89 | 89 | ); |
90 | 90 | |
91 | -require_once __DIR__ . "/_append.php"; |
|
91 | +require_once __DIR__."/_append.php"; |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php require_once __DIR__ . "/_prepend.php"; ?><html lang="en"> |
|
1 | +<?php require_once __DIR__."/_prepend.php"; ?><html lang="en"> |
|
2 | 2 | <head><title>xmlrpc - Introspect demo</title></head> |
3 | 3 | <body> |
4 | 4 | <h1>Introspect demo</h1> |
@@ -10,14 +10,14 @@ discard block |
||
10 | 10 | function display_error($r) |
11 | 11 | { |
12 | 12 | print "An error occurred: "; |
13 | - print "Code: " . $r->faultCode() |
|
14 | - . " Reason: '" . $r->faultString() . "'<br/>"; |
|
13 | + print "Code: ".$r->faultCode() |
|
14 | + . " Reason: '".$r->faultString()."'<br/>"; |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | $client = new PhpXmlRpc\Client(XMLRPCSERVER); |
18 | 18 | |
19 | 19 | // First off, let's retrieve the list of methods available on the remote server |
20 | -print "<h3>methods available at http://" . $client->server . $client->path . "</h3>\n"; |
|
20 | +print "<h3>methods available at http://".$client->server.$client->path."</h3>\n"; |
|
21 | 21 | $req = new PhpXmlRpc\Request('system.listMethods'); |
22 | 22 | $resp = $client->send($req); |
23 | 23 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | |
29 | 29 | // Then, retrieve the signature and help text of each available method |
30 | 30 | foreach ($v as $methodName) { |
31 | - print "<h4>" . $methodName->scalarval() . "</h4>\n"; |
|
31 | + print "<h4>".$methodName->scalarval()."</h4>\n"; |
|
32 | 32 | // build messages first, add params later |
33 | 33 | $m1 = new PhpXmlRpc\Request('system.methodHelp'); |
34 | 34 | $m2 = new PhpXmlRpc\Request('system.methodSignature'); |
@@ -59,13 +59,13 @@ discard block |
||
59 | 59 | if ($val->kindOf() == "array") { |
60 | 60 | foreach ($val as $x) { |
61 | 61 | $ret = $x[0]; |
62 | - print "<code>" . htmlspecialchars($ret->scalarval()) . " " |
|
63 | - . htmlspecialchars($methodName->scalarval()) . "("; |
|
64 | - if ($x->count() > 1) { |
|
65 | - for ($k = 1; $k < $x->count(); $k++) { |
|
62 | + print "<code>".htmlspecialchars($ret->scalarval())." " |
|
63 | + . htmlspecialchars($methodName->scalarval())."("; |
|
64 | + if ($x->count()>1) { |
|
65 | + for ($k = 1; $k<$x->count(); $k++) { |
|
66 | 66 | $y = $x[$k]; |
67 | 67 | print htmlspecialchars($y->scalarval()); |
68 | - if ($k < $x->count() - 1) { |
|
68 | + if ($k<$x->count()-1) { |
|
69 | 69 | print ", "; |
70 | 70 | } |
71 | 71 | } |
@@ -81,4 +81,4 @@ discard block |
||
81 | 81 | } |
82 | 82 | ?> |
83 | 83 | </body> |
84 | -</html><?php require_once __DIR__ . "/_append.php"; ?> |
|
84 | +</html><?php require_once __DIR__."/_append.php"; ?> |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php require_once __DIR__ . "/_prepend.php"; ?><html lang="en"> |
|
1 | +<?php require_once __DIR__."/_prepend.php"; ?><html lang="en"> |
|
2 | 2 | <head><title>xmlrpc - Getstatename demo</title></head> |
3 | 3 | <body> |
4 | 4 | <h1>Getstatename demo</h1> |
@@ -11,32 +11,32 @@ discard block |
||
11 | 11 | <?php |
12 | 12 | |
13 | 13 | if (isset($_POST["stateno"]) && $_POST["stateno"] != "") { |
14 | - $stateNo = (integer)$_POST["stateno"]; |
|
14 | + $stateNo = (integer) $_POST["stateno"]; |
|
15 | 15 | $encoder = new PhpXmlRpc\Encoder(); |
16 | 16 | $req = new PhpXmlRpc\Request('examples.getStateName', |
17 | 17 | array($encoder->encode($stateNo)) |
18 | 18 | ); |
19 | - print "Sending the following request:<pre>\n\n" . htmlentities($req->serialize()) . "\n\n</pre>Debug info of server data follows...\n\n"; |
|
19 | + print "Sending the following request:<pre>\n\n".htmlentities($req->serialize())."\n\n</pre>Debug info of server data follows...\n\n"; |
|
20 | 20 | $client = new PhpXmlRpc\Client(XMLRPCSERVER); |
21 | 21 | $client->setDebug(1); |
22 | 22 | $r = $client->send($req); |
23 | 23 | if (!$r->faultCode()) { |
24 | 24 | $v = $r->value(); |
25 | - print "<br/>State number <b>" . $stateNo . "</b> is <b>" |
|
26 | - . htmlspecialchars($encoder->decode($v)) . "</b><br/><br/>"; |
|
25 | + print "<br/>State number <b>".$stateNo."</b> is <b>" |
|
26 | + . htmlspecialchars($encoder->decode($v))."</b><br/><br/>"; |
|
27 | 27 | } else { |
28 | 28 | print "An error occurred: "; |
29 | - print "Code: " . htmlspecialchars($r->faultCode()) |
|
30 | - . " Reason: '" . htmlspecialchars($r->faultString()) . "'</pre><br/>"; |
|
29 | + print "Code: ".htmlspecialchars($r->faultCode()) |
|
30 | + . " Reason: '".htmlspecialchars($r->faultString())."'</pre><br/>"; |
|
31 | 31 | } |
32 | 32 | } else { |
33 | 33 | $stateNo = ""; |
34 | 34 | } |
35 | 35 | |
36 | 36 | print "<form action=\"getstatename.php\" method=\"POST\"> |
37 | -<input name=\"stateno\" value=\"" . $stateNo . "\"><input type=\"submit\" value=\"go\" name=\"submit\"></form> |
|
37 | +<input name=\"stateno\" value=\"" . $stateNo."\"><input type=\"submit\" value=\"go\" name=\"submit\"></form> |
|
38 | 38 | <p>Enter a state number to query its name</p>"; |
39 | 39 | |
40 | 40 | ?> |
41 | 41 | </body> |
42 | -</html><?php require_once __DIR__ . "/_append.php"; ?> |
|
42 | +</html><?php require_once __DIR__."/_append.php"; ?> |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php require_once __DIR__ . "/_prepend.php"; ?><html lang="en"> |
|
1 | +<?php require_once __DIR__."/_prepend.php"; ?><html lang="en"> |
|
2 | 2 | <head><title>xmlrpc - Agesort demo</title></head> |
3 | 3 | <body> |
4 | 4 | <h1>Agesort demo</h1> |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | $inAr = array("Dave" => 24, "Edd" => 45, "Joe" => 37, "Fred" => 27); |
14 | 14 | print "This is the input data:<br/><pre>"; |
15 | 15 | foreach ($inAr as $key => $val) { |
16 | - print $key . ", " . $val . "\n"; |
|
16 | + print $key.", ".$val."\n"; |
|
17 | 17 | } |
18 | 18 | print "</pre>"; |
19 | 19 | |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | ); |
30 | 30 | } |
31 | 31 | $v = new PhpXmlRpc\Value($p, "array"); |
32 | -print "Encoded into xmlrpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n"; |
|
32 | +print "Encoded into xmlrpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n"; |
|
33 | 33 | |
34 | 34 | // create client and message objects |
35 | 35 | $req = new PhpXmlRpc\Request('examples.sortByAge', array($v)); |
@@ -49,17 +49,17 @@ discard block |
||
49 | 49 | foreach ($value as $struct) { |
50 | 50 | $name = $struct["name"]; |
51 | 51 | $age = $struct["age"]; |
52 | - print htmlspecialchars($name->scalarval()) . ", " . htmlspecialchars($age->scalarval()) . "\n"; |
|
52 | + print htmlspecialchars($name->scalarval()).", ".htmlspecialchars($age->scalarval())."\n"; |
|
53 | 53 | } |
54 | 54 | |
55 | - print "<hr/>For nerds: I got this value back<br/><pre>" . |
|
56 | - htmlentities($resp->serialize()) . "</pre><hr/>\n"; |
|
55 | + print "<hr/>For nerds: I got this value back<br/><pre>". |
|
56 | + htmlentities($resp->serialize())."</pre><hr/>\n"; |
|
57 | 57 | } else { |
58 | 58 | print "An error occurred:<pre>"; |
59 | - print "Code: " . htmlspecialchars($resp->faultCode()) . |
|
60 | - "\nReason: '" . htmlspecialchars($resp->faultString()) . '\'</pre><hr/>'; |
|
59 | + print "Code: ".htmlspecialchars($resp->faultCode()). |
|
60 | + "\nReason: '".htmlspecialchars($resp->faultString()).'\'</pre><hr/>'; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | ?> |
64 | 64 | </body> |
65 | -</html><?php require_once __DIR__ . "/_append.php"; ?> |
|
65 | +</html><?php require_once __DIR__."/_append.php"; ?> |
@@ -1,4 +1,4 @@ discard block |
||
1 | -<?php require_once __DIR__ . "/_prepend.php"; ?><html lang="en"> |
|
1 | +<?php require_once __DIR__."/_prepend.php"; ?><html lang="en"> |
|
2 | 2 | <head><title>xmlrpc - Webservice wrappper demo</title></head> |
3 | 3 | <body> |
4 | 4 | <h1>Webservice wrappper demo</h1> |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $client->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals |
18 | 18 | $resp = $client->send(new PhpXmlRpc\Request('system.listMethods')); |
19 | 19 | if ($resp->faultCode()) { |
20 | - echo "<p>Server methods list could not be retrieved: error {$resp->faultCode()} '" . htmlspecialchars($resp->faultString()) . "'</p>\n"; |
|
20 | + echo "<p>Server methods list could not be retrieved: error {$resp->faultCode()} '".htmlspecialchars($resp->faultString())."'</p>\n"; |
|
21 | 21 | } else { |
22 | 22 | echo "<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n"; |
23 | 23 | flush(); |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | if ($methodName == 'examples.getStateName') { |
30 | 30 | $callable = $wrapper->wrapXmlrpcMethod($client, $methodName); |
31 | 31 | if ($callable) { |
32 | - echo "<li>Remote server method " . htmlspecialchars($methodName) . " wrapped into php function</li>\n"; |
|
32 | + echo "<li>Remote server method ".htmlspecialchars($methodName)." wrapped into php function</li>\n"; |
|
33 | 33 | } else { |
34 | - echo "<li>Remote server method " . htmlspecialchars($methodName) . " could not be wrapped!</li>\n"; |
|
34 | + echo "<li>Remote server method ".htmlspecialchars($methodName)." could not be wrapped!</li>\n"; |
|
35 | 35 | } |
36 | 36 | break; |
37 | 37 | } |
@@ -49,4 +49,4 @@ discard block |
||
49 | 49 | } |
50 | 50 | ?> |
51 | 51 | </body> |
52 | -</html><?php require_once __DIR__ . "/_append.php"; ?> |
|
52 | +</html><?php require_once __DIR__."/_append.php"; ?> |