gggeek / phpxmlrpc

tests/6HTTPTest.php

Spacing +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
-include_once __DIR__ . '/../lib/xmlrpc.inc';
-include_once __DIR__ . '/../lib/xmlrpc_wrappers.inc';
+include_once __DIR__.'/../lib/xmlrpc.inc';
+include_once __DIR__.'/../lib/xmlrpc_wrappers.inc';
 
-include_once __DIR__ . '/parse_args.php';
+include_once __DIR__.'/parse_args.php';
 
-include_once __DIR__ . '/5ServerTest.php';
+include_once __DIR__.'/5ServerTest.php';
 
 /**
  * Tests which stress http features of the library.
@@ -30,7 +30,7 @@ 
         );
 
         $methods = array();
-        foreach(get_class_methods('ServerTest') as $method)
+        foreach (get_class_methods('ServerTest') as $method)
         {
             if (strpos($method, 'test') === 0 && !in_array($method, $unsafeMethods))
             {
@@ -271,7 +271,7 @@ 
                 preg_match('/ubunutu([0-9]+)/', $output[0], $matches);
                 $ubuntuVersion = @$matches[1];
             }
-            if ($ubuntuVersion >= 20) {
+            if ($ubuntuVersion>=20) {
                 $this->markTestSkipped('HTTPS via Socket known to fail on php less than 7.2 on Ubuntu 20 and higher');
                 return;
             }

lib/xmlrpcs.inc

Spacing +14 added lines, -14 removed lines

@@ -54,7 +54,7 @@ 
      */
     public function echoInput()
     {
-        $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '" . file_get_contents('php://input'), 'string'));
+        $r = new PhpXmlRpc\Response(new PhpXmlRpc\Value("'Aha said I: '".file_get_contents('php://input'), 'string'));
         print $r->serialize();
     }
 
@@ -65,12 +65,12 @@ 
      */
     public function __get($name)
     {
-        switch($name) {
+        switch ($name) {
             case 'dmap':
                 return $this->dmap;
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' .
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.
                     $trace[0]['line'], E_USER_NOTICE);
                 return null;
         }
@@ -97,30 +97,30 @@ 
     Server::xmlrpc_debugmsg($m);
 }
 
-function _xmlrpcs_getCapabilities($server, $m=null)
+function _xmlrpcs_getCapabilities($server, $m = null)
 {
     return Server::_xmlrpcs_getCapabilities($server, $m);
 }
 
-$_xmlrpcs_listMethods_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray));
-$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch';
-$_xmlrpcs_listMethods_sdoc=array(array('list of method names'));
-function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing
+$_xmlrpcs_listMethods_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray));
+$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch';
+$_xmlrpcs_listMethods_sdoc = array(array('list of method names'));
+function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing
 {
     return Server::_xmlrpcs_listMethods($server, $m);
 }
 
-$_xmlrpcs_methodSignature_sig=array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString']));
-$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
-$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
+$_xmlrpcs_methodSignature_sig = array(array(\PhpXmlRpc\Value::$xmlrpcArray, $GLOBALS['xmlrpcString']));
+$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';
+$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));
 function _xmlrpcs_methodSignature($server, $m)
 {
     return Server::_xmlrpcs_methodSignature($server, $m);
 }
 
-$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
-$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string';
-$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described'));
+$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));
+$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string';
+$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described'));
 function _xmlrpcs_methodHelp($server, $m)
 {
     return Server::_xmlrpcs_methodHelp($server, $m);

lib/xmlrpc_wrappers.inc

Spacing +18 added lines, -18 removed lines

@@ -41,10 +41,10 @@ 
  * @param array $extraOptions
  * @return array|false
  */
-function wrap_php_function($funcName, $newFuncName='', $extraOptions=array())
+function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $wrapped = $wrapper->wrapPhpFunction($funcName, $newFuncName, $extraOptions);
@@ -64,17 +64,17 @@ 
  * @param array $extraOptions
  * @return array|false
  */
-function wrap_php_class($className, $extraOptions=array())
+function wrap_php_class($className, $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
     $fix = false;
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $fix = true;
     }
     $wrapped = $wrapper->wrapPhpClass($className, $extraOptions);
-    foreach($wrapped as $name => $value) {
+    foreach ($wrapped as $name => $value) {
         if ($fix) {
             eval($value['source']);
         }
@@ -93,7 +93,7 @@ 
  * @param string $newFuncName     deprecated, use an option in $extraOptions
  * @return array|callable|false
  */
-function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='')
+function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '')
 {
     if (!is_array($extraOptions))
     {
@@ -108,7 +108,7 @@ 
 
     $wrapper = new PhpXmlRpc\Wrapper();
 
-    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) {
+    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) {
         // backwards compat: return string instead of callable
         $extraOptions['return_source'] = true;
         $wrapped = $wrapper->wrapXmlrpcMethod($client, $methodName, $extraOptions);
@@ -128,7 +128,7 @@ 
  * @param array $extraOptions
  * @return mixed
  */
-function wrap_xmlrpc_server($client, $extraOptions=array())
+function wrap_xmlrpc_server($client, $extraOptions = array())
 {
     $wrapper = new PhpXmlRpc\Wrapper();
     return $wrapper->wrapXmlrpcServer($client, $extraOptions);
@@ -148,7 +148,7 @@ 
      $faultResponse = '', $namespace = '\\PhpXmlRpc\\')
 {
     $code = "function $xmlrpcFuncName (";
-    if ($clientCopyMode < 2) {
+    if ($clientCopyMode<2) {
         // client copy mode 0 or 1 == partial / full client copy in emitted code
         $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix);
         $innerCode .= "\$client->setDebug(\$debug);\n";
@@ -162,7 +162,7 @@ 
 
     if ($mDesc != '') {
         // take care that PHP comment is not terminated unwillingly by method description
-        $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n";
+        $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n";
     } else {
         $mDesc = "/**\nFunction $xmlrpcFuncName\n";
     }
@@ -171,7 +171,7 @@ 
     $innerCode .= "\$encoder = new {$namespace}Encoder();\n";
     $plist = array();
     $pCount = count($mSig);
-    for ($i = 1; $i < $pCount; $i++) {
+    for ($i = 1; $i<$pCount; $i++) {
         $plist[] = "\$p$i";
         $pType = $mSig[$i];
         if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' ||
@@ -187,19 +187,19 @@ 
             }
         }
         $innerCode .= "\$req->addparam(\$p$i);\n";
-        $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n";
+        $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n";
     }
-    if ($clientCopyMode < 2) {
+    if ($clientCopyMode<2) {
         $plist[] = '$debug=0';
         $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n";
     }
     $plist = implode(', ', $plist);
-    $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n";
+    $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n";
 
     $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n";
     if ($decodeFault) {
         if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) {
-            $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')";
+            $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')";
         } else {
             $respCode = var_export($faultResponse, true);
         }
@@ -212,7 +212,7 @@ 
         $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());";
     }
 
-    $code = $code . $plist . ") {\n" . $innerCode . "\n}\n";
+    $code = $code.$plist.") {\n".$innerCode."\n}\n";
 
     return array('source' => $code, 'docstring' => $mDesc);
 }
@@ -220,10 +220,10 @@ 
 /**
  * @deprecated
  */
-function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc')
+function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc')
 {
     $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path).
-        "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n";
+        "', '".str_replace("'", "\'", $client->server)."', $client->port);\n";
 
     // copy all client fields to the client that will be generated runtime
     // (this provides for future expansion or subclassing of client obj)

tests/index.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
         chmod($GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'], 0777);
     }
 
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/prepend.php";
 }
 
 $targetFile = null;
@@ -38,5 +38,5 @@ 
 }
 
 if (isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) && extension_loaded('xdebug')) {
-    include_once __DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
+    include_once __DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/append.php";
 }

src/Response.php

Spacing +13 added lines, -13 removed lines

@@ -151,35 +151,35 @@ 
     public function serialize($charsetEncoding = '')
     {
         if ($charsetEncoding != '') {
-            $this->content_type = 'text/xml; charset=' . $charsetEncoding;
+            $this->content_type = 'text/xml; charset='.$charsetEncoding;
         } else {
             $this->content_type = 'text/xml';
         }
         if (PhpXmlRpc::$xmlrpc_null_apache_encoding) {
-            $result = "<methodResponse xmlns:ex=\"" . PhpXmlRpc::$xmlrpc_null_apache_encoding_ns . "\">\n";
+            $result = "<methodResponse xmlns:ex=\"".PhpXmlRpc::$xmlrpc_null_apache_encoding_ns."\">\n";
         } else {
             $result = "<methodResponse>\n";
         }
         if ($this->errno) {
             // Let non-ASCII response messages be tolerated by clients by xml-encoding non ascii chars
-            $result .= "<fault>\n" .
-                "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .
-                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
-                Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding) . "</string></value>\n</member>\n" .
+            $result .= "<fault>\n".
+                "<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.
+                "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".
+                Charset::instance()->encodeEntities($this->errstr, PhpXmlRpc::$xmlrpc_internalencoding, $charsetEncoding)."</string></value>\n</member>\n".
                 "</struct>\n</value>\n</fault>";
         } else {
             if (!is_object($this->val) || !is_a($this->val, 'PhpXmlRpc\Value')) {
                 if (is_string($this->val) && $this->valtyp == 'xml') {
-                    $result .= "<params>\n<param>\n" .
-                        $this->val .
+                    $result .= "<params>\n<param>\n".
+                        $this->val.
                         "</param>\n</params>";
                 } else {
                     /// @todo try to build something serializable using the Encoder...
                     throw new \Exception('cannot serialize xmlrpc response objects whose content is native php values');
                 }
             } else {
-                $result .= "<params>\n<param>\n" .
-                    $this->val->serialize($charsetEncoding) .
+                $result .= "<params>\n<param>\n".
+                    $this->val->serialize($charsetEncoding).
                     "</param>\n</params>";
             }
         }
@@ -204,7 +204,7 @@ 
                 return $this->httpResponse['raw_data'];
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                trigger_error('Undefined property via __get(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __get(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
                 return null;
         }
     }
@@ -225,7 +225,7 @@ 
                 break;
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                trigger_error('Undefined property via __set(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __set(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 
@@ -257,7 +257,7 @@ 
                 break;
             default:
                 $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                trigger_error('Undefined property via __unset(): ' . $name . ' in ' . $trace[0]['file'] . ' on line ' . $trace[0]['line'], E_USER_WARNING);
+                trigger_error('Undefined property via __unset(): '.$name.' in '.$trace[0]['file'].' on line '.$trace[0]['line'], E_USER_WARNING);
         }
     }
 }

src/Encoder.php

Spacing +7 added lines, -7 removed lines

@@ -76,13 +76,13 @@ 
                                 'scalar' => $val,
                                 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($val)
                             );
-                            return (object)$xmlrpcVal;
+                            return (object) $xmlrpcVal;
                         case 'base64':
                             $xmlrpcVal = array(
                                 'xmlrpc_type' => 'base64',
                                 'scalar' => $val
                             );
-                            return (object)$xmlrpcVal;
+                            return (object) $xmlrpcVal;
                         case 'string':
                             if (isset($options['extension_api_encoding'])) {
                                 $dval = @iconv('UTF-8', $options['extension_api_encoding'], $val);
@@ -145,7 +145,7 @@ 
             case 'msg':
                 $paramCount = $xmlrpcVal->getNumParams();
                 $arr = array();
-                for ($i = 0; $i < $paramCount; $i++) {
+                for ($i = 0; $i<$paramCount; $i++) {
                     $arr[] = $this->decode($xmlrpcVal->getParam($i), $options);
                 }
                 return $arr;
@@ -262,7 +262,7 @@ 
                 break;
             case 'resource':
                 if (in_array('extension_api', $options)) {
-                    $xmlrpcVal = new Value((int)$phpVal, Value::$xmlrpcInt);
+                    $xmlrpcVal = new Value((int) $phpVal, Value::$xmlrpcInt);
                 } else {
                     $xmlrpcVal = new Value();
                 }
@@ -310,7 +310,7 @@ 
                     if ($valEncoding == 'ISO-8859-1') {
                         $xmlVal = utf8_encode($xmlVal);
                     } else {
-                        $this->getLogger()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of xml text: ' . $valEncoding);
+                        $this->getLogger()->errorLog('XML-RPC: '.__METHOD__.': invalid charset encoding of xml text: '.$valEncoding);
                     }
                 }
             }
@@ -332,7 +332,7 @@ 
             $parserOptions
         );
 
-        if ($xmlRpcParser->_xh['isf'] > 1) {
+        if ($xmlRpcParser->_xh['isf']>1) {
             // test that $xmlrpc->_xh['value'] is an obj, too???
 
             $this->getLogger()->errorLog($xmlRpcParser->_xh['isf_reason']);
@@ -356,7 +356,7 @@ 
 
             case 'methodcall':
                 $req = new Request($xmlRpcParser->_xh['method']);
-                for ($i = 0; $i < count($xmlRpcParser->_xh['params']); $i++) {
+                for ($i = 0; $i<count($xmlRpcParser->_xh['params']); $i++) {
                     $req->addParam($xmlRpcParser->_xh['params'][$i]);
                 }
                 return $req;

debugger/index.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 if (isset($_GET['run'])) {
     $path = parse_url($_GET['run']);
     if (isset($path['query'])) {
-        $query = '?' . $path['query'];
+        $query = '?'.$path['query'];
     }
 }
 

debugger/action.php

Spacing +114 added lines, -114 removed lines

@@ -90,13 +90,13 @@ 
 <body>
 <?php
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 
 if ($action) {
 
     // avoid php hanging when using the builtin webserver and sending requests to itself
     $skip = false;
-    if (php_sapi_name() === 'cli-server' && ((int)getenv('PHP_CLI_SERVER_WORKERS') < 2)) {
+    if (php_sapi_name() === 'cli-server' && ((int) getenv('PHP_CLI_SERVER_WORKERS')<2)) {
         $localHost = explode(':', $_SERVER['HTTP_HOST']);
         /// @todo support also case where port is null (on either side), and when there is a Proxy in the parameters,
         ///       and that proxy is us
@@ -109,7 +109,7 @@ 
     if (!$skip) {
         // make sure the script waits long enough for the call to complete...
         if ($timeout) {
-            set_time_limit($timeout + 10);
+            set_time_limit($timeout+10);
         }
 
         if ($wstype == 1) {
@@ -133,13 +133,13 @@ 
             $server = "$host$path";
         }
         if ($protocol == 2 || $protocol == 3) {
-            $server = 'https://' . $server;
+            $server = 'https://'.$server;
         } else {
-            $server = 'http://' . $server;
+            $server = 'http://'.$server;
         }
         if ($proxy != '') {
             $pproxy = explode(':', $proxy);
-            if (count($pproxy) > 1) {
+            if (count($pproxy)>1) {
                 $pport = $pproxy[1];
             } else {
                 $pport = 8080;
@@ -214,9 +214,9 @@ 
             case 'wrap':
                 $msg[0] = new $requestClass('system.methodHelp', array(), $id);
                 $msg[0]->addparam(new PhpXmlRpc\Value($method));
-                $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1);
+                $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1);
                 $msg[1]->addparam(new PhpXmlRpc\Value($method));
-                $actionname = 'Description of method "' . $method . '"';
+                $actionname = 'Description of method "'.$method.'"';
                 break;
             case 'list':
                 $msg[0] = new $requestClass('system.listMethods', array(), $id);
@@ -229,9 +229,9 @@ 
                 $msg[0] = new $requestClass($method, array(), $id);
                 // hack! build xml payload by hand
                 if ($wstype == 1) {
-                    $msg[0]->payload = "{\n" .
-                        '"method": "' . $method . "\",\n\"params\": [" .
-                        $payload .
+                    $msg[0]->payload = "{\n".
+                        '"method": "'.$method."\",\n\"params\": [".
+                        $payload.
                         "\n],\n\"id\": ";
                     // fix: if user gave an empty string, use NULL, or we'll break json syntax
                     if ($id == "") {
@@ -244,21 +244,21 @@ 
                         }
                     }
                 } else {
-                    $msg[0]->payload = $msg[0]->xml_header($inputcharset) .
-                        '<methodName>' . $method . "</methodName>\n<params>" .
-                        $payload .
-                        "</params>\n" . $msg[0]->xml_footer();
+                    $msg[0]->payload = $msg[0]->xml_header($inputcharset).
+                        '<methodName>'.$method."</methodName>\n<params>".
+                        $payload.
+                        "</params>\n".$msg[0]->xml_footer();
                 }
-                $actionname = 'Execution of method ' . $method;
+                $actionname = 'Execution of method '.$method;
                 break;
             default: // give a warning
-                $actionname = '[ERROR: unknown action] "' . $action . '"';
+                $actionname = '[ERROR: unknown action] "'.$action.'"';
         }
     }
 
     // Before calling execute, echo out brief description of action taken + date and time ???
     // this gives good user feedback for long-running methods...
-    echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n";
+    echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n";
     flush();
 
     $response = null;
@@ -275,7 +275,7 @@ 
             break;
         }
     }
-    $time = microtime(true) - $time;
+    $time = microtime(true)-$time;
     if ($debug) {
         echo "</div>\n";
     }
@@ -285,8 +285,8 @@ 
             // call failed! echo out error msg!
             //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
             echo "<h3>$protoName call FAILED!</h3>\n";
-            echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
-                "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n";
+            echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
+                "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n";
             echo(date("d/M/Y:H:i:s\n"));
         } else {
             // call succeeded: parse results
@@ -302,36 +302,36 @@ 
                         $max = $v->count();
                         echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
                         echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n";
-                        foreach($v as $i => $rec) {
+                        foreach ($v as $i => $rec) {
                             if ($i % 2) {
                                 $class = ' class="oddrow"';
                             } else {
                                 $class = ' class="evenrow"';
                             }
-                            echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" .
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" .
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
-                                "<input type=\"hidden\" name=\"action\" value=\"describe\" />" .
-                                "<input type=\"hidden\" name=\"run\" value=\"now\" />" .
+                            echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">".
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />".
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
+                                "<input type=\"hidden\" name=\"action\" value=\"describe\" />".
+                                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
                                 "<input type=\"submit\" value=\"Describe\" /></form></td>");
                             //echo("</tr>\n");
 
@@ -358,7 +358,7 @@ 
                     $r2 = $resp[1]->value();
 
                     echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
-                    echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
+                    echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
                     $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
                     if ($desc == "") {
                         $desc = "-";
@@ -368,41 +368,41 @@ 
                     if ($r2->kindOf() != "array") {
                         echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
                     } else {
-                        foreach($r2 as $i => $x) {
+                        foreach ($r2 as $i => $x) {
                             $payload = "";
                             $alt_payload = "";
-                            if ($i + 1 % 2) {
+                            if ($i+1 % 2) {
                                 $class = ' class="oddrow"';
                             } else {
                                 $class = ' class="evenrow"';
                             }
-                            echo "<tr><td$class>Signature&nbsp;" . ($i + 1) . "</td><td$class>";
+                            echo "<tr><td$class>Signature&nbsp;".($i+1)."</td><td$class>";
                             if ($x->kindOf() == "array") {
                                 $ret = $x[0];
-                                echo "<code>OUT:&nbsp;" . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: (";
-                                if ($x->count() > 1) {
-                                    foreach($x as $k => $y) {
+                                echo "<code>OUT:&nbsp;".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: (";
+                                if ($x->count()>1) {
+                                    foreach ($x as $k => $y) {
                                         if ($k == 0) continue;
                                         echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
                                         if ($wstype != 1) {
                                             $type = $y->scalarval();
                                             $payload .= '<param><value>';
-                                            switch($type) {
+                                            switch ($type) {
                                                 case 'undefined':
                                                     break;
                                                 case 'null';
                                                     $type = 'nil';
                                                     // fall thru intentionally
                                                 default:
-                                                    $payload .= '<' .
-                                                        htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
-                                                        '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
+                                                    $payload .= '<'.
+                                                        htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
+                                                        '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
                                                         '>';
                                             }
                                             $payload .= "</value></param>\n";
                                         }
                                         $alt_payload .= $y->scalarval();
-                                        if ($k < $x->count() - 1) {
+                                        if ($k<$x->count()-1) {
                                             $alt_payload .= ';';
                                             echo ", ";
                                         }
@@ -415,63 +415,63 @@ 
                             echo '</td>';
                             // button to test this method
                             //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>";
-                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" .
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
+                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
                                 "<input type=\"hidden\" name=\"action\" value=\"execute\" />";
                             if ($wstype != 1) {
                                 echo "<input type=\"submit\" value=\"Load method synopsis\" />";
                             }
                             echo "</form></td>\n";
 
-                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" .
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" .
-                                "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
-                                "<input type=\"hidden\" name=\"run\" value=\"now\" />" .
-                                "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" .
+                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />".
+                                "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
+                                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
+                                "<input type=\"hidden\" name=\"action\" value=\"wrap\" />".
                                 "<input type=\"submit\" value=\"Generate method call stub code\" />";
                             echo "</form></td></tr>\n";
                         }
@@ -483,14 +483,14 @@ 
                 case 'wrap':
                     $r1 = $resp[0]->value();
                     $r2 = $resp[1]->value();
-                    if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) {
+                    if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) {
                         echo "Error: signature unknown\n";
                     } else {
                         $mdesc = $r1->scalarval();
                         $encoder = new PhpXmlRpc\Encoder();
                         $msig = $encoder->decode($r2);
                         $msig = $msig[$methodsig];
-                        $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) );
+                        $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : '')));
                         if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression &&
                             $clientcookies == ''
                         ) {
@@ -504,11 +504,11 @@ 
                             $prefix = 'xmlrpc';
                         }
                         $wrapper = new PhpXmlRpc\Wrapper();
-                        $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc);
+                        $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc);
                         //if ($code)
                         //{
                         echo "<div id=\"phpcode\">\n";
-                        highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>');
+                        highlight_string("<?php\n".$code['docstring'].$code['source'].'?>');
                         echo "\n</div>";
                         //}
                         //else
@@ -519,7 +519,7 @@ 
                     break;
 
                 case 'execute':
-                    echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>';
+                    echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>';
                     break;
 
                 default: // give a warning

debugger/common.php

Spacing +4 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
     // assume this is either a standalone install, or installed as Composer dependency
     /// @todo if the latter is true, should we just not skip using the custom Autoloader, and let a top-level
     ///       debugger include this one, taking care of autoloading?
-    include_once __DIR__ . "/../src/Autoloader.php";
+    include_once __DIR__."/../src/Autoloader.php";
     PhpXmlRpc\Autoloader::register();
 }
 
@@ -34,7 +34,7 @@ 
         }
 
         // Variables that shouldn't be unset
-        $noUnset = array('GLOBALS',  '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
+        $noUnset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES');
 
         $input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES,
             isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array()
@@ -54,8 +54,7 @@ 
     function stripslashes_deep($value)
     {
         $value = is_array($value) ?
-            array_map('stripslashes_deep', $value) :
-            stripslashes($value);
+            array_map('stripslashes_deep', $value) : stripslashes($value);
 
         return $value;
     }
@@ -105,7 +104,7 @@ 
     $path = isset($_GET['path']) ? $_GET['path'] : '';
     // in case user forgot initial '/' in xmlrpc server path, add it back
     if ($path && ($path[0]) != '/') {
-        $path = '/' . $path;
+        $path = '/'.$path;
     }
 
     if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) {