gggeek /
phpxmlrpc
@@ -155,35 +155,35 @@ discard block |
||
| 155 | 155 | public function serialize($charsetEncoding = '') |
| 156 | 156 | { |
| 157 | 157 | if ($charsetEncoding != '') { |
| 158 | - $this->content_type = 'text/xml; charset=' . $charsetEncoding; |
|
| 158 | + $this->content_type = 'text/xml; charset='.$charsetEncoding; |
|
| 159 | 159 | } else { |
| 160 | 160 | $this->content_type = 'text/xml'; |
| 161 | 161 | } |
| 162 | 162 | if (PhpXmlRpc::$xmlrpc_null_apache_encoding) { |
| 163 | - $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n"; |
|
| 163 | + $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n"; |
|
| 164 | 164 | } else { |
| 165 | 165 | $result = "<methodResponse>\n"; |
| 166 | 166 | } |
| 167 | 167 | if ($this->errno) { |
| 168 | 168 | // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars |
| 169 | - $result .= "<fault>\n" . |
|
| 170 | - "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno . |
|
| 171 | - "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" . |
|
| 172 | - $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" . |
|
| 169 | + $result .= "<fault>\n". |
|
| 170 | + "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno. |
|
| 171 | + "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>". |
|
| 172 | + $this->getCharsetEncoder()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n". |
|
| 173 | 173 | "</struct>\n</value>\n</fault>"; |
| 174 | 174 | } else { |
| 175 | 175 | if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) { |
| 176 | 176 | if (is_string($this->val) && $this->valtyp == 'xml') { |
| 177 | - $result .= "<params>\n<param>\n" . |
|
| 178 | - $this->val . |
|
| 177 | + $result .= "<params>\n<param>\n". |
|
| 178 | + $this->val. |
|
| 179 | 179 | "</param>\n</params>"; |
| 180 | 180 | } else { |
| 181 | 181 | /// @todo try to build something serializable using the Encoder... |
| 182 | 182 | throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values'); |
| 183 | 183 | } |
| 184 | 184 | } else { |
| 185 | - $result .= "<params>\n<param>\n" . |
|
| 186 | - $this->val->serialize($charsetEncoding) . |
|
| 185 | + $result .= "<params>\n<param>\n". |
|
| 186 | + $this->val->serialize($charsetEncoding). |
|
| 187 | 187 | "</param>\n</params>"; |
| 188 | 188 | } |
| 189 | 189 | } |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | return $this->httpResponse['raw_data']; |
| 209 | 209 | default: |
| 210 | 210 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 211 | - trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 211 | + trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 212 | 212 | return null; |
| 213 | 213 | } |
| 214 | 214 | } |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | break; |
| 230 | 230 | default: |
| 231 | 231 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 232 | - trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 232 | + trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 233 | 233 | } |
| 234 | 234 | } |
| 235 | 235 | |
@@ -263,7 +263,7 @@ discard block |
||
| 263 | 263 | break; |
| 264 | 264 | default: |
| 265 | 265 | $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
| 266 | - trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING); |
|
| 266 | + trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING); |
|
| 267 | 267 | } |
| 268 | 268 | } |
| 269 | 269 | } |
@@ -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,30 +33,30 @@ discard block |
||
| 33 | 33 | /// @const JSXMLRPC_PATH Path to the visual xml-rpc 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__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile |
|
| 40 | - __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger |
|
| 41 | - __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger |
|
| 42 | - __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 43 | - __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 44 | - __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 45 | - __DIR__ . '/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc) |
|
| 46 | - __DIR__ . '/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer |
|
| 47 | - __DIR__ . '/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm |
|
| 48 | - __DIR__ . '/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project |
|
| 39 | + __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile |
|
| 40 | + __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger |
|
| 41 | + __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger |
|
| 42 | + __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer |
|
| 43 | + __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm |
|
| 44 | + __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too |
|
| 45 | + __DIR__.'/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc) |
|
| 46 | + __DIR__.'/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer |
|
| 47 | + __DIR__.'/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm |
|
| 48 | + __DIR__.'/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project |
|
| 49 | 49 | ); |
| 50 | 50 | } |
| 51 | - foreach($editorpaths as $editorpath) { |
|
| 52 | - if (is_file(realpath($editorpath . 'visualeditor.html'))) { |
|
| 51 | + foreach ($editorpaths as $editorpath) { |
|
| 52 | + if (is_file(realpath($editorpath.'visualeditor.html'))) { |
|
| 53 | 53 | $haseditor = true; |
| 54 | 54 | break; |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | if ($haseditor) { |
| 58 | - $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
| 59 | - $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath); |
|
| 58 | + $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); |
|
| 59 | + $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath); |
|
| 60 | 60 | /// @todo for cases above 4 and up, look at $controllerRootUrl and check if the web root is not pointing directly |
| 61 | 61 | /// at this folder, as in that case the link to the visualeditor will not |
| 62 | 62 | /// work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | function activateeditor() { |
| 236 | - var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\", "\\'"), $alt_payload); ?>'; |
|
| 236 | + var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>'; |
|
| 237 | 237 | if (document.frmaction.wstype.value == "1") |
| 238 | 238 | url += '&type=jsonrpc'; |
| 239 | 239 | var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1'); |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | JSON-RPC'; |
| 279 | 279 | } ?> |
| 280 | 280 | Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?> |
| 281 | -<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
| 281 | +<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. '.htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
| 282 | 282 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
| 283 | 283 | |
| 284 | 284 | <table id="serverblock"> |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | </select> |
| 340 | 340 | </td> |
| 341 | 341 | <td class="labelcell">Timeout:</td> |
| 342 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
| 342 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
| 343 | 343 | <td></td> |
| 344 | 344 | <td></td> |
| 345 | 345 | </tr> |
@@ -66,7 +66,12 @@ discard block |
||
| 66 | 66 | <html lang="en"> |
| 67 | 67 | <head> |
| 68 | 68 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 69 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
| 69 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 70 | + echo 'JSON-RPC'; |
|
| 71 | +} else { |
|
| 72 | + echo 'XML-RPC'; |
|
| 73 | +} |
|
| 74 | +?> Debugger</title> |
|
| 70 | 75 | <meta name="robots" content="index,nofollow"/> |
| 71 | 76 | <script type="text/javascript" language="Javascript"> |
| 72 | 77 | if (window.name != 'frmcontroller') |
@@ -266,19 +271,26 @@ discard block |
||
| 266 | 271 | </script> |
| 267 | 272 | </head> |
| 268 | 273 | <body |
| 269 | - onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) { |
|
| 274 | + onload="<?php if ($hasjsonrpcclient) { |
|
| 275 | + echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) { |
|
| 270 | 276 | echo ' document.frmaction.submit();'; |
| 277 | +} |
|
| 271 | 278 | } ?>"> |
| 272 | 279 | <h1>XML-RPC |
| 273 | 280 | <?php if ($hasjsonrpcclient) { |
| 274 | 281 | echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"'; |
| 275 | 282 | // q: does this if make sense at all? |
| 276 | - if (!class_exists('\PhpXmlRpc\Client')) echo ' disabled="disabled"'; |
|
| 283 | + if (!class_exists('\PhpXmlRpc\Client')) { |
|
| 284 | + echo ' disabled="disabled"'; |
|
| 285 | + } |
|
| 277 | 286 | echo ' /></form> / <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form> |
| 278 | 287 | JSON-RPC'; |
| 279 | 288 | } ?> |
| 280 | 289 | Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?> |
| 281 | -<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); ?>)</h3> |
|
| 290 | +<?php if (class_exists('\PhpXmlRpc\JsonRpc\PhpJsonRpc')) { |
|
| 291 | + echo ' and <a href="https://gggeek.github.io/phpxmlrpc-jsonrpc/">PHPJOSNRPC</a>, ver. ' . htmlspecialchars(\PhpXmlRpc\JsonRpc\PhpJsonRpc::$jsonrpcVersion); |
|
| 292 | +} |
|
| 293 | +?>)</h3> |
|
| 282 | 294 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
| 283 | 295 | |
| 284 | 296 | <table id="serverblock"> |
@@ -15,7 +15,12 @@ discard block |
||
| 15 | 15 | <html lang="en"> |
| 16 | 16 | <head> |
| 17 | 17 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
| 18 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title> |
|
| 18 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
| 19 | + echo 'JSON-RPC'; |
|
| 20 | +} else { |
|
| 21 | + echo 'XML-RPC'; |
|
| 22 | +} |
|
| 23 | +?> Debugger</title> |
|
| 19 | 24 | <meta name="robots" content="index,nofollow"/> |
| 20 | 25 | <style type="text/css"> |
| 21 | 26 | <!-- |
@@ -367,7 +372,9 @@ discard block |
||
| 367 | 372 | echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
| 368 | 373 | if ($x->count() > 1) { |
| 369 | 374 | foreach($x as $k => $y) { |
| 370 | - if ($k == 0) continue; |
|
| 375 | + if ($k == 0) { |
|
| 376 | + continue; |
|
| 377 | + } |
|
| 371 | 378 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 372 | 379 | if ($wstype == 1) { |
| 373 | 380 | switch($y->scalarval()) { |
@@ -78,13 +78,13 @@ discard block |
||
| 78 | 78 | <body> |
| 79 | 79 | <?php |
| 80 | 80 | |
| 81 | -include __DIR__ . '/common.php'; |
|
| 81 | +include __DIR__.'/common.php'; |
|
| 82 | 82 | |
| 83 | 83 | if ($action) { |
| 84 | 84 | |
| 85 | 85 | // avoid php hanging when using the builtin webserver and sending requests to itself |
| 86 | 86 | $skip = false; |
| 87 | - if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) { |
|
| 87 | + if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) { |
|
| 88 | 88 | $localHost = explode(':', $_SERVER['HTTP_HOST']); |
| 89 | 89 | /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters, |
| 90 | 90 | /// and that proxy is us |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | if (!$skip) { |
| 98 | 98 | // make sure the script waits long enough for the call to complete... |
| 99 | 99 | if ($timeout) { |
| 100 | - set_time_limit($timeout + 10); |
|
| 100 | + set_time_limit($timeout+10); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | if ($wstype == 1) { |
@@ -118,13 +118,13 @@ discard block |
||
| 118 | 118 | $server = "$host$path"; |
| 119 | 119 | } |
| 120 | 120 | if ($protocol == 2 || $protocol == 3) { |
| 121 | - $server = 'https://' . $server; |
|
| 121 | + $server = 'https://'.$server; |
|
| 122 | 122 | } else { |
| 123 | - $server = 'http://' . $server; |
|
| 123 | + $server = 'http://'.$server; |
|
| 124 | 124 | } |
| 125 | 125 | if ($proxy != '') { |
| 126 | 126 | $pproxy = explode(':', $proxy); |
| 127 | - if (count($pproxy) > 1) { |
|
| 127 | + if (count($pproxy)>1) { |
|
| 128 | 128 | $pport = $pproxy[1]; |
| 129 | 129 | } else { |
| 130 | 130 | $pport = 8080; |
@@ -199,9 +199,9 @@ discard block |
||
| 199 | 199 | case 'wrap': |
| 200 | 200 | $msg[0] = new $requestClass('system.methodHelp', array(), $id); |
| 201 | 201 | $msg[0]->addparam(new PhpXmlRpc\Value($method)); |
| 202 | - $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1); |
|
| 202 | + $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1); |
|
| 203 | 203 | $msg[1]->addparam(new PhpXmlRpc\Value($method)); |
| 204 | - $actionname = 'Description of method "' . $method . '"'; |
|
| 204 | + $actionname = 'Description of method "'.$method.'"'; |
|
| 205 | 205 | break; |
| 206 | 206 | case 'list': |
| 207 | 207 | $msg[0] = new $requestClass('system.listMethods', array(), $id); |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | $msg[0] = new $requestClass($method, array(), $id); |
| 215 | 215 | // hack! build payload by hand |
| 216 | 216 | if ($wstype == 1) { |
| 217 | - $msg[0]->payload = "{\n" . |
|
| 218 | - '"method": "' . $method . "\",\n\"params\": [" . |
|
| 219 | - $payload . |
|
| 217 | + $msg[0]->payload = "{\n". |
|
| 218 | + '"method": "'.$method."\",\n\"params\": [". |
|
| 219 | + $payload. |
|
| 220 | 220 | "\n],\n\"id\": "; |
| 221 | 221 | // fix: if user gave an empty string, use NULL, or we'll break json syntax |
| 222 | 222 | if ($id == "") { |
@@ -229,21 +229,21 @@ discard block |
||
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | } else { |
| 232 | - $msg[0]->payload = $msg[0]->xml_header($inputcharset) . |
|
| 233 | - '<methodName>' . $method . "</methodName>\n<params>" . |
|
| 234 | - $payload . |
|
| 235 | - "</params>\n" . $msg[0]->xml_footer(); |
|
| 232 | + $msg[0]->payload = $msg[0]->xml_header($inputcharset). |
|
| 233 | + '<methodName>'.$method."</methodName>\n<params>". |
|
| 234 | + $payload. |
|
| 235 | + "</params>\n".$msg[0]->xml_footer(); |
|
| 236 | 236 | } |
| 237 | - $actionname = 'Execution of method ' . $method; |
|
| 237 | + $actionname = 'Execution of method '.$method; |
|
| 238 | 238 | break; |
| 239 | 239 | default: // give a warning |
| 240 | - $actionname = '[ERROR: unknown action] "' . $action . '"'; |
|
| 240 | + $actionname = '[ERROR: unknown action] "'.$action.'"'; |
|
| 241 | 241 | } |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | // Before calling execute, echo out brief description of action taken + date and time ??? |
| 245 | 245 | // this gives good user feedback for long-running methods... |
| 246 | - echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n"; |
|
| 246 | + echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n"; |
|
| 247 | 247 | flush(); |
| 248 | 248 | |
| 249 | 249 | $response = null; |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | break; |
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | - $time = microtime(true) - $time; |
|
| 263 | + $time = microtime(true)-$time; |
|
| 264 | 264 | if ($debug) { |
| 265 | 265 | echo "</div>\n"; |
| 266 | 266 | } |
@@ -270,8 +270,8 @@ discard block |
||
| 270 | 270 | // call failed! echo out error msg! |
| 271 | 271 | //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>'; |
| 272 | 272 | echo "<h3>$protoName call FAILED!</h3>\n"; |
| 273 | - echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 274 | - "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n"; |
|
| 273 | + echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 274 | + "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n"; |
|
| 275 | 275 | echo(date("d/M/Y:H:i:s\n")); |
| 276 | 276 | } else { |
| 277 | 277 | // call succeeded: parse results |
@@ -287,36 +287,36 @@ discard block |
||
| 287 | 287 | $max = $v->count(); |
| 288 | 288 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 289 | 289 | echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n"; |
| 290 | - foreach($v as $i => $rec) { |
|
| 290 | + foreach ($v as $i => $rec) { |
|
| 291 | 291 | if ($i % 2) { |
| 292 | 292 | $class = ' class="oddrow"'; |
| 293 | 293 | } else { |
| 294 | 294 | $class = ' class="evenrow"'; |
| 295 | 295 | } |
| 296 | - echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" . |
|
| 297 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 298 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 299 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 300 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 301 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 302 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 303 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 304 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 305 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 306 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 307 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 308 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 309 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 310 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 311 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 312 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 313 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 314 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 315 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 316 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" . |
|
| 317 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 318 | - "<input type=\"hidden\" name=\"action\" value=\"describe\" />" . |
|
| 319 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 296 | + echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">". |
|
| 297 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 298 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 299 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 300 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 301 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 302 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 303 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 304 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 305 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 306 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 307 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 308 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 309 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 310 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 311 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 312 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 313 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 314 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 315 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 316 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />". |
|
| 317 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 318 | + "<input type=\"hidden\" name=\"action\" value=\"describe\" />". |
|
| 319 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 320 | 320 | "<input type=\"submit\" value=\"Describe\" /></form></td>"); |
| 321 | 321 | //echo("</tr>\n"); |
| 322 | 322 | |
@@ -343,7 +343,7 @@ discard block |
||
| 343 | 343 | $r2 = $resp[1]->value(); |
| 344 | 344 | |
| 345 | 345 | echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; |
| 346 | - echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 346 | + echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th> </th><th> </th></tr>\n</thead>\n<tbody>\n"; |
|
| 347 | 347 | $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 348 | 348 | if ($desc == "") { |
| 349 | 349 | $desc = "-"; |
@@ -353,24 +353,24 @@ discard block |
||
| 353 | 353 | if ($r2->kindOf() != "array") { |
| 354 | 354 | echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\"> </td></tr>\n"; |
| 355 | 355 | } else { |
| 356 | - foreach($r2 as $i => $x) { |
|
| 356 | + foreach ($r2 as $i => $x) { |
|
| 357 | 357 | $payload = ""; |
| 358 | 358 | $alt_payload = ""; |
| 359 | - if ($i + 1 % 2) { |
|
| 359 | + if ($i+1 % 2) { |
|
| 360 | 360 | $class = ' class="oddrow"'; |
| 361 | 361 | } else { |
| 362 | 362 | $class = ' class="evenrow"'; |
| 363 | 363 | } |
| 364 | - echo "<tr><td$class>Signature " . ($i + 1) . "</td><td$class>"; |
|
| 364 | + echo "<tr><td$class>Signature ".($i+1)."</td><td$class>"; |
|
| 365 | 365 | if ($x->kindOf() == "array") { |
| 366 | 366 | $ret = $x[0]; |
| 367 | - echo "<code>OUT: " . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: ("; |
|
| 368 | - if ($x->count() > 1) { |
|
| 369 | - foreach($x as $k => $y) { |
|
| 367 | + echo "<code>OUT: ".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: ("; |
|
| 368 | + if ($x->count()>1) { |
|
| 369 | + foreach ($x as $k => $y) { |
|
| 370 | 370 | if ($k == 0) continue; |
| 371 | 371 | echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding); |
| 372 | 372 | if ($wstype == 1) { |
| 373 | - switch($y->scalarval()) { |
|
| 373 | + switch ($y->scalarval()) { |
|
| 374 | 374 | case 'string': |
| 375 | 375 | case 'dateTime.iso8601': |
| 376 | 376 | case 'base64': |
@@ -403,22 +403,22 @@ discard block |
||
| 403 | 403 | } else { |
| 404 | 404 | $type = $y->scalarval(); |
| 405 | 405 | $payload .= '<param><value>'; |
| 406 | - switch($type) { |
|
| 406 | + switch ($type) { |
|
| 407 | 407 | case 'undefined': |
| 408 | 408 | break; |
| 409 | 409 | case 'null'; |
| 410 | 410 | $type = 'nil'; |
| 411 | 411 | // fall thru intentionally |
| 412 | 412 | default: |
| 413 | - $payload .= '<' . |
|
| 414 | - htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 415 | - '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . |
|
| 413 | + $payload .= '<'. |
|
| 414 | + htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 415 | + '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding). |
|
| 416 | 416 | '>'; |
| 417 | 417 | } |
| 418 | 418 | $payload .= "</value></param>\n"; |
| 419 | 419 | } |
| 420 | 420 | $alt_payload .= $y->scalarval(); |
| 421 | - if ($k < $x->count() - 1) { |
|
| 421 | + if ($k<$x->count()-1) { |
|
| 422 | 422 | $alt_payload .= ';'; |
| 423 | 423 | if ($wstype == 1) { |
| 424 | 424 | $payload .= ', '; |
@@ -434,63 +434,63 @@ discard block |
||
| 434 | 434 | echo '</td>'; |
| 435 | 435 | // button to test this method |
| 436 | 436 | //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>"; |
| 437 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 438 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 439 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 440 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 441 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 442 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 443 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 444 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 445 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 446 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 447 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 448 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 449 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 450 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 451 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 452 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 453 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 454 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 455 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 456 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 457 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 458 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 459 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 460 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 437 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 438 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 439 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 440 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 441 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 442 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 443 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 444 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 445 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 446 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 447 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 448 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 449 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 450 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 451 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 452 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 453 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 454 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 455 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 456 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 457 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 458 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 459 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 460 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 461 | 461 | "<input type=\"hidden\" name=\"action\" value=\"execute\" />"; |
| 462 | 462 | //if ($wstype != 1) { |
| 463 | 463 | echo "<input type=\"submit\" value=\"Load method synopsis\" />"; |
| 464 | 464 | //} |
| 465 | 465 | echo "</form></td>\n"; |
| 466 | 466 | |
| 467 | - echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" . |
|
| 468 | - "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 469 | - "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 470 | - "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 471 | - "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 472 | - "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" . |
|
| 473 | - "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 474 | - "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 475 | - "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" . |
|
| 476 | - "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" . |
|
| 477 | - "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" . |
|
| 478 | - "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 479 | - "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 480 | - "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 481 | - "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 482 | - "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" . |
|
| 483 | - "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" . |
|
| 484 | - "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 485 | - "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" . |
|
| 486 | - "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 487 | - "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 488 | - "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" . |
|
| 489 | - "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 490 | - "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" . |
|
| 491 | - "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" . |
|
| 492 | - "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" . |
|
| 493 | - "<input type=\"hidden\" name=\"run\" value=\"now\" />" . |
|
| 467 | + echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">". |
|
| 468 | + "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />". |
|
| 469 | + "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />". |
|
| 470 | + "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />". |
|
| 471 | + "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />". |
|
| 472 | + "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />". |
|
| 473 | + "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />". |
|
| 474 | + "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />". |
|
| 475 | + "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />". |
|
| 476 | + "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />". |
|
| 477 | + "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />". |
|
| 478 | + "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />". |
|
| 479 | + "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />". |
|
| 480 | + "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />". |
|
| 481 | + "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />". |
|
| 482 | + "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />". |
|
| 483 | + "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />". |
|
| 484 | + "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />". |
|
| 485 | + "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />". |
|
| 486 | + "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />". |
|
| 487 | + "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />". |
|
| 488 | + "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />". |
|
| 489 | + "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 490 | + "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />". |
|
| 491 | + "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />". |
|
| 492 | + "<input type=\"hidden\" name=\"action\" value=\"wrap\" />". |
|
| 493 | + "<input type=\"hidden\" name=\"run\" value=\"now\" />". |
|
| 494 | 494 | "<input type=\"submit\" value=\"Generate method call stub code\" />"; |
| 495 | 495 | echo "</form></td></tr>\n"; |
| 496 | 496 | } |
@@ -502,14 +502,14 @@ discard block |
||
| 502 | 502 | case 'wrap': |
| 503 | 503 | $r1 = $resp[0]->value(); |
| 504 | 504 | $r2 = $resp[1]->value(); |
| 505 | - if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) { |
|
| 505 | + if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) { |
|
| 506 | 506 | echo "Error: signature unknown\n"; |
| 507 | 507 | } else { |
| 508 | 508 | $mdesc = $r1->scalarval(); |
| 509 | 509 | $encoder = new PhpXmlRpc\Encoder(); |
| 510 | 510 | $msig = $encoder->decode($r2); |
| 511 | 511 | $msig = $msig[$methodsig]; |
| 512 | - $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) ); |
|
| 512 | + $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : ''))); |
|
| 513 | 513 | if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression && |
| 514 | 514 | $clientcookies == '') { |
| 515 | 515 | $opts = 1; // simple client copy in stub code |
@@ -530,12 +530,12 @@ discard block |
||
| 530 | 530 | $client, |
| 531 | 531 | $method, |
| 532 | 532 | array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true), |
| 533 | - str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc |
|
| 533 | + str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc |
|
| 534 | 534 | ); |
| 535 | 535 | //if ($code) |
| 536 | 536 | //{ |
| 537 | 537 | echo "<div id=\"phpcode\">\n"; |
| 538 | - highlight_string("<?php\n" . $code['docstring'] . $code['source']); |
|
| 538 | + highlight_string("<?php\n".$code['docstring'].$code['source']); |
|
| 539 | 539 | echo "\n</div>"; |
| 540 | 540 | //} |
| 541 | 541 | //else |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | break; |
| 547 | 547 | |
| 548 | 548 | case 'execute': |
| 549 | - echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>'; |
|
| 549 | + echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>'; |
|
| 550 | 550 | break; |
| 551 | 551 | |
| 552 | 552 | default: // give a warning |
@@ -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() |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | $id = ''; |
| 87 | 87 | if (isset($_GET['action'])) { |
| 88 | 88 | if (isset($_GET['wstype']) && ($_GET['wstype'] == '1' || $_GET['wstype'] == '0')) { |
| 89 | - $wstype = (int)$_GET['wstype']; |
|
| 89 | + $wstype = (int) $_GET['wstype']; |
|
| 90 | 90 | if ($wstype === 1 && !$hasjsonrpcclient) { |
| 91 | 91 | $wstype = 0; |
| 92 | 92 | } |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xml-rpc error... |
| 98 | 98 | if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2' || $_GET['protocol'] == '3' |
| 99 | 99 | || $_GET['protocol'] == '4')) { |
| 100 | - $protocol = (int)$_GET['protocol']; |
|
| 100 | + $protocol = (int) $_GET['protocol']; |
|
| 101 | 101 | } |
| 102 | 102 | if (strpos($host, 'http://') === 0) { |
| 103 | 103 | // NB: if protocol is https or h2, it will override http:// |
@@ -109,18 +109,18 @@ discard block |
||
| 109 | 109 | $protocol = 2; |
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | - $port = isset($_GET['port']) ? (int)$_GET['port'] : ''; |
|
| 112 | + $port = isset($_GET['port']) ? (int) $_GET['port'] : ''; |
|
| 113 | 113 | if ($port === 0) { |
| 114 | 114 | $port = ''; |
| 115 | 115 | } |
| 116 | 116 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
| 117 | 117 | // in case user forgot initial '/' in xml-rpc server path, add it back |
| 118 | 118 | if ($path && ($path[0]) != '/') { |
| 119 | - $path = '/' . $path; |
|
| 119 | + $path = '/'.$path; |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
| 123 | - $debug = (int)$_GET['debug']; |
|
| 123 | + $debug = (int) $_GET['debug']; |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0; |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | /// @todo what about an https proxy? |
| 138 | 138 | $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : ''; |
| 139 | 139 | $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : ''; |
| 140 | - $timeout = isset($_GET['timeout']) ? (int)$_GET['timeout'] : 0; |
|
| 140 | + $timeout = isset($_GET['timeout']) ? (int) $_GET['timeout'] : 0; |
|
| 141 | 141 | $action = $_GET['action']; |
| 142 | 142 | |
| 143 | 143 | $method = isset($_GET['method']) ? $_GET['method'] : ''; |
@@ -152,15 +152,15 @@ discard block |
||
| 152 | 152 | $username = isset($_GET['username']) ? $_GET['username'] : ''; |
| 153 | 153 | $password = isset($_GET['password']) ? $_GET['password'] : ''; |
| 154 | 154 | |
| 155 | - $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int)$_GET['authtype'] : 1; |
|
| 155 | + $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int) $_GET['authtype'] : 1; |
|
| 156 | 156 | |
| 157 | 157 | if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) { |
| 158 | - (int)$requestcompression = $_GET['requestcompression']; |
|
| 158 | + (int) $requestcompression = $_GET['requestcompression']; |
|
| 159 | 159 | } else { |
| 160 | 160 | $requestcompression = 0; |
| 161 | 161 | } |
| 162 | 162 | if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) { |
| 163 | - $responsecompression = (int)$_GET['responsecompression']; |
|
| 163 | + $responsecompression = (int) $_GET['responsecompression']; |
|
| 164 | 164 | } else { |
| 165 | 165 | $responsecompression = 0; |
| 166 | 166 | } |
@@ -605,8 +605,9 @@ |
||
| 605 | 605 | } |
| 606 | 606 | foreach ($parsVariations as $i => $pars) { |
| 607 | 607 | $innerCode .= " if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
| 608 | - if ($i < (count($parsVariations) - 1)) |
|
| 609 | - $innerCode .= " else\n"; |
|
| 608 | + if ($i < (count($parsVariations) - 1)) { |
|
| 609 | + $innerCode .= " else\n"; |
|
| 610 | + } |
|
| 610 | 611 | } |
| 611 | 612 | $innerCode .= " if (is_a(\$retVal, '" . static::$namespace . "Response'))\n return \$retVal;\n else\n"; |
| 612 | 613 | /// q: why not do the same for int, float, bool, string? |
@@ -173,20 +173,20 @@ discard block |
||
| 173 | 173 | $callable = explode('::', $callable); |
| 174 | 174 | } |
| 175 | 175 | if (is_array($callable)) { |
| 176 | - if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 177 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong'); |
|
| 176 | + if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) { |
|
| 177 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong'); |
|
| 178 | 178 | return false; |
| 179 | 179 | } |
| 180 | 180 | if (is_string($callable[0])) { |
| 181 | 181 | $plainFuncName = implode('::', $callable); |
| 182 | 182 | } elseif (is_object($callable[0])) { |
| 183 | - $plainFuncName = get_class($callable[0]) . '->' . $callable[1]; |
|
| 183 | + $plainFuncName = get_class($callable[0]).'->'.$callable[1]; |
|
| 184 | 184 | } |
| 185 | 185 | $exists = method_exists($callable[0], $callable[1]); |
| 186 | 186 | } else if ($callable instanceof \Closure) { |
| 187 | 187 | // we do not support creating code which wraps closures, as php does not allow to serialize them |
| 188 | 188 | if (!$buildIt) { |
| 189 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code'); |
|
| 189 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code'); |
|
| 190 | 190 | return false; |
| 191 | 191 | } |
| 192 | 192 | |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | if (!$exists) { |
| 201 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName); |
|
| 201 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName); |
|
| 202 | 202 | return false; |
| 203 | 203 | } |
| 204 | 204 | |
@@ -242,23 +242,23 @@ discard block |
||
| 242 | 242 | if (is_array($callable)) { |
| 243 | 243 | $func = new \ReflectionMethod($callable[0], $callable[1]); |
| 244 | 244 | if ($func->isPrivate()) { |
| 245 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName); |
|
| 245 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName); |
|
| 246 | 246 | return false; |
| 247 | 247 | } |
| 248 | 248 | if ($func->isProtected()) { |
| 249 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName); |
|
| 249 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName); |
|
| 250 | 250 | return false; |
| 251 | 251 | } |
| 252 | 252 | if ($func->isConstructor()) { |
| 253 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName); |
|
| 253 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName); |
|
| 254 | 254 | return false; |
| 255 | 255 | } |
| 256 | 256 | if ($func->isDestructor()) { |
| 257 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName); |
|
| 257 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName); |
|
| 258 | 258 | return false; |
| 259 | 259 | } |
| 260 | 260 | if ($func->isAbstract()) { |
| 261 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName); |
|
| 261 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName); |
|
| 262 | 262 | return false; |
| 263 | 263 | } |
| 264 | 264 | /// @todo add more checks for static vs. nonstatic? |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | if ($func->isInternal()) { |
| 269 | 269 | /// @todo from PHP 5.1.0 onward, we should be able to use invokeargs instead of getparameters to fully |
| 270 | 270 | /// reflect internal php functions |
| 271 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName); |
|
| 271 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName); |
|
| 272 | 272 | return false; |
| 273 | 273 | } |
| 274 | 274 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | $i = 0; |
| 321 | 321 | foreach ($func->getParameters() as $paramObj) { |
| 322 | 322 | $params[$i] = array(); |
| 323 | - $params[$i]['name'] = '$' . $paramObj->getName(); |
|
| 323 | + $params[$i]['name'] = '$'.$paramObj->getName(); |
|
| 324 | 324 | $params[$i]['isoptional'] = $paramObj->isOptional(); |
| 325 | 325 | $i++; |
| 326 | 326 | } |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | // build a signature |
| 385 | 385 | $sig = array($this->php2XmlrpcType($funcDesc['returns'])); |
| 386 | 386 | $pSig = array($funcDesc['returnsDocs']); |
| 387 | - for ($i = 0; $i < count($pars); $i++) { |
|
| 387 | + for ($i = 0; $i<count($pars); $i++) { |
|
| 388 | 388 | $name = strtolower($funcDesc['params'][$i]['name']); |
| 389 | 389 | if (isset($funcDesc['paramDocs'][$name]['type'])) { |
| 390 | 390 | $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']); |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | } |
| 441 | 441 | } |
| 442 | 442 | $numPars = $req->getNumParams(); |
| 443 | - if ($numPars < $minPars || $numPars > $maxPars) { |
|
| 443 | + if ($numPars<$minPars || $numPars>$maxPars) { |
|
| 444 | 444 | return new $responseClass(0, 3, 'Incorrect parameters passed to method'); |
| 445 | 445 | } |
| 446 | 446 | |
@@ -453,7 +453,7 @@ discard block |
||
| 453 | 453 | |
| 454 | 454 | $result = call_user_func_array($callable, $params); |
| 455 | 455 | |
| 456 | - if (! is_a($result, $responseClass)) { |
|
| 456 | + if (!is_a($result, $responseClass)) { |
|
| 457 | 457 | // q: why not do the same for int, float, bool, string? |
| 458 | 458 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 459 | 459 | $result = new $valueClass($result, $funcDesc['returns']); |
@@ -492,9 +492,9 @@ discard block |
||
| 492 | 492 | if ($newFuncName == '') { |
| 493 | 493 | if (is_array($callable)) { |
| 494 | 494 | if (is_string($callable[0])) { |
| 495 | - $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable); |
|
| 495 | + $xmlrpcFuncName = "{$prefix}_".implode('_', $callable); |
|
| 496 | 496 | } else { |
| 497 | - $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1]; |
|
| 497 | + $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1]; |
|
| 498 | 498 | } |
| 499 | 499 | } else { |
| 500 | 500 | if ($callable instanceof \Closure) { |
@@ -526,9 +526,9 @@ discard block |
||
| 526 | 526 | */ |
| 527 | 527 | protected function buildWrapFunctionSource($callable, $newFuncName, $extraOptions, $plainFuncName, $funcDesc) |
| 528 | 528 | { |
| 529 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 530 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 531 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 529 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 530 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 531 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 532 | 532 | $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : ''; |
| 533 | 533 | |
| 534 | 534 | $i = 0; |
@@ -563,9 +563,9 @@ discard block |
||
| 563 | 563 | // build body of new function |
| 564 | 564 | |
| 565 | 565 | $innerCode = " \$paramCount = \$req->getNumParams();\n"; |
| 566 | - $innerCode .= " if (\$paramCount < $minPars || \$paramCount > $maxPars) return new " . static::$namespace . "Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n"; |
|
| 566 | + $innerCode .= " if (\$paramCount < $minPars || \$paramCount > $maxPars) return new ".static::$namespace."Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n"; |
|
| 567 | 567 | |
| 568 | - $innerCode .= " \$encoder = new " . static::$namespace . "Encoder();\n"; |
|
| 568 | + $innerCode .= " \$encoder = new ".static::$namespace."Encoder();\n"; |
|
| 569 | 569 | if ($decodePhpObjects) { |
| 570 | 570 | $innerCode .= " \$params = \$encoder->decode(\$req, array('decode_php_objs'));\n"; |
| 571 | 571 | } else { |
@@ -578,23 +578,23 @@ discard block |
||
| 578 | 578 | static::holdObject($newFuncName, $callable[0]); |
| 579 | 579 | $class = get_class($callable[0]); |
| 580 | 580 | if ($class[0] !== '\\') { |
| 581 | - $class = '\\' . $class; |
|
| 581 | + $class = '\\'.$class; |
|
| 582 | 582 | } |
| 583 | 583 | $innerCode .= " /// @var $class \$obj\n"; |
| 584 | 584 | $innerCode .= " \$obj = PhpXmlRpc\\Wrapper::getHeldObject('$newFuncName');\n"; |
| 585 | - $realFuncName = '$obj->' . $callable[1]; |
|
| 585 | + $realFuncName = '$obj->'.$callable[1]; |
|
| 586 | 586 | } else { |
| 587 | 587 | $realFuncName = $plainFuncName; |
| 588 | 588 | } |
| 589 | 589 | foreach ($parsVariations as $i => $pars) { |
| 590 | - $innerCode .= " if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n"; |
|
| 591 | - if ($i < (count($parsVariations) - 1)) |
|
| 590 | + $innerCode .= " if (\$paramCount == ".count($pars).") \$retVal = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n"; |
|
| 591 | + if ($i<(count($parsVariations)-1)) |
|
| 592 | 592 | $innerCode .= " else\n"; |
| 593 | 593 | } |
| 594 | - $innerCode .= " if (is_a(\$retVal, '" . static::$namespace . "Response'))\n return \$retVal;\n else\n"; |
|
| 594 | + $innerCode .= " if (is_a(\$retVal, '".static::$namespace."Response'))\n return \$retVal;\n else\n"; |
|
| 595 | 595 | /// q: why not do the same for int, float, bool, string? |
| 596 | 596 | if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) { |
| 597 | - $innerCode .= " return new " . static::$namespace . "Response(new " . static::$namespace . "Value(\$retVal, '{$funcDesc['returns']}'));"; |
|
| 597 | + $innerCode .= " return new ".static::$namespace."Response(new ".static::$namespace."Value(\$retVal, '{$funcDesc['returns']}'));"; |
|
| 598 | 598 | } else { |
| 599 | 599 | $encodeOptions = array(); |
| 600 | 600 | if ($encodeNulls) { |
@@ -605,18 +605,18 @@ discard block |
||
| 605 | 605 | } |
| 606 | 606 | |
| 607 | 607 | if ($encodeOptions) { |
| 608 | - $innerCode .= " return new " . static::$namespace . "Response(\$encoder->encode(\$retVal, array('" . |
|
| 609 | - implode("', '", $encodeOptions) . "')));"; |
|
| 608 | + $innerCode .= " return new ".static::$namespace."Response(\$encoder->encode(\$retVal, array('". |
|
| 609 | + implode("', '", $encodeOptions)."')));"; |
|
| 610 | 610 | } else { |
| 611 | - $innerCode .= " return new " . static::$namespace . "Response(\$encoder->encode(\$retVal));"; |
|
| 611 | + $innerCode .= " return new ".static::$namespace."Response(\$encoder->encode(\$retVal));"; |
|
| 612 | 612 | } |
| 613 | 613 | } |
| 614 | 614 | // shall we exclude functions returning by ref? |
| 615 | 615 | // if ($func->returnsReference()) |
| 616 | 616 | // return false; |
| 617 | 617 | |
| 618 | - $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n" . |
|
| 619 | - "function $newFuncName(\$req)\n{\n" . $innerCode . "\n}"; |
|
| 618 | + $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n". |
|
| 619 | + "function $newFuncName(\$req)\n{\n".$innerCode."\n}"; |
|
| 620 | 620 | |
| 621 | 621 | return $code; |
| 622 | 622 | } |
@@ -670,7 +670,7 @@ discard block |
||
| 670 | 670 | protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array()) |
| 671 | 671 | { |
| 672 | 672 | if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) { |
| 673 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . $classMethod; |
|
| 673 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod; |
|
| 674 | 674 | } |
| 675 | 675 | |
| 676 | 676 | if (is_object($className)) { |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | } else { |
| 679 | 679 | $realClassName = $className; |
| 680 | 680 | } |
| 681 | - return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '') . "$realClassName.$classMethod"; |
|
| 681 | + return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod"; |
|
| 682 | 682 | } |
| 683 | 683 | |
| 684 | 684 | /** |
@@ -761,21 +761,21 @@ discard block |
||
| 761 | 761 | */ |
| 762 | 762 | protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array()) |
| 763 | 763 | { |
| 764 | - $reqClass = static::$namespace . 'Request'; |
|
| 765 | - $valClass = static::$namespace . 'Value'; |
|
| 766 | - $decoderClass = static::$namespace . 'Encoder'; |
|
| 764 | + $reqClass = static::$namespace.'Request'; |
|
| 765 | + $valClass = static::$namespace.'Value'; |
|
| 766 | + $decoderClass = static::$namespace.'Encoder'; |
|
| 767 | 767 | |
| 768 | 768 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 769 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 769 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 770 | 770 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 771 | - $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0; |
|
| 771 | + $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0; |
|
| 772 | 772 | |
| 773 | 773 | $req = new $reqClass('system.methodSignature'); |
| 774 | 774 | $req->addparam(new $valClass($methodName)); |
| 775 | 775 | $client->setDebug($debug); |
| 776 | 776 | $response = $client->send($req, $timeout, $protocol); |
| 777 | 777 | if ($response->faultCode()) { |
| 778 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName); |
|
| 778 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName); |
|
| 779 | 779 | return false; |
| 780 | 780 | } |
| 781 | 781 | |
@@ -786,8 +786,8 @@ discard block |
||
| 786 | 786 | $mSig = $decoder->decode($mSig); |
| 787 | 787 | } |
| 788 | 788 | |
| 789 | - if (!is_array($mSig) || count($mSig) <= $sigNum) { |
|
| 790 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName); |
|
| 789 | + if (!is_array($mSig) || count($mSig)<=$sigNum) { |
|
| 790 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName); |
|
| 791 | 791 | return false; |
| 792 | 792 | } |
| 793 | 793 | |
@@ -802,11 +802,11 @@ discard block |
||
| 802 | 802 | */ |
| 803 | 803 | protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array()) |
| 804 | 804 | { |
| 805 | - $reqClass = static::$namespace . 'Request'; |
|
| 806 | - $valClass = static::$namespace . 'Value'; |
|
| 805 | + $reqClass = static::$namespace.'Request'; |
|
| 806 | + $valClass = static::$namespace.'Value'; |
|
| 807 | 807 | |
| 808 | 808 | $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0; |
| 809 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 809 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 810 | 810 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 811 | 811 | |
| 812 | 812 | $mDesc = ''; |
@@ -840,11 +840,11 @@ discard block |
||
| 840 | 840 | $clientClone = clone $client; |
| 841 | 841 | $function = function() use($clientClone, $methodName, $extraOptions, $mSig) |
| 842 | 842 | { |
| 843 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 843 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 844 | 844 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 845 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 846 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 847 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 845 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 846 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 847 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 848 | 848 | $throwFault = false; |
| 849 | 849 | $decodeFault = false; |
| 850 | 850 | $faultResponse = null; |
@@ -855,9 +855,9 @@ discard block |
||
| 855 | 855 | $faultResponse = $extraOptions['return_on_fault']; |
| 856 | 856 | } |
| 857 | 857 | |
| 858 | - $reqClass = static::$namespace . 'Request'; |
|
| 859 | - $encoderClass = static::$namespace . 'Encoder'; |
|
| 860 | - $valueClass = static::$namespace . 'Value'; |
|
| 858 | + $reqClass = static::$namespace.'Request'; |
|
| 859 | + $encoderClass = static::$namespace.'Encoder'; |
|
| 860 | + $valueClass = static::$namespace.'Value'; |
|
| 861 | 861 | |
| 862 | 862 | $encoder = new $encoderClass(); |
| 863 | 863 | $encodeOptions = array(); |
@@ -939,14 +939,14 @@ discard block |
||
| 939 | 939 | * @param string $mDesc |
| 940 | 940 | * @return string[] keys: source, docstring |
| 941 | 941 | */ |
| 942 | - public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='') |
|
| 942 | + public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '') |
|
| 943 | 943 | { |
| 944 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 944 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 945 | 945 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 946 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 947 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 948 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 949 | - $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0; |
|
| 946 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 947 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 948 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 949 | + $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0; |
|
| 950 | 950 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 951 | 951 | $throwFault = false; |
| 952 | 952 | $decodeFault = false; |
@@ -959,10 +959,10 @@ discard block |
||
| 959 | 959 | } |
| 960 | 960 | |
| 961 | 961 | $code = "function $newFuncName("; |
| 962 | - if ($clientCopyMode < 2) { |
|
| 962 | + if ($clientCopyMode<2) { |
|
| 963 | 963 | // client copy mode 0 or 1 == full / partial client copy in emitted code |
| 964 | 964 | $verbatimClientCopy = !$clientCopyMode; |
| 965 | - $innerCode = ' ' . str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 965 | + $innerCode = ' '.str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 966 | 966 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
| 967 | 967 | $this_ = ''; |
| 968 | 968 | } else { |
@@ -970,28 +970,28 @@ discard block |
||
| 970 | 970 | $innerCode = ''; |
| 971 | 971 | $this_ = 'this->'; |
| 972 | 972 | } |
| 973 | - $innerCode .= " \$req = new " . static::$namespace . "Request('$methodName');\n"; |
|
| 973 | + $innerCode .= " \$req = new ".static::$namespace."Request('$methodName');\n"; |
|
| 974 | 974 | |
| 975 | 975 | if ($mDesc != '') { |
| 976 | 976 | // take care that PHP comment is not terminated unwillingly by method description |
| 977 | 977 | /// @todo according to the spec, method desc can have html in it. We should run it through strip_tags... |
| 978 | - $mDesc = "/**\n * " . str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc) . "\n"; |
|
| 978 | + $mDesc = "/**\n * ".str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc)."\n"; |
|
| 979 | 979 | } else { |
| 980 | 980 | $mDesc = "/**\n * Function $newFuncName.\n"; |
| 981 | 981 | } |
| 982 | 982 | |
| 983 | 983 | // param parsing |
| 984 | - $innerCode .= " \$encoder = new " . static::$namespace . "Encoder();\n"; |
|
| 984 | + $innerCode .= " \$encoder = new ".static::$namespace."Encoder();\n"; |
|
| 985 | 985 | $plist = array(); |
| 986 | 986 | $pCount = count($mSig); |
| 987 | - for ($i = 1; $i < $pCount; $i++) { |
|
| 987 | + for ($i = 1; $i<$pCount; $i++) { |
|
| 988 | 988 | $plist[] = "\$p$i"; |
| 989 | 989 | $pType = $mSig[$i]; |
| 990 | 990 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
| 991 | 991 | $pType == 'string' || $pType == 'dateTime.iso8601' || $pType == 'base64' || $pType == 'null' |
| 992 | 992 | ) { |
| 993 | 993 | // only build directly xml-rpc values when type is known and scalar |
| 994 | - $innerCode .= " \$p$i = new " . static::$namespace . "Value(\$p$i, '$pType');\n"; |
|
| 994 | + $innerCode .= " \$p$i = new ".static::$namespace."Value(\$p$i, '$pType');\n"; |
|
| 995 | 995 | } else { |
| 996 | 996 | if ($encodePhpObjects || $encodeNulls) { |
| 997 | 997 | $encOpts = array(); |
@@ -1002,26 +1002,26 @@ discard block |
||
| 1002 | 1002 | $encOpts[] = 'null_extension'; |
| 1003 | 1003 | } |
| 1004 | 1004 | |
| 1005 | - $innerCode .= " \$p$i = \$encoder->encode(\$p$i, array( '" . implode("', '", $encOpts) . "'));\n"; |
|
| 1005 | + $innerCode .= " \$p$i = \$encoder->encode(\$p$i, array( '".implode("', '", $encOpts)."'));\n"; |
|
| 1006 | 1006 | } else { |
| 1007 | 1007 | $innerCode .= " \$p$i = \$encoder->encode(\$p$i);\n"; |
| 1008 | 1008 | } |
| 1009 | 1009 | } |
| 1010 | 1010 | $innerCode .= " \$req->addparam(\$p$i);\n"; |
| 1011 | - $mDesc .= " * @param " . $this->xmlrpc2PhpType($pType) . " \$p$i\n"; |
|
| 1011 | + $mDesc .= " * @param ".$this->xmlrpc2PhpType($pType)." \$p$i\n"; |
|
| 1012 | 1012 | } |
| 1013 | - if ($clientCopyMode < 2) { |
|
| 1013 | + if ($clientCopyMode<2) { |
|
| 1014 | 1014 | $plist[] = '$debug = 0'; |
| 1015 | 1015 | $mDesc .= " * @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
| 1016 | 1016 | } |
| 1017 | 1017 | $plist = implode(', ', $plist); |
| 1018 | - $mDesc .= ' * @return ' . $this->xmlrpc2PhpType($mSig[0]); |
|
| 1018 | + $mDesc .= ' * @return '.$this->xmlrpc2PhpType($mSig[0]); |
|
| 1019 | 1019 | if ($throwFault) { |
| 1020 | - $mDesc .= "\n * @throws " . (is_string($throwFault) ? $throwFault : '\\Exception'); |
|
| 1020 | + $mDesc .= "\n * @throws ".(is_string($throwFault) ? $throwFault : '\\Exception'); |
|
| 1021 | 1021 | } else if ($decodeFault) { |
| 1022 | - $mDesc .= '|' . gettype($faultResponse) . " (a " . gettype($faultResponse) . " if call fails)"; |
|
| 1022 | + $mDesc .= '|'.gettype($faultResponse)." (a ".gettype($faultResponse)." if call fails)"; |
|
| 1023 | 1023 | } else { |
| 1024 | - $mDesc .= '|' . static::$namespace . "Response (a " . static::$namespace . "Response obj instance if call fails)"; |
|
| 1024 | + $mDesc .= '|'.static::$namespace."Response (a ".static::$namespace."Response obj instance if call fails)"; |
|
| 1025 | 1025 | } |
| 1026 | 1026 | $mDesc .= "\n */\n"; |
| 1027 | 1027 | |
@@ -1033,9 +1033,9 @@ discard block |
||
| 1033 | 1033 | $respCode = "throw new $throwFault(\$res->faultString(), \$res->faultCode())"; |
| 1034 | 1034 | } else if ($decodeFault) { |
| 1035 | 1035 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
| 1036 | - $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
| 1036 | + $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
| 1037 | 1037 | } else { |
| 1038 | - $respCode = 'return ' . var_export($faultResponse, true); |
|
| 1038 | + $respCode = 'return '.var_export($faultResponse, true); |
|
| 1039 | 1039 | } |
| 1040 | 1040 | } else { |
| 1041 | 1041 | $respCode = 'return $res'; |
@@ -1046,7 +1046,7 @@ discard block |
||
| 1046 | 1046 | $innerCode .= " if (\$res->faultCode()) $respCode; else return \$encoder->decode(\$res->value());"; |
| 1047 | 1047 | } |
| 1048 | 1048 | |
| 1049 | - $code = $code . $plist . ")\n{\n" . $innerCode . "\n}\n"; |
|
| 1049 | + $code = $code.$plist.")\n{\n".$innerCode."\n}\n"; |
|
| 1050 | 1050 | |
| 1051 | 1051 | return array('source' => $code, 'docstring' => $mDesc); |
| 1052 | 1052 | } |
@@ -1073,25 +1073,25 @@ discard block |
||
| 1073 | 1073 | public function wrapXmlrpcServer($client, $extraOptions = array()) |
| 1074 | 1074 | { |
| 1075 | 1075 | $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : ''; |
| 1076 | - $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0; |
|
| 1076 | + $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0; |
|
| 1077 | 1077 | $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : ''; |
| 1078 | 1078 | $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : ''; |
| 1079 | - $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false; |
|
| 1080 | - $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false; |
|
| 1081 | - $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false; |
|
| 1079 | + $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false; |
|
| 1080 | + $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false; |
|
| 1081 | + $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false; |
|
| 1082 | 1082 | $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true; |
| 1083 | - $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool)$extraOptions['throw_on_fault'] : false; |
|
| 1083 | + $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool) $extraOptions['throw_on_fault'] : false; |
|
| 1084 | 1084 | $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true; |
| 1085 | 1085 | $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc'; |
| 1086 | 1086 | |
| 1087 | - $reqClass = static::$namespace . 'Request'; |
|
| 1088 | - $decoderClass = static::$namespace . 'Encoder'; |
|
| 1087 | + $reqClass = static::$namespace.'Request'; |
|
| 1088 | + $decoderClass = static::$namespace.'Encoder'; |
|
| 1089 | 1089 | |
| 1090 | 1090 | // retrieve the list of methods |
| 1091 | 1091 | $req = new $reqClass('system.listMethods'); |
| 1092 | 1092 | $response = $client->send($req, $timeout, $protocol); |
| 1093 | 1093 | if ($response->faultCode()) { |
| 1094 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server'); |
|
| 1094 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server'); |
|
| 1095 | 1095 | |
| 1096 | 1096 | return false; |
| 1097 | 1097 | } |
@@ -1102,7 +1102,7 @@ discard block |
||
| 1102 | 1102 | $mList = $decoder->decode($mList); |
| 1103 | 1103 | } |
| 1104 | 1104 | if (!is_array($mList) || !count($mList)) { |
| 1105 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server'); |
|
| 1105 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server'); |
|
| 1106 | 1106 | |
| 1107 | 1107 | return false; |
| 1108 | 1108 | } |
@@ -1111,8 +1111,8 @@ discard block |
||
| 1111 | 1111 | if ($newClassName != '') { |
| 1112 | 1112 | $xmlrpcClassName = $newClassName; |
| 1113 | 1113 | } else { |
| 1114 | - $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1115 | - array('_', ''), $client->server) . '_client'; |
|
| 1114 | + $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), |
|
| 1115 | + array('_', ''), $client->server).'_client'; |
|
| 1116 | 1116 | } |
| 1117 | 1117 | while ($buildIt && class_exists($xmlrpcClassName)) { |
| 1118 | 1118 | $xmlrpcClassName .= 'x'; |
@@ -1121,7 +1121,7 @@ discard block |
||
| 1121 | 1121 | /// @todo add method setDebug() to new class, to enable/disable debugging |
| 1122 | 1122 | $source = "class $xmlrpcClassName\n{\n public \$client;\n\n"; |
| 1123 | 1123 | $source .= " function __construct()\n {\n"; |
| 1124 | - $source .= ' ' . str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 1124 | + $source .= ' '.str_replace("\n", "\n ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace)); |
|
| 1125 | 1125 | $source .= "\$this->client = \$client;\n }\n\n"; |
| 1126 | 1126 | $opts = array( |
| 1127 | 1127 | 'return_source' => true, |
@@ -1144,26 +1144,26 @@ discard block |
||
| 1144 | 1144 | $methodWrap = $this->wrapXmlrpcMethod($client, $mName, $opts); |
| 1145 | 1145 | if ($methodWrap) { |
| 1146 | 1146 | if ($buildIt) { |
| 1147 | - $source .= $methodWrap['source'] . "\n"; |
|
| 1147 | + $source .= $methodWrap['source']."\n"; |
|
| 1148 | 1148 | |
| 1149 | 1149 | } else { |
| 1150 | - $source .= ' ' . str_replace("\n", "\n ", $methodWrap['docstring']); |
|
| 1151 | - $source .= str_replace("\n", "\n ", $methodWrap['source']). "\n"; |
|
| 1150 | + $source .= ' '.str_replace("\n", "\n ", $methodWrap['docstring']); |
|
| 1151 | + $source .= str_replace("\n", "\n ", $methodWrap['source'])."\n"; |
|
| 1152 | 1152 | } |
| 1153 | 1153 | |
| 1154 | 1154 | } else { |
| 1155 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName); |
|
| 1155 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName); |
|
| 1156 | 1156 | } |
| 1157 | 1157 | } |
| 1158 | 1158 | } |
| 1159 | 1159 | $source .= "}\n"; |
| 1160 | 1160 | if ($buildIt) { |
| 1161 | 1161 | $allOK = 0; |
| 1162 | - eval($source . '$allOK=1;'); |
|
| 1162 | + eval($source.'$allOK=1;'); |
|
| 1163 | 1163 | if ($allOK) { |
| 1164 | 1164 | return $xmlrpcClassName; |
| 1165 | 1165 | } else { |
| 1166 | - $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName . ' to wrap remote server ' . $client->server); |
|
| 1166 | + $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.' to wrap remote server '.$client->server); |
|
| 1167 | 1167 | return false; |
| 1168 | 1168 | } |
| 1169 | 1169 | } else { |
@@ -1182,8 +1182,8 @@ discard block |
||
| 1182 | 1182 | */ |
| 1183 | 1183 | protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\') |
| 1184 | 1184 | { |
| 1185 | - $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path) . |
|
| 1186 | - "', '" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server) . "', $client->port);\n"; |
|
| 1185 | + $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->path). |
|
| 1186 | + "', '".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->server)."', $client->port);\n"; |
|
| 1187 | 1187 | |
| 1188 | 1188 | // copy all client fields to the client that will be generated runtime |
| 1189 | 1189 | // (this provides for future expansion or subclassing of client obj) |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * @author JoakimLofgren |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 6 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 7 | 7 | |
| 8 | 8 | use PhpXmlRpc\Helper\Charset; |
| 9 | 9 | |
@@ -32,10 +32,10 @@ discard block |
||
| 32 | 32 | { |
| 33 | 33 | // construct a latin string with all chars (except control ones) |
| 34 | 34 | $this->latinString = "\n\r\t"; |
| 35 | - for($i = 32; $i < 127; $i++) { |
|
| 35 | + for ($i = 32; $i<127; $i++) { |
|
| 36 | 36 | $this->latinString .= chr($i); |
| 37 | 37 | } |
| 38 | - for($i = 160; $i < 256; $i++) { |
|
| 38 | + for ($i = 160; $i<256; $i++) { |
|
| 39 | 39 | $this->latinString .= chr($i); |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Runner\BaseTestRunner; |
| 11 | 11 | |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | /// @todo it seems that old php versions can not automatically transform latin to utf8 upon xml parsing. |
| 104 | 104 | /// We should fix that, then re-enable this test |
| 105 | 105 | if (version_compare(PHP_VERSION, '5.6.0', '>=')) { |
| 106 | - $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>' . $string . '</string></value>'); |
|
| 106 | + $i = $e->decodeXml('<?xml version="1.0" encoding="ISO-8859-15" ?><value><string>'.$string.'</string></value>'); |
|
| 107 | 107 | $this->assertEquals($string, $i->scalarVal()); |
| 108 | 108 | } |
| 109 | 109 | |
@@ -23,14 +23,16 @@ |
||
| 23 | 23 | { |
| 24 | 24 | $this->args = argParser::getArgs(); |
| 25 | 25 | // hide parsing errors unless in debug mode |
| 26 | - if ($this->args['DEBUG'] == 1) |
|
| 27 | - ob_start(); |
|
| 26 | + if ($this->args['DEBUG'] == 1) { |
|
| 27 | + ob_start(); |
|
| 28 | + } |
|
| 28 | 29 | } |
| 29 | 30 | |
| 30 | 31 | protected function tear_down() |
| 31 | 32 | { |
| 32 | - if ($this->args['DEBUG'] != 1) |
|
| 33 | - return; |
|
| 33 | + if ($this->args['DEBUG'] != 1) { |
|
| 34 | + return; |
|
| 35 | + } |
|
| 34 | 36 | $out = ob_get_clean(); |
| 35 | 37 | $status = $this->getStatus(); |
| 36 | 38 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; |
|
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; |
|
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Runner\BaseTestRunner; |
| 11 | 11 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | $this->assertequals(1, count($v1)); |
| 129 | 129 | $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); |
| 130 | 130 | |
| 131 | - foreach($v1 as $key => $val) |
|
| 131 | + foreach ($v1 as $key => $val) |
|
| 132 | 132 | { |
| 133 | 133 | $this->assertArrayHasKey($key, $out); |
| 134 | 134 | $expected = $out[$key]; |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | $this->assertequals(2, count($v2)); |
| 144 | 144 | $out = array(array('key' => 0, 'value' => 'object'), array('key' => 1, 'value' => 'object')); |
| 145 | 145 | $i = 0; |
| 146 | - foreach($v2 as $key => $val) |
|
| 146 | + foreach ($v2 as $key => $val) |
|
| 147 | 147 | { |
| 148 | 148 | $expected = $out[$i]; |
| 149 | 149 | $this->assertequals($expected['key'], $key); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | { |
| 158 | 158 | // nb: make sure that the serialized xml corresponding to this is > 10MB in size |
| 159 | 159 | $data = array(); |
| 160 | - for ($i = 0; $i < 500000; $i++ ) { |
|
| 160 | + for ($i = 0; $i<500000; $i++) { |
|
| 161 | 161 | $data[] = 'hello world'; |
| 162 | 162 | } |
| 163 | 163 | |
@@ -21,14 +21,16 @@ |
||
| 21 | 21 | protected function set_up() |
| 22 | 22 | { |
| 23 | 23 | $this->args = argParser::getArgs(); |
| 24 | - if ($this->args['DEBUG'] == 1) |
|
| 25 | - ob_start(); |
|
| 24 | + if ($this->args['DEBUG'] == 1) { |
|
| 25 | + ob_start(); |
|
| 26 | + } |
|
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | protected function tear_down() |
| 29 | 30 | { |
| 30 | - if ($this->args['DEBUG'] != 1) |
|
| 31 | - return; |
|
| 31 | + if ($this->args['DEBUG'] != 1) { |
|
| 32 | + return; |
|
| 33 | + } |
|
| 32 | 34 | $out = ob_get_clean(); |
| 33 | 35 | $status = $this->getStatus(); |
| 34 | 36 | if ($status == BaseTestRunner::STATUS_ERROR |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; |
|
| 4 | -include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc'; |
|
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; |
|
| 4 | +include_once __DIR__.'/../lib/xmlrpc_wrappers.inc'; |
|
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; |
|
| 6 | +include_once __DIR__.'/parse_args.php'; |
|
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/08ServerTest.php'; |
|
| 8 | +include_once __DIR__.'/08ServerTest.php'; |
|
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * Tests which stress http features of the library. |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | ); |
| 31 | 31 | |
| 32 | 32 | $methods = array(); |
| 33 | - foreach(get_class_methods('ServerTest') as $method) |
|
| 33 | + foreach (get_class_methods('ServerTest') as $method) |
|
| 34 | 34 | { |
| 35 | 35 | if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods)) |
| 36 | 36 | { |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | preg_match('/ubunutu([0-9]+)/', $output[0], $matches); |
| 305 | 305 | $ubuntuVersion = @$matches[1]; |
| 306 | 306 | } |
| 307 | - if ($ubuntuVersion >= 20) { |
|
| 307 | + if ($ubuntuVersion>=20) { |
|
| 308 | 308 | $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher'); |
| 309 | 309 | return; |
| 310 | 310 | } |
@@ -201,8 +201,7 @@ discard block |
||
| 201 | 201 | { |
| 202 | 202 | $this->markTestSkipped('CURL missing: cannot test http 1.1 w. proxy'); |
| 203 | 203 | return; |
| 204 | - } |
|
| 205 | - else if ($this->args['PROXYSERVER'] == '') |
|
| 204 | + } else if ($this->args['PROXYSERVER'] == '') |
|
| 206 | 205 | { |
| 207 | 206 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. http 1.1'); |
| 208 | 207 | return; |
@@ -226,8 +225,7 @@ discard block |
||
| 226 | 225 | { |
| 227 | 226 | $this->markTestSkipped('CURL missing: cannot test https functionality'); |
| 228 | 227 | return; |
| 229 | - } |
|
| 230 | - else if ($this->args['HTTPSSERVER'] == '') |
|
| 228 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
| 231 | 229 | { |
| 232 | 230 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https'); |
| 233 | 231 | return; |
@@ -278,13 +276,11 @@ discard block |
||
| 278 | 276 | { |
| 279 | 277 | $this->markTestSkipped('CURL missing: cannot test https w. proxy'); |
| 280 | 278 | return; |
| 281 | - } |
|
| 282 | - else if ($this->args['PROXYSERVER'] == '') |
|
| 279 | + } else if ($this->args['PROXYSERVER'] == '') |
|
| 283 | 280 | { |
| 284 | 281 | $this->markTestSkipped('PROXYSERVER definition missing: cannot test proxy w. https'); |
| 285 | 282 | return; |
| 286 | - } |
|
| 287 | - else if ($this->args['HTTPSSERVER'] == '') |
|
| 283 | + } else if ($this->args['HTTPSSERVER'] == '') |
|
| 288 | 284 | { |
| 289 | 285 | $this->markTestSkipped('HTTPS SERVER definition missing: cannot test https w. proxy'); |
| 290 | 286 | return; |
