gggeek / phpxmlrpc

lib/xmlrpc_wrappers.inc

Spacing +94 added lines, -94 removed lines

@@ -27,7 +27,7 @@ 
 	*/
 	function php_2_xmlrpc_type($phptype)
 	{
-		switch(strtolower($phptype))
+		switch (strtolower($phptype))
 		{
 			case 'string':
 				return $GLOBALS['xmlrpcString'];
@@ -49,7 +49,7 @@ 
 			case 'resource':
 				return '';
 			default:
-				if(class_exists($phptype))
+				if (class_exists($phptype))
 				{
 					return $GLOBALS['xmlrpcStruct'];
 				}
@@ -68,7 +68,7 @@ 
 	*/
 	function xmlrpc_2_php_type($xmlrpctype)
 	{
-		switch(strtolower($xmlrpctype))
+		switch (strtolower($xmlrpctype))
 		{
 			case 'base64':
 			case 'datetime.iso8601':
@@ -140,12 +140,12 @@ 
 	* @todo if $newfuncname is empty, we could use create_user_func instead of eval, as it is possibly faster
 	* @todo add a verbatim_object_copy parameter to allow avoiding the same obj instance?
 	*/
-	function wrap_php_function($funcname, $newfuncname='', $extra_options=array())
+	function wrap_php_function($funcname, $newfuncname = '', $extra_options = array())
 	{
 		$buildit = isset($extra_options['return_source']) ? !($extra_options['return_source']) : true;
 		$prefix = isset($extra_options['prefix']) ? $extra_options['prefix'] : 'xmlrpc';
-		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool)$extra_options['encode_php_objs'] : false;
-		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool)$extra_options['decode_php_objs'] : false;
+		$encode_php_objects = isset($extra_options['encode_php_objs']) ? (bool) $extra_options['encode_php_objs'] : false;
+		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool) $extra_options['decode_php_objs'] : false;
 		$catch_warnings = isset($extra_options['suppress_warnings']) && $extra_options['suppress_warnings'] ? '@' : '';
 
 		$exists = false;
@@ -153,20 +153,20 @@ 
 		{
 			$funcname = explode('::', $funcname);
 		}
-		if(is_array($funcname))
+		if (is_array($funcname))
 		{
-			if(count($funcname) < 2 || (!is_string($funcname[0]) && !is_object($funcname[0])))
+			if (count($funcname)<2 || (!is_string($funcname[0]) && !is_object($funcname[0])))
 			{
 				error_log('XML-RPC: syntax for function to be wrapped is wrong');
 				return false;
 			}
-			if(is_string($funcname[0]))
+			if (is_string($funcname[0]))
 			{
 				$plainfuncname = implode('::', $funcname);
 			}
-			elseif(is_object($funcname[0]))
+			elseif (is_object($funcname[0]))
 			{
-				$plainfuncname = get_class($funcname[0]) . '->' . $funcname[1];
+				$plainfuncname = get_class($funcname[0]).'->'.$funcname[1];
 			}
 			$exists = method_exists($funcname[0], $funcname[1]);
 		}
@@ -176,7 +176,7 @@ 
 			$exists = function_exists($funcname);
 		}
 
-		if(!$exists)
+		if (!$exists)
 		{
 			error_log('XML-RPC: function to be wrapped is not defined: '.$plainfuncname);
 			return false;
@@ -184,14 +184,14 @@ 
 		else
 		{
 			// determine name of new php function
-			if($newfuncname == '')
+			if ($newfuncname == '')
 			{
-				if(is_array($funcname))
+				if (is_array($funcname))
 				{
-					if(is_string($funcname[0]))
+					if (is_string($funcname[0]))
 						$xmlrpcfuncname = "{$prefix}_".implode('_', $funcname);
 					else
-						$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]) . '_' . $funcname[1];
+						$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]).'_'.$funcname[1];
 				}
 				else
 				{
@@ -202,36 +202,36 @@ 
 			{
 				$xmlrpcfuncname = $newfuncname;
 			}
-			while($buildit && function_exists($xmlrpcfuncname))
+			while ($buildit && function_exists($xmlrpcfuncname))
 			{
 				$xmlrpcfuncname .= 'x';
 			}
 
 			// start to introspect PHP code
-			if(is_array($funcname))
+			if (is_array($funcname))
 			{
 				$func = new ReflectionMethod($funcname[0], $funcname[1]);
-				if($func->isPrivate())
+				if ($func->isPrivate())
 				{
 					error_log('XML-RPC: method to be wrapped is private: '.$plainfuncname);
 					return false;
 				}
-				if($func->isProtected())
+				if ($func->isProtected())
 				{
 					error_log('XML-RPC: method to be wrapped is protected: '.$plainfuncname);
 					return false;
 				}
-	 			if($func->isConstructor())
+	 			if ($func->isConstructor())
 				{
 					error_log('XML-RPC: method to be wrapped is the constructor: '.$plainfuncname);
 					return false;
 				}
-				if($func->isDestructor())
+				if ($func->isDestructor())
 				{
 					error_log('XML-RPC: method to be wrapped is the destructor: '.$plainfuncname);
 					return false;
 				}
-				if($func->isAbstract())
+				if ($func->isAbstract())
 				{
 					error_log('XML-RPC: method to be wrapped is abstract: '.$plainfuncname);
 					return false;
@@ -242,7 +242,7 @@ 
 			{
 				$func = new ReflectionFunction($funcname);
 			}
-			if($func->isInternal())
+			if ($func->isInternal())
 			{
 				// Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs
 				// instead of getparameters to fully reflect internal php functions ?
@@ -262,27 +262,27 @@ 
 			$paramDocs = array();
 
 			$docs = $func->getDocComment();
-			if($docs != '')
+			if ($docs != '')
 			{
 				$docs = explode("\n", $docs);
 				$i = 0;
-				foreach($docs as $doc)
+				foreach ($docs as $doc)
 				{
 					$doc = trim($doc, " \r\t/*");
-					if(strlen($doc) && strpos($doc, '@') !== 0 && !$i)
+					if (strlen($doc) && strpos($doc, '@') !== 0 && !$i)
 					{
-						if($desc)
+						if ($desc)
 						{
 							$desc .= "\n";
 						}
 						$desc .= $doc;
 					}
-					elseif(strpos($doc, '@param') === 0)
+					elseif (strpos($doc, '@param') === 0)
 					{
 						// syntax: @param type [$name] desc
-						if(preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches))
+						if (preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches))
 						{
-							if(strpos($matches[1], '|'))
+							if (strpos($matches[1], '|'))
 							{
 								//$paramDocs[$i]['type'] = explode('|', $matches[1]);
 								$paramDocs[$i]['type'] = 'mixed';
@@ -296,14 +296,14 @@ 
 						}
 						$i++;
 					}
-					elseif(strpos($doc, '@return') === 0)
+					elseif (strpos($doc, '@return') === 0)
 					{
 						// syntax: @return type desc
 						//$returns = preg_split('/\s+/', $doc);
-						if(preg_match('/@return\s+(\S+)\s+(.+)/', $doc, $matches))
+						if (preg_match('/@return\s+(\S+)\s+(.+)/', $doc, $matches))
 						{
 							$returns = php_2_xmlrpc_type($matches[1]);
-							if(isset($matches[2]))
+							if (isset($matches[2]))
 							{
 								$returnsDocs = $matches[2];
 							}
@@ -315,7 +315,7 @@ 
 			// execute introspection of actual function prototype
 			$params = array();
 			$i = 0;
-			foreach($func->getParameters() as $paramobj)
+			foreach ($func->getParameters() as $paramobj)
 			{
 				$params[$i] = array();
 				$params[$i]['name'] = '$'.$paramobj->getName();
@@ -329,7 +329,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']))
 				{
@@ -337,7 +337,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";
@@ -355,11 +355,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;
@@ -368,7 +368,7 @@ 
 
 			$sigs = array();
 			$psigs = array();
-			if(count($parsvariations) == 0)
+			if (count($parsvariations) == 0)
 			{
 				// only known good synopsis = no parameters
 				$parsvariations[] = array();
@@ -379,24 +379,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];
 			}
@@ -404,13 +404,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']))
 					{
@@ -429,7 +429,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'));";
 			}
@@ -443,7 +443,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)
 			{
@@ -452,7 +452,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;
@@ -480,26 +480,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'];
 						}
@@ -547,7 +547,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?
@@ -558,8 +558,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'] : '';
 		}
@@ -567,10 +567,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']))
@@ -592,8 +592,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;
@@ -605,7 +605,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;
@@ -613,7 +613,7 @@ 
 			else
 			{
 				// pick a suitable name for the new function, avoiding collisions
-				if($newfuncname != '')
+				if ($newfuncname != '')
 				{
 					$xmlrpcfuncname = $newfuncname;
 				}
@@ -624,7 +624,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';
 				}
@@ -633,11 +633,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();
@@ -660,7 +660,7 @@ 
 					eval($results['source'].'$allOK=1;');
 					// alternative
 					//$xmlrpcfuncname = create_function('$m', $innercode);
-					if($allOK)
+					if ($allOK)
 					{
 						return $xmlrpcfuncname;
 					}
@@ -687,15 +687,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';
@@ -705,8 +705,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;
@@ -718,7 +718,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;
@@ -726,7 +726,7 @@ 
 			else
 			{
 				// pick a suitable name for the new function, avoiding collisions
-				if($newclassname != '')
+				if ($newclassname != '')
 				{
 					$xmlrpcclassname = $newclassname;
 				}
@@ -735,7 +735,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';
 				}
@@ -751,7 +751,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))
 					{
@@ -779,7 +779,7 @@ 
 					eval($source.'$allOK=1;');
 					// alternative
 					//$xmlrpcfuncname = create_function('$m', $innercode);
-					if($allOK)
+					if ($allOK)
 					{
 						return $xmlrpcclassname;
 					}
@@ -806,12 +806,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);
@@ -839,11 +839,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
@@ -863,7 +863,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";
@@ -896,7 +896,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);
 	}
@@ -907,18 +907,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";

lib/xmlrpcs.inc

Spacing +179 added lines, -179 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');
 			}
@@ -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();
 		}
 	}