gggeek / phpxmlrpc

demo/client/simple_call.php

Doc Comments -3 removed lines

@@ -24,9 +24,6 @@
 	 *
 	 * @param xmlrpc_client client object, properly set up to connect to server
 	 * @param string remote function name
-	 * @param mixed $parameter1
-	 * @param mixed $parameter2
-	 * @param mixed $parameter3 ...
 	 * @return xmlrpcresp or false on error
 	 */
 	function xmlrpccall_simple()

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);
 			}

lib/xmlrpc_wrappers.inc

Doc Comments +3 added lines, -1 removed lines

@@ -536,7 +536,7 @@ 
 	*

 	* @param xmlrpc_client $client     an xmlrpc client set up correctly to communicate with target server

 	* @param string        $methodname the xmlrpc method to be mapped to a php function

-	* @param array         $extra_options array of options that specify conversion details. valid options include

+	* @param integer         $extra_options array of options that specify conversion details. valid options include

 	*        integer       signum      the index of the method signature to use in mapping (if method exposes many sigs)

 	*        integer       timeout     timeout (in secs) to be used when executing function/calling remote method

 	*        string        protocol    'http' (default), 'http11' or 'https'

@@ -805,6 +805,8 @@ 
 	* valid php code is emitted.

 	* Note: real spaghetti code follows...

 	* @access private

+	* @param xmlrpc_client $client
+	* @param string $methodname
 	*/

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

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

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";

debugger/common.php

Spacing +4 added lines, -5 removed lines

@@ -14,8 +14,7 @@ 
     function stripslashes_deep($value)
     {
         $value = is_array($value) ?
-                    array_map('stripslashes_deep', $value) :
-                    stripslashes($value);
+                    array_map('stripslashes_deep', $value) : stripslashes($value);
 
         return $value;
     }
@@ -25,7 +24,7 @@ 
   $preferredEncodings = 'UTF-8, ASCII, ISO-8859-1, UTF-7, EUC-JP, SJIS, eucJP-win, SJIS-win, JIS, ISO-2022-JP';
   $inputcharset = mb_detect_encoding(urldecode($_SERVER['REQUEST_URI']), $preferredEncodings);
 
-  if ( isset( $_GET['usepost'] ) && $_GET['usepost'] === 'true' )
+  if (isset($_GET['usepost']) && $_GET['usepost'] === 'true')
   {
       $_GET = $_POST;
       $inputcharset = mb_detect_encoding(implode('', $_GET), $preferredEncodings);
@@ -69,11 +68,11 @@ 
       $verifypeer = true;
     else
       $verifypeer = false;
-    $cainfo= isset($_GET['cainfo']) ? $_GET['cainfo'] : '';
+    $cainfo = isset($_GET['cainfo']) ? $_GET['cainfo'] : '';
     $proxy = isset($_GET['proxy']) ? $_GET['proxy'] : 0;
     if (strpos($proxy, 'http://') === 0)
       $proxy = substr($proxy, 7);
-    $proxyuser= isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
+    $proxyuser = isset($_GET['proxyuser']) ? $_GET['proxyuser'] : '';
     $proxypwd = isset($_GET['proxypwd']) ? $_GET['proxypwd'] : '';
     $timeout = isset($_GET['timeout']) ? $_GET['timeout'] : 0;
     if (!is_numeric($timeout))

debugger/action.php

Spacing +32 added lines, -32 removed lines

@@ -81,7 +81,7 @@ 
     }
     if ($proxy != '') {
       $pproxy = explode(':', $proxy);
-      if (count($pproxy) > 1)
+      if (count($pproxy)>1)
         $pport = $pproxy[1];
       else
         $pport = 8080;
@@ -175,8 +175,8 @@ 
         if ($wstype == 1)
         {
           $msg[0]->payload = "{\n".
-            '"method": "' . $method . "\",\n\"params\": [" .
-            $payload .
+            '"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 == "")
@@ -196,10 +196,10 @@ 
             }
         }
         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;
         break;
       default: // give a warning
@@ -214,20 +214,20 @@ 
     $response = null;
     // execute method(s)
     if ($debug)
-      echo '<div class="dbginfo"><h2>Debug info:</h2>';  /// @todo use ob_start instead
+      echo '<div class="dbginfo"><h2>Debug info:</h2>'; /// @todo use ob_start instead
     $resp = array();
-    $mtime = explode(' ',microtime());
-    $time = (float)$mtime[0] + (float)$mtime[1];
+    $mtime = explode(' ', microtime());
+    $time = (float) $mtime[0]+(float) $mtime[1];
     foreach ($msg as $message)
     {
       // catch errors: for older xmlrpc libs, send does not return by ref
-      @$response =& $client->send($message, $timeout, $httpprotocol);
+      @$response = & $client->send($message, $timeout, $httpprotocol);
       $resp[] = $response;
       if (!$response || $response->faultCode())
         break;
     }
-    $mtime = explode(' ',microtime());
-    $time = (float)$mtime[0] + (float)$mtime[1] - $time;
+    $mtime = explode(' ', microtime());
+    $time = (float) $mtime[0]+(float) $mtime[1]-$time;
     if ($debug)
       echo "</div>\n";
 
@@ -239,15 +239,15 @@ 
       // 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, $GLOBALS['xmlrpc_internalencoding']) .
-        "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) . "'</p>\n";
+      echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']).
+        "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."'</p>\n";
       echo (strftime("%d/%b/%Y:%H:%M:%S\n"));
     }
     else
     {
       // call succeeded: parse results
       //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
-      printf ("<h3>%s call(s) OK (%.2f secs.)</h3>\n", $protoname, $time);
+      printf("<h3>%s call(s) OK (%.2f secs.)</h3>\n", $protoname, $time);
       echo (strftime("%d/%b/%Y:%H:%M:%S\n"));
 
       switch ($action)
@@ -255,15 +255,15 @@ 
         case 'list':
 
         $v = $response->value();
-        if ($v->kindOf()=="array")
+        if ($v->kindOf() == "array")
         {
           $max = $v->arraysize();
           echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
           echo "<thead>\n<tr><th>Method</th><th>Description</th></tr>\n</thead>\n<tbody>\n";
-          for($i=0; $i < $max; $i++)
+          for ($i = 0; $i<$max; $i++)
           {
             $rec = $v->arraymem($i);
-            if ($i%2) $class=' class="oddrow"'; else $class = ' class="evenrow"';
+            if ($i % 2) $class = ' class="oddrow"'; else $class = ' class="evenrow"';
             echo ("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, $GLOBALS['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)."\" />".
@@ -319,33 +319,33 @@ 
         if ($desc == "")
           $desc = "-";
         echo "<tr><td class=\"evenrow\">Description</td><td colspan=\"3\" class=\"evenrow\">$desc</td></tr>\n";
-        $payload="";
-        $alt_payload="";
-        if ($r2->kindOf()!="array")
+        $payload = "";
+        $alt_payload = "";
+        if ($r2->kindOf() != "array")
           echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
         else
         {
-          for($i=0; $i < $r2->arraysize(); $i++)
+          for ($i = 0; $i<$r2->arraysize(); $i++)
           {
-            if ($i+1%2) $class=' class="oddrow"'; else $class = ' class="evenrow"';
+            if ($i+1 % 2) $class = ' class="oddrow"'; else $class = ' class="evenrow"';
             echo "<tr><td$class>Signature&nbsp;".($i+1)."</td><td$class>";
             $x = $r2->arraymem($i);
-            if ($x->kindOf()=="array")
+            if ($x->kindOf() == "array")
             {
               $ret = $x->arraymem(0);
-              echo "<code>OUT:&nbsp;" . htmlspecialchars($ret->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']) . "<br />IN: (";
-              if ($x->arraysize() > 1)
+              echo "<code>OUT:&nbsp;".htmlspecialchars($ret->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."<br />IN: (";
+              if ($x->arraysize()>1)
               {
-                for($k = 1; $k < $x->arraysize(); $k++)
+                for ($k = 1; $k<$x->arraysize(); $k++)
                 {
                   $y = $x->arraymem($k);
                   echo $y->scalarval();
                   if ($wstype != 1)
                   {
-                    $payload = $payload . '<param><value><'.htmlspecialchars($y->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']).'></'.htmlspecialchars($y->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."></value></param>\n";
+                    $payload = $payload.'<param><value><'.htmlspecialchars($y->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding']).'></'.htmlspecialchars($y->scalarval(), ENT_COMPAT, $GLOBALS['xmlrpc_internalencoding'])."></value></param>\n";
                   }
                   $alt_payload .= $y->scalarval();
-                  if ($k < $x->arraysize()-1)
+                  if ($k<$x->arraysize()-1)
                   {
                     $alt_payload .= ';';
                     echo ", ";
@@ -429,7 +429,7 @@ 
         case 'wrap':
           $r1 = $resp[0]->value();
           $r2 = $resp[1]->value();
-          if ($r2->kindOf()!="array" || $r2->arraysize() <= $methodsig)
+          if ($r2->kindOf() != "array" || $r2->arraysize()<=$methodsig)
             echo "Error: signature unknown\n";
           else
           {
@@ -437,7 +437,7 @@ 
           $msig = php_xmlrpc_decode($r2);
           $msig = $msig[$methodsig];
           $proto = $protocol == 2 ? 'https' : $protocol == 1 ? 'http11' : '';
-          if ($proxy  == '' && $username == '' && !$requestcompression && !$responsecompression &&
+          if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression &&
             $clientcookies == '')
           {
             $opts = 0; // simple client copy in stub code

debugger/controller.php

Spacing +7 added lines, -7 removed lines

@@ -214,7 +214,7 @@ 
 //-->
 </script>
 </head>
-<body onload="switchtransport(<?php echo $wstype;?>); switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) echo ' document.forms[2].submit();'; ?>">
+<body onload="switchtransport(<?php echo $wstype; ?>); switchaction(); switchssl(); switchauth(); swicthcainfo();<?php if ($run) echo ' document.forms[2].submit();'; ?>">
 <h1>XMLRPC <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);"/></form>
 /<form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);"/></form>JSONRPC Debugger (based on the <a href="http://phpxmlrpc.sourceforge.net">PHP-XMLRPC</a> library)</h1>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();"
@@ -232,10 +232,10 @@ 
 <table id="actionblock">
 <tr>
 <td><h2>Action</h2></td>
-<td>List available methods<input type="radio" name="action" value="list"<?php if ($action=='list') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Describe method<input type="radio" name="action" value="describe"<?php if ($action=='describe') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Execute method<input type="radio" name="action" value="execute"<?php if ($action=='execute') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
-<td>Generate stub for method call<input type="radio" name="action" value="wrap"<?php if ($action=='wrap') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
+<td>List available methods<input type="radio" name="action" value="list"<?php if ($action == 'list') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
+<td>Describe method<input type="radio" name="action" value="describe"<?php if ($action == 'describe') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
+<td>Execute method<input type="radio" name="action" value="execute"<?php if ($action == 'execute') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
+<td>Generate stub for method call<input type="radio" name="action" value="wrap"<?php if ($action == 'wrap') echo ' checked="checked"'; ?> onclick="switchaction();" /></td>
 </tr>
 </table>
 <input type="hidden" name="methodsig" value="<?php echo htmlspecialchars($methodsig, ENT_COMPAT, $inputcharset); ?>" />
@@ -246,7 +246,7 @@ 
 <td class="labelcell">Name:</td><td><input type="text" name="method" value="<?php echo htmlspecialchars($method, ENT_COMPAT, $inputcharset); ?>" /></td>
 <td class="labelcell">Payload:<br/><div id="methodpayloadbtn"></div></td><td><textarea id="methodpayload" name="methodpayload" rows="1" cols="40"><?php echo htmlspecialchars($payload, ENT_COMPAT, $inputcharset); ?></textarea></td>
 <td class="labelcell" id="idcell">Msg id: <input type="text" name="id" size="3" value="<?php echo htmlspecialchars($id, ENT_COMPAT, $inputcharset); ?>"/></td>
-<td><input type="hidden" name="wstype" value="<?php echo $wstype;?>" />
+<td><input type="hidden" name="wstype" value="<?php echo $wstype; ?>" />
 <input type="submit" value="Execute" onclick="return verifyserver();"/></td>
 </tr>
 </table>
@@ -260,7 +260,7 @@ 
 <option value="2"<?php if ($debug == 2) echo ' selected="selected"'; ?>>More</option>
 </select>
 </td>
-<td class="labelcell">Timeout:</td><td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) echo $timeout; ?>" /></td>
+<td class="labelcell">Timeout:</td><td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) echo $timeout; ?>" /></td>
 <td class="labelcell">Protocol:</td><td><select name="protocol" onchange="switchssl(); switchauth(); swicthcainfo();">
 <option value="0"<?php if ($protocol == 0) echo ' selected="selected"'; ?>>HTTP 1.0</option>
 <option value="1"<?php if ($protocol == 1) echo ' selected="selected"'; ?>>HTTP 1.1</option>

demo/server/proxy.php

Spacing +4 added lines, -4 removed lines

@@ -23,14 +23,14 @@ 
 		$timeout = 0;
 		$url = php_xmlrpc_decode($m->getParam(0));
 		$c = new xmlrpc_client($url);
-		if ($m->getNumParams() > 3)
+		if ($m->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 = php_xmlrpc_decode($m->getParam(3));
-			foreach($options as $key => $val)
+			foreach ($options as $key => $val)
 			{
-				switch($key)
+				switch ($key)
 				{
 					case 'Cookie':
 						break;
@@ -59,7 +59,7 @@ 
 		$method = php_xmlrpc_decode($m->getParam(1));
 		$pars = $m->getParam(2);
 		$m = new xmlrpcmsg($method);
-		for ($i = 0; $i < $pars->arraySize(); $i++)
+		for ($i = 0; $i<$pars->arraySize(); $i++)
 		{
 			$m->addParam($pars->arraymem($i));
 		}

demo/server/discuss.php

Spacing +29 added lines, -29 removed lines

@@ -3,9 +3,9 @@ 
 	include("xmlrpc.inc");
 	include("xmlrpcs.inc");
 
-	$addcomment_sig=array(array($xmlrpcInt, $xmlrpcString, $xmlrpcString, $xmlrpcString));
+	$addcomment_sig = array(array($xmlrpcInt, $xmlrpcString, $xmlrpcString, $xmlrpcString));
 
-	$addcomment_doc='Adds a comment to an item. The first parameter
+	$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.';
@@ -13,7 +13,7 @@ 
 	function addcomment($m)
 	{
 		global $xmlrpcerruser;
-		$err="";
+		$err = "";
 		// since validation has already been carried out for us,
 		// we know we got exactly 3 string values
 		$n = php_xmlrpc_decode($m);
@@ -21,31 +21,31 @@ 
 		$name  = $n[1];
 		$comment = $n[2];
 
-		$dbh=dba_open("/tmp/comments.db", "c", "db2");
-		if($dbh)
+		$dbh = dba_open("/tmp/comments.db", "c", "db2");
+		if ($dbh)
 		{
-			$countID="${msgID}_count";
-			if(dba_exists($countID, $dbh))
+			$countID = "${msgID}_count";
+			if (dba_exists($countID, $dbh))
 			{
-				$count=dba_fetch($countID, $dbh);
+				$count = dba_fetch($countID, $dbh);
 			}
 			else
 			{
-				$count=0;
+				$count = 0;
 			}
 			// add the new comment in
-			dba_insert($msgID . "_comment_${count}", $comment, $dbh);
-			dba_insert($msgID . "_name_${count}", $name, $dbh);
+			dba_insert($msgID."_comment_${count}", $comment, $dbh);
+			dba_insert($msgID."_name_${count}", $name, $dbh);
 			$count++;
 			dba_replace($countID, $count, $dbh);
 			dba_close($dbh);
 		}
 		else
 		{
-			$err="Unable to open comments database.";
+			$err = "Unable to open comments database.";
 		}
 		// if we generated an error, create an error return response
-		if($err)
+		if ($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
 		}
@@ -57,37 +57,37 @@ 
 		}
 	}
 
-	$getcomments_sig=array(array($xmlrpcArray, $xmlrpcString));
+	$getcomments_sig = array(array($xmlrpcArray, $xmlrpcString));
 
-	$getcomments_doc='Returns an array of comments for a given ID, which
+	$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.';
 
 	function getcomments($m)
 	{
 		global $xmlrpcerruser;
-		$err="";
-		$ra=array();
+		$err = "";
+		$ra = array();
 		// get the first param
-		if(XMLRPC_EPI_ENABLED == '1')
+		if (XMLRPC_EPI_ENABLED == '1')
 		{
-			$msgID=xmlrpc_decode($m->getParam(0));
+			$msgID = xmlrpc_decode($m->getParam(0));
 		}
 		else
 		{
-			$msgID=php_xmlrpc_decode($m->getParam(0));
+			$msgID = php_xmlrpc_decode($m->getParam(0));
 		}
-		$dbh=dba_open("/tmp/comments.db", "r", "db2");
-		if($dbh)
+		$dbh = dba_open("/tmp/comments.db", "r", "db2");
+		if ($dbh)
 		{
-			$countID="${msgID}_count";
-			if(dba_exists($countID, $dbh))
+			$countID = "${msgID}_count";
+			if (dba_exists($countID, $dbh))
 			{
-				$count=dba_fetch($countID, $dbh);
-				for($i=0; $i<$count; $i++)
+				$count = dba_fetch($countID, $dbh);
+				for ($i = 0; $i<$count; $i++)
 				{
-					$name=dba_fetch("${msgID}_name_${i}", $dbh);
-					$comment=dba_fetch("${msgID}_comment_${i}", $dbh);
+					$name = dba_fetch("${msgID}_name_${i}", $dbh);
+					$comment = dba_fetch("${msgID}_comment_${i}", $dbh);
 					// push a new struct onto the return array
 					$ra[] = array(
 						"name" => $name,
@@ -97,7 +97,7 @@ 
 			}
 		}
 		// if we generated an error, create an error return response
-		if($err)
+		if ($err)
 		{
 			return new xmlrpcresp(0, $xmlrpcerruser, $err);
 		}

demo/server/server.php

Spacing +175 added lines, -175 removed lines

@@ -71,8 +71,8 @@ 
 		"Virginia", "Washington", "West Virginia", "Wisconsin", "Wyoming"
 	);
 
-	$findstate_sig=array(array($xmlrpcString, $xmlrpcInt));
-	$findstate_doc='When passed an integer between 1 and 51 returns the
+	$findstate_sig = array(array($xmlrpcString, $xmlrpcInt));
+	$findstate_doc = 'When passed an integer between 1 and 51 returns the
 name of a US state, where the integer is the index of that state name
 in an alphabetic order.';
 
@@ -80,24 +80,24 @@ 
 	function findstate($m)
 	{
 		global $xmlrpcerruser, $stateNames;
-		$err="";
+		$err = "";
 		// get the first param
-		$sno=$m->getParam(0);
+		$sno = $m->getParam(0);
 
 		// param must be there and of the correct type: server object does the
 		// validation for us
 
 		// extract the value of the state number
-		$snv=$sno->scalarval();
+		$snv = $sno->scalarval();
 		// look it up in our array (zero-based)
 		if (isset($stateNames[$snv-1]))
 		{
-			$sname=$stateNames[$snv-1];
+			$sname = $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 we generated an error, create an error return response
@@ -129,7 +129,7 @@ 
 		else
 		{
 			// not, there so complain
-			return "I don't have a state for the index '" . $stateno . "'";
+			return "I don't have a state for the index '".$stateno."'";
 		}
 	}
 	$findstate2_sig = wrap_php_function('inner_findstate');
@@ -141,70 +141,70 @@ 
 	$obj = new xmlrpc_server_methods_container();
 	$findstate4_sig = wrap_php_function(array($obj, 'findstate'));
 
-	$addtwo_sig=array(array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt));
-	$addtwo_doc='Add two integers together and return the result';
+	$addtwo_sig = array(array($xmlrpcInt, $xmlrpcInt, $xmlrpcInt));
+	$addtwo_doc = 'Add two integers together and return the result';
 	function addtwo($m)
 	{
-		$s=$m->getParam(0);
-		$t=$m->getParam(1);
-		return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(),"int"));
+		$s = $m->getParam(0);
+		$t = $m->getParam(1);
+		return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(), "int"));
 	}
 
-	$addtwodouble_sig=array(array($xmlrpcDouble, $xmlrpcDouble, $xmlrpcDouble));
-	$addtwodouble_doc='Add two doubles together and return the result';
+	$addtwodouble_sig = array(array($xmlrpcDouble, $xmlrpcDouble, $xmlrpcDouble));
+	$addtwodouble_doc = 'Add two doubles together and return the result';
 	function addtwodouble($m)
 	{
-		$s=$m->getParam(0);
-		$t=$m->getParam(1);
-		return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(),"double"));
+		$s = $m->getParam(0);
+		$t = $m->getParam(1);
+		return new xmlrpcresp(new xmlrpcval($s->scalarval()+$t->scalarval(), "double"));
 	}
 
-	$stringecho_sig=array(array($xmlrpcString, $xmlrpcString));
-	$stringecho_doc='Accepts a string parameter, returns the string.';
+	$stringecho_sig = array(array($xmlrpcString, $xmlrpcString));
+	$stringecho_doc = 'Accepts a string parameter, returns the string.';
 	function stringecho($m)
 	{
 		// just sends back a string
-		$s=$m->getParam(0);
+		$s = $m->getParam(0);
 		$v = $s->scalarval();
 		return new xmlrpcresp(new xmlrpcval($s->scalarval()));
 	}
 
-	$echoback_sig=array(array($xmlrpcString, $xmlrpcString));
-	$echoback_doc='Accepts a string parameter, returns the entire incoming payload';
+	$echoback_sig = array(array($xmlrpcString, $xmlrpcString));
+	$echoback_doc = 'Accepts a string parameter, returns the entire incoming payload';
 	function echoback($m)
 	{
 		// just sends back a string with what i got
 		// sent to me, just escaped, that's all
 		//
 		// $m is an incoming message
-		$s="I got the following message:\n" . $m->serialize();
+		$s = "I got the following message:\n".$m->serialize();
 		return new xmlrpcresp(new xmlrpcval($s));
 	}
 
-	$echosixtyfour_sig=array(array($xmlrpcString, $xmlrpcBase64));
-	$echosixtyfour_doc='Accepts a base64 parameter and returns it decoded as a string';
+	$echosixtyfour_sig = array(array($xmlrpcString, $xmlrpcBase64));
+	$echosixtyfour_doc = 'Accepts a base64 parameter and returns it decoded as a string';
 	function echosixtyfour($m)
 	{
 		// accepts an encoded value, but sends it back
 		// as a normal string. this is to test base64 encoding
 		// is working as expected
-		$incoming=$m->getParam(0);
+		$incoming = $m->getParam(0);
 		return new xmlrpcresp(new xmlrpcval($incoming->scalarval(), "string"));
 	}
 
-	$bitflipper_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$bitflipper_doc='Accepts an array of booleans, and returns them inverted';
+	$bitflipper_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$bitflipper_doc = 'Accepts an array of booleans, and returns them inverted';
 	function bitflipper($m)
 	{
 		global $xmlrpcArray;
 
-		$v=$m->getParam(0);
-		$sz=$v->arraysize();
-		$rv=new xmlrpcval(array(), $xmlrpcArray);
+		$v = $m->getParam(0);
+		$sz = $v->arraysize();
+		$rv = new xmlrpcval(array(), $xmlrpcArray);
 
-		for($j=0; $j<$sz; $j++)
+		for ($j = 0; $j<$sz; $j++)
 		{
-			$b=$v->arraymem($j);
+			$b = $v->arraymem($j);
 			if ($b->scalarval())
 			{
 				$rv->addScalar(false, "boolean");
@@ -235,18 +235,18 @@ 
 
 		// don't even ask me _why_ these come padded with
 		// hyphens, I couldn't tell you :p
-		$a=str_replace("-", "", $a);
-		$b=str_replace("-", "", $b);
+		$a = str_replace("-", "", $a);
+		$b = str_replace("-", "", $b);
 
-		if ($agesorter_arr[$a]==$agesorter[$b])
+		if ($agesorter_arr[$a] == $agesorter[$b])
 		{
 			return 0;
 		}
-		return ($agesorter_arr[$a] > $agesorter_arr[$b]) ? -1 : 1;
+		return ($agesorter_arr[$a]>$agesorter_arr[$b]) ? -1 : 1;
 	}
 
-	$agesorter_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$agesorter_doc='Send this method an array of [string, int] structs, eg:
+	$agesorter_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$agesorter_doc = 'Send this method an array of [string, int] structs, eg:
 <pre>
  Dave   35
  Edd	45
@@ -261,43 +261,43 @@ 
 
 		xmlrpc_debugmsg("Entering 'agesorter'");
 		// get the parameter
-		$sno=$m->getParam(0);
+		$sno = $m->getParam(0);
 		// error string for [if|when] things go wrong
-		$err="";
+		$err = "";
 		// create the output value
-		$v=new xmlrpcval();
-		$agar=array();
+		$v = new xmlrpcval();
+		$agar = array();
 
-		if (isset($sno) && $sno->kindOf()=="array")
+		if (isset($sno) && $sno->kindOf() == "array")
 		{
-			$max=$sno->arraysize();
+			$max = $sno->arraysize();
 			// TODO: create debug method to print can work once more
 			// print "<!-- found $max array elements -->\n";
-			for($i=0; $i<$max; $i++)
+			for ($i = 0; $i<$max; $i++)
 			{
-				$rec=$sno->arraymem($i);
-				if ($rec->kindOf()!="struct")
+				$rec = $sno->arraymem($i);
+				if ($rec->kindOf() != "struct")
 				{
-					$err="Found non-struct in array at element $i";
+					$err = "Found non-struct in array at element $i";
 					break;
 				}
 				// extract name and age from struct
-				$n=$rec->structmem("name");
-				$a=$rec->structmem("age");
+				$n = $rec->structmem("name");
+				$a = $rec->structmem("age");
 				// $n and $a are xmlrpcvals,
 				// so get the scalarval from them
-				$agar[$n->scalarval()]=$a->scalarval();
+				$agar[$n->scalarval()] = $a->scalarval();
 			}
 
-			$agesorter_arr=$agar;
+			$agesorter_arr = $agar;
 			// hack, must make global as uksort() won't
 			// allow us to pass any other auxilliary information
 			uksort($agesorter_arr, agesorter_compare);
-			$outAr=array();
-			while (list( $key, $val ) = each( $agesorter_arr ) )
+			$outAr = array();
+			while (list($key, $val) = each($agesorter_arr))
 			{
 				// recreate each struct element
-				$outAr[]=new xmlrpcval(array("name" =>
+				$outAr[] = new xmlrpcval(array("name" =>
 				new xmlrpcval($key),
 				"age" =>
 				new xmlrpcval($val, "int")), "struct");
@@ -307,7 +307,7 @@ 
 		}
 		else
 		{
-			$err="Must be one parameter, an array of structs";
+			$err = "Must be one parameter, an array of structs";
 		}
 
 		if ($err)
@@ -322,13 +322,13 @@ 
 
 	// signature and instructions, place these in the dispatch
 	// map
-	$mail_send_sig=array(array(
+	$mail_send_sig = array(array(
 		$xmlrpcBoolean, $xmlrpcString, $xmlrpcString,
 		$xmlrpcString, $xmlrpcString, $xmlrpcString,
 		$xmlrpcString, $xmlrpcString
 	));
 
-	$mail_send_doc='mail.send(recipient, subject, text, sender, cc, bcc, mimetype)<br/>
+	$mail_send_doc = 'mail.send(recipient, subject, text, sender, cc, bcc, mimetype)<br/>
 recipient, cc, and bcc are strings, comma-separated lists of email addresses, as described above.<br/>
 subject is a string, the subject of the message.<br/>
 sender is a string, it\'s the email address of the person sending the message. This string can not be
@@ -342,51 +342,51 @@ 
 	function mail_send($m)
 	{
 		global $xmlrpcerruser, $xmlrpcBoolean;
-		$err="";
+		$err = "";
 
-		$mTo=$m->getParam(0);
-		$mSub=$m->getParam(1);
-		$mBody=$m->getParam(2);
-		$mFrom=$m->getParam(3);
-		$mCc=$m->getParam(4);
-		$mBcc=$m->getParam(5);
-		$mMime=$m->getParam(6);
+		$mTo = $m->getParam(0);
+		$mSub = $m->getParam(1);
+		$mBody = $m->getParam(2);
+		$mFrom = $m->getParam(3);
+		$mCc = $m->getParam(4);
+		$mBcc = $m->getParam(5);
+		$mMime = $m->getParam(6);
 
-		if ($mTo->scalarval()=="")
+		if ($mTo->scalarval() == "")
 		{
-			$err="Error, no 'To' field specified";
+			$err = "Error, no 'To' field specified";
 		}
 
-		if ($mFrom->scalarval()=="")
+		if ($mFrom->scalarval() == "")
 		{
-			$err="Error, no 'From' field specified";
+			$err = "Error, no 'From' field specified";
 		}
 
-		$msghdr="From: " . $mFrom->scalarval() . "\n";
-		$msghdr.="To: ". $mTo->scalarval() . "\n";
+		$msghdr = "From: ".$mFrom->scalarval()."\n";
+		$msghdr .= "To: ".$mTo->scalarval()."\n";
 
-		if ($mCc->scalarval()!="")
+		if ($mCc->scalarval() != "")
 		{
-			$msghdr.="Cc: " . $mCc->scalarval(). "\n";
+			$msghdr .= "Cc: ".$mCc->scalarval()."\n";
 		}
-		if ($mBcc->scalarval()!="")
+		if ($mBcc->scalarval() != "")
 		{
-			$msghdr.="Bcc: " . $mBcc->scalarval(). "\n";
+			$msghdr .= "Bcc: ".$mBcc->scalarval()."\n";
 		}
-		if ($mMime->scalarval()!="")
+		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";
+		$msghdr .= "X-Mailer: XML-RPC for PHP mailer 1.0";
 
-		if ($err=="")
+		if ($err == "")
 		{
 			if (!mail("",
 				$mSub->scalarval(),
 				$mBody->scalarval(),
 				$msghdr))
 			{
-				$err="Error, could not send the mail.";
+				$err = "Error, could not send the mail.";
 			}
 		}
 
@@ -400,8 +400,8 @@ 
 		}
 	}
 
-	$getallheaders_sig=array(array($xmlrpcStruct));
-	$getallheaders_doc='Returns a struct containing all the HTTP headers received with the request. Provides limited functionality with IIS';
+	$getallheaders_sig = array(array($xmlrpcStruct));
+	$getallheaders_doc = 'Returns a struct containing all the HTTP headers received with the request. Provides limited functionality with IIS';
 	function getallheaders_xmlrpc($m)
 	{
 		global $xmlrpcerruser;
@@ -423,12 +423,12 @@ 
 		}
 	}
 
-	$setcookies_sig=array(array($xmlrpcInt, $xmlrpcStruct));
-	$setcookies_doc='Sends to client a response containing a single \'1\' digit, and sets to it http cookies as received in the request (array of structs describing a cookie)';
+	$setcookies_sig = array(array($xmlrpcInt, $xmlrpcStruct));
+	$setcookies_doc = 'Sends to client a response containing a single \'1\' digit, and sets to it http cookies as received in the request (array of structs describing a cookie)';
 	function setcookies($m)
 	{
 		$m = $m->getParam(0);
-		while(list($name,$value) = $m->structeach())
+		while (list($name, $value) = $m->structeach())
 		{
 			$cookiedesc = php_xmlrpc_decode($value);
 			setcookie($name, @$cookiedesc['value'], @$cookiedesc['expires'], @$cookiedesc['path'], @$cookiedesc['domain'], @$cookiedesc['secure']);
@@ -436,60 +436,60 @@ 
 		return new xmlrpcresp(new xmlrpcval(1, 'int'));
 	}
 
-	$getcookies_sig=array(array($xmlrpcStruct));
-	$getcookies_doc='Sends to client a response containing all http cookies as received in the request (as struct)';
+	$getcookies_sig = array(array($xmlrpcStruct));
+	$getcookies_doc = 'Sends to client a response containing all http cookies as received in the request (as struct)';
 	function getcookies($m)
 	{
 		return new xmlrpcresp(php_xmlrpc_encode($_COOKIE));
 	}
 
-	$v1_arrayOfStructs_sig=array(array($xmlrpcInt, $xmlrpcArray));
-	$v1_arrayOfStructs_doc='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.';
+	$v1_arrayOfStructs_sig = array(array($xmlrpcInt, $xmlrpcArray));
+	$v1_arrayOfStructs_doc = '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 v1_arrayOfStructs($m)
 	{
-		$sno=$m->getParam(0);
-		$numcurly=0;
-		for($i=0; $i<$sno->arraysize(); $i++)
+		$sno = $m->getParam(0);
+		$numcurly = 0;
+		for ($i = 0; $i<$sno->arraysize(); $i++)
 		{
-			$str=$sno->arraymem($i);
+			$str = $sno->arraymem($i);
 			$str->structreset();
-			while(list($key,$val)=$str->structeach())
+			while (list($key, $val) = $str->structeach())
 			{
-				if ($key=="curly")
+				if ($key == "curly")
 				{
-					$numcurly+=$val->scalarval();
+					$numcurly += $val->scalarval();
 				}
 			}
 		}
 		return new xmlrpcresp(new xmlrpcval($numcurly, "int"));
 	}
 
-	$v1_easyStruct_sig=array(array($xmlrpcInt, $xmlrpcStruct));
-	$v1_easyStruct_doc='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.';
+	$v1_easyStruct_sig = array(array($xmlrpcInt, $xmlrpcStruct));
+	$v1_easyStruct_doc = '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 v1_easyStruct($m)
 	{
-		$sno=$m->getParam(0);
-		$moe=$sno->structmem("moe");
-		$larry=$sno->structmem("larry");
-		$curly=$sno->structmem("curly");
-		$num=$moe->scalarval() + $larry->scalarval() + $curly->scalarval();
+		$sno = $m->getParam(0);
+		$moe = $sno->structmem("moe");
+		$larry = $sno->structmem("larry");
+		$curly = $sno->structmem("curly");
+		$num = $moe->scalarval()+$larry->scalarval()+$curly->scalarval();
 		return new xmlrpcresp(new xmlrpcval($num, "int"));
 	}
 
-	$v1_echoStruct_sig=array(array($xmlrpcStruct, $xmlrpcStruct));
-	$v1_echoStruct_doc='This handler takes a single parameter, a struct. Your handler must return the struct.';
+	$v1_echoStruct_sig = array(array($xmlrpcStruct, $xmlrpcStruct));
+	$v1_echoStruct_doc = 'This handler takes a single parameter, a struct. Your handler must return the struct.';
 	function v1_echoStruct($m)
 	{
-		$sno=$m->getParam(0);
+		$sno = $m->getParam(0);
 		return new xmlrpcresp($sno);
 	}
 
-	$v1_manyTypes_sig=array(array(
+	$v1_manyTypes_sig = array(array(
 		$xmlrpcArray, $xmlrpcInt, $xmlrpcBoolean,
 		$xmlrpcString, $xmlrpcDouble, $xmlrpcDateTime,
 		$xmlrpcBase64
 	));
-	$v1_manyTypes_doc='This handler takes six parameters, and returns an array containing all the parameters.';
+	$v1_manyTypes_doc = 'This handler takes six parameters, and returns an array containing all the parameters.';
 	function v1_manyTypes($m)
 	{
 		return new xmlrpcresp(new xmlrpcval(array(
@@ -503,58 +503,58 @@ 
 		));
 	}
 
-	$v1_moderateSizeArrayCheck_sig=array(array($xmlrpcString, $xmlrpcArray));
-	$v1_moderateSizeArrayCheck_doc='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.';
+	$v1_moderateSizeArrayCheck_sig = array(array($xmlrpcString, $xmlrpcArray));
+	$v1_moderateSizeArrayCheck_doc = '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 v1_moderateSizeArrayCheck($m)
 	{
-		$ar=$m->getParam(0);
-		$sz=$ar->arraysize();
-		$first=$ar->arraymem(0);
-		$last=$ar->arraymem($sz-1);
-		return new xmlrpcresp(new xmlrpcval($first->scalarval() .
+		$ar = $m->getParam(0);
+		$sz = $ar->arraysize();
+		$first = $ar->arraymem(0);
+		$last = $ar->arraymem($sz-1);
+		return new xmlrpcresp(new xmlrpcval($first->scalarval().
 		$last->scalarval(), "string"));
 	}
 
-	$v1_simpleStructReturn_sig=array(array($xmlrpcStruct, $xmlrpcInt));
-	$v1_simpleStructReturn_doc='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.';
+	$v1_simpleStructReturn_sig = array(array($xmlrpcStruct, $xmlrpcInt));
+	$v1_simpleStructReturn_doc = '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 v1_simpleStructReturn($m)
 	{
-		$sno=$m->getParam(0);
-		$v=$sno->scalarval();
+		$sno = $m->getParam(0);
+		$v = $sno->scalarval();
 		return new xmlrpcresp(new xmlrpcval(array(
-			"times10"   => new xmlrpcval($v*10, "int"),
-			"times100"  => new xmlrpcval($v*100, "int"),
-			"times1000" => new xmlrpcval($v*1000, "int")),
+			"times10"   => new xmlrpcval($v * 10, "int"),
+			"times100"  => new xmlrpcval($v * 100, "int"),
+			"times1000" => new xmlrpcval($v * 1000, "int")),
 			"struct"
 		));
 	}
 
-	$v1_nestedStruct_sig=array(array($xmlrpcInt, $xmlrpcStruct));
-	$v1_nestedStruct_doc='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.';
+	$v1_nestedStruct_sig = array(array($xmlrpcInt, $xmlrpcStruct));
+	$v1_nestedStruct_doc = '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 v1_nestedStruct($m)
 	{
-		$sno=$m->getParam(0);
-
-		$twoK=$sno->structmem("2000");
-		$april=$twoK->structmem("04");
-		$fools=$april->structmem("01");
-		$curly=$fools->structmem("curly");
-		$larry=$fools->structmem("larry");
-		$moe=$fools->structmem("moe");
-		return new xmlrpcresp(new xmlrpcval($curly->scalarval() + $larry->scalarval() + $moe->scalarval(), "int"));
+		$sno = $m->getParam(0);
+
+		$twoK = $sno->structmem("2000");
+		$april = $twoK->structmem("04");
+		$fools = $april->structmem("01");
+		$curly = $fools->structmem("curly");
+		$larry = $fools->structmem("larry");
+		$moe = $fools->structmem("moe");
+		return new xmlrpcresp(new xmlrpcval($curly->scalarval()+$larry->scalarval()+$moe->scalarval(), "int"));
 	}
 
-	$v1_countTheEntities_sig=array(array($xmlrpcStruct, $xmlrpcString));
-	$v1_countTheEntities_doc='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.';
+	$v1_countTheEntities_sig = array(array($xmlrpcStruct, $xmlrpcString));
+	$v1_countTheEntities_doc = '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 v1_countTheEntities($m)
 	{
-		$sno=$m->getParam(0);
-		$str=$sno->scalarval();
-		$gt=0; $lt=0; $ap=0; $qu=0; $amp=0;
-		for($i=0; $i<strlen($str); $i++)
+		$sno = $m->getParam(0);
+		$str = $sno->scalarval();
+		$gt = 0; $lt = 0; $ap = 0; $qu = 0; $amp = 0;
+		for ($i = 0; $i<strlen($str); $i++)
 		{
-			$c=substr($str, $i, 1);
-			switch($c)
+			$c = substr($str, $i, 1);
+			switch ($c)
 			{
 				case ">":
 					$gt++;
@@ -588,42 +588,42 @@ 
 	// trivial interop tests
 	// http://www.xmlrpc.com/stories/storyReader$1636
 
-	$i_echoString_sig=array(array($xmlrpcString, $xmlrpcString));
-	$i_echoString_doc="Echoes string.";
+	$i_echoString_sig = array(array($xmlrpcString, $xmlrpcString));
+	$i_echoString_doc = "Echoes string.";
 
-	$i_echoStringArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoStringArray_doc="Echoes string array.";
+	$i_echoStringArray_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$i_echoStringArray_doc = "Echoes string array.";
 
-	$i_echoInteger_sig=array(array($xmlrpcInt, $xmlrpcInt));
-	$i_echoInteger_doc="Echoes integer.";
+	$i_echoInteger_sig = array(array($xmlrpcInt, $xmlrpcInt));
+	$i_echoInteger_doc = "Echoes integer.";
 
-	$i_echoIntegerArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoIntegerArray_doc="Echoes integer array.";
+	$i_echoIntegerArray_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$i_echoIntegerArray_doc = "Echoes integer array.";
 
-	$i_echoFloat_sig=array(array($xmlrpcDouble, $xmlrpcDouble));
-	$i_echoFloat_doc="Echoes float.";
+	$i_echoFloat_sig = array(array($xmlrpcDouble, $xmlrpcDouble));
+	$i_echoFloat_doc = "Echoes float.";
 
-	$i_echoFloatArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoFloatArray_doc="Echoes float array.";
+	$i_echoFloatArray_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$i_echoFloatArray_doc = "Echoes float array.";
 
-	$i_echoStruct_sig=array(array($xmlrpcStruct, $xmlrpcStruct));
-	$i_echoStruct_doc="Echoes struct.";
+	$i_echoStruct_sig = array(array($xmlrpcStruct, $xmlrpcStruct));
+	$i_echoStruct_doc = "Echoes struct.";
 
-	$i_echoStructArray_sig=array(array($xmlrpcArray, $xmlrpcArray));
-	$i_echoStructArray_doc="Echoes struct array.";
+	$i_echoStructArray_sig = array(array($xmlrpcArray, $xmlrpcArray));
+	$i_echoStructArray_doc = "Echoes struct array.";
 
-	$i_echoValue_doc="Echoes any value back.";
-	$i_echoValue_sig=array(array($xmlrpcValue, $xmlrpcValue));
+	$i_echoValue_doc = "Echoes any value back.";
+	$i_echoValue_sig = array(array($xmlrpcValue, $xmlrpcValue));
 
-	$i_echoBase64_sig=array(array($xmlrpcBase64, $xmlrpcBase64));
-	$i_echoBase64_doc="Echoes base64.";
+	$i_echoBase64_sig = array(array($xmlrpcBase64, $xmlrpcBase64));
+	$i_echoBase64_doc = "Echoes base64.";
 
-	$i_echoDate_sig=array(array($xmlrpcDateTime, $xmlrpcDateTime));
-	$i_echoDate_doc="Echoes dateTime.";
+	$i_echoDate_sig = array(array($xmlrpcDateTime, $xmlrpcDateTime));
+	$i_echoDate_doc = "Echoes dateTime.";
 
 	function i_echoParam($m)
 	{
-		$s=$m->getParam(0);
+		$s = $m->getParam(0);
 		return new xmlrpcresp($s);
 	}
 
@@ -639,23 +639,23 @@ 
 	function i_echoBase64($m) { return i_echoParam($m); }
 	function i_echoDate($m) { return i_echoParam($m); }
 
-	$i_whichToolkit_sig=array(array($xmlrpcStruct));
-	$i_whichToolkit_doc="Returns a struct containing the following strings: toolkitDocsUrl, toolkitName, toolkitVersion, toolkitOperatingSystem.";
+	$i_whichToolkit_sig = array(array($xmlrpcStruct));
+	$i_whichToolkit_doc = "Returns a struct containing the following strings: toolkitDocsUrl, toolkitName, toolkitVersion, toolkitOperatingSystem.";
 
 	function i_whichToolkit($m)
 	{
-		global $xmlrpcName, $xmlrpcVersion,$SERVER_SOFTWARE;
-		$ret=array(
+		global $xmlrpcName, $xmlrpcVersion, $SERVER_SOFTWARE;
+		$ret = array(
 			"toolkitDocsUrl" => "http://phpxmlrpc.sourceforge.net/",
 			"toolkitName" => $xmlrpcName,
 			"toolkitVersion" => $xmlrpcVersion,
 			"toolkitOperatingSystem" => isset ($SERVER_SOFTWARE) ? $SERVER_SOFTWARE : $_SERVER['SERVER_SOFTWARE']
 		);
-		return new xmlrpcresp ( php_xmlrpc_encode($ret));
+		return new xmlrpcresp(php_xmlrpc_encode($ret));
 	}
 
-	$o=new xmlrpc_server_methods_container;
-	$a=array(
+	$o = new xmlrpc_server_methods_container;
+	$a = array(
 		"examples.getStateName" => array(
 			"function" => "findstate",
 			"signature" => $findstate_sig,
@@ -837,7 +837,7 @@ 
     if ($findstate5_sig)
         $a['examples.php4.getStateName'] = $findstate5_sig;
 
-	$s=new xmlrpc_server($a, false);
+	$s = new xmlrpc_server($a, false);
 	$s->setdebug(3);
 	$s->compress_response = true;
 

demo/vardemo.php

Spacing +11 added lines, -11 removed lines

@@ -9,9 +9,9 @@ 
 	print "<h3>Testing value serialization</h3>\n";
 
 	$v = new xmlrpcval(23, "int");
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+	print "<PRE>".htmlentities($v->serialize())."</PRE>";
 	$v = new xmlrpcval("What are you saying? >> << &&");
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+	print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 	$v = new xmlrpcval(array(
 		new xmlrpcval("ABCDEFHIJ"),
@@ -20,7 +20,7 @@ 
 		"array"
 	);
 
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+	print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 	$v = new xmlrpcval(
 		array(
@@ -48,11 +48,11 @@ 
 		"struct"
 	);
 
-	print "<PRE>" . htmlentities($v->serialize()) . "</PRE>";
+	print "<PRE>".htmlentities($v->serialize())."</PRE>";
 
 	$w = new xmlrpcval(array($v, new xmlrpcval("That was the struct!")), "array");
 
-	print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
+	print "<PRE>".htmlentities($w->serialize())."</PRE>";
 
 	$w = new xmlrpcval("Mary had a little lamb,
 Whose fleece was white as snow,
@@ -64,26 +64,26 @@ 
 Ten thousand volts went down its back
 And turned it into nylon", "base64"
 	);
-	print "<PRE>" . htmlentities($w->serialize()) . "</PRE>";
-	print "<PRE>Value of base64 string is: '" . $w->scalarval() . "'</PRE>";
+	print "<PRE>".htmlentities($w->serialize())."</PRE>";
+	print "<PRE>Value of base64 string is: '".$w->scalarval()."'</PRE>";
 
 	$f->method('');
 	$f->addParam(new xmlrpcval("41", "int"));
 
 	print "<h3>Testing request serialization</h3>\n";
 	$op = $f->serialize();
-	print "<PRE>" . htmlentities($op) . "</PRE>";
+	print "<PRE>".htmlentities($op)."</PRE>";
 
 	print "<h3>Testing ISO date format</h3><pre>\n";
 
 	$t = time();
 	$date = iso8601_encode($t);
 	print "Now is $t --> $date\n";
-	print "Or in UTC, that is " . iso8601_encode($t, 1) . "\n";
+	print "Or in UTC, that is ".iso8601_encode($t, 1)."\n";
 	$tb = iso8601_decode($date);
 	print "That is to say $date --> $tb\n";
-	print "Which comes out at " . iso8601_encode($tb) . "\n";
-	print "Which was the time in UTC at " . iso8601_decode($date, 1) . "\n";
+	print "Which comes out at ".iso8601_encode($tb)."\n";
+	print "Which was the time in UTC at ".iso8601_decode($date, 1)."\n";
 
 	print "</pre>\n";
 ?>