gggeek /
phpxmlrpc
@@ -20,7 +20,7 @@ discard block |
||
| 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 |
||
| 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() |
@@ -54,8 +54,7 @@ discard block |
||
| 54 | 54 | function stripslashes_deep($value) |
| 55 | 55 | { |
| 56 | 56 | $value = is_array($value) ? |
| 57 | - array_map('stripslashes_deep', $value) : |
|
| 58 | - stripslashes($value); |
|
| 57 | + array_map('stripslashes_deep', $value) : stripslashes($value); |
|
| 59 | 58 | |
| 60 | 59 | return $value; |
| 61 | 60 | } |
@@ -105,7 +104,7 @@ discard block |
||
| 105 | 104 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
| 106 | 105 | // in case user forgot initial '/' in xmlrpc server path, add it back |
| 107 | 106 | if ($path && ($path[0]) != '/') { |
| 108 | - $path = '/' . $path; |
|
| 107 | + $path = '/'.$path; |
|
| 109 | 108 | } |
| 110 | 109 | |
| 111 | 110 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | * @todo rename to something akin to xsltproc |
| 8 | 8 | */ |
| 9 | 9 | |
| 10 | -if ($_SERVER['argc'] < 4) { |
|
| 10 | +if ($_SERVER['argc']<4) { |
|
| 11 | 11 | error("Usage: php convert.php docbook.xml stylesheet.xsl output-dir|output_file"); |
| 12 | 12 | } |
| 13 | 13 | |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>xmlrpc - Webservice wrapper demo</title></head> |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | $client->return_type = 'phpvals'; // let client give us back php values instead of xmlrpcvals |
| 21 | 21 | $resp = $client->send(new PhpXmlRpc\Request('system.listMethods')); |
| 22 | 22 | if ($resp->faultCode()) { |
| 23 | - output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '" . htmlspecialchars($resp->faultString()) . "'</p>\n"); |
|
| 23 | + output("<p>Server methods list could not be retrieved: error {$resp->faultCode()} '".htmlspecialchars($resp->faultString())."'</p>\n"); |
|
| 24 | 24 | } else { |
| 25 | 25 | output("<p>Server methods list retrieved, now wrapping it up...</p>\n<ul>\n"); |
| 26 | 26 | flush(); |
@@ -32,9 +32,9 @@ discard block |
||
| 32 | 32 | if ($methodName == 'examples.getStateName') { |
| 33 | 33 | $callable = $wrapper->wrapXmlrpcMethod($client, $methodName); |
| 34 | 34 | if ($callable) { |
| 35 | - output("<li>Remote server method " . htmlspecialchars($methodName) . " wrapped into php function</li>\n"); |
|
| 35 | + output("<li>Remote server method ".htmlspecialchars($methodName)." wrapped into php function</li>\n"); |
|
| 36 | 36 | } else { |
| 37 | - output("<li>Remote server method " . htmlspecialchars($methodName) . " could not be wrapped!</li>\n"); |
|
| 37 | + output("<li>Remote server method ".htmlspecialchars($methodName)." could not be wrapped!</li>\n"); |
|
| 38 | 38 | } |
| 39 | 39 | break; |
| 40 | 40 | } |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -require_once __DIR__ . "/_prepend.php"; |
|
| 2 | +require_once __DIR__."/_prepend.php"; |
|
| 3 | 3 | |
| 4 | 4 | output('<html lang="en"> |
| 5 | 5 | <head><title>xmlrpc - Agesort demo</title></head> |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | output("This is the input data:<br/><pre>"); |
| 16 | 16 | foreach ($inAr as $key => $val) { |
| 17 | - output($key . ", " . $val . "\n"); |
|
| 17 | + output($key.", ".$val."\n"); |
|
| 18 | 18 | } |
| 19 | 19 | output("</pre>"); |
| 20 | 20 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | ); |
| 31 | 31 | } |
| 32 | 32 | $v = new PhpXmlRpc\Value($p, "array"); |
| 33 | -output("Encoded into xmlrpc format it looks like this: <pre>\n" . htmlentities($v->serialize()) . "</pre>\n"); |
|
| 33 | +output("Encoded into xmlrpc format it looks like this: <pre>\n".htmlentities($v->serialize())."</pre>\n"); |
|
| 34 | 34 | |
| 35 | 35 | // create client and message objects |
| 36 | 36 | $req = new PhpXmlRpc\Request('examples.sortByAge', array($v)); |
@@ -50,15 +50,15 @@ discard block |
||
| 50 | 50 | foreach ($value as $struct) { |
| 51 | 51 | $name = $struct["name"]; |
| 52 | 52 | $age = $struct["age"]; |
| 53 | - output(htmlspecialchars($name->scalarval()) . ", " . htmlspecialchars($age->scalarval()) . "\n"); |
|
| 53 | + output(htmlspecialchars($name->scalarval()).", ".htmlspecialchars($age->scalarval())."\n"); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - output("<hr/>For nerds: I got this value back<br/><pre>" . |
|
| 57 | - htmlentities($resp->serialize()) . "</pre><hr/>\n"); |
|
| 56 | + output("<hr/>For nerds: I got this value back<br/><pre>". |
|
| 57 | + htmlentities($resp->serialize())."</pre><hr/>\n"); |
|
| 58 | 58 | } else { |
| 59 | 59 | output("An error occurred:<pre>"); |
| 60 | - output("Code: " . htmlspecialchars($resp->faultCode()) . |
|
| 61 | - "\nReason: '" . htmlspecialchars($resp->faultString()) . '\'</pre><hr/>'); |
|
| 60 | + output("Code: ".htmlspecialchars($resp->faultCode()). |
|
| 61 | + "\nReason: '".htmlspecialchars($resp->faultString()).'\'</pre><hr/>'); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | output("</body></html>\n"); |
@@ -24,12 +24,12 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | // read chunk-size, chunk-extension (if any) and crlf |
| 26 | 26 | // get the position of the linebreak |
| 27 | - $chunkEnd = strpos($buffer, "\r\n") + 2; |
|
| 27 | + $chunkEnd = strpos($buffer, "\r\n")+2; |
|
| 28 | 28 | $temp = substr($buffer, 0, $chunkEnd); |
| 29 | 29 | $chunkSize = hexdec(trim($temp)); |
| 30 | 30 | $chunkStart = $chunkEnd; |
| 31 | - while ($chunkSize > 0) { |
|
| 32 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize); |
|
| 31 | + while ($chunkSize>0) { |
|
| 32 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize); |
|
| 33 | 33 | |
| 34 | 34 | // just in case we got a broken connection |
| 35 | 35 | if ($chunkEnd == false) { |
@@ -41,19 +41,19 @@ discard block |
||
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | // read chunk-data and crlf |
| 44 | - $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 44 | + $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 45 | 45 | // append chunk-data to entity-body |
| 46 | 46 | $new .= $chunk; |
| 47 | 47 | // length := length + chunk-size |
| 48 | 48 | $length += strlen($chunk); |
| 49 | 49 | // read chunk-size and crlf |
| 50 | - $chunkStart = $chunkEnd + 2; |
|
| 50 | + $chunkStart = $chunkEnd+2; |
|
| 51 | 51 | |
| 52 | - $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2; |
|
| 52 | + $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2; |
|
| 53 | 53 | if ($chunkEnd == false) { |
| 54 | 54 | break; // just in case we got a broken connection |
| 55 | 55 | } |
| 56 | - $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart); |
|
| 56 | + $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart); |
|
| 57 | 57 | $chunkSize = hexdec(trim($temp)); |
| 58 | 58 | $chunkStart = $chunkEnd; |
| 59 | 59 | } |
@@ -83,11 +83,11 @@ discard block |
||
| 83 | 83 | // Look for CR/LF or simple LF as line separator (even though it is not valid http) |
| 84 | 84 | $pos = strpos($data, "\r\n\r\n"); |
| 85 | 85 | if ($pos || is_int($pos)) { |
| 86 | - $bd = $pos + 4; |
|
| 86 | + $bd = $pos+4; |
|
| 87 | 87 | } else { |
| 88 | 88 | $pos = strpos($data, "\n\n"); |
| 89 | 89 | if ($pos || is_int($pos)) { |
| 90 | - $bd = $pos + 2; |
|
| 90 | + $bd = $pos+2; |
|
| 91 | 91 | } else { |
| 92 | 92 | // No separation between response headers and body: fault? |
| 93 | 93 | $bd = 0; |
@@ -97,8 +97,8 @@ discard block |
||
| 97 | 97 | // this filters out all http headers from proxy. maybe we could take them into account, too? |
| 98 | 98 | $data = substr($data, $bd); |
| 99 | 99 | } else { |
| 100 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 101 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 100 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed'); |
|
| 101 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']); |
|
| 102 | 102 | } |
| 103 | 103 | } |
| 104 | 104 | |
@@ -131,19 +131,19 @@ discard block |
||
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | if ($httpResponse['status_code'] !== '200') { |
| 134 | - $errstr = substr($data, 0, strpos($data, "\n") - 1); |
|
| 135 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr); |
|
| 136 | - throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 134 | + $errstr = substr($data, 0, strpos($data, "\n")-1); |
|
| 135 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr); |
|
| 136 | + throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']); |
|
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | // be tolerant to usage of \n instead of \r\n to separate headers and data (even though it is not valid http) |
| 140 | 140 | $pos = strpos($data, "\r\n\r\n"); |
| 141 | 141 | if ($pos || is_int($pos)) { |
| 142 | - $bd = $pos + 4; |
|
| 142 | + $bd = $pos+4; |
|
| 143 | 143 | } else { |
| 144 | 144 | $pos = strpos($data, "\n\n"); |
| 145 | 145 | if ($pos || is_int($pos)) { |
| 146 | - $bd = $pos + 2; |
|
| 146 | + $bd = $pos+2; |
|
| 147 | 147 | } else { |
| 148 | 148 | // No separation between response headers and body: fault? |
| 149 | 149 | // we could take some action here instead of going on... |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | foreach ($ar as $line) { |
| 158 | 158 | // take care of multi-line headers and cookies |
| 159 | 159 | $arr = explode(':', $line, 2); |
| 160 | - if (count($arr) > 1) { |
|
| 160 | + if (count($arr)>1) { |
|
| 161 | 161 | $headerName = strtolower(trim($arr[0])); |
| 162 | 162 | /// @todo some other headers (the ones that allow a CSV list of values) do allow many values to be |
| 163 | 163 | /// passed using multiple header lines. |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | foreach ($cookies as $cookie) { |
| 175 | 175 | // glue together all received cookies, using a comma to separate them (same as php does with getallheaders()) |
| 176 | 176 | if (isset($httpResponse['headers'][$headerName])) { |
| 177 | - $httpResponse['headers'][$headerName] .= ', ' . trim($cookie); |
|
| 177 | + $httpResponse['headers'][$headerName] .= ', '.trim($cookie); |
|
| 178 | 178 | } else { |
| 179 | 179 | $httpResponse['headers'][$headerName] = trim($cookie); |
| 180 | 180 | } |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | } |
| 204 | 204 | } elseif (isset($headerName)) { |
| 205 | 205 | /// @todo version1 cookies might span multiple lines, thus breaking the parsing above |
| 206 | - $httpResponse['headers'][$headerName] .= ' ' . trim($line); |
|
| 206 | + $httpResponse['headers'][$headerName] .= ' '.trim($line); |
|
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | 209 | |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | // Decode chunked encoding sent by http 1.1 servers |
| 227 | 227 | if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') { |
| 228 | 228 | if (!$data = static::decodeChunked($data)) { |
| 229 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 229 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server'); |
|
| 230 | 230 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']); |
| 231 | 231 | } |
| 232 | 232 | } |
@@ -241,19 +241,19 @@ discard block |
||
| 241 | 241 | if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 242 | 242 | $data = $degzdata; |
| 243 | 243 | if ($debug) { |
| 244 | - Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 244 | + Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 245 | 245 | } |
| 246 | 246 | } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 247 | 247 | $data = $degzdata; |
| 248 | 248 | if ($debug) { |
| 249 | - Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---"); |
|
| 249 | + Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---"); |
|
| 250 | 250 | } |
| 251 | 251 | } else { |
| 252 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server'); |
|
| 252 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server'); |
|
| 253 | 253 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']); |
| 254 | 254 | } |
| 255 | 255 | } else { |
| 256 | - Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 256 | + Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.'); |
|
| 257 | 257 | throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']); |
| 258 | 258 | } |
| 259 | 259 | } |
@@ -183,20 +183,20 @@ discard block |
||
| 183 | 183 | $callable = explode('::', $callable); |
| 184 | 184 | } |
| 185 | 185 | if (is_array($callable)) { |
| 186 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 186 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 187 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 188 | 188 | return false; |
| 189 | 189 | } |
| 190 | 190 | if (is_string($callable[0])) { |
| 191 | 191 | $plainFuncName = implode('::', $callable); |
| 192 | 192 | } elseif (is_object($callable[0])) { |
| 193 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 193 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 194 | 194 | } |
| 195 | 195 | $exists = method_exists($callable[0], $callable[1]); |
| 196 | 196 | } else if ($callable instanceof \Closure) { |
| 197 | 197 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 198 | 198 | if (!$buildIt) { |
| 199 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 199 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 200 | 200 | return false; |
| 201 | 201 | } |
| 202 | 202 | |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | if (!$exists) { |
| 211 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 211 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 212 | 212 | return false; |
| 213 | 213 | } |
| 214 | 214 | |
@@ -253,23 +253,23 @@ discard block |
||
| 253 | 253 | if (is_array($callable)) { |
| 254 | 254 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 255 | 255 | if ($func->isPrivate()) { |
| 256 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 256 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 257 | 257 | return false; |
| 258 | 258 | } |
| 259 | 259 | if ($func->isProtected()) { |
| 260 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 260 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 261 | 261 | return false; |
| 262 | 262 | } |
| 263 | 263 | if ($func->isConstructor()) { |
| 264 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 264 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 265 | 265 | return false; |
| 266 | 266 | } |
| 267 | 267 | if ($func->isDestructor()) { |
| 268 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 268 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 269 | 269 | return false; |
| 270 | 270 | } |
| 271 | 271 | if ($func->isAbstract()) { |
| 272 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 272 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 273 | 273 | return false; |
| 274 | 274 | } |
| 275 | 275 | /// @todo add more checks for static vs. nonstatic? |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | if ($func->isInternal()) { |
| 280 | 280 | // Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs |
| 281 | 281 | // instead of getparameters to fully reflect internal php functions ? |
| 282 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 282 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 283 | 283 | return false; |
| 284 | 284 | } |
| 285 | 285 | |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | $i = 0; |
| 332 | 332 | foreach ($func->getParameters() as $paramObj) { |
| 333 | 333 | $params[$i] = array(); |
| 334 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 334 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 335 | 335 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 336 | 336 | $i++; |
| 337 | 337 | } |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | // build a signature |
| 397 | 397 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 398 | 398 | $pSig = array($funcDesc['returnsDocs']); |
| 399 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 399 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 400 | 400 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 401 | 401 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 402 | 402 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | } |
| 455 | 455 | } |
| 456 | 456 | $numPars = $req->getNumParams(); |
| 457 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 457 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 458 | 458 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 459 | 459 | } |
| 460 | 460 | |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | |
| 468 | 468 | $result = call_user_func_array($callable, $params); |
| 469 | 469 | |
| 470 | - if (! is_a($result, $responseClass)) { |
|
| 470 | + if (!is_a($result, $responseClass)) { |
|
| 471 | 471 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 472 | 472 | $result = new $valueClass($result, $funcDesc['returns']); |
| 473 | 473 | } else { |
@@ -503,9 +503,9 @@ discard block |
||
| 503 | 503 | if ($newFuncName == '') { |
| 504 | 504 | if (is_array($callable)) { |
| 505 | 505 | if (is_string($callable[0])) { |
| 506 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 506 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 507 | 507 | } else { |
| 508 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 508 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 509 | 509 | } |
| 510 | 510 | } else { |
| 511 | 511 | if ($callable instanceof \Closure) { |
@@ -542,8 +542,8 @@ discard block |
||
| 542 | 542 | { |
| 543 | 543 | $namespace = '\\PhpXmlRpc\\'; |
| 544 | 544 | |
| 545 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 546 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 545 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 546 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 547 | 547 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 548 | 548 | |
| 549 | 549 | $i = 0; |
@@ -578,7 +578,7 @@ discard block |
||
| 578 | 578 | // build body of new function |
| 579 | 579 | |
| 580 | 580 | $innerCode = "\$paramCount = \$req->getNumParams();\n"; |
| 581 | - $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 581 | + $innerCode .= "if (\$paramCount < $minPars || \$paramCount > $maxPars) return new {$namespace}Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 582 | 582 | |
| 583 | 583 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 584 | 584 | if ($decodePhpObjects) { |
@@ -592,13 +592,13 @@ discard block |
||
| 592 | 592 | if (is_array($callable) && is_object($callable[0])) { |
| 593 | 593 | self::$objHolder[$newFuncName] = $callable[0]; |
| 594 | 594 | $innerCode .= "\$obj = PhpXmlRpc\\Wrapper::\$objHolder['$newFuncName'];\n"; |
| 595 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 595 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 596 | 596 | } else { |
| 597 | 597 | $realFuncName = $plainFuncName; |
| 598 | 598 | } |
| 599 | 599 | foreach ($parsVariations as $i => $pars) { |
| 600 | - $innerCode .= "if (\$paramCount == " . count($pars) . ") \$retval = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 601 | - if ($i < (count($parsVariations) - 1)) |
|
| 600 | + $innerCode .= "if (\$paramCount == ".count($pars).") \$retval = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 601 | + if ($i<(count($parsVariations)-1)) |
|
| 602 | 602 | $innerCode .= "else\n"; |
| 603 | 603 | } |
| 604 | 604 | $innerCode .= "if (is_a(\$retval, '{$namespace}Response')) return \$retval; else\n"; |
@@ -615,7 +615,7 @@ discard block |
||
| 615 | 615 | // if ($func->returnsReference()) |
| 616 | 616 | // return false; |
| 617 | 617 | |
| 618 | - $code = "function $newFuncName(\$req) {\n" . $innerCode . "\n}"; |
|
| 618 | + $code = "function $newFuncName(\$req) {\n".$innerCode."\n}"; |
|
| 619 | 619 | |
| 620 | 620 | return $code; |
| 621 | 621 | } |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 672 | 672 | { |
| 673 | 673 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 674 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 674 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | if (is_object($className)) { |
@@ -679,7 +679,7 @@ discard block |
||
| 679 | 679 | } else { |
| 680 | 680 | $realClassName = $className; |
| 681 | 681 | } |
| 682 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 682 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 683 | 683 | } |
| 684 | 684 | |
| 685 | 685 | /** |
@@ -770,21 +770,21 @@ discard block |
||
| 770 | 770 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 771 | 771 | { |
| 772 | 772 | $namespace = '\\PhpXmlRpc\\'; |
| 773 | - $reqClass = $namespace . 'Request'; |
|
| 774 | - $valClass = $namespace . 'Value'; |
|
| 775 | - $decoderClass = $namespace . 'Encoder'; |
|
| 773 | + $reqClass = $namespace.'Request'; |
|
| 774 | + $valClass = $namespace.'Value'; |
|
| 775 | + $decoderClass = $namespace.'Encoder'; |
|
| 776 | 776 | |
| 777 | 777 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 778 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 778 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 779 | 779 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 780 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 780 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 781 | 781 | |
| 782 | 782 | $req = new $reqClass('system.methodSignature'); |
| 783 | 783 | $req->addparam(new $valClass($methodName)); |
| 784 | 784 | $client->setDebug($debug); |
| 785 | 785 | $response = $client->send($req, $timeout, $protocol); |
| 786 | 786 | if ($response->faultCode()) { |
| 787 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 787 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 788 | 788 | return false; |
| 789 | 789 | } |
| 790 | 790 | |
@@ -794,8 +794,8 @@ discard block |
||
| 794 | 794 | $mSig = $decoder->decode($mSig); |
| 795 | 795 | } |
| 796 | 796 | |
| 797 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 798 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 797 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 798 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 799 | 799 | return false; |
| 800 | 800 | } |
| 801 | 801 | |
@@ -812,11 +812,11 @@ discard block |
||
| 812 | 812 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 813 | 813 | { |
| 814 | 814 | $namespace = '\\PhpXmlRpc\\'; |
| 815 | - $reqClass = $namespace . 'Request'; |
|
| 816 | - $valClass = $namespace . 'Value'; |
|
| 815 | + $reqClass = $namespace.'Request'; |
|
| 816 | + $valClass = $namespace.'Value'; |
|
| 817 | 817 | |
| 818 | 818 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 819 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 819 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 820 | 820 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 821 | 821 | |
| 822 | 822 | $mDesc = ''; |
@@ -851,10 +851,10 @@ discard block |
||
| 851 | 851 | $clientClone = clone $client; |
| 852 | 852 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 853 | 853 | { |
| 854 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 854 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 855 | 855 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 856 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 857 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 856 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 857 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 858 | 858 | if (isset($extraOptions['return_on_fault'])) { |
| 859 | 859 | $decodeFault = true; |
| 860 | 860 | $faultResponse = $extraOptions['return_on_fault']; |
@@ -863,9 +863,9 @@ discard block |
||
| 863 | 863 | } |
| 864 | 864 | |
| 865 | 865 | $namespace = '\\PhpXmlRpc\\'; |
| 866 | - $reqClass = $namespace . 'Request'; |
|
| 867 | - $encoderClass = $namespace . 'Encoder'; |
|
| 868 | - $valueClass = $namespace . 'Value'; |
|
| 866 | + $reqClass = $namespace.'Request'; |
|
| 867 | + $encoderClass = $namespace.'Encoder'; |
|
| 868 | + $valueClass = $namespace.'Value'; |
|
| 869 | 869 | |
| 870 | 870 | $encoder = new $encoderClass(); |
| 871 | 871 | $encodeOptions = array(); |
@@ -937,13 +937,13 @@ discard block |
||
| 937 | 937 | * |
| 938 | 938 | * @return string[] keys: source, docstring |
| 939 | 939 | */ |
| 940 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 940 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 941 | 941 | { |
| 942 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 942 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 943 | 943 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 944 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 945 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 946 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 944 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 945 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 946 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 947 | 947 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 948 | 948 | if (isset($extraOptions['return_on_fault'])) { |
| 949 | 949 | $decodeFault = true; |
@@ -956,7 +956,7 @@ discard block |
||
| 956 | 956 | $namespace = '\\PhpXmlRpc\\'; |
| 957 | 957 | |
| 958 | 958 | $code = "function $newFuncName ("; |
| 959 | - if ($clientCopyMode < 2) { |
|
| 959 | + if ($clientCopyMode<2) { |
|
| 960 | 960 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 961 | 961 | $verbatimClientCopy = !$clientCopyMode; |
| 962 | 962 | $innerCode = $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, $namespace); |
@@ -971,7 +971,7 @@ discard block |
||
| 971 | 971 | |
| 972 | 972 | if ($mDesc != '') { |
| 973 | 973 | // take care that PHP comment is not terminated unwillingly by method description |
| 974 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
| 974 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
| 975 | 975 | } else { |
| 976 | 976 | $mDesc = "/**\nFunction $newFuncName\n"; |
| 977 | 977 | } |
@@ -980,7 +980,7 @@ discard block |
||
| 980 | 980 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
| 981 | 981 | $plist = array(); |
| 982 | 982 | $pCount = count($mSig); |
| 983 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 983 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 984 | 984 | $plist[] = "\$p$i"; |
| 985 | 985 | $pType = $mSig[$i]; |
| 986 | 986 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -996,19 +996,19 @@ discard block |
||
| 996 | 996 | } |
| 997 | 997 | } |
| 998 | 998 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
| 999 | - $mDesc .= '* @param ' . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 999 | + $mDesc .= '* @param '.$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 1000 | 1000 | } |
| 1001 | - if ($clientCopyMode < 2) { |
|
| 1001 | + if ($clientCopyMode<2) { |
|
| 1002 | 1002 | $plist[] = '$debug=0'; |
| 1003 | 1003 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 1004 | 1004 | } |
| 1005 | 1005 | $plist = implode(', ', $plist); |
| 1006 | - $mDesc .= "* @return {$namespace}Response|" . $this->xmlrpc2PhpType($mSig[0]) . " (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 1006 | + $mDesc .= "* @return {$namespace}Response|".$this->xmlrpc2PhpType($mSig[0])." (an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
| 1007 | 1007 | |
| 1008 | 1008 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
| 1009 | 1009 | if ($decodeFault) { |
| 1010 | 1010 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 1011 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 1011 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 1012 | 1012 | } else { |
| 1013 | 1013 | $respCode = var_export($faultResponse, true); |
| 1014 | 1014 | } |
@@ -1021,7 +1021,7 @@ discard block |
||
| 1021 | 1021 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
| 1022 | 1022 | } |
| 1023 | 1023 | |
| 1024 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
| 1024 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
| 1025 | 1025 | |
| 1026 | 1026 | return array('source' => $code, 'docstring' => $mDesc); |
| 1027 | 1027 | } |
@@ -1047,23 +1047,23 @@ discard block |
||
| 1047 | 1047 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1048 | 1048 | { |
| 1049 | 1049 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1050 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1050 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1051 | 1051 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1052 | 1052 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1053 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1054 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1053 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1054 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1055 | 1055 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1056 | 1056 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1057 | 1057 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1058 | 1058 | $namespace = '\\PhpXmlRpc\\'; |
| 1059 | 1059 | |
| 1060 | - $reqClass = $namespace . 'Request'; |
|
| 1061 | - $decoderClass = $namespace . 'Encoder'; |
|
| 1060 | + $reqClass = $namespace.'Request'; |
|
| 1061 | + $decoderClass = $namespace.'Encoder'; |
|
| 1062 | 1062 | |
| 1063 | 1063 | $req = new $reqClass('system.listMethods'); |
| 1064 | 1064 | $response = $client->send($req, $timeout, $protocol); |
| 1065 | 1065 | if ($response->faultCode()) { |
| 1066 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1066 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1067 | 1067 | |
| 1068 | 1068 | return false; |
| 1069 | 1069 | } else { |
@@ -1073,7 +1073,7 @@ discard block |
||
| 1073 | 1073 | $mList = $decoder->decode($mList); |
| 1074 | 1074 | } |
| 1075 | 1075 | if (!is_array($mList) || !count($mList)) { |
| 1076 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1076 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1077 | 1077 | |
| 1078 | 1078 | return false; |
| 1079 | 1079 | } else { |
@@ -1081,8 +1081,8 @@ discard block |
||
| 1081 | 1081 | if ($newClassName != '') { |
| 1082 | 1082 | $xmlrpcClassName = $newClassName; |
| 1083 | 1083 | } else { |
| 1084 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1085 | - array('_', ''), $client->server) . '_client'; |
|
| 1084 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1085 | + array('_', ''), $client->server).'_client'; |
|
| 1086 | 1086 | } |
| 1087 | 1087 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1088 | 1088 | $xmlrpcClassName .= 'x'; |
@@ -1113,20 +1113,20 @@ discard block |
||
| 1113 | 1113 | if (!$buildIt) { |
| 1114 | 1114 | $source .= $methodWrap['docstring']; |
| 1115 | 1115 | } |
| 1116 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1116 | + $source .= $methodWrap['source']."\n"; |
|
| 1117 | 1117 | } else { |
| 1118 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1118 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1119 | 1119 | } |
| 1120 | 1120 | } |
| 1121 | 1121 | } |
| 1122 | 1122 | $source .= "}\n"; |
| 1123 | 1123 | if ($buildIt) { |
| 1124 | 1124 | $allOK = 0; |
| 1125 | - eval($source . '$allOK=1;'); |
|
| 1125 | + eval($source.'$allOK=1;'); |
|
| 1126 | 1126 | if ($allOK) { |
| 1127 | 1127 | return $xmlrpcClassName; |
| 1128 | 1128 | } else { |
| 1129 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1129 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1130 | 1130 | return false; |
| 1131 | 1131 | } |
| 1132 | 1132 | } else { |
@@ -1148,8 +1148,8 @@ discard block |
||
| 1148 | 1148 | */ |
| 1149 | 1149 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1150 | 1150 | { |
| 1151 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) . |
|
| 1152 | - "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n"; |
|
| 1151 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path). |
|
| 1152 | + "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server)."', $client->port);\n"; |
|
| 1153 | 1153 | |
| 1154 | 1154 | // copy all client fields to the client that will be generated runtime |
| 1155 | 1155 | // (this provides for future expansion or subclassing of client obj) |
@@ -92,9 +92,9 @@ discard block |
||
| 92 | 92 | public function xml_header($charsetEncoding = '') |
| 93 | 93 | { |
| 94 | 94 | if ($charsetEncoding != '') { |
| 95 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?" . ">\n<methodCall>\n"; |
|
| 95 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\" ?".">\n<methodCall>\n"; |
|
| 96 | 96 | } else { |
| 97 | - return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n"; |
|
| 97 | + return "<?xml version=\"1.0\"?".">\n<methodCall>\n"; |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
@@ -116,16 +116,16 @@ discard block |
||
| 116 | 116 | public function createPayload($charsetEncoding = '') |
| 117 | 117 | { |
| 118 | 118 | if ($charsetEncoding != '') { |
| 119 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 119 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 120 | 120 | } else { |
| 121 | 121 | $this->content_type = 'text/xml'; |
| 122 | 122 | } |
| 123 | 123 | $this->payload = $this->xml_header($charsetEncoding); |
| 124 | - $this->payload .= '<methodName>' . $this->getCharsetEncoder()->encodeEntities( |
|
| 125 | - $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</methodName>\n"; |
|
| 124 | + $this->payload .= '<methodName>'.$this->getCharsetEncoder()->encodeEntities( |
|
| 125 | + $this->methodname, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</methodName>\n"; |
|
| 126 | 126 | $this->payload .= "<params>\n"; |
| 127 | 127 | foreach ($this->params as $p) { |
| 128 | - $this->payload .= "<param>\n" . $p->serialize($charsetEncoding) . |
|
| 128 | + $this->payload .= "<param>\n".$p->serialize($charsetEncoding). |
|
| 129 | 129 | "</param>\n"; |
| 130 | 130 | } |
| 131 | 131 | $this->payload .= "</params>\n"; |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | $this->httpResponse = array('raw_data' => $data, 'headers' => array(), 'cookies' => array()); |
| 254 | 254 | |
| 255 | 255 | if ($data == '') { |
| 256 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': no response received from server.'); |
|
| 256 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': no response received from server.'); |
|
| 257 | 257 | return new Response(0, PhpXmlRpc::$xmlrpcerr['no_data'], PhpXmlRpc::$xmlrpcstr['no_data']); |
| 258 | 258 | } |
| 259 | 259 | |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | // failed processing of HTTP response headers |
| 267 | 267 | // save into response obj the full payload received, for debugging |
| 268 | 268 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data, 'status_code', $e->statusCode())); |
| 269 | - } catch(\Exception $e) { |
|
| 269 | + } catch (\Exception $e) { |
|
| 270 | 270 | return new Response(0, $e->getCode(), $e->getMessage(), '', array('raw_data' => $data)); |
| 271 | 271 | } |
| 272 | 272 | } |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | // idea from Luca Mariano <[email protected]> originally in PEARified version of the lib |
| 281 | 281 | $pos = strrpos($data, '</methodResponse>'); |
| 282 | 282 | if ($pos !== false) { |
| 283 | - $data = substr($data, 0, $pos + 17); |
|
| 283 | + $data = substr($data, 0, $pos+17); |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | // try to 'guestimate' the character encoding of the received response |
@@ -294,9 +294,9 @@ discard block |
||
| 294 | 294 | if ($start) { |
| 295 | 295 | $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):'); |
| 296 | 296 | $end = strpos($data, '-->', $start); |
| 297 | - $comments = substr($data, $start, $end - $start); |
|
| 298 | - $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t" . |
|
| 299 | - str_replace("\n", "\n\t", base64_decode($comments)) . "\n---END---", $respEncoding); |
|
| 297 | + $comments = substr($data, $start, $end-$start); |
|
| 298 | + $this->getLogger()->debugMessage("---SERVER DEBUG INFO (DECODED) ---\n\t". |
|
| 299 | + str_replace("\n", "\n\t", base64_decode($comments))."\n---END---", $respEncoding); |
|
| 300 | 300 | } |
| 301 | 301 | } |
| 302 | 302 | |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | if ($respEncoding == 'ISO-8859-1') { |
| 319 | 319 | $data = utf8_encode($data); |
| 320 | 320 | } else { |
| 321 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received response: ' . $respEncoding); |
|
| 321 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$respEncoding); |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | } |
@@ -339,12 +339,12 @@ discard block |
||
| 339 | 339 | $xmlRpcParser->parse($data, $returnType, XMLParser::ACCEPT_RESPONSE, $options); |
| 340 | 340 | |
| 341 | 341 | // first error check: xml not well-formed |
| 342 | - if ($xmlRpcParser->_xh['isf'] > 2) { |
|
| 342 | + if ($xmlRpcParser->_xh['isf']>2) { |
|
| 343 | 343 | |
| 344 | 344 | // BC break: in the past for some cases we used the error message: 'XML error at line 1, check URL' |
| 345 | 345 | |
| 346 | 346 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['invalid_xml'], |
| 347 | - PhpXmlRpc::$xmlrpcstr['invalid_xml'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', |
|
| 347 | + PhpXmlRpc::$xmlrpcstr['invalid_xml'].' '.$xmlRpcParser->_xh['isf_reason'], '', |
|
| 348 | 348 | $this->httpResponse |
| 349 | 349 | ); |
| 350 | 350 | |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | // second error check: xml well-formed but not xml-rpc compliant |
| 356 | 356 | elseif ($xmlRpcParser->_xh['isf'] == 2) { |
| 357 | 357 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['xml_not_compliant'], |
| 358 | - PhpXmlRpc::$xmlrpcstr['xml_not_compliant'] . ' ' . $xmlRpcParser->_xh['isf_reason'], '', |
|
| 358 | + PhpXmlRpc::$xmlrpcstr['xml_not_compliant'].' '.$xmlRpcParser->_xh['isf_reason'], '', |
|
| 359 | 359 | $this->httpResponse |
| 360 | 360 | ); |
| 361 | 361 | |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | '', $this->httpResponse |
| 372 | 372 | ); |
| 373 | 373 | } else { |
| 374 | - if ($this->debug > 1) { |
|
| 374 | + if ($this->debug>1) { |
|
| 375 | 375 | $this->getLogger()->debugMessage( |
| 376 | 376 | "---PARSED---\n".var_export($xmlRpcParser->_xh['value'], true)."\n---END---" |
| 377 | 377 | ); |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | // Make sure we set the correct charset type for output, so that we can display all characters |
| 18 | 18 | header('Content-Type: text/html; charset=utf-8'); |
| 19 | 19 | |
| 20 | -include __DIR__ . '/common.php'; |
|
| 20 | +include __DIR__.'/common.php'; |
|
| 21 | 21 | if ($action == '') { |
| 22 | 22 | $action = 'list'; |
| 23 | 23 | } |
@@ -33,24 +33,24 @@ discard block |
||
| 33 | 33 | /// @const JSXMLRPC_PATH Path to the visual xmlrpc editing dialog's containing folder. Can be absolute, or |
| 34 | 34 | /// relative to this debugger's folder. |
| 35 | 35 | if (defined('JSXMLRPC_PATH')) { |
| 36 | - $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH)); |
|
| 36 | + $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH)); |
|
| 37 | 37 | } else { |
| 38 | 38 | $editorpaths = array( |
| 39 | - __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger |
|
| 40 | - __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger |
|
| 41 | - __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 42 | - __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 43 | - __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 39 | + __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger |
|
| 40 | + __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger |
|
| 41 | + __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 42 | + __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 43 | + __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 44 | 44 | ); |
| 45 | 45 | } |
| 46 | - foreach($editorpaths as $editorpath) { |
|
| 47 | - if (is_file(realpath($editorpath . 'visualeditor.html'))) { |
|
| 46 | + foreach ($editorpaths as $editorpath) { |
|
| 47 | + if (is_file(realpath($editorpath.'visualeditor.html'))) { |
|
| 48 | 48 | $haseditor = true; |
| 49 | 49 | break; |
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | if ($haseditor) { |
| 53 | - $editorurlpath = preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath); |
|
| 53 | + $editorurlpath = preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath); |
|
| 54 | 54 | |
| 55 | 55 | /// @todo for cases 3, 4 and 5 above, look at `parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)` and check if the |
| 56 | 56 | /// web root is not pointing directly at this folder, as in that case the link to the visualeditor will not |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | function activateeditor() { |
| 231 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>'; |
|
| 231 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
| 232 | 232 | if (document.frmaction.wstype.value == "1") |
| 233 | 233 | url += '&type=jsonrpc'; |
| 234 | 234 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -265,9 +265,9 @@ discard block |
||
| 265 | 265 | echo ' document.forms[2].submit();'; |
| 266 | 266 | } ?>"> |
| 267 | 267 | <h1>XMLRPC |
| 268 | - <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
| 268 | + <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
| 269 | 269 | / |
| 270 | - <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
| 270 | + <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
| 271 | 271 | JSONRPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a> library) |
| 272 | 272 | </h1> |
| 273 | 273 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | </select> |
| 331 | 331 | </td> |
| 332 | 332 | <td class="labelcell">Timeout:</td> |
| 333 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 333 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 334 | 334 | <td></td> |
| 335 | 335 | <td></td> |
| 336 | 336 | </tr> |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | */ |
| 203 | 203 | public static function xmlrpc_debugmsg($msg) |
| 204 | 204 | { |
| 205 | - static::$_xmlrpc_debuginfo .= $msg . "\n"; |
|
| 205 | + static::$_xmlrpc_debuginfo .= $msg."\n"; |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | */ |
| 214 | 214 | public static function error_occurred($msg) |
| 215 | 215 | { |
| 216 | - static::$_xmlrpcs_occurred_errors .= $msg . "\n"; |
|
| 216 | + static::$_xmlrpcs_occurred_errors .= $msg."\n"; |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | /** |
@@ -234,10 +234,10 @@ discard block |
||
| 234 | 234 | // user debug info should be encoded by the end user using the INTERNAL_ENCODING |
| 235 | 235 | $out = ''; |
| 236 | 236 | if ($this->debug_info != '') { |
| 237 | - $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n" . base64_encode($this->debug_info) . "\n-->\n"; |
|
| 237 | + $out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n"; |
|
| 238 | 238 | } |
| 239 | 239 | if (static::$_xmlrpc_debuginfo != '') { |
| 240 | - $out .= "<!-- DEBUG INFO:\n" . $this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "\n-->\n"; |
|
| 240 | + $out .= "<!-- DEBUG INFO:\n".$this->getCharsetEncoder()->encodeEntities(str_replace('--', '_-', static::$_xmlrpc_debuginfo), PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."\n-->\n"; |
|
| 241 | 241 | // NB: a better solution MIGHT be to use CDATA, but we need to insert it |
| 242 | 242 | // into return payload AFTER the beginning tag |
| 243 | 243 | //$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', static::$_xmlrpc_debuginfo) . "\n]]>\n"; |
@@ -266,8 +266,8 @@ discard block |
||
| 266 | 266 | $this->debug_info = ''; |
| 267 | 267 | |
| 268 | 268 | // Save what we received, before parsing it |
| 269 | - if ($this->debug > 1) { |
|
| 270 | - $this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++"); |
|
| 269 | + if ($this->debug>1) { |
|
| 270 | + $this->debugmsg("+++GOT+++\n".$data."\n+++END+++"); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | $r = $this->parseRequestHeaders($data, $reqCharset, $respCharset, $respEncoding); |
@@ -281,21 +281,21 @@ discard block |
||
| 281 | 281 | $r->raw_data = $rawData; |
| 282 | 282 | } |
| 283 | 283 | |
| 284 | - if ($this->debug > 2 && static::$_xmlrpcs_occurred_errors != '') { |
|
| 285 | - $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" . |
|
| 286 | - static::$_xmlrpcs_occurred_errors . "+++END+++"); |
|
| 284 | + if ($this->debug>2 && static::$_xmlrpcs_occurred_errors != '') { |
|
| 285 | + $this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n". |
|
| 286 | + static::$_xmlrpcs_occurred_errors."+++END+++"); |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | $payload = $this->xml_header($respCharset); |
| 290 | - if ($this->debug > 0) { |
|
| 291 | - $payload = $payload . $this->serializeDebug($respCharset); |
|
| 290 | + if ($this->debug>0) { |
|
| 291 | + $payload = $payload.$this->serializeDebug($respCharset); |
|
| 292 | 292 | } |
| 293 | 293 | |
| 294 | 294 | // Do not create response serialization if it has already happened. Helps building json magic |
| 295 | 295 | if (empty($r->payload)) { |
| 296 | 296 | $r->serialize($respCharset); |
| 297 | 297 | } |
| 298 | - $payload = $payload . $r->payload; |
|
| 298 | + $payload = $payload.$r->payload; |
|
| 299 | 299 | |
| 300 | 300 | if ($returnPayload) { |
| 301 | 301 | return $payload; |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | // if we get a warning/error that has output some text before here, then we cannot |
| 305 | 305 | // add a new header. We cannot say we are sending xml, either... |
| 306 | 306 | if (!headers_sent()) { |
| 307 | - header('Content-Type: ' . $r->content_type); |
|
| 307 | + header('Content-Type: '.$r->content_type); |
|
| 308 | 308 | // we do not know if client actually told us an accepted charset, but if it did we have to tell it what we did |
| 309 | 309 | header("Vary: Accept-Charset"); |
| 310 | 310 | |
@@ -330,10 +330,10 @@ discard block |
||
| 330 | 330 | // Note that Apache/mod_php will add (and even alter!) the Content-Length header on its own, but only for |
| 331 | 331 | // responses up to 8000 bytes |
| 332 | 332 | if ($phpNoSelfCompress) { |
| 333 | - header('Content-Length: ' . (int)strlen($payload)); |
|
| 333 | + header('Content-Length: '.(int) strlen($payload)); |
|
| 334 | 334 | } |
| 335 | 335 | } else { |
| 336 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 336 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages'); |
|
| 337 | 337 | } |
| 338 | 338 | |
| 339 | 339 | print $payload; |
@@ -388,9 +388,9 @@ discard block |
||
| 388 | 388 | $numParams = count($in); |
| 389 | 389 | } |
| 390 | 390 | foreach ($sigs as $curSig) { |
| 391 | - if (count($curSig) == $numParams + 1) { |
|
| 391 | + if (count($curSig) == $numParams+1) { |
|
| 392 | 392 | $itsOK = 1; |
| 393 | - for ($n = 0; $n < $numParams; $n++) { |
|
| 393 | + for ($n = 0; $n<$numParams; $n++) { |
|
| 394 | 394 | if (is_object($in)) { |
| 395 | 395 | $p = $in->getParam($n); |
| 396 | 396 | if ($p->kindOf() == 'scalar') { |
@@ -403,10 +403,10 @@ discard block |
||
| 403 | 403 | } |
| 404 | 404 | |
| 405 | 405 | // param index is $n+1, as first member of sig is return type |
| 406 | - if ($pt != $curSig[$n + 1] && $curSig[$n + 1] != Value::$xmlrpcValue) { |
|
| 406 | + if ($pt != $curSig[$n+1] && $curSig[$n+1] != Value::$xmlrpcValue) { |
|
| 407 | 407 | $itsOK = 0; |
| 408 | - $pno = $n + 1; |
|
| 409 | - $wanted = $curSig[$n + 1]; |
|
| 408 | + $pno = $n+1; |
|
| 409 | + $wanted = $curSig[$n+1]; |
|
| 410 | 410 | $got = $pt; |
| 411 | 411 | break; |
| 412 | 412 | } |
@@ -433,10 +433,10 @@ discard block |
||
| 433 | 433 | // check if $_SERVER is populated: it might have been disabled via ini file |
| 434 | 434 | // (this is true even when in CLI mode) |
| 435 | 435 | if (count($_SERVER) == 0) { |
| 436 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': cannot parse request headers as $_SERVER is not populated'); |
|
| 436 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated'); |
|
| 437 | 437 | } |
| 438 | 438 | |
| 439 | - if ($this->debug > 1) { |
|
| 439 | + if ($this->debug>1) { |
|
| 440 | 440 | if (function_exists('getallheaders')) { |
| 441 | 441 | $this->debugmsg(''); // empty line |
| 442 | 442 | foreach (getallheaders() as $name => $val) { |
@@ -460,13 +460,13 @@ discard block |
||
| 460 | 460 | if (function_exists('gzinflate') && in_array($contentEncoding, $this->accepted_compression)) { |
| 461 | 461 | if ($contentEncoding == 'deflate' && $degzdata = @gzuncompress($data)) { |
| 462 | 462 | $data = $degzdata; |
| 463 | - if ($this->debug > 1) { |
|
| 464 | - $this->debugmsg("\n+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 463 | + if ($this->debug>1) { |
|
| 464 | + $this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 465 | 465 | } |
| 466 | 466 | } elseif ($contentEncoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) { |
| 467 | 467 | $data = $degzdata; |
| 468 | - if ($this->debug > 1) { |
|
| 469 | - $this->debugmsg("+++INFLATED REQUEST+++[" . strlen($data) . " chars]+++\n" . $data . "\n+++END+++"); |
|
| 468 | + if ($this->debug>1) { |
|
| 469 | + $this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++"); |
|
| 470 | 470 | } |
| 471 | 471 | } else { |
| 472 | 472 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_decompress_fail'], |
@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | if ($reqEncoding == 'ISO-8859-1') { |
| 561 | 561 | $data = utf8_encode($data); |
| 562 | 562 | } else { |
| 563 | - $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $reqEncoding); |
|
| 563 | + $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$reqEncoding); |
|
| 564 | 564 | } |
| 565 | 565 | } |
| 566 | 566 | } |
@@ -579,18 +579,18 @@ discard block |
||
| 579 | 579 | |
| 580 | 580 | $xmlRpcParser = $this->getParser(); |
| 581 | 581 | $xmlRpcParser->parse($data, $this->functions_parameters_type, XMLParser::ACCEPT_REQUEST, $options); |
| 582 | - if ($xmlRpcParser->_xh['isf'] > 2) { |
|
| 582 | + if ($xmlRpcParser->_xh['isf']>2) { |
|
| 583 | 583 | // (BC) we return XML error as a faultCode |
| 584 | 584 | preg_match('/^XML error ([0-9]+)/', $xmlRpcParser->_xh['isf_reason'], $matches); |
| 585 | 585 | $r = new Response( |
| 586 | 586 | 0, |
| 587 | - PhpXmlRpc::$xmlrpcerrxml + (int)$matches[1], |
|
| 587 | + PhpXmlRpc::$xmlrpcerrxml+(int) $matches[1], |
|
| 588 | 588 | $xmlRpcParser->_xh['isf_reason']); |
| 589 | 589 | } elseif ($xmlRpcParser->_xh['isf']) { |
| 590 | 590 | $r = new Response( |
| 591 | 591 | 0, |
| 592 | 592 | PhpXmlRpc::$xmlrpcerr['invalid_request'], |
| 593 | - PhpXmlRpc::$xmlrpcstr['invalid_request'] . ' ' . $xmlRpcParser->_xh['isf_reason']); |
|
| 593 | + PhpXmlRpc::$xmlrpcstr['invalid_request'].' '.$xmlRpcParser->_xh['isf_reason']); |
|
| 594 | 594 | } else { |
| 595 | 595 | // small layering violation in favor of speed and memory usage: |
| 596 | 596 | // we should allow the 'execute' method handle this, but in the |
@@ -601,20 +601,20 @@ discard block |
||
| 601 | 601 | ($this->dmap[$xmlRpcParser->_xh['method']]['parameters_type'] != 'xmlrpcvals') |
| 602 | 602 | ) |
| 603 | 603 | ) { |
| 604 | - if ($this->debug > 1) { |
|
| 605 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($xmlRpcParser->_xh['params'], true) . "\n+++END+++"); |
|
| 604 | + if ($this->debug>1) { |
|
| 605 | + $this->debugmsg("\n+++PARSED+++\n".var_export($xmlRpcParser->_xh['params'], true)."\n+++END+++"); |
|
| 606 | 606 | } |
| 607 | 607 | $r = $this->execute($xmlRpcParser->_xh['method'], $xmlRpcParser->_xh['params'], $xmlRpcParser->_xh['pt']); |
| 608 | 608 | } else { |
| 609 | 609 | // build a Request object with data parsed from xml |
| 610 | 610 | $req = new Request($xmlRpcParser->_xh['method']); |
| 611 | 611 | // now add parameters in |
| 612 | - for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) { |
|
| 612 | + for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) { |
|
| 613 | 613 | $req->addParam($xmlRpcParser->_xh['params'][$i]); |
| 614 | 614 | } |
| 615 | 615 | |
| 616 | - if ($this->debug > 1) { |
|
| 617 | - $this->debugmsg("\n+++PARSED+++\n" . var_export($req, true) . "\n+++END+++"); |
|
| 616 | + if ($this->debug>1) { |
|
| 617 | + $this->debugmsg("\n+++PARSED+++\n".var_export($req, true)."\n+++END+++"); |
|
| 618 | 618 | } |
| 619 | 619 | $r = $this->execute($req); |
| 620 | 620 | } |
@@ -667,7 +667,7 @@ discard block |
||
| 667 | 667 | return new Response( |
| 668 | 668 | 0, |
| 669 | 669 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 670 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": {$errStr}" |
|
| 670 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": {$errStr}" |
|
| 671 | 671 | ); |
| 672 | 672 | } |
| 673 | 673 | } |
@@ -680,7 +680,7 @@ discard block |
||
| 680 | 680 | |
| 681 | 681 | if (is_array($func)) { |
| 682 | 682 | if (is_object($func[0])) { |
| 683 | - $funcName = get_class($func[0]) . '->' . $func[1]; |
|
| 683 | + $funcName = get_class($func[0]).'->'.$func[1]; |
|
| 684 | 684 | } else { |
| 685 | 685 | $funcName = implode('::', $func); |
| 686 | 686 | } |
@@ -692,17 +692,17 @@ discard block |
||
| 692 | 692 | |
| 693 | 693 | // verify that function to be invoked is in fact callable |
| 694 | 694 | if (!is_callable($func)) { |
| 695 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler is not callable"); |
|
| 695 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler is not callable"); |
|
| 696 | 696 | return new Response( |
| 697 | 697 | 0, |
| 698 | 698 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 699 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": no function matches method" |
|
| 699 | + PhpXmlRpc::$xmlrpcstr['server_error'].": no function matches method" |
|
| 700 | 700 | ); |
| 701 | 701 | } |
| 702 | 702 | |
| 703 | 703 | // If debug level is 3, we should catch all errors generated during |
| 704 | 704 | // processing of user function, and log them as part of response |
| 705 | - if ($this->debug > 2) { |
|
| 705 | + if ($this->debug>2) { |
|
| 706 | 706 | self::$_xmlrpcs_prev_ehandler = set_error_handler(array('\PhpXmlRpc\Server', '_xmlrpcs_errorHandler')); |
| 707 | 707 | } |
| 708 | 708 | |
@@ -715,14 +715,14 @@ discard block |
||
| 715 | 715 | $r = call_user_func($func, $req); |
| 716 | 716 | } |
| 717 | 717 | if (!is_a($r, 'PhpXmlRpc\Response')) { |
| 718 | - $this->getLogger()->errorLog("XML-RPC: " . __METHOD__ . ": function '$funcName' registered as method handler does not return an xmlrpc response object but a " . gettype($r)); |
|
| 718 | + $this->getLogger()->errorLog("XML-RPC: ".__METHOD__.": function '$funcName' registered as method handler does not return an xmlrpc response object but a ".gettype($r)); |
|
| 719 | 719 | if (is_a($r, 'PhpXmlRpc\Value')) { |
| 720 | 720 | $r = new Response($r); |
| 721 | 721 | } else { |
| 722 | 722 | $r = new Response( |
| 723 | 723 | 0, |
| 724 | 724 | PhpXmlRpc::$xmlrpcerr['server_error'], |
| 725 | - PhpXmlRpc::$xmlrpcstr['server_error'] . ": function does not return xmlrpc response object" |
|
| 725 | + PhpXmlRpc::$xmlrpcstr['server_error'].": function does not return xmlrpc response object" |
|
| 726 | 726 | ); |
| 727 | 727 | } |
| 728 | 728 | } |
@@ -738,7 +738,7 @@ discard block |
||
| 738 | 738 | // mimic EPI behaviour: if we get an array that looks like an error, make it |
| 739 | 739 | // an error response |
| 740 | 740 | if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r)) { |
| 741 | - $r = new Response(0, (integer)$r['faultCode'], (string)$r['faultString']); |
|
| 741 | + $r = new Response(0, (integer) $r['faultCode'], (string) $r['faultString']); |
|
| 742 | 742 | } else { |
| 743 | 743 | // functions using EPI api should NOT return resp objects, |
| 744 | 744 | // so make sure we encode the return type correctly |
@@ -761,7 +761,7 @@ discard block |
||
| 761 | 761 | // proper error-response |
| 762 | 762 | switch ($this->exception_handling) { |
| 763 | 763 | case 2: |
| 764 | - if ($this->debug > 2) { |
|
| 764 | + if ($this->debug>2) { |
|
| 765 | 765 | if (self::$_xmlrpcs_prev_ehandler) { |
| 766 | 766 | set_error_handler(self::$_xmlrpcs_prev_ehandler); |
| 767 | 767 | } else { |
@@ -776,7 +776,7 @@ discard block |
||
| 776 | 776 | $r = new Response(0, PhpXmlRpc::$xmlrpcerr['server_error'], PhpXmlRpc::$xmlrpcstr['server_error']); |
| 777 | 777 | } |
| 778 | 778 | } |
| 779 | - if ($this->debug > 2) { |
|
| 779 | + if ($this->debug>2) { |
|
| 780 | 780 | // note: restore the error handler we found before calling the |
| 781 | 781 | // user func, even if it has been changed inside the func itself |
| 782 | 782 | if (self::$_xmlrpcs_prev_ehandler) { |
@@ -796,7 +796,7 @@ discard block |
||
| 796 | 796 | */ |
| 797 | 797 | protected function debugmsg($string) |
| 798 | 798 | { |
| 799 | - $this->debug_info .= $string . "\n"; |
|
| 799 | + $this->debug_info .= $string."\n"; |
|
| 800 | 800 | } |
| 801 | 801 | |
| 802 | 802 | /** |
@@ -807,9 +807,9 @@ discard block |
||
| 807 | 807 | protected function xml_header($charsetEncoding = '') |
| 808 | 808 | { |
| 809 | 809 | if ($charsetEncoding != '') { |
| 810 | - return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?" . ">\n"; |
|
| 810 | + return "<?xml version=\"1.0\" encoding=\"$charsetEncoding\"?".">\n"; |
|
| 811 | 811 | } else { |
| 812 | - return "<?xml version=\"1.0\"?" . ">\n"; |
|
| 812 | + return "<?xml version=\"1.0\"?".">\n"; |
|
| 813 | 813 | } |
| 814 | 814 | } |
| 815 | 815 | |
@@ -1087,7 +1087,7 @@ discard block |
||
| 1087 | 1087 | $i++; // for error message, we count params from 1 |
| 1088 | 1088 | return static::_xmlrpcs_multicall_error(new Response(0, |
| 1089 | 1089 | PhpXmlRpc::$xmlrpcerr['incorrect_params'], |
| 1090 | - PhpXmlRpc::$xmlrpcstr['incorrect_params'] . ": probable xml error in param " . $i)); |
|
| 1090 | + PhpXmlRpc::$xmlrpcstr['incorrect_params'].": probable xml error in param ".$i)); |
|
| 1091 | 1091 | } |
| 1092 | 1092 | } |
| 1093 | 1093 | |
@@ -1170,7 +1170,7 @@ discard block |
||
| 1170 | 1170 | } |
| 1171 | 1171 | } else { |
| 1172 | 1172 | $numCalls = count($req); |
| 1173 | - for ($i = 0; $i < $numCalls; $i++) { |
|
| 1173 | + for ($i = 0; $i<$numCalls; $i++) { |
|
| 1174 | 1174 | $result[$i] = static::_xmlrpcs_multicall_do_call_phpvals($server, $req[$i]); |
| 1175 | 1175 | } |
| 1176 | 1176 | } |
