gggeek / phpxmlrpc

lib/xmlrpcs.inc

Spacing +180 added lines, -180 removed lines

@@ -57,10 +57,10 @@ 
 	);

 

 	/* Functions that implement system.XXX methods of xmlrpc servers */

-	$_xmlrpcs_getCapabilities_sig=array(array($GLOBALS['xmlrpcStruct']));

-	$_xmlrpcs_getCapabilities_doc='This method lists all the capabilites that the XML-RPC server has: the (more or less standard) extensions to the xmlrpc spec that it adheres to';

-	$_xmlrpcs_getCapabilities_sdoc=array(array('list of capabilities, described as structs with a version number and url for the spec'));

-	function _xmlrpcs_getCapabilities($server, $m=null)

+	$_xmlrpcs_getCapabilities_sig = array(array($GLOBALS['xmlrpcStruct']));

+	$_xmlrpcs_getCapabilities_doc = 'This method lists all the capabilites that the XML-RPC server has: the (more or less standard) extensions to the xmlrpc spec that it adheres to';

+	$_xmlrpcs_getCapabilities_sdoc = array(array('list of capabilities, described as structs with a version number and url for the spec'));

+	function _xmlrpcs_getCapabilities($server, $m = null)

 	{

 		$outAr = $GLOBALS['xmlrpcs_capabilities'];

 		// NIL extension

@@ -75,117 +75,117 @@ 
 

 	// listMethods: signature was either a string, or nothing.

 	// The useless string variant has been removed

-	$_xmlrpcs_listMethods_sig=array(array($GLOBALS['xmlrpcArray']));

-	$_xmlrpcs_listMethods_doc='This method lists all the methods that the XML-RPC server knows how to dispatch';

-	$_xmlrpcs_listMethods_sdoc=array(array('list of method names'));

-	function _xmlrpcs_listMethods($server, $m=null) // if called in plain php values mode, second param is missing

+	$_xmlrpcs_listMethods_sig = array(array($GLOBALS['xmlrpcArray']));

+	$_xmlrpcs_listMethods_doc = 'This method lists all the methods that the XML-RPC server knows how to dispatch';

+	$_xmlrpcs_listMethods_sdoc = array(array('list of method names'));

+	function _xmlrpcs_listMethods($server, $m = null) // if called in plain php values mode, second param is missing

 	{

 

-		$outAr=array();

-		foreach($server->dmap as $key => $val)

+		$outAr = array();

+		foreach ($server->dmap as $key => $val)

 		{

-			$outAr[]=new xmlrpcval($key, 'string');

+			$outAr[] = new xmlrpcval($key, 'string');

 		}

-		if($server->allow_system_funcs)

+		if ($server->allow_system_funcs)

 		{

-			foreach($GLOBALS['_xmlrpcs_dmap'] as $key => $val)

+			foreach ($GLOBALS['_xmlrpcs_dmap'] as $key => $val)

 			{

-				$outAr[]=new xmlrpcval($key, 'string');

+				$outAr[] = new xmlrpcval($key, 'string');

 			}

 		}

 		return new xmlrpcresp(new xmlrpcval($outAr, 'array'));

 	}

 

-	$_xmlrpcs_methodSignature_sig=array(array($GLOBALS['xmlrpcArray'], $GLOBALS['xmlrpcString']));

-	$_xmlrpcs_methodSignature_doc='Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';

-	$_xmlrpcs_methodSignature_sdoc=array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));

+	$_xmlrpcs_methodSignature_sig = array(array($GLOBALS['xmlrpcArray'], $GLOBALS['xmlrpcString']));

+	$_xmlrpcs_methodSignature_doc = 'Returns an array of known signatures (an array of arrays) for the method name passed. If no signatures are known, returns a none-array (test for type != array to detect missing signature)';

+	$_xmlrpcs_methodSignature_sdoc = array(array('list of known signatures, each sig being an array of xmlrpc type names', 'name of method to be described'));

 	function _xmlrpcs_methodSignature($server, $m)

 	{

 		// let accept as parameter both an xmlrpcval or string

 		if (is_object($m))

 		{

-			$methName=$m->getParam(0);

-			$methName=$methName->scalarval();

+			$methName = $m->getParam(0);

+			$methName = $methName->scalarval();

 		}

 		else

 		{

-			$methName=$m;

+			$methName = $m;

 		}

-		if(strpos($methName, "system.") === 0)

+		if (strpos($methName, "system.") === 0)

 		{

-			$dmap=$GLOBALS['_xmlrpcs_dmap']; $sysCall=1;

+			$dmap = $GLOBALS['_xmlrpcs_dmap']; $sysCall = 1;

 		}

 		else

 		{

-			$dmap=$server->dmap; $sysCall=0;

+			$dmap = $server->dmap; $sysCall = 0;

 		}

-		if(isset($dmap[$methName]))

+		if (isset($dmap[$methName]))

 		{

-			if(isset($dmap[$methName]['signature']))

+			if (isset($dmap[$methName]['signature']))

 			{

-				$sigs=array();

-				foreach($dmap[$methName]['signature'] as $inSig)

+				$sigs = array();

+				foreach ($dmap[$methName]['signature'] as $inSig)

 				{

-					$cursig=array();

-					foreach($inSig as $sig)

+					$cursig = array();

+					foreach ($inSig as $sig)

 					{

-						$cursig[]=new xmlrpcval($sig, 'string');

+						$cursig[] = new xmlrpcval($sig, 'string');

 					}

-					$sigs[]=new xmlrpcval($cursig, 'array');

+					$sigs[] = new xmlrpcval($cursig, 'array');

 				}

-				$r=new xmlrpcresp(new xmlrpcval($sigs, 'array'));

+				$r = new xmlrpcresp(new xmlrpcval($sigs, 'array'));

 			}

 			else

 			{

 				// NB: according to the official docs, we should be returning a

 				// "none-array" here, which means not-an-array

-				$r=new xmlrpcresp(new xmlrpcval('undef', 'string'));

+				$r = new xmlrpcresp(new xmlrpcval('undef', 'string'));

 			}

 		}

 		else

 		{

-			$r=new xmlrpcresp(0,$GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);

+			$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);

 		}

 		return $r;

 	}

 

-	$_xmlrpcs_methodHelp_sig=array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));

-	$_xmlrpcs_methodHelp_doc='Returns help text if defined for the method passed, otherwise returns an empty string';

-	$_xmlrpcs_methodHelp_sdoc=array(array('method description', 'name of the method to be described'));

+	$_xmlrpcs_methodHelp_sig = array(array($GLOBALS['xmlrpcString'], $GLOBALS['xmlrpcString']));

+	$_xmlrpcs_methodHelp_doc = 'Returns help text if defined for the method passed, otherwise returns an empty string';

+	$_xmlrpcs_methodHelp_sdoc = array(array('method description', 'name of the method to be described'));

 	function _xmlrpcs_methodHelp($server, $m)

 	{

 		// let accept as parameter both an xmlrpcval or string

 		if (is_object($m))

 		{

-			$methName=$m->getParam(0);

-			$methName=$methName->scalarval();

+			$methName = $m->getParam(0);

+			$methName = $methName->scalarval();

 		}

 		else

 		{

-			$methName=$m;

+			$methName = $m;

 		}

-		if(strpos($methName, "system.") === 0)

+		if (strpos($methName, "system.") === 0)

 		{

-			$dmap=$GLOBALS['_xmlrpcs_dmap']; $sysCall=1;

+			$dmap = $GLOBALS['_xmlrpcs_dmap']; $sysCall = 1;

 		}

 		else

 		{

-			$dmap=$server->dmap; $sysCall=0;

+			$dmap = $server->dmap; $sysCall = 0;

 		}

-		if(isset($dmap[$methName]))

+		if (isset($dmap[$methName]))

 		{

-			if(isset($dmap[$methName]['docstring']))

+			if (isset($dmap[$methName]['docstring']))

 			{

-				$r=new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');

+				$r = new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');

 			}

 			else

 			{

-				$r=new xmlrpcresp(new xmlrpcval('', 'string'));

+				$r = new xmlrpcresp(new xmlrpcval('', 'string'));

 			}

 		}

 		else

 		{

-			$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);

+			$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);

 		}

 		return $r;

 	}

@@ -195,7 +195,7 @@ 
 	$_xmlrpcs_multicall_sdoc = array(array('list of response structs, where each struct has the usual members', 'list of calls, with each call being represented as a struct, with members "methodname" and "params"'));

 	function _xmlrpcs_multicall_error($err)

 	{

-		if(is_string($err))

+		if (is_string($err))

 		{

 			$str = $GLOBALS['xmlrpcstr']["multicall_${err}"];

 			$code = $GLOBALS['xmlrpcerr']["multicall_${err}"];

@@ -213,52 +213,52 @@ 
 

 	function _xmlrpcs_multicall_do_call($server, $call)

 	{

-		if($call->kindOf() != 'struct')

+		if ($call->kindOf() != 'struct')

 		{

 			return _xmlrpcs_multicall_error('notstruct');

 		}

 		$methName = @$call->structmem('methodName');

-		if(!$methName)

+		if (!$methName)

 		{

 			return _xmlrpcs_multicall_error('nomethod');

 		}

-		if($methName->kindOf() != 'scalar' || $methName->scalartyp() != 'string')

+		if ($methName->kindOf() != 'scalar' || $methName->scalartyp() != 'string')

 		{

 			return _xmlrpcs_multicall_error('notstring');

 		}

-		if($methName->scalarval() == 'system.multicall')

+		if ($methName->scalarval() == 'system.multicall')

 		{

 			return _xmlrpcs_multicall_error('recursion');

 		}

 

 		$params = @$call->structmem('params');

-		if(!$params)

+		if (!$params)

 		{

 			return _xmlrpcs_multicall_error('noparams');

 		}

-		if($params->kindOf() != 'array')

+		if ($params->kindOf() != 'array')

 		{

 			return _xmlrpcs_multicall_error('notarray');

 		}

 		$numParams = $params->arraysize();

 

 		$msg = new xmlrpcmsg($methName->scalarval());

-		for($i = 0; $i < $numParams; $i++)

+		for ($i = 0; $i<$numParams; $i++)

 		{

-			if(!$msg->addParam($params->arraymem($i)))

+			if (!$msg->addParam($params->arraymem($i)))

 			{

 				$i++;

 				return _xmlrpcs_multicall_error(new xmlrpcresp(0,

 					$GLOBALS['xmlrpcerr']['incorrect_params'],

-					$GLOBALS['xmlrpcstr']['incorrect_params'] . ": probable xml error in param " . $i));

+					$GLOBALS['xmlrpcstr']['incorrect_params'].": probable xml error in param ".$i));

 			}

 		}

 

 		$result = $server->execute($msg);

 

-		if($result->faultCode() != 0)

+		if ($result->faultCode() != 0)

 		{

-			return _xmlrpcs_multicall_error($result);		// Method returned fault.

+			return _xmlrpcs_multicall_error($result); // Method returned fault.

 		}

 

 		return new xmlrpcval(array($result->value()), 'array');

@@ -266,11 +266,11 @@ 
 

 	function _xmlrpcs_multicall_do_call_phpvals($server, $call)

 	{

-		if(!is_array($call))

+		if (!is_array($call))

 		{

 			return _xmlrpcs_multicall_error('notstruct');

 		}

-		if(!array_key_exists('methodName', $call))

+		if (!array_key_exists('methodName', $call))

 		{

 			return _xmlrpcs_multicall_error('nomethod');

 		}

@@ -278,15 +278,15 @@ 
 		{

 			return _xmlrpcs_multicall_error('notstring');

 		}

-		if($call['methodName'] == 'system.multicall')

+		if ($call['methodName'] == 'system.multicall')

 		{

 			return _xmlrpcs_multicall_error('recursion');

 		}

-		if(!array_key_exists('params', $call))

+		if (!array_key_exists('params', $call))

 		{

 			return _xmlrpcs_multicall_error('noparams');

 		}

-		if(!is_array($call['params']))

+		if (!is_array($call['params']))

 		{

 			return _xmlrpcs_multicall_error('notarray');

 		}

@@ -295,14 +295,14 @@ 
 		// base64 or datetime values, but they will be listed as strings here...

 		$numParams = count($call['params']);

 		$pt = array();

-		foreach($call['params'] as $val)

+		foreach ($call['params'] as $val)

 			$pt[] = php_2_xmlrpc_type(gettype($val));

 

 		$result = $server->execute($call['methodName'], $call['params'], $pt);

 

-		if($result->faultCode() != 0)

+		if ($result->faultCode() != 0)

 		{

-			return _xmlrpcs_multicall_error($result);		// Method returned fault.

+			return _xmlrpcs_multicall_error($result); // Method returned fault.

 		}

 

 		return new xmlrpcval(array($result->value()), 'array');

@@ -316,7 +316,7 @@ 
 		{

 			$calls = $m->getParam(0);

 			$numCalls = $calls->arraysize();

-			for($i = 0; $i < $numCalls; $i++)

+			for ($i = 0; $i<$numCalls; $i++)

 			{

 				$call = $calls->arraymem($i);

 				$result[$i] = _xmlrpcs_multicall_do_call($server, $call);

@@ -324,8 +324,8 @@ 
 		}

 		else

 		{

-			$numCalls=count($m);

-			for($i = 0; $i < $numCalls; $i++)

+			$numCalls = count($m);

+			for ($i = 0; $i<$numCalls; $i++)

 			{

 				$result[$i] = _xmlrpcs_multicall_do_call_phpvals($server, $m[$i]);

 			}

@@ -334,7 +334,7 @@ 
 		return new xmlrpcresp(new xmlrpcval($result, 'array'));

 	}

 

-	$GLOBALS['_xmlrpcs_dmap']=array(

+	$GLOBALS['_xmlrpcs_dmap'] = array(

 		'system.listMethods' => array(

 			'function' => '_xmlrpcs_listMethods',

 			'signature' => $_xmlrpcs_listMethods_sig,

@@ -374,24 +374,24 @@ 
 	* NB: in fact a user defined error handler can only handle WARNING, NOTICE and USER_* errors.

 	*

 	*/

-	function _xmlrpcs_errorHandler($errcode, $errstring, $filename=null, $lineno=null, $context=null)

+	function _xmlrpcs_errorHandler($errcode, $errstring, $filename = null, $lineno = null, $context = null)

 	{

 		// obey the @ protocol

 		if (error_reporting() == 0)

 			return;

 

 		//if($errcode != E_NOTICE && $errcode != E_WARNING && $errcode != E_USER_NOTICE && $errcode != E_USER_WARNING)

-		if($errcode != E_STRICT)

+		if ($errcode != E_STRICT)

 		{

-			$GLOBALS['_xmlrpcs_occurred_errors'] = $GLOBALS['_xmlrpcs_occurred_errors'] . $errstring . "\n";

+			$GLOBALS['_xmlrpcs_occurred_errors'] = $GLOBALS['_xmlrpcs_occurred_errors'].$errstring."\n";

 		}

 		// Try to avoid as much as possible disruption to the previous error handling

 		// mechanism in place

-		if($GLOBALS['_xmlrpcs_prev_ehandler'] == '')

+		if ($GLOBALS['_xmlrpcs_prev_ehandler'] == '')

 		{

 			// The previous error handler was the default: all we should do is log error

 			// to the default error log (if level high enough)

-			if(ini_get('log_errors') && (intval(ini_get('error_reporting')) & $errcode))

+			if (ini_get('log_errors') && (intval(ini_get('error_reporting')) & $errcode))

 			{

 				error_log($errstring);

 			}

@@ -399,10 +399,10 @@ 
 		else

 		{

 			// Pass control on to previous error handler, trying to avoid loops...

-			if($GLOBALS['_xmlrpcs_prev_ehandler'] != '_xmlrpcs_errorHandler')

+			if ($GLOBALS['_xmlrpcs_prev_ehandler'] != '_xmlrpcs_errorHandler')

 			{

 				// NB: this code will NOT work on php < 4.0.2: only 2 params were used for error handlers

-				if(is_array($GLOBALS['_xmlrpcs_prev_ehandler']))

+				if (is_array($GLOBALS['_xmlrpcs_prev_ehandler']))

 				{

 					// the following works both with static class methods and plain object methods as error handler

 					call_user_func_array($GLOBALS['_xmlrpcs_prev_ehandler'], array($errcode, $errstring, $filename, $lineno, $context));

@@ -415,7 +415,7 @@ 
 		}

 	}

 

-	$GLOBALS['_xmlrpc_debuginfo']='';

+	$GLOBALS['_xmlrpc_debuginfo'] = '';

 

 	/**

 	* Add a string to the debug info that can be later seralized by the server

@@ -427,7 +427,7 @@ 
 	*/

 	function xmlrpc_debugmsg($m)

 	{

-		$GLOBALS['_xmlrpc_debuginfo'] .= $m . "\n";

+		$GLOBALS['_xmlrpc_debuginfo'] .= $m."\n";

 	}

 

 	class xmlrpc_server

@@ -436,20 +436,20 @@ 
 		* Array defining php functions exposed as xmlrpc methods by this server

 		* @access private

 		*/

-		var $dmap=array();

+		var $dmap = array();

 		/**

 		* Defines how functions in dmap will be invoked: either using an xmlrpc msg object

 		* or plain php values.

 		* valid strings are 'xmlrpcvals', 'phpvals' or 'epivals'

 		*/

-		var $functions_parameters_type='xmlrpcvals';

+		var $functions_parameters_type = 'xmlrpcvals';

 		/**

 		* Option used for fine-tuning the encoding the php values returned from

 		* functions registered in the dispatch map when the functions_parameters_types

 		* member is set to 'phpvals'

 		* @see php_xmlrpc_encode for a list of values

 		*/

-		var $phpvals_encoding_options = array( 'auto_dates' );

+		var $phpvals_encoding_options = array('auto_dates');

 		/// controls whether the server is going to echo debugging messages back to the client as comments in response body. valid values: 0,1,2,3

 		var $debug = 1;

 		/**

@@ -497,11 +497,11 @@ 
 		* @param array $dispmap the dispatch map with definition of exposed services

 		* @param boolean $servicenow set to false to prevent the server from running upon construction

 		*/

-		function __construct($dispMap=null, $serviceNow=true)

+		function __construct($dispMap = null, $serviceNow = true)

 		{

 			// if ZLIB is enabled, let the server by default accept compressed requests,

 			// and compress responses sent to clients that support them

-			if(function_exists('gzinflate'))

+			if (function_exists('gzinflate'))

 			{

 				$this->accepted_compression = array('gzip', 'deflate');

 				$this->compress_response = true;

@@ -519,10 +519,10 @@ 
 			 * instead, you can use the class add_to_map() function

 			 * to add functions manually (borrowed from SOAPX4)

 			 */

-			if($dispMap)

+			if ($dispMap)

 			{

 				$this->dmap = $dispMap;

-				if($serviceNow)

+				if ($serviceNow)

 				{

 					$this->service();

 				}

@@ -532,7 +532,7 @@ 
 		/**

 		* @deprecated

 		*/

-		function xmlrpc_client($dispMap=null, $serviceNow=true)

+		function xmlrpc_client($dispMap = null, $serviceNow = true)

 		{

 			self::__construct($dispMap, $serviceNow);

 		}

@@ -553,7 +553,7 @@ 
 		*/

 		function setDebug($in)

 		{

-			$this->debug=$in;

+			$this->debug = $in;

 		}

 

 		/**

@@ -561,7 +561,7 @@ 
 		* @param string $charset_encoding the target charset encoding for the serialization

 		* @return string an XML comment (or two)

 		*/

-		function serializeDebug($charset_encoding='')

+		function serializeDebug($charset_encoding = '')

 		{

 			// Tough encoding problem: which internal charset should we assume for debug info?

 			// It might contain a copy of raw data received from client, ie with unknown encoding,

@@ -573,10 +573,10 @@ 
 			{

 				$out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";

 			}

-			if($GLOBALS['_xmlrpc_debuginfo']!='')

+			if ($GLOBALS['_xmlrpc_debuginfo'] != '')

 			{

 

-				$out .= "<!-- DEBUG INFO:\n" . xmlrpc_encode_entitites(str_replace('--', '_-', $GLOBALS['_xmlrpc_debuginfo']), $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "\n-->\n";

+				$out .= "<!-- DEBUG INFO:\n".xmlrpc_encode_entitites(str_replace('--', '_-', $GLOBALS['_xmlrpc_debuginfo']), $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."\n-->\n";

 				// NB: a better solution MIGHT be to use CDATA, but we need to insert it

 				// into return payload AFTER the beginning tag

 				//$out .= "<![CDATA[ DEBUG INFO:\n\n" . str_replace(']]>', ']_]_>', $GLOBALS['_xmlrpc_debuginfo']) . "\n]]>\n";

@@ -590,7 +590,7 @@ 
 		* @return xmlrpcresp the response object (usually not used by caller...)

 		* @access public

 		*/

-		function service($data=null, $return_payload=false)

+		function service($data = null, $return_payload = false)

 		{

 			if ($data === null)

 			{

@@ -603,30 +603,30 @@ 
 			$this->debug_info = '';

 

 			// Echo back what we received, before parsing it

-			if($this->debug > 1)

+			if ($this->debug>1)

 			{

-				$this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++");

+				$this->debugmsg("+++GOT+++\n".$data."\n+++END+++");

 			}

 

 			$r = $this->parseRequestHeaders($data, $req_charset, $resp_charset, $resp_encoding);

 			if (!$r)

 			{

-				$r=$this->parseRequest($data, $req_charset);

+				$r = $this->parseRequest($data, $req_charset);

 			}

 

 			// save full body of request into response, for more debugging usages

 			$r->raw_data = $raw_data;

 

-			if($this->debug > 2 && $GLOBALS['_xmlrpcs_occurred_errors'])

+			if ($this->debug>2 && $GLOBALS['_xmlrpcs_occurred_errors'])

 			{

-				$this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" .

-					$GLOBALS['_xmlrpcs_occurred_errors'] . "+++END+++");

+				$this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n".

+					$GLOBALS['_xmlrpcs_occurred_errors']."+++END+++");

 			}

 

-			$payload=$this->xml_header($resp_charset);

-			if($this->debug > 0)

+			$payload = $this->xml_header($resp_charset);

+			if ($this->debug>0)

 			{

-				$payload = $payload . $this->serializeDebug($resp_charset);

+				$payload = $payload.$this->serializeDebug($resp_charset);

 			}

 

 			// G. Giunta 2006-01-27: do not create response serialization if it has

@@ -635,7 +635,7 @@ 
 			{

 				$r->serialize($resp_charset);

 			}

-			$payload = $payload . $r->payload;

+			$payload = $payload.$r->payload;

 

 			if ($return_payload)

 			{

@@ -644,7 +644,7 @@ 
 

 			// if we get a warning/error that has output some text before here, then we cannot

 			// add a new header. We cannot say we are sending xml, either...

-			if(!headers_sent())

+			if (!headers_sent())

 			{

 				header('Content-Type: '.$r->content_type);

 				// we do not know if client actually told us an accepted charset, but if he did

@@ -655,10 +655,10 @@ 
 				// if we can do it, and we want to do it, and client asked us to,

 				// and php ini settings do not force it already

 				$php_no_self_compress = !ini_get('zlib.output_compression') && (ini_get('output_handler') != 'ob_gzhandler');

-				if($this->compress_response && function_exists('gzencode') && $resp_encoding != ''

+				if ($this->compress_response && function_exists('gzencode') && $resp_encoding != ''

 					&& $php_no_self_compress)

 				{

-					if(strpos($resp_encoding, 'gzip') !== false)

+					if (strpos($resp_encoding, 'gzip') !== false)

 					{

 						$payload = gzencode($payload);

 						header("Content-Encoding: gzip");

@@ -674,9 +674,9 @@ 
 

 				// do not ouput content-length header if php is compressing output for us:

 				// it will mess up measurements

-				if($php_no_self_compress)

+				if ($php_no_self_compress)

 				{

-					header('Content-Length: ' . (int)strlen($payload));

+					header('Content-Length: '.(int) strlen($payload));

 				}

 			}

 			else

@@ -699,7 +699,7 @@ 
 		* @param array $sigdoc the array of valid method signatures docs (one string per param, one for return type)

 		* @access public

 		*/

-		function add_to_map($methodname,$function,$sig=null,$doc=false,$sigdoc=false)

+		function add_to_map($methodname, $function, $sig = null, $doc = false, $sigdoc = false)

 		{

 			$this->dmap[$methodname] = array(

 				'function'	=> $function,

@@ -733,47 +733,47 @@ 
 			{

 				$numParams = count($in);

 			}

-			foreach($sig as $cursig)

+			foreach ($sig as $cursig)

 			{

-				if(count($cursig)==$numParams+1)

+				if (count($cursig) == $numParams+1)

 				{

-					$itsOK=1;

-					for($n=0; $n<$numParams; $n++)

+					$itsOK = 1;

+					for ($n = 0; $n<$numParams; $n++)

 					{

 						if (is_object($in))

 						{

-							$p=$in->getParam($n);

-							if($p->kindOf() == 'scalar')

+							$p = $in->getParam($n);

+							if ($p->kindOf() == 'scalar')

 							{

-								$pt=$p->scalartyp();

+								$pt = $p->scalartyp();

 							}

 							else

 							{

-								$pt=$p->kindOf();

+								$pt = $p->kindOf();

 							}

 						}

 						else

 						{

-							$pt= $in[$n] == 'i4' ? 'int' : strtolower($in[$n]); // dispatch maps never use i4...

+							$pt = $in[$n] == 'i4' ? 'int' : strtolower($in[$n]); // dispatch maps never use i4...

 						}

 

 						// param index is $n+1, as first member of sig is return type

-						if($pt != $cursig[$n+1] && $cursig[$n+1] != $GLOBALS['xmlrpcValue'])

+						if ($pt != $cursig[$n+1] && $cursig[$n+1] != $GLOBALS['xmlrpcValue'])

 						{

-							$itsOK=0;

-							$pno=$n+1;

-							$wanted=$cursig[$n+1];

-							$got=$pt;

+							$itsOK = 0;

+							$pno = $n+1;

+							$wanted = $cursig[$n+1];

+							$got = $pt;

 							break;

 						}

 					}

-					if($itsOK)

+					if ($itsOK)

 					{

-						return array(1,'');

+						return array(1, '');

 					}

 				}

 			}

-			if(isset($wanted))

+			if (isset($wanted))

 			{

 				return array(0, "Wanted ${wanted}, got ${got} at param ${pno}");

 			}

@@ -797,12 +797,12 @@ 
 				error_log('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');

 			}

 

-			if($this->debug > 1)

+			if ($this->debug>1)

 			{

-				if(function_exists('getallheaders'))

+				if (function_exists('getallheaders'))

 				{

 					$this->debugmsg(''); // empty line

-					foreach(getallheaders() as $name => $val)

+					foreach (getallheaders() as $name => $val)

 					{

 						$this->debugmsg("HEADER: $name: $val");

 					}

@@ -810,7 +810,7 @@ 
 

 			}

 

-			if(isset($_SERVER['HTTP_CONTENT_ENCODING']))

+			if (isset($_SERVER['HTTP_CONTENT_ENCODING']))

 			{

 				$content_encoding = str_replace('x-', '', $_SERVER['HTTP_CONTENT_ENCODING']);

 			}

@@ -820,26 +820,26 @@ 
 			}

 

 			// check if request body has been compressed and decompress it

-			if($content_encoding != '' && strlen($data))

+			if ($content_encoding != '' && strlen($data))

 			{

-				if($content_encoding == 'deflate' || $content_encoding == 'gzip')

+				if ($content_encoding == 'deflate' || $content_encoding == 'gzip')

 				{

 					// if decoding works, use it. else assume data wasn't gzencoded

-					if(function_exists('gzinflate') && in_array($content_encoding, $this->accepted_compression))

+					if (function_exists('gzinflate') && in_array($content_encoding, $this->accepted_compression))

 					{

-						if($content_encoding == 'deflate' && $degzdata = @gzuncompress($data))

+						if ($content_encoding == 'deflate' && $degzdata = @gzuncompress($data))

 						{

 							$data = $degzdata;

-							if($this->debug > 1)

+							if ($this->debug>1)

 							{

-								$this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");

+								$this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");

 							}

 						}

-						elseif($content_encoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

+						elseif ($content_encoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

 						{

 							$data = $degzdata;

-							if($this->debug > 1)

-								$this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");

+							if ($this->debug>1)

+								$this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n".$data."\n+++END+++");

 						}

 						else

 						{

@@ -912,7 +912,7 @@ 
 		* @return xmlrpcresp

 		* @access private

 		*/

-		function parseRequest($data, $req_encoding='')

+		function parseRequest($data, $req_encoding = '')

 		{

 			// 2005/05/07 commented and moved into caller function code

 			//if($data=='')

@@ -924,16 +924,16 @@ 
 			// so we do not try to convert them into xml character entities

 			//$data = xmlrpc_html_entity_xlate($data);

 

-			$GLOBALS['_xh']=array();

-			$GLOBALS['_xh']['ac']='';

-			$GLOBALS['_xh']['stack']=array();

+			$GLOBALS['_xh'] = array();

+			$GLOBALS['_xh']['ac'] = '';

+			$GLOBALS['_xh']['stack'] = array();

 			$GLOBALS['_xh']['valuestack'] = array();

-			$GLOBALS['_xh']['params']=array();

-			$GLOBALS['_xh']['pt']=array();

-			$GLOBALS['_xh']['isf']=0;

-			$GLOBALS['_xh']['isf_reason']='';

-			$GLOBALS['_xh']['method']=false; // so we can check later if we got a methodname or not

-			$GLOBALS['_xh']['rt']='';

+			$GLOBALS['_xh']['params'] = array();

+			$GLOBALS['_xh']['pt'] = array();

+			$GLOBALS['_xh']['isf'] = 0;

+			$GLOBALS['_xh']['isf_reason'] = '';

+			$GLOBALS['_xh']['method'] = false; // so we can check later if we got a methodname or not

+			$GLOBALS['_xh']['rt'] = '';

 

 			// decompose incoming XML into request structure

 

@@ -951,7 +951,7 @@ 
 						if (extension_loaded('mbstring')) {

 							$data = mb_convert_encoding($data, 'UTF-8', $req_encoding);

 						} else {

-							error_log('XML-RPC: ' . __METHOD__ . ': invalid charset encoding of received request: ' . $req_encoding);

+							error_log('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$req_encoding);

 						}

 					}

 				}

@@ -980,10 +980,10 @@ 
 				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');

 			xml_set_character_data_handler($parser, 'xmlrpc_cd');

 			xml_set_default_handler($parser, 'xmlrpc_dh');

-			if(!xml_parse($parser, $data, 1))

+			if (!xml_parse($parser, $data, 1))

 			{

 				// return XML error as a faultCode

-				$r=new xmlrpcresp(0,

+				$r = new xmlrpcresp(0,

 				$GLOBALS['xmlrpcerrxml']+xml_get_error_code($parser),

 				sprintf('XML error: %s at line %d, column %d',

 					xml_error_string(xml_get_error_code($parser)),

@@ -993,9 +993,9 @@ 
 			elseif ($GLOBALS['_xh']['isf'])

 			{

 				xml_parser_free($parser);

-				$r=new xmlrpcresp(0,

+				$r = new xmlrpcresp(0,

 					$GLOBALS['xmlrpcerr']['invalid_request'],

-					$GLOBALS['xmlrpcstr']['invalid_request'] . ' ' . $GLOBALS['_xh']['isf_reason']);

+					$GLOBALS['xmlrpcstr']['invalid_request'].' '.$GLOBALS['_xh']['isf_reason']);

 			}

 			else

 			{

@@ -1006,7 +1006,7 @@ 
 				// registered as phpvals) that would mean a useless encode+decode pass

 				if ($this->functions_parameters_type != 'xmlrpcvals' || (isset($this->dmap[$GLOBALS['_xh']['method']]['parameters_type']) && ($this->dmap[$GLOBALS['_xh']['method']]['parameters_type'] == 'phpvals')))

 				{

-					if($this->debug > 1)

+					if ($this->debug>1)

 					{

 						$this->debugmsg("\n+++PARSED+++\n".var_export($GLOBALS['_xh']['params'], true)."\n+++END+++");

 					}

@@ -1015,14 +1015,14 @@ 
 				else

 				{

 					// build an xmlrpcmsg object with data parsed from xml

-					$m=new xmlrpcmsg($GLOBALS['_xh']['method']);

+					$m = new xmlrpcmsg($GLOBALS['_xh']['method']);

 					// now add parameters in

-					for($i=0; $i<count($GLOBALS['_xh']['params']); $i++)

+					for ($i = 0; $i<count($GLOBALS['_xh']['params']); $i++)

 					{

 						$m->addParam($GLOBALS['_xh']['params'][$i]);

 					}

 

-					if($this->debug > 1)

+					if ($this->debug>1)

 					{

 						$this->debugmsg("\n+++PARSED+++\n".var_export($m, true)."\n+++END+++");

 					}

@@ -1040,7 +1040,7 @@ 
 		* @return xmlrpcresp

 		* @access private

 		*/

-		function execute($m, $params=null, $paramtypes=null)

+		function execute($m, $params = null, $paramtypes = null)

 		{

 			if (is_object($m))

 			{

@@ -1053,7 +1053,7 @@ 
 			$sysCall = $this->allow_system_funcs && (strpos($methName, "system.") === 0);

 			$dmap = $sysCall ? $GLOBALS['_xmlrpcs_dmap'] : $this->dmap;

 

-			if(!isset($dmap[$methName]['function']))

+			if (!isset($dmap[$methName]['function']))

 			{

 				// No such method

 				return new xmlrpcresp(0,

@@ -1062,7 +1062,7 @@ 
 			}

 

 			// Check signature

-			if(isset($dmap[$methName]['signature']))

+			if (isset($dmap[$methName]['signature']))

 			{

 				$sig = $dmap[$methName]['signature'];

 				if (is_object($m))

@@ -1073,37 +1073,37 @@ 
 				{

 					list($ok, $errstr) = $this->verifySignature($paramtypes, $sig);

 				}

-				if(!$ok)

+				if (!$ok)

 				{

 					// Didn't match.

 					return new xmlrpcresp(

 						0,

 						$GLOBALS['xmlrpcerr']['incorrect_params'],

-						$GLOBALS['xmlrpcstr']['incorrect_params'] . ": ${errstr}"

+						$GLOBALS['xmlrpcstr']['incorrect_params'].": ${errstr}"

 					);

 				}

 			}

 

 			$func = $dmap[$methName]['function'];

 			// let the 'class::function' syntax be accepted in dispatch maps

-			if(is_string($func) && strpos($func, '::'))

+			if (is_string($func) && strpos($func, '::'))

 			{

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

 			}

 			// verify that function to be invoked is in fact callable

-			if(!is_callable($func))

+			if (!is_callable($func))

 			{

 				error_log("XML-RPC: ".__METHOD__.": function $func registered as method handler is not callable");

 				return new xmlrpcresp(

 					0,

 					$GLOBALS['xmlrpcerr']['server_error'],

-					$GLOBALS['xmlrpcstr']['server_error'] . ": no function matches method"

+					$GLOBALS['xmlrpcstr']['server_error'].": no function matches method"

 				);

 			}

 

 			// If debug level is 3, we should catch all errors generated during

 			// processing of user function, and log them as part of response

-			if($this->debug > 2)

+			if ($this->debug>2)

 			{

 				$GLOBALS['_xmlrpcs_prev_ehandler'] = set_error_handler('_xmlrpcs_errorHandler');

 			}

@@ -1112,7 +1112,7 @@ 
 				// Allow mixed-convention servers

 				if (is_object($m))

 				{

-					if($sysCall)

+					if ($sysCall)

 					{

 						$r = call_user_func($func, $this, $m);

 					}

@@ -1132,7 +1132,7 @@ 
 							$r = new xmlrpcresp(

 								0,

 								$GLOBALS['xmlrpcerr']['server_error'],

-								$GLOBALS['xmlrpcstr']['server_error'] . ": function does not return xmlrpcresp object"

+								$GLOBALS['xmlrpcstr']['server_error'].": function does not return xmlrpcresp object"

 							);

 						}

 					}

@@ -1140,7 +1140,7 @@ 
 				else

 				{

 					// call a 'plain php' function

-					if($sysCall)

+					if ($sysCall)

 					{

 						array_unshift($params, $this);

 						$r = call_user_func_array($func, $params);

@@ -1155,7 +1155,7 @@ 
 							// an eror response

 							if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r))

 							{

-								$r = new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']);

+								$r = new xmlrpcresp(0, (integer) $r['faultCode'], (string) $r['faultString']);

 							}

 							else

 							{

@@ -1178,11 +1178,11 @@ 
 					}

 				}

 			}

-			catch(Exception $e)

+			catch (Exception $e)

 			{

 				// (barring errors in the lib) an uncatched exception happened

 				// in the called function, we wrap it in a proper error-response

-				switch($this->exception_handling)

+				switch ($this->exception_handling)

 				{

 					case 2:

 						throw $e;

@@ -1194,11 +1194,11 @@ 
 						$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_error'], $GLOBALS['xmlrpcstr']['server_error']);

 				}

 			}

-			if($this->debug > 2)

+			if ($this->debug>2)

 			{

 				// note: restore the error handler we found before calling the

 				// user func, even if it has been changed inside the func itself

-				if($GLOBALS['_xmlrpcs_prev_ehandler'])

+				if ($GLOBALS['_xmlrpcs_prev_ehandler'])

 				{

 					set_error_handler($GLOBALS['_xmlrpcs_prev_ehandler']);

 				}

@@ -1223,15 +1223,15 @@ 
 		/**

 		* @access private

 		*/

-		function xml_header($charset_encoding='')

+		function xml_header($charset_encoding = '')

 		{

 			if ($charset_encoding != '')

 			{

-				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\"?" . ">\n";

+				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\"?".">\n";

 			}

 			else

 			{

-				return "<?xml version=\"1.0\"?" . ">\n";

+				return "<?xml version=\"1.0\"?".">\n";

 			}

 		}

 

@@ -1241,7 +1241,7 @@ 
 		*/

 		function echoInput()

 		{

-			$r=new xmlrpcresp(new xmlrpcval( "'Aha said I: '" . $GLOBALS['HTTP_RAW_POST_DATA'], 'string'));

+			$r = new xmlrpcresp(new xmlrpcval("'Aha said I: '".$GLOBALS['HTTP_RAW_POST_DATA'], 'string'));

 			print $r->serialize();

 		}

 	}