gggeek / phpxmlrpc

demo/server/methodProviders/validator1.php

Spacing +13 added lines, -13 removed lines

@@ -17,7 +17,7 @@ 
             array(Value::$xmlrpcInt, Value::$xmlrpcArray)
         ),
         "docstring" => 'This handler takes a single parameter, an array of structs, each of which contains at least three elements named moe, larry and curly, all <i4>s. Your handler must add all the struct elements named curly and return the result.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $numCurly = 0;
@@ -38,13 +38,13 @@ 
             array(Value::$xmlrpcInt, Value::$xmlrpcStruct)
         ),
         "docstring" => 'This handler takes a single parameter, a struct, containing at least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $moe = $sno["moe"];
             $larry = $sno["larry"];
             $curly = $sno["curly"];
-            $num = $moe->scalarval() + $larry->scalarval() + $curly->scalarval();
+            $num = $moe->scalarval()+$larry->scalarval()+$curly->scalarval();
 
             return new Response(new Value($num, Value::$xmlrpcInt));
         }
@@ -55,7 +55,7 @@ 
             array(Value::$xmlrpcStruct, Value::$xmlrpcStruct)
         ),
         "docstring" => 'This handler takes a single parameter, a struct. Your handler must return the struct.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
 
@@ -71,7 +71,7 @@ 
             )
         ),
         "docstring" => 'This handler takes six parameters, and returns an array containing all the parameters.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             return new Response(new Value(
                 array(
@@ -92,14 +92,14 @@ 
             array(Value::$xmlrpcString, Value::$xmlrpcArray)
         ),
         "docstring" => 'This handler takes a single parameter, which is an array containing between 100 and 200 elements. Each of the items is a string, your handler must return a string containing the concatenated text of the first and last elements.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $ar = $req->getParam(0);
             $sz = $ar->count();
             $first = $ar[0];
-            $last = $ar[$sz - 1];
+            $last = $ar[$sz-1];
 
-            return new Response(new Value($first->scalarval() . $last->scalarval(), Value::$xmlrpcString));
+            return new Response(new Value($first->scalarval().$last->scalarval(), Value::$xmlrpcString));
         }
     ),
 
@@ -108,7 +108,7 @@ 
             array(Value::$xmlrpcStruct, Value::$xmlrpcInt)
         ),
         "docstring" => 'This handler takes one parameter, and returns a struct containing three elements, times10, times100 and times1000, the result of multiplying the number by 10, 100 and 1000.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $v = $sno->scalarval();
@@ -129,7 +129,7 @@ 
             array(Value::$xmlrpcInt, Value::$xmlrpcStruct)
         ),
         "docstring" => 'This handler takes a single parameter, a struct, that models a daily calendar. At the top level, there is one struct for each year. Each year is broken down into months, and months into days. Most of the days are empty in the struct you receive, but the entry for April 1, 2000 contains a least three elements named moe, larry and curly, all &lt;i4&gt;s. Your handler must add the three numbers and return the result.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
 
@@ -140,7 +140,7 @@ 
             $larry = $fools["larry"];
             $moe = $fools["moe"];
 
-            return new Response(new Value($curly->scalarval() + $larry->scalarval() + $moe->scalarval(), Value::$xmlrpcInt));
+            return new Response(new Value($curly->scalarval()+$larry->scalarval()+$moe->scalarval(), Value::$xmlrpcInt));
         }
     ),
 
@@ -149,7 +149,7 @@ 
             array(Value::$xmlrpcStruct, Value::$xmlrpcString)
         ),
         "docstring" => 'This handler takes a single parameter, a string, that contains any number of predefined entities, namely &lt;, &gt;, &amp; \' and ".<BR>Your handler must return a struct that contains five fields, all numbers: ctLeftAngleBrackets, ctRightAngleBrackets, ctAmpersands, ctApostrophes, ctQuotes.',
-        "function" => function ($req)
+        "function" => function($req)
         {
             $sno = $req->getParam(0);
             $str = $sno->scalarval();
@@ -158,7 +158,7 @@ 
             $ap = 0;
             $qu = 0;
             $amp = 0;
-            for ($i = 0; $i < strlen($str); $i++) {
+            for ($i = 0; $i<strlen($str); $i++) {
                 $c = substr($str, $i, 1);
                 switch ($c) {
                     case ">":

demo/server/methodProviders/functions.php

Spacing +11 added lines, -11 removed lines

@@ -54,11 +54,11 @@ 
         $snv = $sno->scalarval();
 
         // look it up in our array (zero-based)
-        if (isset(self::$stateNames[$snv - 1])) {
-            $stateName = self::$stateNames[$snv - 1];
+        if (isset(self::$stateNames[$snv-1])) {
+            $stateName = self::$stateNames[$snv-1];
         } else {
             // not there, so complain
-            $err = "I don't have a state for the index '" . $snv . "'";
+            $err = "I don't have a state for the index '".$snv."'";
         }
 
         if ($err != '') {
@@ -132,7 +132,7 @@ 
         $s = $req->getParam(0);
         $t = $req->getParam(1);
 
-        return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcInt));
+        return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcInt));
     }
 
     public static $addtwodouble_sig = array(array('double', 'double', 'double'));
@@ -142,7 +142,7 @@ 
         $s = $req->getParam(0);
         $t = $req->getParam(1);
 
-        return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcDouble));
+        return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcDouble));
     }
 
     public static $stringecho_sig = array(array('string', 'string'));
@@ -165,7 +165,7 @@ 
         ///       In fact, we miss some API (or extra data) in the Request...
         //$payload = file_get_contents('php://input');
         $payload = $req->serialize(PhpXmlRpc::$xmlrpc_internalencoding);
-        $s = "I got the following message:\n" . $payload;
+        $s = "I got the following message:\n".$payload;
 
         return new Response(new Value($s));
     }
@@ -238,17 +238,17 @@ 
 
         /// @todo in real life, we should check for presence of return characters to avoid header injection!
 
-        $msgHdr = "From: " . $mFrom->scalarval() . "\n";
-        $msgHdr .= "To: " . $mTo->scalarval() . "\n";
+        $msgHdr = "From: ".$mFrom->scalarval()."\n";
+        $msgHdr .= "To: ".$mTo->scalarval()."\n";
 
         if ($mCc->scalarval() != "") {
-            $msgHdr .= "Cc: " . $mCc->scalarval() . "\n";
+            $msgHdr .= "Cc: ".$mCc->scalarval()."\n";
         }
         if ($mBcc->scalarval() != "") {
-            $msgHdr .= "Bcc: " . $mBcc->scalarval() . "\n";
+            $msgHdr .= "Bcc: ".$mBcc->scalarval()."\n";
         }
         if ($mMime->scalarval() != "") {
-            $msgHdr .= "Content-type: " . $mMime->scalarval() . "\n";
+            $msgHdr .= "Content-type: ".$mMime->scalarval()."\n";
         }
         $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0";
 

demo/server/proxy.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
  * @license code licensed under the BSD License: see file license.txt
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 // *** NB: WE BLOCK THIS FROM RUNNING BY DEFAULT IN CASE ACCESS IS GRANTED TO IT IN PRODUCTION BY MISTAKE ***
 // Comment out the following safeguard if you want to use it as is, but remember: this is an open relay !!!
@@ -46,7 +46,7 @@ 
     //            fe. any url using the 'file://' protocol might be considered a hacking attempt
     $client = new Client($url);
 
-    if ($req->getNumParams() > 3) {
+    if ($req->getNumParams()>3) {
         // We have to set some options onto the client.
         // Note that if we do not untaint the received values, warnings might be generated...
         $options = $encoder->decode($req->getParam(3));
@@ -86,7 +86,7 @@ 
                     $client->setSSLVerifyPeer($val);
                     break;
                 case 'Timeout':
-                    $timeout = (integer)$val;
+                    $timeout = (integer) $val;
                     break;
             } // switch
         }
@@ -99,7 +99,7 @@ 
     ///         X-forwarded-for anyway, unless they consider this server as trusted...)
     $reqMethod = $req->getParam(1)->scalarval();
     $req = new Request($reqMethod);
-    if ($req->getNumParams() > 1) {
+    if ($req->getNumParams()>1) {
         $pars = $req->getParam(2);
         foreach ($pars as $par) {
             $req->addParam($par);
@@ -107,7 +107,7 @@ 
     }
 
     // add debug info into response we give back to caller
-    Server::xmlrpc_debugmsg("Sending to server $url the payload: " . $req->serialize());
+    Server::xmlrpc_debugmsg("Sending to server $url the payload: ".$req->serialize());
 
     return $client->send($req, $timeout);
 }

demo/server/discuss.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  *   `$functions_parameters_type` and `$exception_handling`
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 require_once __DIR__.'/methodProviders/CommentManager.php';
 
@@ -19,12 +19,12 @@ 
 
 $addComment_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcString, Value::$xmlrpcString, Value::$xmlrpcString));
 
-$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, ' .
+$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, '.
     'and the third is the comment itself. Returns the number of comments against that ID.';
 
 $getComments_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcString));
 
-$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct ' .
+$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct '.
     'containing name and comment text.';
 
 $srv = new Server();

demo/client/windowscharset.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 /**
  * Demoing the charset conversion of the library: create a client class which uses data in the CP-1252 character set,

debugger/controller.php

Spacing +19 added lines, -19 removed lines

@@ -17,7 +17,7 @@ 
 // Make sure we set the correct charset type for output, so that we can display all characters
 header('Content-Type: text/html; charset=utf-8');
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 if ($action == '') {
     $action = 'list';
 }
@@ -33,30 +33,30 @@ 
     /// @const JSXMLRPC_PATH Path to the visual xml-rpc editing dialog's containing folder. Can be absolute, or
     ///         relative to this debugger's folder.
     if (defined('JSXMLRPC_PATH')) {
-        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH));
+        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH));
     } else {
         $editorpaths = array(
-            __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile
-            __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger
-            __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger
-            __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
-            __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
-            __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
-            __DIR__ . '/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc)
-            __DIR__ . '/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer
-            __DIR__ . '/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm
-            __DIR__ . '/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project
+            __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile
+            __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer inside the debugger
+            __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm inside the debugger
+            __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
+            __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
+            __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
+            __DIR__.'/../../../../debugger/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level via taskfile (ie. jsonrpc)
+            __DIR__.'/../../../../debugger/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via composer
+            __DIR__.'/../../../../debugger/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed in the top-level debugger via npm
+            __DIR__.'/../../../../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm in the top-level project
         );
     }
-    foreach($editorpaths as $editorpath) {
-        if (is_file(realpath($editorpath . 'visualeditor.html'))) {
+    foreach ($editorpaths as $editorpath) {
+        if (is_file(realpath($editorpath.'visualeditor.html'))) {
             $haseditor = true;
             break;
         }
     }
     if ($haseditor) {
-        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'],  PHP_URL_PATH));
-        $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath);
+        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
+        $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath);
         /// @todo for cases above 4 and up, look at $controllerRootUrl and check if the web root is not pointing directly
         ///       at this folder, as in that case the link to the visualeditor will not
         ///       work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html
@@ -233,7 +233,7 @@ 
         }
 
         function activateeditor() {
-            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\", "\\'"), $alt_payload); ?>';
+            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>';
             if (document.frmaction.wstype.value == "1")
                 url += '&type=jsonrpc';
             var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1');
@@ -278,7 +278,7 @@ 
     JSON-RPC';
 } ?>
 Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
-<?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>
+<?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>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
 
     <table id="serverblock">
@@ -339,7 +339,7 @@ 
                 </select>
             </td>
             <td class="labelcell">Timeout:</td>
-            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
+            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
             <td></td>
             <td></td>
         </tr>

Braces +16 added lines, -4 removed lines

@@ -66,7 +66,12 @@ 
 <html lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
+    echo 'JSON-RPC';
+} else {
+    echo 'XML-RPC';
+}
+?> Debugger</title>
     <meta name="robots" content="index,nofollow"/>
     <script type="text/javascript" language="Javascript">
         if (window.name != 'frmcontroller')
@@ -266,19 +271,26 @@ 
     </script>
 </head>
 <body
-    onload="<?php if ($hasjsonrpcclient) echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
+    onload="<?php if ($hasjsonrpcclient) {
+    echo "switchtransport($wstype); " ?>switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) {
         echo ' document.frmaction.submit();';
+}
     } ?>">
 <h1>XML-RPC
 <?php if ($hasjsonrpcclient) {
     echo '<form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"';
     // q: does this if make sense at all?
-    if (!class_exists('\PhpXmlRpc\Client')) echo ' disabled="disabled"';
+    if (!class_exists('\PhpXmlRpc\Client')) {
+        echo ' disabled="disabled"';
+    }
     echo ' /></form> / <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>
     JSON-RPC';
 } ?>
 Debugger</h1><h3>(based on <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a>, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>
-<?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>
+<?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>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
 
     <table id="serverblock">

debugger/action.php

Braces +9 added lines, -2 removed lines

@@ -15,7 +15,12 @@ 
 <html lang="en">
 <head>
     <link rel="icon" type="image/vnd.microsoft.icon" href="favicon.ico">
-    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) echo 'JSON-RPC'; else echo 'XML-RPC'; ?> Debugger</title>
+    <title><?php if (defined('DEFAULT_WSTYPE') && DEFAULT_WSTYPE == 1) {
+    echo 'JSON-RPC';
+} else {
+    echo 'XML-RPC';
+}
+?> Debugger</title>
     <meta name="robots" content="index,nofollow"/>
     <style type="text/css">
         <!--
@@ -367,7 +372,9 @@ 
                                 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;
+                                        if ($k == 0) {
+                                            continue;
+                                        }
                                         echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
                                         if ($wstype == 1) {
                                             switch($y->scalarval()) {

Spacing +115 added lines, -115 removed lines

@@ -78,13 +78,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
@@ -97,7 +97,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) {
@@ -118,13 +118,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;
@@ -199,9 +199,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);
@@ -214,9 +214,9 @@ 
                 $msg[0] = new $requestClass($method, array(), $id);
                 // hack! build 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 == "") {
@@ -229,21 +229,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;
@@ -260,7 +260,7 @@ 
             break;
         }
     }
-    $time = microtime(true) - $time;
+    $time = microtime(true)-$time;
     if ($debug) {
         echo "</div>\n";
     }
@@ -270,8 +270,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
@@ -287,36 +287,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");
 
@@ -343,7 +343,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 = "-";
@@ -353,24 +353,24 @@ 
                     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) {
-                                            switch($y->scalarval()) {
+                                            switch ($y->scalarval()) {
                                                 case 'string':
                                                 case 'dateTime.iso8601':
                                                 case 'base64':
@@ -403,22 +403,22 @@ 
                                         } else {
                                             $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 .= ';';
                                             if ($wstype == 1) {
                                                 $payload .= ', ';
@@ -434,63 +434,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=\"action\" value=\"wrap\" />" .
-                                "<input type=\"hidden\" name=\"run\" value=\"now\" />" .
+                            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=\"action\" value=\"wrap\" />".
+                                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
                                 "<input type=\"submit\" value=\"Generate method call stub code\" />";
                             echo "</form></td></tr>\n";
                         }
@@ -502,14 +502,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 == '') {
                             $opts = 1; // simple client copy in stub code
@@ -530,12 +530,12 @@ 
                             $client,
                             $method,
                             array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix, 'throw_on_fault' => true),
-                            str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc
+                            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
@@ -546,7 +546,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 +11 added lines, -11 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()
@@ -86,7 +86,7 @@ 
 $id = '';
 if (isset($_GET['action'])) {
     if (isset($_GET['wstype']) && ($_GET['wstype'] == '1' || $_GET['wstype'] == '0')) {
-        $wstype = (int)$_GET['wstype'];
+        $wstype = (int) $_GET['wstype'];
         if ($wstype === 1 && !$hasjsonrpcclient) {
             $wstype = 0;
         }
@@ -97,7 +97,7 @@ 
     $host = isset($_GET['host']) ? $_GET['host'] : 'localhost'; // using '' will trigger an xml-rpc error...
     if (isset($_GET['protocol']) && ($_GET['protocol'] == '1' || $_GET['protocol'] == '2' || $_GET['protocol'] == '3'
         || $_GET['protocol'] == '4')) {
-        $protocol = (int)$_GET['protocol'];
+        $protocol = (int) $_GET['protocol'];
     }
     if (strpos($host, 'http://') === 0) {
         // NB: if protocol is https or h2, it will override http://
@@ -109,18 +109,18 @@ 
             $protocol = 2;
         }
     }
-    $port = isset($_GET['port']) ? (int)$_GET['port'] : '';
+    $port = isset($_GET['port']) ? (int) $_GET['port'] : '';
     if ($port === 0) {
         $port = '';
     }
     $path = isset($_GET['path']) ? $_GET['path'] : '';
     // in case user forgot initial '/' in xml-rpc server path, add it back
     if ($path && ($path[0]) != '/') {
-        $path = '/' . $path;
+        $path = '/'.$path;
     }
 
     if (isset($_GET['debug']) && ($_GET['debug'] == '1' || $_GET['debug'] == '2')) {
-        $debug = (int)$_GET['debug'];
+        $debug = (int) $_GET['debug'];
     }
 
     $verifyhost = (isset($_GET['verifyhost']) && ($_GET['verifyhost'] == '1' || $_GET['verifyhost'] == '2')) ? $_GET['verifyhost'] : 0;
@@ -137,7 +137,7 @@ 
     /// @todo what about an https proxy?
     $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
     $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : '';
-    $timeout = isset($_GET['timeout']) ? (int)$_GET['timeout'] : 0;
+    $timeout = isset($_GET['timeout']) ? (int) $_GET['timeout'] : 0;
     $action = $_GET['action'];
 
     $method = isset($_GET['method']) ? $_GET['method'] : '';
@@ -152,15 +152,15 @@ 
     $username = isset($_GET['username']) ? $_GET['username'] : '';
     $password = isset($_GET['password']) ? $_GET['password'] : '';
 
-    $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int)$_GET['authtype'] : 1;
+    $authtype = (isset($_GET['authtype']) && ($_GET['authtype'] == '2' || $_GET['authtype'] == '8')) ? (int) $_GET['authtype'] : 1;
 
     if (isset($_GET['requestcompression']) && ($_GET['requestcompression'] == '1' || $_GET['requestcompression'] == '2')) {
-        (int)$requestcompression = $_GET['requestcompression'];
+        (int) $requestcompression = $_GET['requestcompression'];
     } else {
         $requestcompression = 0;
     }
     if (isset($_GET['responsecompression']) && ($_GET['responsecompression'] == '1' || $_GET['responsecompression'] == '2' || $_GET['responsecompression'] == '3')) {
-        $responsecompression = (int)$_GET['responsecompression'];
+        $responsecompression = (int) $_GET['responsecompression'];
     } else {
         $responsecompression = 0;
     }

src/Wrapper.php

Braces +3 added lines, -2 removed lines

@@ -605,8 +605,9 @@
         }
         foreach ($parsVariations as $i => $pars) {
             $innerCode .= "  if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n";
-            if ($i < (count($parsVariations) - 1))
-                $innerCode .= "  else\n";
+            if ($i < (count($parsVariations) - 1)) {
+                            $innerCode .= "  else\n";
+            }
         }
         $innerCode .= "  if (is_a(\$retVal, '" . static::$namespace . "Response'))\n    return \$retVal;\n  else\n";
         /// q: why not do the same for int, float, bool, string?

Spacing +96 added lines, -96 removed lines

@@ -173,20 +173,20 @@ 
             $callable = explode('::', $callable);
         }
         if (is_array($callable)) {
-            if (count($callable) < 2 || (!is_string($callable[0]) && !is_object($callable[0]))) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': syntax for function to be wrapped is wrong');
+            if (count($callable)<2 || (!is_string($callable[0]) && !is_object($callable[0]))) {
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': syntax for function to be wrapped is wrong');
                 return false;
             }
             if (is_string($callable[0])) {
                 $plainFuncName = implode('::', $callable);
             } elseif (is_object($callable[0])) {
-                $plainFuncName = get_class($callable[0]) . '->' . $callable[1];
+                $plainFuncName = get_class($callable[0]).'->'.$callable[1];
             }
             $exists = method_exists($callable[0], $callable[1]);
         } else if ($callable instanceof \Closure) {
             // we do not support creating code which wraps closures, as php does not allow to serialize them
             if (!$buildIt) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': a closure can not be wrapped in generated source code');
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': a closure can not be wrapped in generated source code');
                 return false;
             }
 
@@ -198,7 +198,7 @@ 
         }
 
         if (!$exists) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': function to be wrapped is not defined: ' . $plainFuncName);
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': function to be wrapped is not defined: '.$plainFuncName);
             return false;
         }
 
@@ -242,23 +242,23 @@ 
         if (is_array($callable)) {
             $func = new \ReflectionMethod($callable[0], $callable[1]);
             if ($func->isPrivate()) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is private: ' . $plainFuncName);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is private: '.$plainFuncName);
                 return false;
             }
             if ($func->isProtected()) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is protected: ' . $plainFuncName);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is protected: '.$plainFuncName);
                 return false;
             }
             if ($func->isConstructor()) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the constructor: ' . $plainFuncName);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is the constructor: '.$plainFuncName);
                 return false;
             }
             if ($func->isDestructor()) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is the destructor: ' . $plainFuncName);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is the destructor: '.$plainFuncName);
                 return false;
             }
             if ($func->isAbstract()) {
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': method to be wrapped is abstract: ' . $plainFuncName);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': method to be wrapped is abstract: '.$plainFuncName);
                 return false;
             }
             /// @todo add more checks for static vs. nonstatic?
@@ -268,7 +268,7 @@ 
         if ($func->isInternal()) {
             /// @todo from PHP 5.1.0 onward, we should be able to use invokeargs instead of getparameters to fully
             ///       reflect internal php functions
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': function to be wrapped is internal: ' . $plainFuncName);
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': function to be wrapped is internal: '.$plainFuncName);
             return false;
         }
 
@@ -320,7 +320,7 @@ 
         $i = 0;
         foreach ($func->getParameters() as $paramObj) {
             $params[$i] = array();
-            $params[$i]['name'] = '$' . $paramObj->getName();
+            $params[$i]['name'] = '$'.$paramObj->getName();
             $params[$i]['isoptional'] = $paramObj->isOptional();
             $i++;
         }
@@ -384,7 +384,7 @@ 
             // build a signature
             $sig = array($this->php2XmlrpcType($funcDesc['returns']));
             $pSig = array($funcDesc['returnsDocs']);
-            for ($i = 0; $i < count($pars); $i++) {
+            for ($i = 0; $i<count($pars); $i++) {
                 $name = strtolower($funcDesc['params'][$i]['name']);
                 if (isset($funcDesc['paramDocs'][$name]['type'])) {
                     $sig[] = $this->php2XmlrpcType($funcDesc['paramDocs'][$name]['type']);
@@ -440,7 +440,7 @@ 
                 }
             }
             $numPars = $req->getNumParams();
-            if ($numPars < $minPars || $numPars > $maxPars) {
+            if ($numPars<$minPars || $numPars>$maxPars) {
                 return new $responseClass(0, 3, 'Incorrect parameters passed to method');
             }
 
@@ -453,7 +453,7 @@ 
 
             $result = call_user_func_array($callable, $params);
 
-            if (! is_a($result, $responseClass)) {
+            if (!is_a($result, $responseClass)) {
                 // q: why not do the same for int, float, bool, string?
                 if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) {
                     $result = new $valueClass($result, $funcDesc['returns']);
@@ -492,9 +492,9 @@ 
         if ($newFuncName == '') {
             if (is_array($callable)) {
                 if (is_string($callable[0])) {
-                    $xmlrpcFuncName = "{$prefix}_" . implode('_', $callable);
+                    $xmlrpcFuncName = "{$prefix}_".implode('_', $callable);
                 } else {
-                    $xmlrpcFuncName = "{$prefix}_" . get_class($callable[0]) . '_' . $callable[1];
+                    $xmlrpcFuncName = "{$prefix}_".get_class($callable[0]).'_'.$callable[1];
                 }
             } else {
                 if ($callable instanceof \Closure) {
@@ -526,9 +526,9 @@ 
      */
     protected function buildWrapFunctionSource($callable, $newFuncName, $extraOptions, $plainFuncName, $funcDesc)
     {
-        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false;
-        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
+        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false;
+        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
         $catchWarnings = isset($extraOptions['suppress_warnings']) && $extraOptions['suppress_warnings'] ? '@' : '';
 
         $i = 0;
@@ -563,9 +563,9 @@ 
         // build body of new function
 
         $innerCode = "  \$paramCount = \$req->getNumParams();\n";
-        $innerCode .= "  if (\$paramCount < $minPars || \$paramCount > $maxPars) return new " . static::$namespace . "Response(0, " . PhpXmlRpc::$xmlrpcerr['incorrect_params'] . ", '" . PhpXmlRpc::$xmlrpcstr['incorrect_params'] . "');\n";
+        $innerCode .= "  if (\$paramCount < $minPars || \$paramCount > $maxPars) return new ".static::$namespace."Response(0, ".PhpXmlRpc::$xmlrpcerr['incorrect_params'].", '".PhpXmlRpc::$xmlrpcstr['incorrect_params']."');\n";
 
-        $innerCode .= "  \$encoder = new " . static::$namespace . "Encoder();\n";
+        $innerCode .= "  \$encoder = new ".static::$namespace."Encoder();\n";
         if ($decodePhpObjects) {
             $innerCode .= "  \$params = \$encoder->decode(\$req, array('decode_php_objs'));\n";
         } else {
@@ -578,23 +578,23 @@ 
             static::holdObject($newFuncName, $callable[0]);
             $class = get_class($callable[0]);
             if ($class[0] !== '\\') {
-                $class = '\\' . $class;
+                $class = '\\'.$class;
             }
             $innerCode .= "  /// @var $class \$obj\n";
             $innerCode .= "  \$obj = PhpXmlRpc\\Wrapper::getHeldObject('$newFuncName');\n";
-            $realFuncName = '$obj->' . $callable[1];
+            $realFuncName = '$obj->'.$callable[1];
         } else {
             $realFuncName = $plainFuncName;
         }
         foreach ($parsVariations as $i => $pars) {
-            $innerCode .= "  if (\$paramCount == " . count($pars) . ") \$retVal = {$catchWarnings}$realFuncName(" . implode(',', $pars) . ");\n";
-            if ($i < (count($parsVariations) - 1))
+            $innerCode .= "  if (\$paramCount == ".count($pars).") \$retVal = {$catchWarnings}$realFuncName(".implode(',', $pars).");\n";
+            if ($i<(count($parsVariations)-1))
                 $innerCode .= "  else\n";
         }
-        $innerCode .= "  if (is_a(\$retVal, '" . static::$namespace . "Response'))\n    return \$retVal;\n  else\n";
+        $innerCode .= "  if (is_a(\$retVal, '".static::$namespace."Response'))\n    return \$retVal;\n  else\n";
         /// q: why not do the same for int, float, bool, string?
         if ($funcDesc['returns'] == Value::$xmlrpcDateTime || $funcDesc['returns'] == Value::$xmlrpcBase64) {
-            $innerCode .= "    return new " . static::$namespace . "Response(new " . static::$namespace . "Value(\$retVal, '{$funcDesc['returns']}'));";
+            $innerCode .= "    return new ".static::$namespace."Response(new ".static::$namespace."Value(\$retVal, '{$funcDesc['returns']}'));";
         } else {
             $encodeOptions = array();
             if ($encodeNulls) {
@@ -605,18 +605,18 @@ 
             }
 
             if ($encodeOptions) {
-                $innerCode .= "    return new " . static::$namespace . "Response(\$encoder->encode(\$retVal, array('" .
-                    implode("', '", $encodeOptions) . "')));";
+                $innerCode .= "    return new ".static::$namespace."Response(\$encoder->encode(\$retVal, array('".
+                    implode("', '", $encodeOptions)."')));";
             } else {
-                $innerCode .= "    return new " . static::$namespace . "Response(\$encoder->encode(\$retVal));";
+                $innerCode .= "    return new ".static::$namespace."Response(\$encoder->encode(\$retVal));";
             }
         }
         // shall we exclude functions returning by ref?
         // if ($func->returnsReference())
         //     return false;
 
-        $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n" .
-            "function $newFuncName(\$req)\n{\n" . $innerCode . "\n}";
+        $code = "/**\n * @param \PhpXmlRpc\Request \$req\n * @return \PhpXmlRpc\Response\n * @throws \\Exception\n */\n".
+            "function $newFuncName(\$req)\n{\n".$innerCode."\n}";
 
         return $code;
     }
@@ -676,7 +676,7 @@ 
     protected function generateMethodNameForClassMethod($className, $classMethod, $extraOptions = array())
     {
         if (isset($extraOptions['replace_class_name']) && $extraOptions['replace_class_name']) {
-            return (isset($extraOptions['prefix']) ?  $extraOptions['prefix'] : '') . $classMethod;
+            return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '').$classMethod;
         }
 
         if (is_object($className)) {
@@ -684,7 +684,7 @@ 
         } else {
             $realClassName = $className;
         }
-        return (isset($extraOptions['prefix']) ?  $extraOptions['prefix'] : '') . "$realClassName.$classMethod";
+        return (isset($extraOptions['prefix']) ? $extraOptions['prefix'] : '')."$realClassName.$classMethod";
     }
 
     /**
@@ -780,14 +780,14 @@ 
      */
     protected function retrieveMethodSignature($client, $methodName, array $extraOptions = array())
     {
-        $reqClass = static::$namespace . 'Request';
-        $valClass = static::$namespace . 'Value';
-        $decoderClass = static::$namespace . 'Encoder';
+        $reqClass = static::$namespace.'Request';
+        $valClass = static::$namespace.'Value';
+        $decoderClass = static::$namespace.'Encoder';
 
         $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0;
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
-        $sigNum = isset($extraOptions['signum']) ? (int)$extraOptions['signum'] : 0;
+        $sigNum = isset($extraOptions['signum']) ? (int) $extraOptions['signum'] : 0;
 
         $req = new $reqClass('system.methodSignature');
         $req->addParam(new $valClass($methodName));
@@ -797,7 +797,7 @@ 
         $response = $client->send($req, $timeout, $protocol);
         $client->setDebug($origDebug);
         if ($response->faultCode()) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature from remote server for method ' . $methodName);
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method signature from remote server for method '.$methodName);
             return false;
         }
 
@@ -808,8 +808,8 @@ 
             $mSig = $decoder->decode($mSig);
         }
 
-        if (!is_array($mSig) || count($mSig) <= $sigNum) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method signature nr.' . $sigNum . ' from remote server for method ' . $methodName);
+        if (!is_array($mSig) || count($mSig)<=$sigNum) {
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method signature nr.'.$sigNum.' from remote server for method '.$methodName);
             return false;
         }
 
@@ -824,11 +824,11 @@ 
      */
     protected function retrieveMethodHelp($client, $methodName, array $extraOptions = array())
     {
-        $reqClass = static::$namespace . 'Request';
-        $valClass = static::$namespace . 'Value';
+        $reqClass = static::$namespace.'Request';
+        $valClass = static::$namespace.'Value';
 
         $debug = isset($extraOptions['debug']) ? ($extraOptions['debug']) : 0;
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
 
         $mDesc = '';
@@ -865,11 +865,11 @@ 
         $clientClone = clone $client;
         $function = function() use($clientClone, $methodName, $extraOptions, $mSig)
         {
-            $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+            $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
             $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
-            $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-            $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
-            $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false;
+            $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+            $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
+            $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false;
             $throwFault = false;
             $decodeFault = false;
             $faultResponse = null;
@@ -880,9 +880,9 @@ 
                 $faultResponse = $extraOptions['return_on_fault'];
             }
 
-            $reqClass = static::$namespace . 'Request';
-            $encoderClass = static::$namespace . 'Encoder';
-            $valueClass = static::$namespace . 'Value';
+            $reqClass = static::$namespace.'Request';
+            $encoderClass = static::$namespace.'Encoder';
+            $valueClass = static::$namespace.'Value';
 
             $encoder = new $encoderClass();
             $encodeOptions = array();
@@ -964,14 +964,14 @@ 
      * @param string $mDesc
      * @return string[] keys: source, docstring
      */
-    public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc='')
+    public function buildWrapMethodSource($client, $methodName, array $extraOptions, $newFuncName, $mSig, $mDesc = '')
     {
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
-        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
-        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false;
-        $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int)($extraOptions['simple_client_copy']) : 0;
+        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
+        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false;
+        $clientCopyMode = isset($extraOptions['simple_client_copy']) ? (int) ($extraOptions['simple_client_copy']) : 0;
         $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc';
         $throwFault = false;
         $decodeFault = false;
@@ -984,10 +984,10 @@ 
         }
 
         $code = "function $newFuncName(";
-        if ($clientCopyMode < 2) {
+        if ($clientCopyMode<2) {
             // client copy mode 0 or 1 == full / partial client copy in emitted code
             $verbatimClientCopy = !$clientCopyMode;
-            $innerCode = '  ' . str_replace("\n", "\n  ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace));
+            $innerCode = '  '.str_replace("\n", "\n  ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace));
             $innerCode .= "\$client->setDebug(\$debug);\n";
             $this_ = '';
         } else {
@@ -995,28 +995,28 @@ 
             $innerCode = '';
             $this_ = 'this->';
         }
-        $innerCode .= "  \$req = new " . static::$namespace . "Request('$methodName');\n";
+        $innerCode .= "  \$req = new ".static::$namespace."Request('$methodName');\n";
 
         if ($mDesc != '') {
             // take care that PHP comment is not terminated unwillingly by method description
             /// @todo according to the spec, method desc can have html in it. We should run it through strip_tags...
-            $mDesc = "/**\n * " . str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc) . "\n";
+            $mDesc = "/**\n * ".str_replace(array("\n", '*/'), array("\n * ", '* /'), $mDesc)."\n";
         } else {
             $mDesc = "/**\n * Function $newFuncName.\n";
         }
 
         // param parsing
-        $innerCode .= "  \$encoder = new " . static::$namespace . "Encoder();\n";
+        $innerCode .= "  \$encoder = new ".static::$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' ||
                 $pType == 'string' || $pType == 'dateTime.iso8601' || $pType == 'base64' || $pType == 'null'
             ) {
                 // only build directly xml-rpc values when type is known and scalar
-                $innerCode .= "  \$p$i = new " . static::$namespace . "Value(\$p$i, '$pType');\n";
+                $innerCode .= "  \$p$i = new ".static::$namespace."Value(\$p$i, '$pType');\n";
             } else {
                 if ($encodePhpObjects || $encodeNulls) {
                     $encOpts = array();
@@ -1027,26 +1027,26 @@ 
                         $encOpts[] = 'null_extension';
                     }
 
-                    $innerCode .= "  \$p$i = \$encoder->encode(\$p$i, array( '" . implode("', '", $encOpts) . "'));\n";
+                    $innerCode .= "  \$p$i = \$encoder->encode(\$p$i, array( '".implode("', '", $encOpts)."'));\n";
                 } else {
                     $innerCode .= "  \$p$i = \$encoder->encode(\$p$i);\n";
                 }
             }
             $innerCode .= "  \$req->addParam(\$p$i);\n";
-            $mDesc .= " * @param " . $this->xmlrpc2PhpType($pType) . " \$p$i\n";
+            $mDesc .= " * @param ".$this->xmlrpc2PhpType($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 ' . $this->xmlrpc2PhpType($mSig[0]);
+        $mDesc .= ' * @return '.$this->xmlrpc2PhpType($mSig[0]);
         if ($throwFault) {
-            $mDesc .= "\n * @throws " . (is_string($throwFault) ? $throwFault : '\\PhpXmlRpc\\Exception');
+            $mDesc .= "\n * @throws ".(is_string($throwFault) ? $throwFault : '\\PhpXmlRpc\\Exception');
         } else if ($decodeFault) {
-            $mDesc .= '|' . gettype($faultResponse) . " (a " . gettype($faultResponse) . " if call fails)";
+            $mDesc .= '|'.gettype($faultResponse)." (a ".gettype($faultResponse)." if call fails)";
         } else {
-            $mDesc .= '|' . static::$namespace . "Response (a " . static::$namespace . "Response obj instance if call fails)";
+            $mDesc .= '|'.static::$namespace."Response (a ".static::$namespace."Response obj instance if call fails)";
         }
         $mDesc .= "\n */\n";
 
@@ -1059,9 +1059,9 @@ 
             $respCode = "throw new $throwFault(\$res->faultString(), \$res->faultCode())";
         } else if ($decodeFault) {
             if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) {
-                $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')";
+                $respCode = "return str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')";
             } else {
-                $respCode = 'return ' . var_export($faultResponse, true);
+                $respCode = 'return '.var_export($faultResponse, true);
             }
         } else {
             $respCode = 'return $res';
@@ -1072,7 +1072,7 @@ 
             $innerCode .= "  if (\$res->faultCode()) $respCode; else return \$encoder->decode(\$res->value());";
         }
 
-        $code = $code . $plist . ")\n{\n" . $innerCode . "\n}\n";
+        $code = $code.$plist.")\n{\n".$innerCode."\n}\n";
 
         return array('source' => $code, 'docstring' => $mDesc);
     }
@@ -1102,26 +1102,26 @@ 
     public function wrapXmlrpcServer($client, $extraOptions = array())
     {
         $methodFilter = isset($extraOptions['method_filter']) ? $extraOptions['method_filter'] : '';
-        $timeout = isset($extraOptions['timeout']) ? (int)$extraOptions['timeout'] : 0;
+        $timeout = isset($extraOptions['timeout']) ? (int) $extraOptions['timeout'] : 0;
         $protocol = isset($extraOptions['protocol']) ? $extraOptions['protocol'] : '';
         $newClassName = isset($extraOptions['new_class_name']) ? $extraOptions['new_class_name'] : '';
-        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool)$extraOptions['encode_nulls'] : false;
-        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool)$extraOptions['encode_php_objs'] : false;
-        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool)$extraOptions['decode_php_objs'] : false;
+        $encodeNulls = isset($extraOptions['encode_nulls']) ? (bool) $extraOptions['encode_nulls'] : false;
+        $encodePhpObjects = isset($extraOptions['encode_php_objs']) ? (bool) $extraOptions['encode_php_objs'] : false;
+        $decodePhpObjects = isset($extraOptions['decode_php_objs']) ? (bool) $extraOptions['decode_php_objs'] : false;
         $verbatimClientCopy = isset($extraOptions['simple_client_copy']) ? !($extraOptions['simple_client_copy']) : true;
-        $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool)$extraOptions['throw_on_fault'] : false;
+        $throwOnFault = isset($extraOptions['throw_on_fault']) ? (bool) $extraOptions['throw_on_fault'] : false;
         $buildIt = isset($extraOptions['return_source']) ? !($extraOptions['return_source']) : true;
         $prefix = isset($extraOptions['prefix']) ? $extraOptions['prefix'] : 'xmlrpc';
 
-        $reqClass = static::$namespace . 'Request';
-        $decoderClass = static::$namespace . 'Encoder';
+        $reqClass = static::$namespace.'Request';
+        $decoderClass = static::$namespace.'Encoder';
 
         // retrieve the list of methods
         $req = new $reqClass('system.listMethods');
         /// @todo move setting of timeout, protocol to outside the send() call
         $response = $client->send($req, $timeout, $protocol);
         if ($response->faultCode()) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve method list from remote server');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve method list from remote server');
 
             return false;
         }
@@ -1132,7 +1132,7 @@ 
             $mList = $decoder->decode($mList);
         }
         if (!is_array($mList) || !count($mList)) {
-            $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not retrieve meaningful method list from remote server');
+            $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not retrieve meaningful method list from remote server');
 
             return false;
         }
@@ -1142,8 +1142,8 @@ 
             $xmlrpcClassName = $newClassName;
         } else {
             /// @todo direct access to $client->server is now deprecated
-            $xmlrpcClassName = $prefix . '_' . preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), array('_', ''),
-                $client->server) . '_client';
+            $xmlrpcClassName = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'), array('_', ''),
+                $client->server).'_client';
         }
         while ($buildIt && class_exists($xmlrpcClassName)) {
             $xmlrpcClassName .= 'x';
@@ -1151,7 +1151,7 @@ 
 
         $source = "class $xmlrpcClassName\n{\n  public \$client;\n\n";
         $source .= "  function __construct()\n  {\n";
-        $source .= '    ' . str_replace("\n", "\n    ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace));
+        $source .= '    '.str_replace("\n", "\n    ", $this->buildClientWrapperCode($client, $verbatimClientCopy, $prefix, static::$namespace));
         $source .= "\$this->client = \$client;\n  }\n\n";
         $opts = array(
             'return_source' => true,
@@ -1174,28 +1174,28 @@ 
                 $methodWrap = $this->wrapXmlrpcMethod($client, $mName, $opts);
                 if ($methodWrap) {
                     if ($buildIt) {
-                        $source .= $methodWrap['source'] . "\n";
+                        $source .= $methodWrap['source']."\n";
 
                     } else {
-                        $source .= '  ' . str_replace("\n", "\n  ", $methodWrap['docstring']);
-                        $source .= str_replace("\n", "\n  ", $methodWrap['source']). "\n";
+                        $source .= '  '.str_replace("\n", "\n  ", $methodWrap['docstring']);
+                        $source .= str_replace("\n", "\n  ", $methodWrap['source'])."\n";
                     }
 
                 } else {
-                    $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': will not create class method to wrap remote method ' . $mName);
+                    $this->getLogger()->error('XML-RPC: '.__METHOD__.': will not create class method to wrap remote method '.$mName);
                 }
             }
         }
         $source .= "}\n";
         if ($buildIt) {
             $allOK = 0;
-            eval($source . '$allOK=1;');
+            eval($source.'$allOK=1;');
             if ($allOK) {
                 return $xmlrpcClassName;
             } else {
                 /// @todo direct access to $client->server is now deprecated
-                $this->getLogger()->error('XML-RPC: ' . __METHOD__ . ': could not create class ' . $xmlrpcClassName .
-                    ' to wrap remote server ' . $client->server);
+                $this->getLogger()->error('XML-RPC: '.__METHOD__.': could not create class '.$xmlrpcClassName.
+                    ' to wrap remote server '.$client->server);
                 return false;
             }
         } else {
@@ -1214,7 +1214,7 @@ 
      */
     protected function buildClientWrapperCode($client, $verbatimClientCopy, $prefix = 'xmlrpc', $namespace = '\\PhpXmlRpc\\')
     {
-        $code = "\$client = new {$namespace}Client('" . str_replace(array("\\", "'"), array("\\\\", "\'"), $client->getUrl()) .
+        $code = "\$client = new {$namespace}Client('".str_replace(array("\\", "'"), array("\\\\", "\'"), $client->getUrl()).
             "');\n";
 
         // copy all client fields to the client that will be generated runtime