@@ -27,8 +27,9 @@ discard block |
||
27 | 27 | |
28 | 28 | public static function libVersion() |
29 | 29 | { |
30 | - if (self::$libVersion == null) |
|
31 | - throw new \Exception('Missing library version argument'); |
|
30 | + if (self::$libVersion == null) { |
|
31 | + throw new \Exception('Missing library version argument'); |
|
32 | + } |
|
32 | 33 | return self::$libVersion; |
33 | 34 | } |
34 | 35 | |
@@ -59,9 +60,10 @@ discard block |
||
59 | 60 | |
60 | 61 | public static function getOpts($args=array(), $cliOpts=array()) |
61 | 62 | { |
62 | - if (count($args) > 0) |
|
63 | - // throw new \Exception('Missing library version argument'); |
|
63 | + if (count($args) > 0) { |
|
64 | + // throw new \Exception('Missing library version argument'); |
|
64 | 65 | self::$libVersion = $args[0]; |
66 | + } |
|
65 | 67 | |
66 | 68 | foreach (self::$tools as $name => $binary) { |
67 | 69 | if (isset($cliOpts[$name])) { |
@@ -338,8 +340,7 @@ discard block |
||
338 | 340 | $cmd = Builder::tool('zip'); |
339 | 341 | $extra = '-9 -r'; |
340 | 342 | pake_sh("$cmd $distFile $extra ".basename(Builder::distDir())); |
341 | - } |
|
342 | - else { |
|
343 | + } else { |
|
343 | 344 | $finder = pakeFinder::type('any')->pattern(basename(Builder::distDir()).'/**'); |
344 | 345 | // see https://bugs.php.net/bug.php?id=58852 |
345 | 346 | $pharFile = str_replace(Builder::libVersion(), '_LIBVERSION_', $distFile); |
@@ -63,9 +63,9 @@ discard block |
||
63 | 63 | ); |
64 | 64 | } |
65 | 65 | |
66 | - public static function getOpts($args=array(), $cliOpts=array()) |
|
66 | + public static function getOpts($args = array(), $cliOpts = array()) |
|
67 | 67 | { |
68 | - if (count($args) > 0) |
|
68 | + if (count($args)>0) |
|
69 | 69 | // throw new \Exception('Missing library version argument'); |
70 | 70 | self::$libVersion = $args[0]; |
71 | 71 | |
@@ -168,17 +168,17 @@ discard block |
||
168 | 168 | $out = ''; |
169 | 169 | while (($start = strpos($content, $startTag, $last)) !== false) { |
170 | 170 | $end = strpos($content, $endTag, $start); |
171 | - $code = substr($content, $start + strlen($startTag), $end - $start - strlen($startTag)); |
|
172 | - if ($code[strlen($code) - 1] == "\n") { |
|
171 | + $code = substr($content, $start+strlen($startTag), $end-$start-strlen($startTag)); |
|
172 | + if ($code[strlen($code)-1] == "\n") { |
|
173 | 173 | $code = substr($code, 0, -1); |
174 | 174 | } |
175 | 175 | |
176 | 176 | $code = str_replace(array('>', '<'), array('>', '<'), $code); |
177 | - $code = highlight_string('<?php ' . $code, true); |
|
177 | + $code = highlight_string('<?php '.$code, true); |
|
178 | 178 | $code = str_replace('<span style="color: #0000BB"><?php <br />', '<span style="color: #0000BB">', $code); |
179 | 179 | |
180 | - $out = $out . substr($content, $last, $start + strlen($startTag) - $last) . $code . $endTag; |
|
181 | - $last = $end + strlen($endTag); |
|
180 | + $out = $out.substr($content, $last, $start+strlen($startTag)-$last).$code.$endTag; |
|
181 | + $last = $end+strlen($endTag); |
|
182 | 182 | } |
183 | 183 | $out .= substr($content, $last, strlen($content)); |
184 | 184 | |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | use PhpXmlRpc\Builder; |
194 | 194 | |
195 | -function run_default($task=null, $args=array(), $cliOpts=array()) |
|
195 | +function run_default($task = null, $args = array(), $cliOpts = array()) |
|
196 | 196 | { |
197 | 197 | echo "Syntax: pake {\$pake-options} \$task \$lib-version [\$git-tag] {\$task-options}\n"; |
198 | 198 | echo "\n"; |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | echo " --zip=ZIP Location of the zip tool\n"; |
211 | 211 | } |
212 | 212 | |
213 | -function run_getopts($task=null, $args=array(), $cliOpts=array()) |
|
213 | +function run_getopts($task = null, $args = array(), $cliOpts = array()) |
|
214 | 214 | { |
215 | 215 | Builder::getOpts($args, $cliOpts); |
216 | 216 | } |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | * Downloads source code in the build workspace directory, optionally checking out the given branch/tag |
220 | 220 | * @todo allow using current installation / dir as source, bypassing git clone in workspace - at least for doc generation |
221 | 221 | */ |
222 | -function run_init($task=null, $args=array(), $cliOpts=array()) |
|
222 | +function run_init($task = null, $args = array(), $cliOpts = array()) |
|
223 | 223 | { |
224 | 224 | // download the current version into the workspace |
225 | 225 | $targetDir = Builder::workspaceDir(); |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | * |
248 | 248 | * (does nothing by itself, as all the steps are managed via task dependencies) |
249 | 249 | */ |
250 | -function run_build($task=null, $args=array(), $cliOpts=array()) |
|
250 | +function run_build($task = null, $args = array(), $cliOpts = array()) |
|
251 | 251 | { |
252 | 252 | } |
253 | 253 | |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | /** |
264 | 264 | * Generates documentation in all formats |
265 | 265 | */ |
266 | -function run_doc($task=null, $args=array(), $cliOpts=array()) |
|
266 | +function run_doc($task = null, $args = array(), $cliOpts = array()) |
|
267 | 267 | { |
268 | 268 | // in |
269 | 269 | $srcDir = Builder::workspaceDir(); |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | |
275 | 275 | // from phpdoc comments using phpdocumentor |
276 | 276 | $cmd = Builder::tool('php'); |
277 | - pake_sh("$cmd " . Builder::toolsDir(). "/vendor/bin/phpdoc run --cache-folder ".Builder::buildDir()."/.phpdoc -d ".$srcDir.'/src'." -t ".$docDir.'/api --title PHP-XMLRPC'); |
|
277 | + pake_sh("$cmd ".Builder::toolsDir()."/vendor/bin/phpdoc run --cache-folder ".Builder::buildDir()."/.phpdoc -d ".$srcDir.'/src'." -t ".$docDir.'/api --title PHP-XMLRPC'); |
|
278 | 278 | |
279 | 279 | // from phpdoc comments using Sami |
280 | 280 | // deprecated on 2021/12, as Sami is abandonware |
@@ -355,7 +355,7 @@ discard block |
||
355 | 355 | /** |
356 | 356 | * Creates the tarballs for a release |
357 | 357 | */ |
358 | -function run_dist($task=null, $args=array(), $cliOpts=array()) |
|
358 | +function run_dist($task = null, $args = array(), $cliOpts = array()) |
|
359 | 359 | { |
360 | 360 | // copy workspace dir into dist dir, without git |
361 | 361 | pake_mkdirs(Builder::distDir()); |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | // create tarballs |
371 | 371 | $cwd = getcwd(); |
372 | 372 | chdir(dirname(Builder::distDir())); |
373 | - foreach(Builder::distFiles() as $distFile) { |
|
373 | + foreach (Builder::distFiles() as $distFile) { |
|
374 | 374 | // php can not really create good zip files via phar: they are not compressed! |
375 | 375 | if (substr($distFile, -4) == '.zip') { |
376 | 376 | $cmd = Builder::tool('zip'); |
@@ -388,7 +388,7 @@ discard block |
||
388 | 388 | chdir($cwd); |
389 | 389 | } |
390 | 390 | |
391 | -function run_clean_workspace($task=null, $args=array(), $cliOpts=array()) |
|
391 | +function run_clean_workspace($task = null, $args = array(), $cliOpts = array()) |
|
392 | 392 | { |
393 | 393 | if (realpath(__DIR__) === realpath(Builder::workspaceDir())) { |
394 | 394 | throw new \Exception("Can not remove workspace dir, as it is where pakefile is located!"); |
@@ -400,13 +400,13 @@ discard block |
||
400 | 400 | * Cleans up the whole build directory |
401 | 401 | * @todo 'make clean' usually just removes the results of the build, distclean removes all but sources |
402 | 402 | */ |
403 | -function run_clean($task=null, $args=array(), $cliOpts=array()) |
|
403 | +function run_clean($task = null, $args = array(), $cliOpts = array()) |
|
404 | 404 | { |
405 | 405 | pake_remove_dir(Builder::buildDir()); |
406 | 406 | } |
407 | 407 | |
408 | 408 | // helper task: display help text |
409 | -pake_task( 'default' ); |
|
409 | +pake_task('default'); |
|
410 | 410 | // internal task: parse cli options |
411 | 411 | pake_task('getopts'); |
412 | 412 | pake_task('init', 'getopts'); |
@@ -3,7 +3,7 @@ |
||
3 | 3 | if (isset($_GET['run'])) { |
4 | 4 | $path = parse_url($_GET['run']); |
5 | 5 | if (isset($path['query'])) { |
6 | - $query = '?' . $path['query']; |
|
6 | + $query = '?'.$path['query']; |
|
7 | 7 | } |
8 | 8 | } |
9 | 9 | ?> |
@@ -12,7 +12,12 @@ |
||
12 | 12 | <html lang="en"> |
13 | 13 | <head> |
14 | 14 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
15 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
15 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
16 | + echo 'JSONRPC'; |
|
17 | +} else { |
|
18 | + echo 'XMLRPC'; |
|
19 | +} |
|
20 | +?> Debugger</title> |
|
16 | 21 | </head> |
17 | 22 | <frameset rows="360,*"> |
18 | 23 | <frame name="frmcontroller" src="controller.php<?php echo htmlspecialchars($query); ?>" marginwidth="0" |
@@ -6,7 +6,7 @@ |
||
6 | 6 | * @license code licensed under the BSD License: see file license.txt |
7 | 7 | **/ |
8 | 8 | |
9 | -$coverageFile = realpath(__DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); |
|
9 | +$coverageFile = realpath(__DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); |
|
10 | 10 | |
11 | 11 | // has to be the same value as used in server.php |
12 | 12 | $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage'; |
@@ -29,7 +29,7 @@ |
||
29 | 29 | return; |
30 | 30 | } |
31 | 31 | |
32 | - if (is_file($file = __DIR__ . str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { |
|
32 | + if (is_file($file = __DIR__.str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { |
|
33 | 33 | require $file; |
34 | 34 | } |
35 | 35 | } |
@@ -141,9 +141,9 @@ |
||
141 | 141 | * @deprecated |
142 | 142 | */ |
143 | 143 | function build_remote_method_wrapper_code($client, $methodName, $xmlrpcFuncName, |
144 | - $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc', |
|
145 | - $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false, |
|
146 | - $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
|
144 | + $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc', |
|
145 | + $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false, |
|
146 | + $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
|
147 | 147 | { |
148 | 148 | $code = "function $xmlrpcFuncName ("; |
149 | 149 | if ($clientCopyMode < 2) { |
@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | * @param array $extraOptions |
42 | 42 | * @return array|false |
43 | 43 | */ |
44 | -function wrap_php_function($funcName, $newFuncName='', $extraOptions=array()) |
|
44 | +function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array()) |
|
45 | 45 | { |
46 | 46 | $wrapper = new PhpXmlRpc\Wrapper(); |
47 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
47 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
48 | 48 | // backwards compat: return string instead of callable |
49 | 49 | $extraOptions['return_source'] = true; |
50 | 50 | $wrapped = $wrapper->wrapPhpFunction($funcName, $newFuncName, $extraOptions); |
@@ -64,17 +64,17 @@ discard block |
||
64 | 64 | * @param array $extraOptions |
65 | 65 | * @return array|false |
66 | 66 | */ |
67 | -function wrap_php_class($className, $extraOptions=array()) |
|
67 | +function wrap_php_class($className, $extraOptions = array()) |
|
68 | 68 | { |
69 | 69 | $wrapper = new PhpXmlRpc\Wrapper(); |
70 | 70 | $fix = false; |
71 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
71 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
72 | 72 | // backwards compat: return string instead of callable |
73 | 73 | $extraOptions['return_source'] = true; |
74 | 74 | $fix = true; |
75 | 75 | } |
76 | 76 | $wrapped = $wrapper->wrapPhpClass($className, $extraOptions); |
77 | - foreach($wrapped as $name => $value) { |
|
77 | + foreach ($wrapped as $name => $value) { |
|
78 | 78 | if ($fix) { |
79 | 79 | eval($value['source']); |
80 | 80 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | * @param string $newFuncName deprecated, use an option in $extraOptions |
94 | 94 | * @return array|callable|false |
95 | 95 | */ |
96 | -function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='') |
|
96 | +function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '') |
|
97 | 97 | { |
98 | 98 | if (!is_array($extraOptions)) |
99 | 99 | { |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | $wrapper = new PhpXmlRpc\Wrapper(); |
110 | 110 | |
111 | - if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
111 | + if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { |
|
112 | 112 | // backwards compat: return string instead of callable |
113 | 113 | $extraOptions['return_source'] = true; |
114 | 114 | $wrapped = $wrapper->wrapXmlrpcMethod($client, $methodName, $extraOptions); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | * @param array $extraOptions |
129 | 129 | * @return mixed |
130 | 130 | */ |
131 | -function wrap_xmlrpc_server($client, $extraOptions=array()) |
|
131 | +function wrap_xmlrpc_server($client, $extraOptions = array()) |
|
132 | 132 | { |
133 | 133 | $wrapper = new PhpXmlRpc\Wrapper(); |
134 | 134 | return $wrapper->wrapXmlrpcServer($client, $extraOptions); |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | $faultResponse = '', $namespace = '\\PhpXmlRpc\\') |
149 | 149 | { |
150 | 150 | $code = "function $xmlrpcFuncName ("; |
151 | - if ($clientCopyMode < 2) { |
|
151 | + if ($clientCopyMode<2) { |
|
152 | 152 | // client copy mode 0 or 1 == partial / full client copy in emitted code |
153 | 153 | $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix); |
154 | 154 | $innerCode .= "\$client->setDebug(\$debug);\n"; |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | if ($mDesc != '') { |
164 | 164 | // take care that PHP comment is not terminated unwillingly by method description |
165 | - $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; |
|
165 | + $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; |
|
166 | 166 | } else { |
167 | 167 | $mDesc = "/**\nFunction $xmlrpcFuncName\n"; |
168 | 168 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; |
172 | 172 | $plist = array(); |
173 | 173 | $pCount = count($mSig); |
174 | - for ($i = 1; $i < $pCount; $i++) { |
|
174 | + for ($i = 1; $i<$pCount; $i++) { |
|
175 | 175 | $plist[] = "\$p$i"; |
176 | 176 | $pType = $mSig[$i]; |
177 | 177 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || |
@@ -187,19 +187,19 @@ discard block |
||
187 | 187 | } |
188 | 188 | } |
189 | 189 | $innerCode .= "\$req->addparam(\$p$i);\n"; |
190 | - $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n"; |
|
190 | + $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n"; |
|
191 | 191 | } |
192 | - if ($clientCopyMode < 2) { |
|
192 | + if ($clientCopyMode<2) { |
|
193 | 193 | $plist[] = '$debug=0'; |
194 | 194 | $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; |
195 | 195 | } |
196 | 196 | $plist = implode(', ', $plist); |
197 | - $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
197 | + $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; |
|
198 | 198 | |
199 | 199 | $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; |
200 | 200 | if ($decodeFault) { |
201 | 201 | if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { |
202 | - $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; |
|
202 | + $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; |
|
203 | 203 | } else { |
204 | 204 | $respCode = var_export($faultResponse, true); |
205 | 205 | } |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; |
213 | 213 | } |
214 | 214 | |
215 | - $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; |
|
215 | + $code = $code.$plist.") {\n".$innerCode."\n}\n"; |
|
216 | 216 | |
217 | 217 | return array('source' => $code, 'docstring' => $mDesc); |
218 | 218 | } |
@@ -220,10 +220,10 @@ discard block |
||
220 | 220 | /** |
221 | 221 | * @deprecated |
222 | 222 | */ |
223 | -function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') |
|
223 | +function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc') |
|
224 | 224 | { |
225 | 225 | $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). |
226 | - "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; |
|
226 | + "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; |
|
227 | 227 | |
228 | 228 | // copy all client fields to the client that will be generated runtime |
229 | 229 | // (this provides for future expansion or subclassing of client obj) |
@@ -39,10 +39,10 @@ |
||
39 | 39 | $flags = ENT_COMPAT; |
40 | 40 | // avoid warnings on php < 5.4... |
41 | 41 | if (defined('ENT_HTML401')) { |
42 | - $flags = $flags | ENT_HTML401; |
|
42 | + $flags = $flags | ENT_HTML401; |
|
43 | 43 | } |
44 | 44 | if (defined('ENT_SUBSTITUTE')) { |
45 | - $flags = $flags | ENT_SUBSTITUTE; |
|
45 | + $flags = $flags | ENT_SUBSTITUTE; |
|
46 | 46 | } |
47 | 47 | if ($encoding != null) { |
48 | 48 | print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>"; |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | |
44 | 44 | // check for command line (env vars) vs. web page input params |
45 | 45 | if (!isset($_SERVER['REQUEST_METHOD'])) { |
46 | - foreach($_SERVER as $key => $val) { |
|
46 | + foreach ($_SERVER as $key => $val) { |
|
47 | 47 | if (array_key_exists($key, $args)) { |
48 | 48 | $$key = $val; |
49 | 49 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | } |
88 | 88 | } |
89 | 89 | if ($HTTPURI[0] != '/') { |
90 | - $HTTPURI = '/' . $HTTPURI; |
|
90 | + $HTTPURI = '/'.$HTTPURI; |
|
91 | 91 | } |
92 | 92 | $args['HTTPURI'] = $HTTPURI; |
93 | 93 | |
@@ -101,21 +101,21 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | if (isset($HTTPSIGNOREPEER)) { |
104 | - $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER; |
|
104 | + $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER; |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | if (isset($HTTPSVERIFYHOST)) { |
108 | - $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST; |
|
108 | + $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST; |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | if (isset($SSLVERSION)) { |
112 | - $args['SSLVERSION'] = (int)$SSLVERSION; |
|
112 | + $args['SSLVERSION'] = (int) $SSLVERSION; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | if (isset($PROXYSERVER)) { |
116 | 116 | $arr = explode(':', $PROXYSERVER); |
117 | 117 | $args['PROXYSERVER'] = $arr[0]; |
118 | - if (count($arr) > 1) { |
|
118 | + if (count($arr)>1) { |
|
119 | 119 | $args['PROXYPORT'] = $arr[1]; |
120 | 120 | } else { |
121 | 121 | $args['PROXYPORT'] = 8080; |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | // assume this is either a standalone install, or installed as Composer dependency |
20 | 20 | /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level |
21 | 21 | /// debugger include this one, taking care of autoloading ? |
22 | - include_once __DIR__ . "/../src/Autoloader.php"; |
|
22 | + include_once __DIR__."/../src/Autoloader.php"; |
|
23 | 23 | PhpXmlRpc\Autoloader::register(); |
24 | 24 | } |
25 | 25 | |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | // Variables that shouldn't be unset |
36 | - $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
36 | + $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES'); |
|
37 | 37 | |
38 | 38 | $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, |
39 | 39 | isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array() |
@@ -53,8 +53,7 @@ discard block |
||
53 | 53 | function stripslashes_deep($value) |
54 | 54 | { |
55 | 55 | $value = is_array($value) ? |
56 | - array_map('stripslashes_deep', $value) : |
|
57 | - stripslashes($value); |
|
56 | + array_map('stripslashes_deep', $value) : stripslashes($value); |
|
58 | 57 | |
59 | 58 | return $value; |
60 | 59 | } |
@@ -99,7 +98,7 @@ discard block |
||
99 | 98 | $path = isset($_GET['path']) ? $_GET['path'] : ''; |
100 | 99 | // in case user forgot initial '/' in xmlrpc server path, add it back |
101 | 100 | if ($path && ($path[0]) != '/') { |
102 | - $path = '/' . $path; |
|
101 | + $path = '/'.$path; |
|
103 | 102 | } |
104 | 103 | |
105 | 104 | if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) { |
@@ -17,15 +17,15 @@ 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 | } |
24 | 24 | |
25 | 25 | // Relative path to the visual xmlrpc editing dialog |
26 | 26 | // We allow to easily configure this path via defines |
27 | -$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/debugger/'; |
|
28 | -$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..') . '/jsxmlrpc/lib/'; |
|
27 | +$editorpath = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/debugger/'; |
|
28 | +$editorlibs = (defined('JSXMLRPC_PATH') ? JSXMLRPC_PATH : '../..').'/jsxmlrpc/lib/'; |
|
29 | 29 | ?> |
30 | 30 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
31 | 31 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
@@ -230,9 +230,9 @@ discard block |
||
230 | 230 | echo ' document.forms[2].submit();'; |
231 | 231 | } ?>"> |
232 | 232 | <h1>XMLRPC |
233 | - <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
233 | + <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
234 | 234 | / |
235 | - <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form> |
|
235 | + <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form> |
|
236 | 236 | JSONRPC Debugger (based on the <a href="http://gggeek.github.io/phpxmlrpc/">PHP-XMLRPC</a> library) |
237 | 237 | </h1> |
238 | 238 | <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"> |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | </select> |
288 | 288 | </td> |
289 | 289 | <td class="labelcell">Timeout:</td> |
290 | - <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td> |
|
290 | + <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td> |
|
291 | 291 | <td class="labelcell">Protocol:</td> |
292 | 292 | <td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();"> |
293 | 293 | <option value="0"<?php if ($protocol == 0) { echo ' selected="selected"'; } ?>>HTTP 1.0</option> |
@@ -32,7 +32,12 @@ |
||
32 | 32 | <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> |
33 | 33 | <head> |
34 | 34 | <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico"> |
35 | - <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSONRPC'; else echo 'XMLRPC'; ?> Debugger</title> |
|
35 | + <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) { |
|
36 | + echo 'JSONRPC'; |
|
37 | +} else { |
|
38 | + echo 'XMLRPC'; |
|
39 | +} |
|
40 | +?> Debugger</title> |
|
36 | 41 | <meta name="robots" content="index,nofollow"/> |
37 | 42 | <script type="text/javascript" language="Javascript"> |
38 | 43 | if (window.name != 'frmcontroller') |