gggeek / phpxmlrpc

demo/client/client.php

Spacing +14 added lines, -14 removed lines

@@ -8,34 +8,34 @@ 
 	include("xmlrpc.inc");
 
 	// Play nice to PHP 5 installations with REGISTER_LONG_ARRAYS off
-	if(!isset($HTTP_POST_VARS) && isset($_POST))
+	if (!isset($HTTP_POST_VARS) && isset($_POST))
 	{
 		$HTTP_POST_VARS = $_POST;
 	}
 
-	if(isset($HTTP_POST_VARS["stateno"]) && $HTTP_POST_VARS["stateno"]!="")
+	if (isset($HTTP_POST_VARS["stateno"]) && $HTTP_POST_VARS["stateno"] != "")
 	{
-		$stateno=(integer)$HTTP_POST_VARS["stateno"];
-		$f=new xmlrpcmsg('examples.getStateName',
+		$stateno = (integer) $HTTP_POST_VARS["stateno"];
+		$f = new xmlrpcmsg('examples.getStateName',
 			array(php_xmlrpc_encode($stateno))
 		);
-		print "<pre>Sending the following request:\n\n" . htmlentities($f->serialize()) . "\n\nDebug info of server data follows...\n\n";
-		$c=new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);
+		print "<pre>Sending the following request:\n\n".htmlentities($f->serialize())."\n\nDebug info of server data follows...\n\n";
+		$c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);
 		$c->setDebug(1);
-		$r=&$c->send($f);
-		if(!$r->faultCode())
+		$r = &$c->send($f);
+		if (!$r->faultCode())
 		{
-			$v=$r->value();
-			print "</pre><br/>State number " . $stateno . " is "
-				. htmlspecialchars($v->scalarval()) . "<br/>";
+			$v = $r->value();
+			print "</pre><br/>State number ".$stateno." is "
+				. htmlspecialchars($v->scalarval())."<br/>";
 			// print "<HR>I got this value back<BR><PRE>" .
 			//  htmlentities($r->serialize()). "</PRE><HR>\n";
 		}
 		else
 		{
 			print "An error occurred: ";
-			print "Code: " . htmlspecialchars($r->faultCode())
-				. " Reason: '" . htmlspecialchars($r->faultString()) . "'</pre><br/>";
+			print "Code: ".htmlspecialchars($r->faultCode())
+				. " Reason: '".htmlspecialchars($r->faultString())."'</pre><br/>";
 		}
 	}
 	else
@@ -44,7 +44,7 @@ 
 	}
 
 	print "<form action=\"client.php\" method=\"POST\">
-<input name=\"stateno\" value=\"" . $stateno . "\"><input type=\"submit\" value=\"go\" name=\"submit\"></form>
+<input name=\"stateno\" value=\"" . $stateno."\"><input type=\"submit\" value=\"go\" name=\"submit\"></form>
 <p>Enter a state number to query its name</p>";
 
 ?>

demo/client/simple_call.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 	 */
 	function xmlrpccall_simple()
 	{
-		if(func_num_args() < 2)
+		if (func_num_args()<2)
 		{
 			// Incorrect
 			return false;
@@ -47,7 +47,7 @@ 
 			}
 
 			$xmlrpcval_array = array();
-			foreach($varargs as $parameter)
+			foreach ($varargs as $parameter)
 			{
 				$xmlrpcval_array[] = php_xmlrpc_encode($parameter);
 			}

demo/client/mail.php

Spacing +8 added lines, -8 removed lines

@@ -21,12 +21,12 @@ 
 	$HTTP_POST_VARS = $_POST;
 
 if (isset($HTTP_POST_VARS["server"]) && $HTTP_POST_VARS["server"]) {
-	if ($HTTP_POST_VARS["server"]=="Userland") {
-		$XP="/RPC2"; $XS="206.204.24.2";
+	if ($HTTP_POST_VARS["server"] == "Userland") {
+		$XP = "/RPC2"; $XS = "206.204.24.2";
 	} else {
-		$XP="/xmlrpc/server.php"; $XS="pingu.heddley.com";
+		$XP = "/xmlrpc/server.php"; $XS = "pingu.heddley.com";
 	}
-	$f=new xmlrpcmsg('mail.send');
+	$f = new xmlrpcmsg('mail.send');
 	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailto"]));
 	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailsub"]));
 	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailmsg"]));
@@ -35,17 +35,17 @@ 
 	$f->addParam(new xmlrpcval($HTTP_POST_VARS["mailbcc"]));
 	$f->addParam(new xmlrpcval("text/plain"));
 
-	$c=new xmlrpc_client($XP, $XS, 80);
+	$c = new xmlrpc_client($XP, $XS, 80);
 	$c->setDebug(2);
-	$r=&$c->send($f);
+	$r = &$c->send($f);
 	if (!$r->faultCode()) {
 		print "Mail sent OK<br/>\n";
 	} else {
 		print "<fonr color=\"red\">";
 		print "Mail send failed<br/>\n";
 		print "Fault: ";
-		print "Code: " . htmlspecialchars($r->faultCode()) .
-	  " Reason: '" . htmlspecialchars($r->faultString()) . "'<br/>";
+		print "Code: ".htmlspecialchars($r->faultCode()).
+	  " Reason: '".htmlspecialchars($r->faultString())."'<br/>";
 		print "</font><br/>";
 	}
 }

demo/client/zopetest.php

Spacing +6 added lines, -6 removed lines

@@ -11,18 +11,18 @@
 	$c->setCredentials("username", "password");
 	$c->setDebug(2);
 	$r = $c->send($f);
-	if(!$r->faultCode())
+	if (!$r->faultCode())
 	{
 		$v = $r->value();
-		print "I received:" . htmlspecialchars($v->scalarval()) . "<br/>";
-		print "<hr/>I got this value back<br/>pre>" .
-		htmlentities($r->serialize()). "</pre>\n";
+		print "I received:".htmlspecialchars($v->scalarval())."<br/>";
+		print "<hr/>I got this value back<br/>pre>".
+		htmlentities($r->serialize())."</pre>\n";
 	}
 	else
 	{
 		print "An error occurred: ";
-		print "Code: " . htmlspecialchars($r->faultCode())
-			. " Reason: '" . ($r->faultString()) . "'<br/>";
+		print "Code: ".htmlspecialchars($r->faultCode())
+			. " Reason: '".($r->faultString())."'<br/>";
 	}
 ?>
 </body>

demo/client/introspect.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Introspect demo</h1>

<h2>Query server for available methods and their description</h2>

<h3>The code demonstrates usage of multicall and introspection methods</h3>

<?php

	include("xmlrpc.inc");



	function display_error($r)

	{

		print "An error occurred: ";

		print "Code: " . $r->faultCode()

			. " Reason: '" .$r->faultString()."'<br/>";

	}



	// 'new style' client constuctor

	$c = new xmlrpc_client("http://phpxmlrpc.sourceforge.net/server.php");

	print "<h3>methods available at http://" . $c->server . $c->path .  "</h3>\n";



	$m = new xmlrpcmsg('system.listMethods');

	$r =& $c->send($m);

	if($r->faultCode())

	{

		display_error($r);

	}

	else

	{

		$v=$r->value();

		for($i=0; $i<$v->arraysize(); $i++)

		{

			$mname=$v->arraymem($i);

			print "<h4>" . $mname->scalarval() . "</h4>\n";



			// build messages first, add params later

			$m1  = new xmlrpcmsg('system.methodHelp');

			$m2  = new xmlrpcmsg('system.methodSignature');

			$val = new xmlrpcval($mname->scalarval(), "string");

			$m1->addParam($val);

			$m2->addParam($val);



			// send multiple messages in one pass.

			// If server does not support multicall, client will fall back to 2 separate calls

			$ms = array($m1, $m2);

			$rs =& $c->send($ms);



			if($rs[0]->faultCode())

			{

				display_error($rs[0]);

			}

			else

			{

				$val=$rs[0]->value();

				$txt=$val->scalarval();

				if($txt != "")

				{

					print "<h4>Documentation</h4><p>${txt}</p>\n";

				}

				else

				{

					print "<p>No documentation available.</p>\n";

				}

			}



			if($rs[1]->faultCode())

			{

				display_error($rs[1]);

			}

			else

			{

				print "<h4>Signature</h4><p>\n";

				$val = $rs[1]->value();

				if($val->kindOf()=="array")

				{

					for($j=0; $j<$val->arraysize(); $j++)

					{

						$x = $val->arraymem($j);

						$ret = $x->arraymem(0);

						print "<code>" . $ret->scalarval() . " "

							. $mname->scalarval() . "(";

						if($x->arraysize()>1)

						{

							for($k=1; $k<$x->arraysize(); $k++)

							{

								$y = $x->arraymem($k);

								print $y->scalarval();

								if($k < $x->arraysize()-1)

								{

									print ", ";

								}

							}

						}

						print ")</code><br/>\n";

					}

				}

				else

				{

					print "Signature unknown\n";

				}

				print "</p>\n";

			}

		}

	}

?>

</body>

</html>


\ No newline at end of file
+<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Introspect demo</h1>

<h2>Query server for available methods and their description</h2>

<h3>The code demonstrates usage of multicall and introspection methods</h3>

<?php

	include("xmlrpc.inc"); function display_error($r) {

		print "An error occurred: "; print "Code: ".$r->faultCode()." Reason: '".$r->faultString()."'<br/>"; }



	// 'new style' client constuctor

	$c = new xmlrpc_client("http://phpxmlrpc.sourceforge.net/server.php"); print "<h3>methods available at http://".$c->server.$c->path."</h3>\n"; $m = new xmlrpcmsg('system.listMethods'); $r = & $c->send($m); if ($r->faultCode()) {

		display_error($r); } else {

		$v = $r->value(); for ($i = 0; $i<$v->arraysize(); $i++) {

			$mname = $v->arraymem($i); print "<h4>".$mname->scalarval()."</h4>\n"; // build messages first, add params later

			$m1 = new xmlrpcmsg('system.methodHelp'); $m2 = new xmlrpcmsg('system.methodSignature'); $val = new xmlrpcval($mname->scalarval(), "string"); $m1->addParam($val); $m2->addParam($val); // send multiple messages in one pass.

			// If server does not support multicall, client will fall back to 2 separate calls

			$ms = array($m1, $m2); $rs = & $c->send($ms); if ($rs[0]->faultCode()) {

				display_error($rs[0]); } else {

				$val = $rs[0]->value(); $txt = $val->scalarval(); if ($txt != "") {

					print "<h4>Documentation</h4><p>${txt}</p>\n"; } else {

					print "<p>No documentation available.</p>\n"; }

			}



			if ($rs[1]->faultCode()) {

				display_error($rs[1]); } else {

				print "<h4>Signature</h4><p>\n"; $val = $rs[1]->value(); if ($val->kindOf() == "array") {

					for ($j = 0; $j<$val->arraysize(); $j++) {

						$x = $val->arraymem($j); $ret = $x->arraymem(0); print "<code>".$ret->scalarval()." ".$mname->scalarval()."("; if ($x->arraysize()>1) {

							for ($k = 1; $k<$x->arraysize(); $k++) {

								$y = $x->arraymem($k); print $y->scalarval(); if ($k<$x->arraysize()-1) {

									print ", "; }

							}

						}

						print ")</code><br/>\n"; }

				} else {

					print "Signature unknown\n"; }

				print "</p>\n"; }

		}

	}

?>

</body>

</html>


\ No newline at end of file

demo/client/which.php

Spacing +1 added lines, -1 removed lines

@@ -1,1 +1,1 @@
-<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Which toolkit demo</h1>

<h2>Query server for toolkit information</h2>

<h3>The code demonstrates usage of the php_xmlrpc_decode function</h3>

<?php

	include("xmlrpc.inc");



	$f = new xmlrpcmsg('interopEchoTests.whichToolkit', array());

	$c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80);

	$r = $c->send($f);

	if(!$r->faultCode())

	{

		$v = php_xmlrpc_decode($r->value());

		print "<pre>";

		print "name: " . htmlspecialchars($v["toolkitName"]) . "\n";

		print "version: " . htmlspecialchars($v["toolkitVersion"]) . "\n";

		print "docs: " . htmlspecialchars($v["toolkitDocsUrl"]) . "\n";

		print "os: " . htmlspecialchars($v["toolkitOperatingSystem"]) . "\n";

		print "</pre>";

	}

	else

	{

		print "An error occurred: ";

		print "Code: " . htmlspecialchars($r->faultCode()) . " Reason: '" . htmlspecialchars($r->faultString()) . "'\n";

	}

?>

</body>

</html>


\ No newline at end of file
+<html>

<head><title>xmlrpc</title></head>

<body>

<h1>Which toolkit demo</h1>

<h2>Query server for toolkit information</h2>

<h3>The code demonstrates usage of the php_xmlrpc_decode function</h3>

<?php

	include("xmlrpc.inc"); $f = new xmlrpcmsg('interopEchoTests.whichToolkit', array()); $c = new xmlrpc_client("/server.php", "phpxmlrpc.sourceforge.net", 80); $r = $c->send($f); if (!$r->faultCode()) {

		$v = php_xmlrpc_decode($r->value()); print "<pre>"; print "name: ".htmlspecialchars($v["toolkitName"])."\n"; print "version: ".htmlspecialchars($v["toolkitVersion"])."\n"; print "docs: ".htmlspecialchars($v["toolkitDocsUrl"])."\n"; print "os: ".htmlspecialchars($v["toolkitOperatingSystem"])."\n"; print "</pre>"; } else {

		print "An error occurred: "; print "Code: ".htmlspecialchars($r->faultCode())." Reason: '".htmlspecialchars($r->faultString())."'\n"; }

?>

</body>

</html>


\ No newline at end of file

doc/convert.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
  * @copyright (c) 2007-2014 G. Giunta
  */
 
-if ($_SERVER['argc'] < 4)
+if ($_SERVER['argc']<4)
     die("Usage: php convert.php docbook.xml \path\\to\stylesheet.xsl output-dir|output_file\n");
 else
     echo "Starting xsl conversion process...\n";
@@ -26,9 +26,9 @@ 
 
 // Configure the transformer
 $proc = new XSLTProcessor;
-if (version_compare(PHP_VERSION,'5.4',"<"))
+if (version_compare(PHP_VERSION, '5.4', "<"))
 {
-    if(defined('XSL_SECPREF_WRITE_FILE'))
+    if (defined('XSL_SECPREF_WRITE_FILE'))
         ini_set("xsl.security_prefs", XSL_SECPREF_CREATE_DIRECTORY | XSL_SECPREF_WRITE_FILE);
 }
 else

doc/highlight.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
   $content = file_get_contents($file);
   $last = 0;
   $out = '';
-  while(($start = strpos($content, $starttag, $last)) !== false)
+  while (($start = strpos($content, $starttag, $last)) !== false)
   {
     $end = strpos($content, $endtag, $start);
 	$code = substr($content, $start+strlen($starttag), $end-$start-strlen($starttag));
@@ -26,7 +26,7 @@ 
     $code = highlight_string('<?php '.$code, true);
     $code = str_replace('<span style="color: #0000BB">&lt;?php&nbsp;<br />', '<span style="color: #0000BB">', $code);
 //echo($code);
-    $out = $out . substr($content, $last, $start+strlen($starttag)-$last) . $code . $endtag;
+    $out = $out.substr($content, $last, $start+strlen($starttag)-$last).$code.$endtag;
     $last = $end+strlen($endtag);
   }
   $out .= substr($content, $last, strlen($content));
@@ -36,7 +36,7 @@ 
 $dir = $argv[1];
 
 $files = scandir($dir);
-foreach($files as $file)
+foreach ($files as $file)
 {
 	if (substr($file, -5, 5) == '.html')
 	{

lib/xmlrpc_wrappers.inc

Spacing +94 added lines, -94 removed lines

@@ -27,7 +27,7 @@ 
 	*/

 	function php_2_xmlrpc_type($phptype)

 	{

-		switch(strtolower($phptype))

+		switch (strtolower($phptype))

 		{

 			case 'string':

 				return $GLOBALS['xmlrpcString'];

@@ -49,7 +49,7 @@ 
 			case 'resource':

 				return '';

 			default:

-				if(class_exists($phptype))

+				if (class_exists($phptype))

 				{

 					return $GLOBALS['xmlrpcStruct'];

 				}

@@ -68,7 +68,7 @@ 
 	*/

 	function xmlrpc_2_php_type($xmlrpctype)

 	{

-		switch(strtolower($xmlrpctype))

+		switch (strtolower($xmlrpctype))

 		{

 			case 'base64':

 			case 'datetime.iso8601':

@@ -140,12 +140,12 @@ 
 	* @todo if $newfuncname is empty, we could use create_user_func instead of eval, as it is possibly faster

 	* @todo add a verbatim_object_copy parameter to allow avoiding the same obj instance?

 	*/

-	function wrap_php_function($funcname, $newfuncname='', $extra_options=array())

+	function wrap_php_function($funcname, $newfuncname = '', $extra_options = array())

 	{

 		$buildit = isset($extra_options['return_source']) ? !($extra_options['return_source']) : true;

 		$prefix = isset($extra_options['prefix']) ? $extra_options['prefix'] : 'xmlrpc';

-		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool)$extra_options['encode_php_objs'] : false;

-		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool)$extra_options['decode_php_objs'] : false;

+		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool) $extra_options['encode_php_objs'] : false;

+		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool) $extra_options['decode_php_objs'] : false;

 		$catch_warnings = isset($extra_options['suppress_warnings']) && $extra_options['suppress_warnings'] ? '@' : '';

 

 		$exists = false;

@@ -153,20 +153,20 @@ 
 		{

 			$funcname = explode('::', $funcname);

 		}

-		if(is_array($funcname))

+		if (is_array($funcname))

 		{

-			if(count($funcname) < 2 || (!is_string($funcname[0]) && !is_object($funcname[0])))

+			if (count($funcname)<2 || (!is_string($funcname[0]) && !is_object($funcname[0])))

 			{

 				error_log('XML-RPC: syntax for function to be wrapped is wrong');

 				return false;

 			}

-			if(is_string($funcname[0]))

+			if (is_string($funcname[0]))

 			{

 				$plainfuncname = implode('::', $funcname);

 			}

-			elseif(is_object($funcname[0]))

+			elseif (is_object($funcname[0]))

 			{

-				$plainfuncname = get_class($funcname[0]) . '->' . $funcname[1];

+				$plainfuncname = get_class($funcname[0]).'->'.$funcname[1];

 			}

 			$exists = method_exists($funcname[0], $funcname[1]);

 		}

@@ -176,7 +176,7 @@ 
 			$exists = function_exists($funcname);

 		}

 

-		if(!$exists)

+		if (!$exists)

 		{

 			error_log('XML-RPC: function to be wrapped is not defined: '.$plainfuncname);

 			return false;

@@ -184,14 +184,14 @@ 
 		else

 		{

 			// determine name of new php function

-			if($newfuncname == '')

+			if ($newfuncname == '')

 			{

-				if(is_array($funcname))

+				if (is_array($funcname))

 				{

-					if(is_string($funcname[0]))

+					if (is_string($funcname[0]))

 						$xmlrpcfuncname = "{$prefix}_".implode('_', $funcname);

 					else

-						$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]) . '_' . $funcname[1];

+						$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]).'_'.$funcname[1];

 				}

 				else

 				{

@@ -202,36 +202,36 @@ 
 			{

 				$xmlrpcfuncname = $newfuncname;

 			}

-			while($buildit && function_exists($xmlrpcfuncname))

+			while ($buildit && function_exists($xmlrpcfuncname))

 			{

 				$xmlrpcfuncname .= 'x';

 			}

 

 			// start to introspect PHP code

-			if(is_array($funcname))

+			if (is_array($funcname))

 			{

 				$func = new ReflectionMethod($funcname[0], $funcname[1]);

-				if($func->isPrivate())

+				if ($func->isPrivate())

 				{

 					error_log('XML-RPC: method to be wrapped is private: '.$plainfuncname);

 					return false;

 				}

-				if($func->isProtected())

+				if ($func->isProtected())

 				{

 					error_log('XML-RPC: method to be wrapped is protected: '.$plainfuncname);

 					return false;

 				}

-	 			if($func->isConstructor())

+	 			if ($func->isConstructor())

 				{

 					error_log('XML-RPC: method to be wrapped is the constructor: '.$plainfuncname);

 					return false;

 				}

-				if($func->isDestructor())

+				if ($func->isDestructor())

 				{

 					error_log('XML-RPC: method to be wrapped is the destructor: '.$plainfuncname);

 					return false;

 				}

-				if($func->isAbstract())

+				if ($func->isAbstract())

 				{

 					error_log('XML-RPC: method to be wrapped is abstract: '.$plainfuncname);

 					return false;

@@ -242,7 +242,7 @@ 
 			{

 				$func = new ReflectionFunction($funcname);

 			}

-			if($func->isInternal())

+			if ($func->isInternal())

 			{

 				// Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs

 				// instead of getparameters to fully reflect internal php functions ?

@@ -262,27 +262,27 @@ 
 			$paramDocs = array();

 

 			$docs = $func->getDocComment();

-			if($docs != '')

+			if ($docs != '')

 			{

 				$docs = explode("\n", $docs);

 				$i = 0;

-				foreach($docs as $doc)

+				foreach ($docs as $doc)

 				{

 					$doc = trim($doc, " \r\t/*");

-					if(strlen($doc) && strpos($doc, '@') !== 0 && !$i)

+					if (strlen($doc) && strpos($doc, '@') !== 0 && !$i)

 					{

-						if($desc)

+						if ($desc)

 						{

 							$desc .= "\n";

 						}

 						$desc .= $doc;

 					}

-					elseif(strpos($doc, '@param') === 0)

+					elseif (strpos($doc, '@param') === 0)

 					{

 						// syntax: @param type [$name] desc

-						if(preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches))

+						if (preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches))

 						{

-							if(strpos($matches[1], '|'))

+							if (strpos($matches[1], '|'))

 							{

 								//$paramDocs[$i]['type'] = explode('|', $matches[1]);

 								$paramDocs[$i]['type'] = 'mixed';

@@ -296,14 +296,14 @@ 
 						}

 						$i++;

 					}

-					elseif(strpos($doc, '@return') === 0)

+					elseif (strpos($doc, '@return') === 0)

 					{

 						// syntax: @return type desc

 						//$returns = preg_split('/\s+/', $doc);

-						if(preg_match('/@return\s+(\S+)\s+(.+)/', $doc, $matches))

+						if (preg_match('/@return\s+(\S+)\s+(.+)/', $doc, $matches))

 						{

 							$returns = php_2_xmlrpc_type($matches[1]);

-							if(isset($matches[2]))

+							if (isset($matches[2]))

 							{

 								$returnsDocs = $matches[2];

 							}

@@ -315,7 +315,7 @@ 
 			// execute introspection of actual function prototype

 			$params = array();

 			$i = 0;

-			foreach($func->getParameters() as $paramobj)

+			foreach ($func->getParameters() as $paramobj)

 			{

 				$params[$i] = array();

 				$params[$i]['name'] = '$'.$paramobj->getName();

@@ -330,7 +330,7 @@ 
 			$parsvariations = array();

 			$pars = array();

 			$pnum = count($params);

-			foreach($params as $param)

+			foreach ($params as $param)

 			{

 				if (isset($paramDocs[$i]['name']) && $paramDocs[$i]['name'] && strtolower($paramDocs[$i]['name']) != strtolower($param['name']))

 				{

@@ -338,7 +338,7 @@ 
 					$paramDocs[$i]['type'] = 'mixed';

 				}

 

-				if($param['isoptional'])

+				if ($param['isoptional'])

 				{

 					// this particular parameter is optional. save as valid previous list of parameters

 					$innercode .= "if (\$paramcount > $i) {\n";

@@ -356,11 +356,11 @@ 
 

 				$pars[] = "\$p$i";

 				$i++;

-				if($param['isoptional'])

+				if ($param['isoptional'])

 				{

 					$innercode .= "}\n";

 				}

-				if($i == $pnum)

+				if ($i == $pnum)

 				{

 					// last allowed parameters combination

 					$parsvariations[] = $pars;

@@ -369,7 +369,7 @@ 
 

 			$sigs = array();

 			$psigs = array();

-			if(count($parsvariations) == 0)

+			if (count($parsvariations) == 0)

 			{

 				// only known good synopsis = no parameters

 				$parsvariations[] = array();

@@ -380,24 +380,24 @@ 
 				$minpars = count($parsvariations[0]);

 			}

 

-			if($minpars)

+			if ($minpars)

 			{

 				// add to code the check for min params number

 				// NB: this check needs to be done BEFORE decoding param values

-				$innercode = "\$paramcount = \$msg->getNumParams();\n" .

-				"if (\$paramcount < $minpars) return new {$prefix}resp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}');\n" . $innercode;

+				$innercode = "\$paramcount = \$msg->getNumParams();\n".

+				"if (\$paramcount < $minpars) return new {$prefix}resp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}');\n".$innercode;

 			}

 			else

 			{

-				$innercode = "\$paramcount = \$msg->getNumParams();\n" . $innercode;

+				$innercode = "\$paramcount = \$msg->getNumParams();\n".$innercode;

 			}

 

 			$innercode .= "\$np = false;\n";

 			// since there are no closures in php, if we are given an object instance,

 			// we store a pointer to it in a global var...

-			if ( is_array($funcname) && is_object($funcname[0]) )

+			if (is_array($funcname) && is_object($funcname[0]))

 			{

-				$GLOBALS['xmlrpcWPFObjHolder'][$xmlrpcfuncname] =& $funcname[0];

+				$GLOBALS['xmlrpcWPFObjHolder'][$xmlrpcfuncname] = & $funcname[0];

 				$innercode .= "\$obj =& \$GLOBALS['xmlrpcWPFObjHolder']['$xmlrpcfuncname'];\n";

 				$realfuncname = '$obj->'.$funcname[1];

 			}

@@ -405,13 +405,13 @@ 
 			{

 				$realfuncname = $plainfuncname;

 			}

-			foreach($parsvariations as $pars)

+			foreach ($parsvariations as $pars)

 			{

-				$innercode .= "if (\$paramcount == " . count($pars) . ") \$retval = {$catch_warnings}$realfuncname(" . implode(',', $pars) . "); else\n";

+				$innercode .= "if (\$paramcount == ".count($pars).") \$retval = {$catch_warnings}$realfuncname(".implode(',', $pars)."); else\n";

 				// build a 'generic' signature (only use an appropriate return type)

 				$sig = array($returns);

 				$psig = array($returnsDocs);

-				for($i=0; $i < count($pars); $i++)

+				for ($i = 0; $i<count($pars); $i++)

 				{

 					if (isset($paramDocs[$i]['type']))

 					{

@@ -430,7 +430,7 @@ 
 			$innercode .= "if (\$np) return new {$prefix}resp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}'); else {\n";

 			//$innercode .= "if (\$_xmlrpcs_error_occurred) return new xmlrpcresp(0, $GLOBALS['xmlrpcerr']user, \$_xmlrpcs_error_occurred); else\n";

 			$innercode .= "if (is_a(\$retval, '{$prefix}resp')) return \$retval; else\n";

-			if($returns == $GLOBALS['xmlrpcDateTime'] || $returns == $GLOBALS['xmlrpcBase64'])

+			if ($returns == $GLOBALS['xmlrpcDateTime'] || $returns == $GLOBALS['xmlrpcBase64'])

 			{

 				$innercode .= "return new {$prefix}resp(new {$prefix}val(\$retval, '$returns'));";

 			}

@@ -444,7 +444,7 @@ 
 			// shall we exclude functions returning by ref?

 			// if($func->returnsReference())

 			// 	return false;

-			$code = "function $xmlrpcfuncname(\$msg) {\n" . $innercode . "}\n}";

+			$code = "function $xmlrpcfuncname(\$msg) {\n".$innercode."}\n}";

 			//print_r($code);

 			if ($buildit)

 			{

@@ -453,7 +453,7 @@ 
 				// alternative

 				//$xmlrpcfuncname = create_function('$m', $innercode);

 

-				if(!$allOK)

+				if (!$allOK)

 				{

 					error_log('XML-RPC: could not create function '.$xmlrpcfuncname.' to wrap php function '.$plainfuncname);

 					return false;

@@ -481,26 +481,26 @@ 
 	* @todo get_class_methods will return both static and non-static methods.

 	*       we have to differentiate the action, depending on whether we received a class name or object

 	*/

-	function wrap_php_class($classname, $extra_options=array())

+	function wrap_php_class($classname, $extra_options = array())

 	{

 		$methodfilter = isset($extra_options['method_filter']) ? $extra_options['method_filter'] : '';

 		$methodtype = isset($extra_options['method_type']) ? $extra_options['method_type'] : 'auto';

 

 		$result = array();

 		$mlist = get_class_methods($classname);

-		foreach($mlist as $mname)

+		foreach ($mlist as $mname)

 		{

 			if ($methodfilter == '' || preg_match($methodfilter, $mname))

 			{

 				// echo $mlist."\n";

 				$func = new ReflectionMethod($classname, $mname);

-				if(!$func->isPrivate() && !$func->isProtected() && !$func->isConstructor() && !$func->isDestructor() && !$func->isAbstract())

+				if (!$func->isPrivate() && !$func->isProtected() && !$func->isConstructor() && !$func->isDestructor() && !$func->isAbstract())

 				{

-					if(($func->isStatic && ($methodtype == 'all' || $methodtype == 'static' || ($methodtype == 'auto' && is_string($classname)))) ||

+					if (($func->isStatic && ($methodtype == 'all' || $methodtype == 'static' || ($methodtype == 'auto' && is_string($classname)))) ||

 						(!$func->isStatic && ($methodtype == 'all' || $methodtype == 'nonstatic' || ($methodtype == 'auto' && is_object($classname)))))

 					{

 						$methodwrap = wrap_php_function(array($classname, $mname), '', $extra_options);

-						if ( $methodwrap )

+						if ($methodwrap)

 						{

 							$result[$methodwrap['function']] = $methodwrap['function'];

 						}

@@ -548,7 +548,7 @@ 
 	*        bool          debug        set it to 1 or 2 to see debug results of querying server for method synopsis

 	* @return string                   the name of the generated php function (or false) - OR AN ARRAY...

 	*/

-	function wrap_xmlrpc_method($client, $methodname, $extra_options=0, $timeout=0, $protocol='', $newfuncname='')

+	function wrap_xmlrpc_method($client, $methodname, $extra_options = 0, $timeout = 0, $protocol = '', $newfuncname = '')

 	{

 		// mind numbing: let caller use sane calling convention (as per javadoc, 3 params),

 		// OR the 2.0 calling convention (no options) - we really love backward compat, don't we?

@@ -559,8 +559,8 @@ 
 		}

 		else

 		{

-			$signum = isset($extra_options['signum']) ? (int)$extra_options['signum'] : 0;

-			$timeout = isset($extra_options['timeout']) ? (int)$extra_options['timeout'] : 0;

+			$signum = isset($extra_options['signum']) ? (int) $extra_options['signum'] : 0;

+			$timeout = isset($extra_options['timeout']) ? (int) $extra_options['timeout'] : 0;

 			$protocol = isset($extra_options['protocol']) ? $extra_options['protocol'] : '';

 			$newfuncname = isset($extra_options['new_function_name']) ? $extra_options['new_function_name'] : '';

 		}

@@ -568,10 +568,10 @@ 
 		//$verbatim_client_copy = in_array('simple_client_copy', $extra_options) ? 1 :

 		//	in_array('build_class_code', $extra_options) ? 2 : 0;

 

-		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool)$extra_options['encode_php_objs'] : false;

-		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool)$extra_options['decode_php_objs'] : false;

+		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool) $extra_options['encode_php_objs'] : false;

+		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool) $extra_options['decode_php_objs'] : false;

 		// it seems like the meaning of 'simple_client_copy' here is swapped wrt client_copy_mode later on...

-		$simple_client_copy = isset($extra_options['simple_client_copy']) ? (int)($extra_options['simple_client_copy']) : 0;

+		$simple_client_copy = isset($extra_options['simple_client_copy']) ? (int) ($extra_options['simple_client_copy']) : 0;

 		$buildit = isset($extra_options['return_source']) ? !($extra_options['return_source']) : true;

 		$prefix = isset($extra_options['prefix']) ? $extra_options['prefix'] : 'xmlrpc';

 		if (isset($extra_options['return_on_fault']))

@@ -593,8 +593,8 @@ 
 		$msg = new $msgclass('system.methodSignature');

 		$msg->addparam(new $valclass($methodname));

 		$client->setDebug($debug);

-		$response =& $client->send($msg, $timeout, $protocol);

-		if($response->faultCode())

+		$response = & $client->send($msg, $timeout, $protocol);

+		if ($response->faultCode())

 		{

 			error_log('XML-RPC: could not retrieve method signature from remote server for method '.$methodname);

 			return false;

@@ -606,7 +606,7 @@ 
 			{

 				$msig = $decodefunc($msig);

 			}

-			if(!is_array($msig) || count($msig) <= $signum)

+			if (!is_array($msig) || count($msig)<=$signum)

 			{

 				error_log('XML-RPC: could not retrieve method signature nr.'.$signum.' from remote server for method '.$methodname);

 				return false;

@@ -614,7 +614,7 @@ 
 			else

 			{

 				// pick a suitable name for the new function, avoiding collisions

-				if($newfuncname != '')

+				if ($newfuncname != '')

 				{

 					$xmlrpcfuncname = $newfuncname;

 				}

@@ -625,7 +625,7 @@ 
 					$xmlrpcfuncname = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'),

 						array('_', ''), $methodname);

 				}

-				while($buildit && function_exists($xmlrpcfuncname))

+				while ($buildit && function_exists($xmlrpcfuncname))

 				{

 					$xmlrpcfuncname .= 'x';

 				}

@@ -634,11 +634,11 @@ 
 				$mdesc = '';

 				// if in 'offline' mode, get method description too.

 				// in online mode, favour speed of operation

-				if(!$buildit)

+				if (!$buildit)

 				{

 					$msg = new $msgclass('system.methodHelp');

 					$msg->addparam(new $valclass($methodname));

-					$response =& $client->send($msg, $timeout, $protocol);

+					$response = & $client->send($msg, $timeout, $protocol);

 					if (!$response->faultCode())

 					{

 						$mdesc = $response->value();

@@ -661,7 +661,7 @@ 
 					eval($results['source'].'$allOK=1;');

 					// alternative

 					//$xmlrpcfuncname = create_function('$m', $innercode);

-					if($allOK)

+					if ($allOK)

 					{

 						return $xmlrpcfuncname;

 					}

@@ -688,15 +688,15 @@ 
 	* @param array $extra_options list of options for wrapped code

 	* @return mixed false on error, the name of the created class if all ok or an array with code, class name and comments (if the appropriatevoption is set in extra_options)

 	*/

-	function wrap_xmlrpc_server($client, $extra_options=array())

+	function wrap_xmlrpc_server($client, $extra_options = array())

 	{

 		$methodfilter = isset($extra_options['method_filter']) ? $extra_options['method_filter'] : '';

 		//$signum = isset($extra_options['signum']) ? (int)$extra_options['signum'] : 0;

-		$timeout = isset($extra_options['timeout']) ? (int)$extra_options['timeout'] : 0;

+		$timeout = isset($extra_options['timeout']) ? (int) $extra_options['timeout'] : 0;

 		$protocol = isset($extra_options['protocol']) ? $extra_options['protocol'] : '';

 		$newclassname = isset($extra_options['new_class_name']) ? $extra_options['new_class_name'] : '';

-		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool)$extra_options['encode_php_objs'] : false;

-		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool)$extra_options['decode_php_objs'] : false;

+		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool) $extra_options['encode_php_objs'] : false;

+		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool) $extra_options['decode_php_objs'] : false;

 		$verbatim_client_copy = isset($extra_options['simple_client_copy']) ? !($extra_options['simple_client_copy']) : true;

 		$buildit = isset($extra_options['return_source']) ? !($extra_options['return_source']) : true;

 		$prefix = isset($extra_options['prefix']) ? $extra_options['prefix'] : 'xmlrpc';

@@ -706,8 +706,8 @@ 
 		$decodefunc = 'php_'.$prefix.'_decode';

 

 		$msg = new $msgclass('system.listMethods');

-		$response =& $client->send($msg, $timeout, $protocol);

-		if($response->faultCode())

+		$response = & $client->send($msg, $timeout, $protocol);

+		if ($response->faultCode())

 		{

 			error_log('XML-RPC: could not retrieve method list from remote server');

 			return false;

@@ -719,7 +719,7 @@ 
 			{

 				$mlist = $decodefunc($mlist);

 			}

-			if(!is_array($mlist) || !count($mlist))

+			if (!is_array($mlist) || !count($mlist))

 			{

 				error_log('XML-RPC: could not retrieve meaningful method list from remote server');

 				return false;

@@ -727,7 +727,7 @@ 
 			else

 			{

 				// pick a suitable name for the new function, avoiding collisions

-				if($newclassname != '')

+				if ($newclassname != '')

 				{

 					$xmlrpcclassname = $newclassname;

 				}

@@ -736,7 +736,7 @@ 
 					$xmlrpcclassname = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'),

 						array('_', ''), $client->server).'_client';

 				}

-				while($buildit && class_exists($xmlrpcclassname))

+				while ($buildit && class_exists($xmlrpcclassname))

 				{

 					$xmlrpcclassname .= 'x';

 				}

@@ -752,7 +752,7 @@ 
 					'decode_php_objs' => $decode_php_objects

 					);

 				/// @todo build javadoc for class definition, too

-				foreach($mlist as $mname)

+				foreach ($mlist as $mname)

 				{

 					if ($methodfilter == '' || preg_match($methodfilter, $mname))

 					{

@@ -780,7 +780,7 @@ 
 					eval($source.'$allOK=1;');

 					// alternative

 					//$xmlrpcfuncname = create_function('$m', $innercode);

-					if($allOK)

+					if ($allOK)

 					{

 						return $xmlrpcclassname;

 					}

@@ -807,12 +807,12 @@ 
 	* @access private

 	*/

 	function build_remote_method_wrapper_code($client, $methodname, $xmlrpcfuncname,

-		$msig, $mdesc='', $timeout=0, $protocol='', $client_copy_mode=0, $prefix='xmlrpc',

-		$decode_php_objects=false, $encode_php_objects=false, $decode_fault=false,

-		$fault_response='')

+		$msig, $mdesc = '', $timeout = 0, $protocol = '', $client_copy_mode = 0, $prefix = 'xmlrpc',

+		$decode_php_objects = false, $encode_php_objects = false, $decode_fault = false,

+		$fault_response = '')

 	{

 		$code = "function $xmlrpcfuncname (";

-		if ($client_copy_mode < 2)

+		if ($client_copy_mode<2)

 		{

 			// client copy mode 0 or 1 == partial / full client copy in emitted code

 			$innercode = build_client_wrapper_code($client, $client_copy_mode, $prefix);

@@ -840,11 +840,11 @@ 
 		// param parsing

 		$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 == 'int' || $ptype == 'boolean' || $ptype == 'double' ||

+			if ($ptype == 'i4' || $ptype == 'int' || $ptype == 'boolean' || $ptype == 'double' ||

 				$ptype == 'string' || $ptype == 'dateTime.iso8601' || $ptype == 'base64' || $ptype == 'null')

 			{

 				// only build directly xmlrpcvals when type is known and scalar

@@ -864,7 +864,7 @@ 
 			$innercode .= "\$msg->addparam(\$p$i);\n";

 			$mdesc .= '* @param '.xmlrpc_2_php_type($ptype)." \$p$i\n";

 		}

-		if ($client_copy_mode < 2)

+		if ($client_copy_mode<2)

 		{

 			$plist[] = '$debug=0';

 			$mdesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n";

@@ -897,7 +897,7 @@ 
 			$innercode .= "if (\$res->faultcode()) return $respcode; else return php_{$prefix}_decode(\$res->value());";

 		}

 

-		$code = $code . $plist. ") {\n" . $innercode . "\n}\n";

+		$code = $code.$plist.") {\n".$innercode."\n}\n";

 

 		return array('source' => $code, 'docstring' => $mdesc);

 	}

@@ -908,18 +908,18 @@ 
 	* valid php code is emitted.

 	* @access private

 	*/

-	function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc')

+	function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc')

 	{

 		$code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path).

-			"', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n";

+			"', '".str_replace("'", "\'", $client->server)."', $client->port);\n";

 

 		// copy all client fields to the client that will be generated runtime

 		// (this provides for future expansion or subclassing of client obj)

 		if ($verbatim_client_copy)

 		{

-			foreach($client as $fld => $val)

+			foreach ($client as $fld => $val)

 			{

-				if($fld != 'debug' && $fld != 'return_type')

+				if ($fld != 'debug' && $fld != 'return_type')

 				{

 					$val = var_export($val, true);

 					$code .= "\$client->$fld = $val;\n";