gggeek / phpxmlrpc

lib/xmlrpcs.inc

Braces +58 added lines, -89 removed lines

@@ -106,16 +106,14 @@ 
 		{

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

 			$methName=$methName->scalarval();

-		}

-		else

+		} else

 		{

 			$methName=$m;

 		}

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

 		{

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

-		}

-		else

+		} else

 		{

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

 		}

@@ -134,15 +132,13 @@ 
 					$sigs[]=new xmlrpcval($cursig, 'array');

 				}

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

-			}

-			else

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

 			}

-		}

-		else

+		} else

 		{

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

 		}

@@ -159,16 +155,14 @@ 
 		{

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

 			$methName=$methName->scalarval();

-		}

-		else

+		} else

 		{

 			$methName=$m;

 		}

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

 		{

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

-		}

-		else

+		} else

 		{

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

 		}

@@ -177,13 +171,11 @@ 
 			if(isset($dmap[$methName]['docstring']))

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

-		}

-		else

+		} else

 		{

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

 		}

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

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

 		$pt = array();

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

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

+		foreach($call['params'] as $val) {
+					$pt[] = php_2_xmlrpc_type(gettype($val));
+		}
 

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

 

@@ -321,8 +314,7 @@ 
 				$call = $calls->arraymem($i);

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

 			}

-		}

-		else

+		} else

 		{

 			$numCalls=count($m);

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

@@ -377,8 +369,9 @@ 
 	function _xmlrpcs_errorHandler($errcode, $errstring, $filename=null, $lineno=null, $context=null)

 	{

 		// obey the @ protocol

-		if (error_reporting() == 0)

-			return;

+		if (error_reporting() == 0) {
+					return;
+		}
 

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

 		if($errcode != E_STRICT)

@@ -395,8 +388,7 @@ 
 			{

 				error_log($errstring);

 			}

-		}

-		else

+		} else

 		{

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

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

@@ -406,8 +398,7 @@ 
 				{

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

-				}

-				else

+				} else

 				{

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

 				}

@@ -663,8 +654,7 @@ 
 						$payload = gzencode($payload);

 						header("Content-Encoding: gzip");

 						header("Vary: Accept-Encoding");

-					}

-					elseif (strpos($resp_encoding, 'deflate') !== false)

+					} elseif (strpos($resp_encoding, 'deflate') !== false)

 					{

 						$payload = gzcompress($payload);

 						header("Content-Encoding: deflate");

@@ -678,8 +668,7 @@ 
 				{

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

 				}

-			}

-			else

+			} else

 			{

 				error_log('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');

 			}

@@ -728,8 +717,7 @@ 
 			if (is_object($in))

 			{

 				$numParams = $in->getNumParams();

-			}

-			else

+			} else

 			{

 				$numParams = count($in);

 			}

@@ -746,13 +734,11 @@ 
 							if($p->kindOf() == 'scalar')

 							{

 								$pt=$p->scalartyp();

-							}

-							else

+							} else

 							{

 								$pt=$p->kindOf();

 							}

-						}

-						else

+						} else

 						{

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

 						}

@@ -813,8 +799,7 @@ 
 			if(isset($_SERVER['HTTP_CONTENT_ENCODING']))

 			{

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

-			}

-			else

+			} else

 			{

 				$content_encoding = '';

 			}

@@ -834,20 +819,18 @@ 
 							{

 								$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+++");

-						}

-						else

+							if($this->debug > 1) {
+															$this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");
+							}
+						} else

 						{

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

 							return $r;

 						}

-					}

-					else

+					} else

 					{

 						//error_log('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');

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

@@ -871,18 +854,19 @@ 
 					$known_charsets = array($GLOBALS['xmlrpc_internalencoding'], 'UTF-8', 'ISO-8859-1', 'US-ASCII');

 					foreach ($known_charsets as $charset)

 					{

-						foreach ($client_accepted_charsets as $accepted)

-							if (strpos($accepted, $charset) === 0)

+						foreach ($client_accepted_charsets as $accepted) {
+													if (strpos($accepted, $charset) === 0)

 							{

-								$resp_encoding = $charset;

+								$resp_encoding = $charset;
+						}
 								break;

 							}

-						if ($resp_encoding)

-							break;

+						if ($resp_encoding) {
+													break;
+						}
 					}

 				}

-			}

-			else

+			} else

 			{

 				$resp_encoding = $this->response_charset_encoding;

 			}

@@ -890,8 +874,7 @@ 
 			if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))

 			{

 				$resp_compression = $_SERVER['HTTP_ACCEPT_ENCODING'];

-			}

-			else

+			} else

 			{

 				$resp_compression = '';

 			}

@@ -968,16 +951,16 @@ 
 			if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))

 			{

 				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');

-			}

-			else

+			} else

 			{

 				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);

 			}

 

-			if ($this->functions_parameters_type != 'xmlrpcvals')

-				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');

-			else

-				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');

+			if ($this->functions_parameters_type != 'xmlrpcvals') {
+							xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');
+			} else {
+							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))

@@ -989,15 +972,13 @@ 
 					xml_error_string(xml_get_error_code($parser)),

 					xml_get_current_line_number($parser), xml_get_current_column_number($parser)));

 				xml_parser_free($parser);

-			}

-			elseif ($GLOBALS['_xh']['isf'])

+			} elseif ($GLOBALS['_xh']['isf'])

 			{

 				xml_parser_free($parser);

 				$r=new xmlrpcresp(0,

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

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

-			}

-			else

+			} else

 			{

 				xml_parser_free($parser);

 				// small layering violation in favor of speed and memory usage:

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

 					}

 					$r = $this->execute($GLOBALS['_xh']['method'], $GLOBALS['_xh']['params'], $GLOBALS['_xh']['pt']);

-				}

-				else

+				} else

 				{

 					// build an xmlrpcmsg object with data parsed from xml

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

@@ -1045,8 +1025,7 @@ 
 			if (is_object($m))

 			{

 				$methName = $m->method();

-			}

-			else

+			} else

 			{

 				$methName = $m;

 			}

@@ -1068,8 +1047,7 @@ 
 				if (is_object($m))

 				{

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

-				}

-				else

+				} else

 				{

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

 				}

@@ -1115,8 +1093,7 @@ 
 					if($sysCall)

 					{

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

-					}

-					else

+					} else

 					{

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

 					}

@@ -1126,8 +1103,7 @@ 
 						if (is_a($r, 'xmlrpcval'))

 						{

 							$r = new xmlrpcresp($r);

-						}

-						else

+						} else

 						{

 							$r = new xmlrpcresp(

 								0,

@@ -1136,16 +1112,14 @@ 
 							);

 						}

 					}

-				}

-				else

+				} else

 				{

 					// call a 'plain php' function

 					if($sysCall)

 					{

 						array_unshift($params, $this);

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

-					}

-					else

+					} else

 					{

 						// 3rd API convention for method-handling functions: EPI-style

 						if ($this->functions_parameters_type == 'epivals')

@@ -1156,15 +1130,13 @@ 
 							if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r))

 							{

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

-							}

-							else

+							} else

 							{

 								// functions using EPI api should NOT return resp objects,

 								// so make sure we encode the return type correctly

 								$r = new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api')));

 							}

-						}

-						else

+						} else

 						{

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

 						}

@@ -1177,8 +1149,7 @@ 
 						$r = new xmlrpcresp(php_xmlrpc_encode($r, $this->phpvals_encoding_options));

 					}

 				}

-			}

-			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

@@ -1201,8 +1172,7 @@ 
 				if($GLOBALS['_xmlrpcs_prev_ehandler'])

 				{

 					set_error_handler($GLOBALS['_xmlrpcs_prev_ehandler']);

-				}

-				else

+				} else

 				{

 					restore_error_handler();

 				}

@@ -1228,8 +1198,7 @@ 
 			if ($charset_encoding != '')

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

Doc Comments +4 added lines, -3 removed lines

@@ -494,8 +494,8 @@ 
 		var $user_data = null;

 

 		/**

-		* @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

+		* @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)

 		{

@@ -785,7 +785,8 @@ 
 

 		/**

 		* Parse http headers received along with xmlrpc request. If needed, inflate request

-		* @return mixed null on success or an xmlrpcresp

+		* @param string $data
+		* @return xmlrpcresp|null null on success or an xmlrpcresp

 		* @access private

 		*/

 		function parseRequestHeaders(&$data, &$req_encoding, &$resp_encoding, &$resp_compression)

Indentation +1208 added lines, -1208 removed lines

@@ -34,1215 +34,1215 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 // OF THE POSSIBILITY OF SUCH DAMAGE.

 

-	// XML RPC Server class

-	// requires: xmlrpc.inc

-

-	$GLOBALS['xmlrpcs_capabilities'] = array(

-		// xmlrpc spec: always supported

-		'xmlrpc' => new xmlrpcval(array(

-			'specUrl' => new xmlrpcval('http://www.xmlrpc.com/spec', 'string'),

-			'specVersion' => new xmlrpcval(1, 'int')

-		), 'struct'),

-		// if we support system.xxx functions, we always support multicall, too...

-		// Note that, as of 2006/09/17, the following URL does not respond anymore

-		'system.multicall' => new xmlrpcval(array(

-			'specUrl' => new xmlrpcval('http://www.xmlrpc.com/discuss/msgReader$1208', 'string'),

-			'specVersion' => new xmlrpcval(1, 'int')

-		), 'struct'),

-		// introspection: version 2! we support 'mixed', too

-		'introspection' => new xmlrpcval(array(

-			'specUrl' => new xmlrpcval('http://phpxmlrpc.sourceforge.net/doc-2/ch10.html', 'string'),

-			'specVersion' => new xmlrpcval(2, 'int')

-		), 'struct')

-	);

-

-	/* 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)

-	{

-		$outAr = $GLOBALS['xmlrpcs_capabilities'];

-		// NIL extension

-		if ($GLOBALS['xmlrpc_null_extension']) {

-			$outAr['nil'] = new xmlrpcval(array(

-				'specUrl' => new xmlrpcval('http://www.ontosys.com/xml-rpc/extensions.php', 'string'),

-				'specVersion' => new xmlrpcval(1, 'int')

-			), 'struct');

-		}

-		return new xmlrpcresp(new xmlrpcval($outAr, 'struct'));

-	}

-

-	// 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

-	{

-

-		$outAr=array();

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

-		{

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

-		}

-		if($server->allow_system_funcs)

-		{

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

-			{

-				$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'));

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

-		}

-		else

-		{

-			$methName=$m;

-		}

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

-		{

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

-		}

-		else

-		{

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

-		}

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

-		{

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

-			{

-				$sigs=array();

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

-				{

-					$cursig=array();

-					foreach($inSig as $sig)

-					{

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

-					}

-					$sigs[]=new xmlrpcval($cursig, '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'));

-			}

-		}

-		else

-		{

-			$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'));

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

-		}

-		else

-		{

-			$methName=$m;

-		}

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

-		{

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

-		}

-		else

-		{

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

-		}

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

-		{

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

-			{

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

-			}

-			else

-			{

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

-			}

-		}

-		else

-		{

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

-		}

-		return $r;

-	}

-

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

-	$_xmlrpcs_multicall_doc = 'Boxcar multiple RPC calls in one request. See http://www.xmlrpc.com/discuss/msgReader$1208 for details';

-	$_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))

-		{

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

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

-		}

-		else

-		{

-			$code = $err->faultCode();

-			$str = $err->faultString();

-		}

-		$struct = array();

-		$struct['faultCode'] = new xmlrpcval($code, 'int');

-		$struct['faultString'] = new xmlrpcval($str, 'string');

-		return new xmlrpcval($struct, 'struct');

-	}

-

-	function _xmlrpcs_multicall_do_call($server, $call)

-	{

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

-		{

-			return _xmlrpcs_multicall_error('notstruct');

-		}

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

-		if(!$methName)

-		{

-			return _xmlrpcs_multicall_error('nomethod');

-		}

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

-		{

-			return _xmlrpcs_multicall_error('notstring');

-		}

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

-		{

-			return _xmlrpcs_multicall_error('recursion');

-		}

-

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

-		if(!$params)

-		{

-			return _xmlrpcs_multicall_error('noparams');

-		}

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

-		{

-			return _xmlrpcs_multicall_error('notarray');

-		}

-		$numParams = $params->arraysize();

-

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

-		for($i = 0; $i < $numParams; $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));

-			}

-		}

-

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

-

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

-		{

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

-		}

-

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

-	}

-

-	function _xmlrpcs_multicall_do_call_phpvals($server, $call)

-	{

-		if(!is_array($call))

-		{

-			return _xmlrpcs_multicall_error('notstruct');

-		}

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

-		{

-			return _xmlrpcs_multicall_error('nomethod');

-		}

-		if (!is_string($call['methodName']))

-		{

-			return _xmlrpcs_multicall_error('notstring');

-		}

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

-		{

-			return _xmlrpcs_multicall_error('recursion');

-		}

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

-		{

-			return _xmlrpcs_multicall_error('noparams');

-		}

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

-		{

-			return _xmlrpcs_multicall_error('notarray');

-		}

-

-		// this is a real dirty and simplistic hack, since we might have received a

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

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

-		$pt = array();

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

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

-

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

-

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

-		{

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

-		}

-

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

-	}

-

-	function _xmlrpcs_multicall($server, $m)

-	{

-		$result = array();

-		// let accept a plain list of php parameters, beside a single xmlrpc msg object

-		if (is_object($m))

-		{

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

-			$numCalls = $calls->arraysize();

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

-			{

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

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

-			}

-		}

-		else

-		{

-			$numCalls=count($m);

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

-			{

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

-			}

-		}

-

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

-	}

-

-	$GLOBALS['_xmlrpcs_dmap']=array(

-		'system.listMethods' => array(

-			'function' => '_xmlrpcs_listMethods',

-			'signature' => $_xmlrpcs_listMethods_sig,

-			'docstring' => $_xmlrpcs_listMethods_doc,

-			'signature_docs' => $_xmlrpcs_listMethods_sdoc),

-		'system.methodHelp' => array(

-			'function' => '_xmlrpcs_methodHelp',

-			'signature' => $_xmlrpcs_methodHelp_sig,

-			'docstring' => $_xmlrpcs_methodHelp_doc,

-			'signature_docs' => $_xmlrpcs_methodHelp_sdoc),

-		'system.methodSignature' => array(

-			'function' => '_xmlrpcs_methodSignature',

-			'signature' => $_xmlrpcs_methodSignature_sig,

-			'docstring' => $_xmlrpcs_methodSignature_doc,

-			'signature_docs' => $_xmlrpcs_methodSignature_sdoc),

-		'system.multicall' => array(

-			'function' => '_xmlrpcs_multicall',

-			'signature' => $_xmlrpcs_multicall_sig,

-			'docstring' => $_xmlrpcs_multicall_doc,

-			'signature_docs' => $_xmlrpcs_multicall_sdoc),

-		'system.getCapabilities' => array(

-			'function' => '_xmlrpcs_getCapabilities',

-			'signature' => $_xmlrpcs_getCapabilities_sig,

-			'docstring' => $_xmlrpcs_getCapabilities_doc,

-			'signature_docs' => $_xmlrpcs_getCapabilities_sdoc)

-	);

-

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

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

-

-	/**

-	* Error handler used to track errors that occur during server-side execution of PHP code.

-	* This allows to report back to the client whether an internal error has occurred or not

-	* using an xmlrpc response object, instead of letting the client deal with the html junk

-	* that a PHP execution error on the server generally entails.

-	*

-	* 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)

-	{

-		// 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)

-		{

-			$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'] == '')

-		{

-			// 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))

-			{

-				error_log($errstring);

-			}

-		}

-		else

-		{

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

-			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']))

-				{

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

-				}

-				else

-				{

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

-				}

-			}

-		}

-	}

-

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

-

-	/**

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

-	* as part of the response message.

-	* Note that for best compatibility, the debug string should be encoded using

-	* the $GLOBALS['xmlrpc_internalencoding'] character set.

-	* @param string $m

-	* @access public

-	*/

-	function xmlrpc_debugmsg($m)

-	{

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

-	}

-

-	class xmlrpc_server

-	{

-		/**

-		* Array defining php functions exposed as xmlrpc methods by this server

-		* @access private

-		*/

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

-		/**

-		* 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' );

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

-		/**

-		* Controls behaviour of server when invoked user function throws an exception:

-		* 0 = catch it and return an 'internal error' xmlrpc response (default)

-		* 1 = catch it and return an xmlrpc response with the error corresponding to the exception

-		* 2 = allow the exception to float to the upper layers

-		*/

-		var $exception_handling = 0;

-		/**

-		* When set to true, it will enable HTTP compression of the response, in case

-		* the client has declared its support for compression in the request.

-		*/

-		var $compress_response = false;

-		/**

-		* List of http compression methods accepted by the server for requests.

-		* NB: PHP supports deflate, gzip compressions out of the box if compiled w. zlib

-		*/

-		var $accepted_compression = array();

-		/// shall we serve calls to system.* methods?

-		var $allow_system_funcs = true;

-		/// list of charset encodings natively accepted for requests

-		var $accepted_charset_encodings = array();

-		/**

-		* charset encoding to be used for response.

-		* NB: if we can, we will convert the generated response from internal_encoding to the intended one.

-		* can be: a supported xml encoding (only UTF-8 and ISO-8859-1 at present, unless mbstring is enabled),

-		* null (leave unspecified in response, convert output stream to US_ASCII),

-		* 'default' (use xmlrpc library default as specified in xmlrpc.inc, convert output stream if needed),

-		* or 'auto' (use client-specified charset encoding or same as request if request headers do not specify it (unless request is US-ASCII: then use library default anyway).

-		* NB: pretty dangerous if you accept every charset and do not have mbstring enabled)

-		*/

-		var $response_charset_encoding = '';

-		/**

-		* Storage for internal debug info

-		* @access private

-		*/

-		var $debug_info = '';

-		/**

-		* Extra data passed at runtime to method handling functions. Used only by EPI layer

-		*/

-		var $user_data = null;

-

-		/**

-		* @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)

-		{

-			// 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'))

-			{

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

-				$this->compress_response = true;

-			}

-

-			// by default the xml parser can support these 3 charset encodings

-			$this->accepted_charset_encodings = array('UTF-8', 'ISO-8859-1', 'US-ASCII');

-

-			// dispMap is a dispatch array of methods

-			// mapped to function names and signatures

-			// if a method

-			// doesn't appear in the map then an unknown

-			// method error is generated

-			/* milosch - changed to make passing dispMap optional.

+    // XML RPC Server class

+    // requires: xmlrpc.inc

+

+    $GLOBALS['xmlrpcs_capabilities'] = array(

+        // xmlrpc spec: always supported

+        'xmlrpc' => new xmlrpcval(array(

+            'specUrl' => new xmlrpcval('http://www.xmlrpc.com/spec', 'string'),

+            'specVersion' => new xmlrpcval(1, 'int')

+        ), 'struct'),

+        // if we support system.xxx functions, we always support multicall, too...

+        // Note that, as of 2006/09/17, the following URL does not respond anymore

+        'system.multicall' => new xmlrpcval(array(

+            'specUrl' => new xmlrpcval('http://www.xmlrpc.com/discuss/msgReader$1208', 'string'),

+            'specVersion' => new xmlrpcval(1, 'int')

+        ), 'struct'),

+        // introspection: version 2! we support 'mixed', too

+        'introspection' => new xmlrpcval(array(

+            'specUrl' => new xmlrpcval('http://phpxmlrpc.sourceforge.net/doc-2/ch10.html', 'string'),

+            'specVersion' => new xmlrpcval(2, 'int')

+        ), 'struct')

+    );

+

+    /* 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)

+    {

+        $outAr = $GLOBALS['xmlrpcs_capabilities'];

+        // NIL extension

+        if ($GLOBALS['xmlrpc_null_extension']) {

+            $outAr['nil'] = new xmlrpcval(array(

+                'specUrl' => new xmlrpcval('http://www.ontosys.com/xml-rpc/extensions.php', 'string'),

+                'specVersion' => new xmlrpcval(1, 'int')

+            ), 'struct');

+        }

+        return new xmlrpcresp(new xmlrpcval($outAr, 'struct'));

+    }

+

+    // 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

+    {

+

+        $outAr=array();

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

+        {

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

+        }

+        if($server->allow_system_funcs)

+        {

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

+            {

+                $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'));

+    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();

+        }

+        else

+        {

+            $methName=$m;

+        }

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

+        {

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

+        }

+        else

+        {

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

+        }

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

+        {

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

+            {

+                $sigs=array();

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

+                {

+                    $cursig=array();

+                    foreach($inSig as $sig)

+                    {

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

+                    }

+                    $sigs[]=new xmlrpcval($cursig, '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'));

+            }

+        }

+        else

+        {

+            $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'));

+    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();

+        }

+        else

+        {

+            $methName=$m;

+        }

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

+        {

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

+        }

+        else

+        {

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

+        }

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

+        {

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

+            {

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

+            }

+            else

+            {

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

+            }

+        }

+        else

+        {

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

+        }

+        return $r;

+    }

+

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

+    $_xmlrpcs_multicall_doc = 'Boxcar multiple RPC calls in one request. See http://www.xmlrpc.com/discuss/msgReader$1208 for details';

+    $_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))

+        {

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

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

+        }

+        else

+        {

+            $code = $err->faultCode();

+            $str = $err->faultString();

+        }

+        $struct = array();

+        $struct['faultCode'] = new xmlrpcval($code, 'int');

+        $struct['faultString'] = new xmlrpcval($str, 'string');

+        return new xmlrpcval($struct, 'struct');

+    }

+

+    function _xmlrpcs_multicall_do_call($server, $call)

+    {

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

+        {

+            return _xmlrpcs_multicall_error('notstruct');

+        }

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

+        if(!$methName)

+        {

+            return _xmlrpcs_multicall_error('nomethod');

+        }

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

+        {

+            return _xmlrpcs_multicall_error('notstring');

+        }

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

+        {

+            return _xmlrpcs_multicall_error('recursion');

+        }

+

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

+        if(!$params)

+        {

+            return _xmlrpcs_multicall_error('noparams');

+        }

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

+        {

+            return _xmlrpcs_multicall_error('notarray');

+        }

+        $numParams = $params->arraysize();

+

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

+        for($i = 0; $i < $numParams; $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));

+            }

+        }

+

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

+

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

+        {

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

+        }

+

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

+    }

+

+    function _xmlrpcs_multicall_do_call_phpvals($server, $call)

+    {

+        if(!is_array($call))

+        {

+            return _xmlrpcs_multicall_error('notstruct');

+        }

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

+        {

+            return _xmlrpcs_multicall_error('nomethod');

+        }

+        if (!is_string($call['methodName']))

+        {

+            return _xmlrpcs_multicall_error('notstring');

+        }

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

+        {

+            return _xmlrpcs_multicall_error('recursion');

+        }

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

+        {

+            return _xmlrpcs_multicall_error('noparams');

+        }

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

+        {

+            return _xmlrpcs_multicall_error('notarray');

+        }

+

+        // this is a real dirty and simplistic hack, since we might have received a

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

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

+        $pt = array();

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

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

+

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

+

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

+        {

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

+        }

+

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

+    }

+

+    function _xmlrpcs_multicall($server, $m)

+    {

+        $result = array();

+        // let accept a plain list of php parameters, beside a single xmlrpc msg object

+        if (is_object($m))

+        {

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

+            $numCalls = $calls->arraysize();

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

+            {

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

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

+            }

+        }

+        else

+        {

+            $numCalls=count($m);

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

+            {

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

+            }

+        }

+

+        return new xmlrpcresp(new xmlrpcval($result, 'array'));

+    }

+

+    $GLOBALS['_xmlrpcs_dmap']=array(

+        'system.listMethods' => array(

+            'function' => '_xmlrpcs_listMethods',

+            'signature' => $_xmlrpcs_listMethods_sig,

+            'docstring' => $_xmlrpcs_listMethods_doc,

+            'signature_docs' => $_xmlrpcs_listMethods_sdoc),

+        'system.methodHelp' => array(

+            'function' => '_xmlrpcs_methodHelp',

+            'signature' => $_xmlrpcs_methodHelp_sig,

+            'docstring' => $_xmlrpcs_methodHelp_doc,

+            'signature_docs' => $_xmlrpcs_methodHelp_sdoc),

+        'system.methodSignature' => array(

+            'function' => '_xmlrpcs_methodSignature',

+            'signature' => $_xmlrpcs_methodSignature_sig,

+            'docstring' => $_xmlrpcs_methodSignature_doc,

+            'signature_docs' => $_xmlrpcs_methodSignature_sdoc),

+        'system.multicall' => array(

+            'function' => '_xmlrpcs_multicall',

+            'signature' => $_xmlrpcs_multicall_sig,

+            'docstring' => $_xmlrpcs_multicall_doc,

+            'signature_docs' => $_xmlrpcs_multicall_sdoc),

+        'system.getCapabilities' => array(

+            'function' => '_xmlrpcs_getCapabilities',

+            'signature' => $_xmlrpcs_getCapabilities_sig,

+            'docstring' => $_xmlrpcs_getCapabilities_doc,

+            'signature_docs' => $_xmlrpcs_getCapabilities_sdoc)

+    );

+

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

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

+

+    /**

+     * Error handler used to track errors that occur during server-side execution of PHP code.

+     * This allows to report back to the client whether an internal error has occurred or not

+     * using an xmlrpc response object, instead of letting the client deal with the html junk

+     * that a PHP execution error on the server generally entails.

+     *

+     * 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)

+    {

+        // 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)

+        {

+            $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'] == '')

+        {

+            // 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))

+            {

+                error_log($errstring);

+            }

+        }

+        else

+        {

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

+            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']))

+                {

+                    // 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));

+                }

+                else

+                {

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

+                }

+            }

+        }

+    }

+

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

+

+    /**

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

+     * as part of the response message.

+     * Note that for best compatibility, the debug string should be encoded using

+     * the $GLOBALS['xmlrpc_internalencoding'] character set.

+     * @param string $m

+     * @access public

+     */

+    function xmlrpc_debugmsg($m)

+    {

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

+    }

+

+    class xmlrpc_server

+    {

+        /**

+         * Array defining php functions exposed as xmlrpc methods by this server

+         * @access private

+         */

+        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';

+        /**

+         * 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' );

+        /// 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;

+        /**

+         * Controls behaviour of server when invoked user function throws an exception:

+         * 0 = catch it and return an 'internal error' xmlrpc response (default)

+         * 1 = catch it and return an xmlrpc response with the error corresponding to the exception

+         * 2 = allow the exception to float to the upper layers

+         */

+        var $exception_handling = 0;

+        /**

+         * When set to true, it will enable HTTP compression of the response, in case

+         * the client has declared its support for compression in the request.

+         */

+        var $compress_response = false;

+        /**

+         * List of http compression methods accepted by the server for requests.

+         * NB: PHP supports deflate, gzip compressions out of the box if compiled w. zlib

+         */

+        var $accepted_compression = array();

+        /// shall we serve calls to system.* methods?

+        var $allow_system_funcs = true;

+        /// list of charset encodings natively accepted for requests

+        var $accepted_charset_encodings = array();

+        /**

+         * charset encoding to be used for response.

+         * NB: if we can, we will convert the generated response from internal_encoding to the intended one.

+         * can be: a supported xml encoding (only UTF-8 and ISO-8859-1 at present, unless mbstring is enabled),

+         * null (leave unspecified in response, convert output stream to US_ASCII),

+         * 'default' (use xmlrpc library default as specified in xmlrpc.inc, convert output stream if needed),

+         * or 'auto' (use client-specified charset encoding or same as request if request headers do not specify it (unless request is US-ASCII: then use library default anyway).

+         * NB: pretty dangerous if you accept every charset and do not have mbstring enabled)

+         */

+        var $response_charset_encoding = '';

+        /**

+         * Storage for internal debug info

+         * @access private

+         */

+        var $debug_info = '';

+        /**

+         * Extra data passed at runtime to method handling functions. Used only by EPI layer

+         */

+        var $user_data = null;

+

+        /**

+         * @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)

+        {

+            // 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'))

+            {

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

+                $this->compress_response = true;

+            }

+

+            // by default the xml parser can support these 3 charset encodings

+            $this->accepted_charset_encodings = array('UTF-8', 'ISO-8859-1', 'US-ASCII');

+

+            // dispMap is a dispatch array of methods

+            // mapped to function names and signatures

+            // if a method

+            // doesn't appear in the map then an unknown

+            // method error is generated

+            /* milosch - changed to make passing dispMap optional.

 			 * instead, you can use the class add_to_map() function

 			 * to add functions manually (borrowed from SOAPX4)

 			 */

-			if($dispMap)

-			{

-				$this->dmap = $dispMap;

-				if($serviceNow)

-				{

-					$this->service();

-				}

-			}

-		}

-

-		/**

-		* @deprecated

-		*/

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

-		{

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

-		}

-

-		/**

-		* Set debug level of server.

-		* @param integer $in debug lvl: determines info added to xmlrpc responses (as xml comments)

-		* 0 = no debug info,

-		* 1 = msgs set from user with debugmsg(),

-		* 2 = add complete xmlrpc request (headers and body),

-		* 3 = add also all processing warnings happened during method processing

-		* (NB: this involves setting a custom error handler, and might interfere

-		* with the standard processing of the php function exposed as method. In

-		* particular, triggering an USER_ERROR level error will not halt script

-		* execution anymore, but just end up logged in the xmlrpc response)

-		* Note that info added at level 2 and 3 will be base64 encoded

-		* @access public

-		*/

-		function setDebug($in)

-		{

-			$this->debug=$in;

-		}

-

-		/**

-		* Return a string with the serialized representation of all debug info

-		* @param string $charset_encoding the target charset encoding for the serialization

-		* @return string an XML comment (or two)

-		*/

-		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,

-			// intermixed with php generated data and user generated data...

-			// so we split it: system debug is base 64 encoded,

-			// user debug info should be encoded by the end user using the INTERNAL_ENCODING

-			$out = '';

-			if ($this->debug_info != '')

-			{

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

-			}

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

-			{

-

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

-			}

-			return $out;

-		}

-

-		/**

-		* Execute the xmlrpc request, printing the response

-		* @param string $data the request body. If null, the http POST request will be examined

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

-		* @access public

-		*/

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

-		{

-			if ($data === null)

-			{

-				// workaround for a known bug in php ver. 5.2.2 that broke $HTTP_RAW_POST_DATA

-				$data = file_get_contents('php://input');

-			}

-			$raw_data = $data;

-

-			// reset internal debug info

-			$this->debug_info = '';

-

-			// Echo back what we received, before parsing it

-			if($this->debug > 1)

-			{

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

-			}

-

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

-			$r->raw_data = $raw_data;

-

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

-			{

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

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

-			}

-

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

-			if($this->debug > 0)

-			{

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

-			}

-

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

-			// already happened. Helps building json magic

-			if (empty($r->payload))

-			{

-				$r->serialize($resp_charset);

-			}

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

-

-			if ($return_payload)

-			{

-				return $payload;

-			}

-

-			// 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())

-			{

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

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

-				// we have to tell him what we did

-				header("Vary: Accept-Charset");

-

-				// http compression of output: only

-				// 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 != ''

-					&& $php_no_self_compress)

-				{

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

-					{

-						$payload = gzencode($payload);

-						header("Content-Encoding: gzip");

-						header("Vary: Accept-Encoding");

-					}

-					elseif (strpos($resp_encoding, 'deflate') !== false)

-					{

-						$payload = gzcompress($payload);

-						header("Content-Encoding: deflate");

-						header("Vary: Accept-Encoding");

-					}

-				}

-

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

-				// it will mess up measurements

-				if($php_no_self_compress)

-				{

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

-				}

-			}

-			else

-			{

-				error_log('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');

-			}

-

-			print $payload;

-

-			// return request, in case subclasses want it

-			return $r;

-		}

-

-		/**

-		* Add a method to the dispatch map

-		* @param string $methodname the name with which the method will be made available

-		* @param string $function the php function that will get invoked

-		* @param array $sig the array of valid method signatures

-		* @param string $doc method documentation

-		* @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)

-		{

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

-				'function'	=> $function,

-				'docstring' => $doc

-			);

-			if ($sig)

-			{

-				$this->dmap[$methodname]['signature'] = $sig;

-			}

-			if ($sigdoc)

-			{

-				$this->dmap[$methodname]['signature_docs'] = $sigdoc;

-			}

-		}

-

-		/**

-		* Verify type and number of parameters received against a list of known signatures

-		* @param array $in array of either xmlrpcval objects or xmlrpc type definitions

-		* @param array $sig array of known signatures to match against

-		* @return array

-		* @access private

-		*/

-		function verifySignature($in, $sig)

-		{

-			// check each possible signature in turn

-			if (is_object($in))

-			{

-				$numParams = $in->getNumParams();

-			}

-			else

-			{

-				$numParams = count($in);

-			}

-			foreach($sig as $cursig)

-			{

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

-				{

-					$itsOK=1;

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

-					{

-						if (is_object($in))

-						{

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

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

-							{

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

-							}

-							else

-							{

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

-							}

-						}

-						else

-						{

-							$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'])

-						{

-							$itsOK=0;

-							$pno=$n+1;

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

-							$got=$pt;

-							break;

-						}

-					}

-					if($itsOK)

-					{

-						return array(1,'');

-					}

-				}

-			}

-			if(isset($wanted))

-			{

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

-			}

-			else

-			{

-				return array(0, "No method signature matches number of parameters");

-			}

-		}

-

-		/**

-		* Parse http headers received along with xmlrpc request. If needed, inflate request

-		* @return mixed null on success or an xmlrpcresp

-		* @access private

-		*/

-		function parseRequestHeaders(&$data, &$req_encoding, &$resp_encoding, &$resp_compression)

-		{

-			// check if $_SERVER is populated: it might have been disabled via ini file

-			// (this is true even when in CLI mode)

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

-			{

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

-			}

-

-			if($this->debug > 1)

-			{

-				if(function_exists('getallheaders'))

-				{

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

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

-					{

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

-					}

-				}

-

-			}

-

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

-			{

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

-			}

-			else

-			{

-				$content_encoding = '';

-			}

-

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

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

-			{

-				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($content_encoding == 'deflate' && $degzdata = @gzuncompress($data))

-						{

-							$data = $degzdata;

-							if($this->debug > 1)

-							{

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

-							}

-						}

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

-						}

-						else

-						{

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

-							return $r;

-						}

-					}

-					else

-					{

-						//error_log('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');

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

-						return $r;

-					}

-				}

-			}

-

-			// check if client specified accepted charsets, and if we know how to fulfill

-			// the request

-			if ($this->response_charset_encoding == 'auto')

-			{

-				$resp_encoding = '';

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

-				{

-					// here we should check if we can match the client-requested encoding

-					// with the encodings we know we can generate.

-					/// @todo we should parse q=0.x preferences instead of getting first charset specified...

-					$client_accepted_charsets = explode(',', strtoupper($_SERVER['HTTP_ACCEPT_CHARSET']));

-					// Give preference to internal encoding

-					$known_charsets = array($GLOBALS['xmlrpc_internalencoding'], 'UTF-8', 'ISO-8859-1', 'US-ASCII');

-					foreach ($known_charsets as $charset)

-					{

-						foreach ($client_accepted_charsets as $accepted)

-							if (strpos($accepted, $charset) === 0)

-							{

-								$resp_encoding = $charset;

-								break;

-							}

-						if ($resp_encoding)

-							break;

-					}

-				}

-			}

-			else

-			{

-				$resp_encoding = $this->response_charset_encoding;

-			}

-

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

-			{

-				$resp_compression = $_SERVER['HTTP_ACCEPT_ENCODING'];

-			}

-			else

-			{

-				$resp_compression = '';

-			}

-

-			// 'guestimate' request encoding

-			/// @todo check if mbstring is enabled and automagic input conversion is on: it might mingle with this check???

-			$req_encoding = guess_encoding(isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : '',

-				$data);

-

-			return null;

-		}

-

-		/**

-		* Parse an xml chunk containing an xmlrpc request and execute the corresponding

-		* php function registered with the server

-		* @param string $data the xml request

-		* @param string $req_encoding (optional) the charset encoding of the xml request

-		* @return xmlrpcresp

-		* @access private

-		*/

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

-		{

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

-			//if($data=='')

-			//{

-			//	$data=$GLOBALS['HTTP_RAW_POST_DATA'];

-			//}

-

-			// G. Giunta 2005/02/13: we do NOT expect to receive html entities

-			// 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']['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']='';

-

-			// decompose incoming XML into request structure

-

-			if ($req_encoding != '')

-			{

-				// Since parsing will fail if charset is not specified in the xml prologue,

-				// the encoding is not UTF8 and there are non-ascii chars in the text, we try to work round that...

-				// The following code might be better for mb_string enabled installs, but

-				// makes the lib about 200% slower...

-				//if (!is_valid_charset($req_encoding, array('UTF-8')))

-				if (!in_array($req_encoding, array('UTF-8', 'US-ASCII')) && !has_encoding($data)) {

-					if ($req_encoding == 'ISO-8859-1') {

-						$data = utf8_encode($data);

-					} else {

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

-						}

-					}

-				}

-			}

-

-			$parser = xml_parser_create();

-			xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);

-			// G. Giunta 2005/02/13: PHP internally uses ISO-8859-1, so we have to tell

-			// the xml parser to give us back data in the expected charset

-			// What if internal encoding is not in one of the 3 allowed?

-			// we use the broadest one, ie. utf8

-			// This allows to send data which is native in various charset,

-			// by extending xmlrpc_encode_entitites() and setting xmlrpc_internalencoding

-			if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))

-			{

-				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');

-			}

-			else

-			{

-				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);

-			}

-

-			if ($this->functions_parameters_type != 'xmlrpcvals')

-				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');

-			else

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

-			{

-				// return XML error as a faultCode

-				$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)),

-					xml_get_current_line_number($parser), xml_get_current_column_number($parser)));

-				xml_parser_free($parser);

-			}

-			elseif ($GLOBALS['_xh']['isf'])

-			{

-				xml_parser_free($parser);

-				$r=new xmlrpcresp(0,

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

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

-			}

-			else

-			{

-				xml_parser_free($parser);

-				// small layering violation in favor of speed and memory usage:

-				// we should allow the 'execute' method handle this, but in the

-				// most common scenario (xmlrpcvals type server with some methods

-				// 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)

-					{

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

-					}

-					$r = $this->execute($GLOBALS['_xh']['method'], $GLOBALS['_xh']['params'], $GLOBALS['_xh']['pt']);

-				}

-				else

-				{

-					// build an xmlrpcmsg object with data parsed from xml

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

-					// now add parameters in

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

-					{

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

-					}

-

-					if($this->debug > 1)

-					{

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

-					}

-					$r = $this->execute($m);

-				}

-			}

-			return $r;

-		}

-

-		/**

-		* Execute a method invoked by the client, checking parameters used

-		* @param mixed $m either an xmlrpcmsg obj or a method name

-		* @param array $params array with method parameters as php types (if m is method name only)

-		* @param array $paramtypes array with xmlrpc types of method parameters (if m is method name only)

-		* @return xmlrpcresp

-		* @access private

-		*/

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

-		{

-			if (is_object($m))

-			{

-				$methName = $m->method();

-			}

-			else

-			{

-				$methName = $m;

-			}

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

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

-

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

-			{

-				// No such method

-				return new xmlrpcresp(0,

-					$GLOBALS['xmlrpcerr']['unknown_method'],

-					$GLOBALS['xmlrpcstr']['unknown_method']);

-			}

-

-			// Check signature

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

-			{

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

-				if (is_object($m))

-				{

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

-				}

-				else

-				{

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

-				}

-				if(!$ok)

-				{

-					// Didn't match.

-					return new xmlrpcresp(

-						0,

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

-						$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, '::'))

-			{

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

-			}

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

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

-				);

-			}

-

-			// 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)

-			{

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

-			}

-			try

-			{

-				// Allow mixed-convention servers

-				if (is_object($m))

-				{

-					if($sysCall)

-					{

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

-					}

-					else

-					{

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

-					}

-					if (!is_a($r, 'xmlrpcresp'))

-					{

-						error_log("XML-RPC: ".__METHOD__.": function $func registered as method handler does not return an xmlrpcresp object");

-						if (is_a($r, 'xmlrpcval'))

-						{

-							$r = new xmlrpcresp($r);

-						}

-						else

-						{

-							$r = new xmlrpcresp(

-								0,

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

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

-							);

-						}

-					}

-				}

-				else

-				{

-					// call a 'plain php' function

-					if($sysCall)

-					{

-						array_unshift($params, $this);

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

-					}

-					else

-					{

-						// 3rd API convention for method-handling functions: EPI-style

-						if ($this->functions_parameters_type == 'epivals')

-						{

-							$r = call_user_func_array($func, array($methName, $params, $this->user_data));

-							// mimic EPI behaviour: if we get an array that looks like an error, make it

-							// 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']);

-							}

-							else

-							{

-								// functions using EPI api should NOT return resp objects,

-								// so make sure we encode the return type correctly

-								$r = new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api')));

-							}

-						}

-						else

-						{

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

-						}

-					}

-					// the return type can be either an xmlrpcresp object or a plain php value...

-					if (!is_a($r, 'xmlrpcresp'))

-					{

-						// what should we assume here about automatic encoding of datetimes

-						// and php classes instances???

-						$r = new xmlrpcresp(php_xmlrpc_encode($r, $this->phpvals_encoding_options));

-					}

-				}

-			}

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

-				{

-					case 2:

-						throw $e;

-						break;

-					case 1:

-						$r = new xmlrpcresp(0, $e->getCode(), $e->getMessage());

-						break;

-					default:

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

-				}

-			}

-			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'])

-				{

-					set_error_handler($GLOBALS['_xmlrpcs_prev_ehandler']);

-				}

-				else

-				{

-					restore_error_handler();

-				}

-			}

-			return $r;

-		}

-

-		/**

-		* add a string to the 'internal debug message' (separate from 'user debug message')

-		* @param string $string

-		* @access private

-		*/

-		function debugmsg($string)

-		{

-			$this->debug_info .= $string."\n";

-		}

-

-		/**

-		* @access private

-		*/

-		function xml_header($charset_encoding='')

-		{

-			if ($charset_encoding != '')

-			{

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

-			}

-			else

-			{

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

-			}

-		}

-

-		/**

-		* A debugging routine: just echoes back the input packet as a string value

-		* DEPRECATED!

-		*/

-		function echoInput()

-		{

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

-			print $r->serialize();

-		}

-	}

+            if($dispMap)

+            {

+                $this->dmap = $dispMap;

+                if($serviceNow)

+                {

+                    $this->service();

+                }

+            }

+        }

+

+        /**

+         * @deprecated

+         */

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

+        {

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

+        }

+

+        /**

+         * Set debug level of server.

+         * @param integer $in debug lvl: determines info added to xmlrpc responses (as xml comments)

+         * 0 = no debug info,

+         * 1 = msgs set from user with debugmsg(),

+         * 2 = add complete xmlrpc request (headers and body),

+         * 3 = add also all processing warnings happened during method processing

+         * (NB: this involves setting a custom error handler, and might interfere

+         * with the standard processing of the php function exposed as method. In

+         * particular, triggering an USER_ERROR level error will not halt script

+         * execution anymore, but just end up logged in the xmlrpc response)

+         * Note that info added at level 2 and 3 will be base64 encoded

+         * @access public

+         */

+        function setDebug($in)

+        {

+            $this->debug=$in;

+        }

+

+        /**

+         * Return a string with the serialized representation of all debug info

+         * @param string $charset_encoding the target charset encoding for the serialization

+         * @return string an XML comment (or two)

+         */

+        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,

+            // intermixed with php generated data and user generated data...

+            // so we split it: system debug is base 64 encoded,

+            // user debug info should be encoded by the end user using the INTERNAL_ENCODING

+            $out = '';

+            if ($this->debug_info != '')

+            {

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

+            }

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

+            {

+

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

+            }

+            return $out;

+        }

+

+        /**

+         * Execute the xmlrpc request, printing the response

+         * @param string $data the request body. If null, the http POST request will be examined

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

+         * @access public

+         */

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

+        {

+            if ($data === null)

+            {

+                // workaround for a known bug in php ver. 5.2.2 that broke $HTTP_RAW_POST_DATA

+                $data = file_get_contents('php://input');

+            }

+            $raw_data = $data;

+

+            // reset internal debug info

+            $this->debug_info = '';

+

+            // Echo back what we received, before parsing it

+            if($this->debug > 1)

+            {

+                $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);

+            }

+

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

+            $r->raw_data = $raw_data;

+

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

+            {

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

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

+            }

+

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

+            if($this->debug > 0)

+            {

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

+            }

+

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

+            // already happened. Helps building json magic

+            if (empty($r->payload))

+            {

+                $r->serialize($resp_charset);

+            }

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

+

+            if ($return_payload)

+            {

+                return $payload;

+            }

+

+            // 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())

+            {

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

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

+                // we have to tell him what we did

+                header("Vary: Accept-Charset");

+

+                // http compression of output: only

+                // 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 != ''

+                    && $php_no_self_compress)

+                {

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

+                    {

+                        $payload = gzencode($payload);

+                        header("Content-Encoding: gzip");

+                        header("Vary: Accept-Encoding");

+                    }

+                    elseif (strpos($resp_encoding, 'deflate') !== false)

+                    {

+                        $payload = gzcompress($payload);

+                        header("Content-Encoding: deflate");

+                        header("Vary: Accept-Encoding");

+                    }

+                }

+

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

+                // it will mess up measurements

+                if($php_no_self_compress)

+                {

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

+                }

+            }

+            else

+            {

+                error_log('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');

+            }

+

+            print $payload;

+

+            // return request, in case subclasses want it

+            return $r;

+        }

+

+        /**

+         * Add a method to the dispatch map

+         * @param string $methodname the name with which the method will be made available

+         * @param string $function the php function that will get invoked

+         * @param array $sig the array of valid method signatures

+         * @param string $doc method documentation

+         * @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)

+        {

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

+                'function'	=> $function,

+                'docstring' => $doc

+            );

+            if ($sig)

+            {

+                $this->dmap[$methodname]['signature'] = $sig;

+            }

+            if ($sigdoc)

+            {

+                $this->dmap[$methodname]['signature_docs'] = $sigdoc;

+            }

+        }

+

+        /**

+         * Verify type and number of parameters received against a list of known signatures

+         * @param array $in array of either xmlrpcval objects or xmlrpc type definitions

+         * @param array $sig array of known signatures to match against

+         * @return array

+         * @access private

+         */

+        function verifySignature($in, $sig)

+        {

+            // check each possible signature in turn

+            if (is_object($in))

+            {

+                $numParams = $in->getNumParams();

+            }

+            else

+            {

+                $numParams = count($in);

+            }

+            foreach($sig as $cursig)

+            {

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

+                {

+                    $itsOK=1;

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

+                    {

+                        if (is_object($in))

+                        {

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

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

+                            {

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

+                            }

+                            else

+                            {

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

+                            }

+                        }

+                        else

+                        {

+                            $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'])

+                        {

+                            $itsOK=0;

+                            $pno=$n+1;

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

+                            $got=$pt;

+                            break;

+                        }

+                    }

+                    if($itsOK)

+                    {

+                        return array(1,'');

+                    }

+                }

+            }

+            if(isset($wanted))

+            {

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

+            }

+            else

+            {

+                return array(0, "No method signature matches number of parameters");

+            }

+        }

+

+        /**

+         * Parse http headers received along with xmlrpc request. If needed, inflate request

+         * @return mixed null on success or an xmlrpcresp

+         * @access private

+         */

+        function parseRequestHeaders(&$data, &$req_encoding, &$resp_encoding, &$resp_compression)

+        {

+            // check if $_SERVER is populated: it might have been disabled via ini file

+            // (this is true even when in CLI mode)

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

+            {

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

+            }

+

+            if($this->debug > 1)

+            {

+                if(function_exists('getallheaders'))

+                {

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

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

+                    {

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

+                    }

+                }

+

+            }

+

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

+            {

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

+            }

+            else

+            {

+                $content_encoding = '';

+            }

+

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

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

+            {

+                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($content_encoding == 'deflate' && $degzdata = @gzuncompress($data))

+                        {

+                            $data = $degzdata;

+                            if($this->debug > 1)

+                            {

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

+                            }

+                        }

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

+                        }

+                        else

+                        {

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

+                            return $r;

+                        }

+                    }

+                    else

+                    {

+                        //error_log('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');

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

+                        return $r;

+                    }

+                }

+            }

+

+            // check if client specified accepted charsets, and if we know how to fulfill

+            // the request

+            if ($this->response_charset_encoding == 'auto')

+            {

+                $resp_encoding = '';

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

+                {

+                    // here we should check if we can match the client-requested encoding

+                    // with the encodings we know we can generate.

+                    /// @todo we should parse q=0.x preferences instead of getting first charset specified...

+                    $client_accepted_charsets = explode(',', strtoupper($_SERVER['HTTP_ACCEPT_CHARSET']));

+                    // Give preference to internal encoding

+                    $known_charsets = array($GLOBALS['xmlrpc_internalencoding'], 'UTF-8', 'ISO-8859-1', 'US-ASCII');

+                    foreach ($known_charsets as $charset)

+                    {

+                        foreach ($client_accepted_charsets as $accepted)

+                            if (strpos($accepted, $charset) === 0)

+                            {

+                                $resp_encoding = $charset;

+                                break;

+                            }

+                        if ($resp_encoding)

+                            break;

+                    }

+                }

+            }

+            else

+            {

+                $resp_encoding = $this->response_charset_encoding;

+            }

+

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

+            {

+                $resp_compression = $_SERVER['HTTP_ACCEPT_ENCODING'];

+            }

+            else

+            {

+                $resp_compression = '';

+            }

+

+            // 'guestimate' request encoding

+            /// @todo check if mbstring is enabled and automagic input conversion is on: it might mingle with this check???

+            $req_encoding = guess_encoding(isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : '',

+                $data);

+

+            return null;

+        }

+

+        /**

+         * Parse an xml chunk containing an xmlrpc request and execute the corresponding

+         * php function registered with the server

+         * @param string $data the xml request

+         * @param string $req_encoding (optional) the charset encoding of the xml request

+         * @return xmlrpcresp

+         * @access private

+         */

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

+        {

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

+            //if($data=='')

+            //{

+            //	$data=$GLOBALS['HTTP_RAW_POST_DATA'];

+            //}

+

+            // G. Giunta 2005/02/13: we do NOT expect to receive html entities

+            // 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']['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']='';

+

+            // decompose incoming XML into request structure

+

+            if ($req_encoding != '')

+            {

+                // Since parsing will fail if charset is not specified in the xml prologue,

+                // the encoding is not UTF8 and there are non-ascii chars in the text, we try to work round that...

+                // The following code might be better for mb_string enabled installs, but

+                // makes the lib about 200% slower...

+                //if (!is_valid_charset($req_encoding, array('UTF-8')))

+                if (!in_array($req_encoding, array('UTF-8', 'US-ASCII')) && !has_encoding($data)) {

+                    if ($req_encoding == 'ISO-8859-1') {

+                        $data = utf8_encode($data);

+                    } else {

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

+                        }

+                    }

+                }

+            }

+

+            $parser = xml_parser_create();

+            xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);

+            // G. Giunta 2005/02/13: PHP internally uses ISO-8859-1, so we have to tell

+            // the xml parser to give us back data in the expected charset

+            // What if internal encoding is not in one of the 3 allowed?

+            // we use the broadest one, ie. utf8

+            // This allows to send data which is native in various charset,

+            // by extending xmlrpc_encode_entitites() and setting xmlrpc_internalencoding

+            if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))

+            {

+                xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');

+            }

+            else

+            {

+                xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);

+            }

+

+            if ($this->functions_parameters_type != 'xmlrpcvals')

+                xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');

+            else

+                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))

+            {

+                // return XML error as a faultCode

+                $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)),

+                    xml_get_current_line_number($parser), xml_get_current_column_number($parser)));

+                xml_parser_free($parser);

+            }

+            elseif ($GLOBALS['_xh']['isf'])

+            {

+                xml_parser_free($parser);

+                $r=new xmlrpcresp(0,

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

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

+            }

+            else

+            {

+                xml_parser_free($parser);

+                // small layering violation in favor of speed and memory usage:

+                // we should allow the 'execute' method handle this, but in the

+                // most common scenario (xmlrpcvals type server with some methods

+                // 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)

+                    {

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

+                    }

+                    $r = $this->execute($GLOBALS['_xh']['method'], $GLOBALS['_xh']['params'], $GLOBALS['_xh']['pt']);

+                }

+                else

+                {

+                    // build an xmlrpcmsg object with data parsed from xml

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

+                    // now add parameters in

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

+                    {

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

+                    }

+

+                    if($this->debug > 1)

+                    {

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

+                    }

+                    $r = $this->execute($m);

+                }

+            }

+            return $r;

+        }

+

+        /**

+         * Execute a method invoked by the client, checking parameters used

+         * @param mixed $m either an xmlrpcmsg obj or a method name

+         * @param array $params array with method parameters as php types (if m is method name only)

+         * @param array $paramtypes array with xmlrpc types of method parameters (if m is method name only)

+         * @return xmlrpcresp

+         * @access private

+         */

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

+        {

+            if (is_object($m))

+            {

+                $methName = $m->method();

+            }

+            else

+            {

+                $methName = $m;

+            }

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

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

+

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

+            {

+                // No such method

+                return new xmlrpcresp(0,

+                    $GLOBALS['xmlrpcerr']['unknown_method'],

+                    $GLOBALS['xmlrpcstr']['unknown_method']);

+            }

+

+            // Check signature

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

+            {

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

+                if (is_object($m))

+                {

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

+                }

+                else

+                {

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

+                }

+                if(!$ok)

+                {

+                    // Didn't match.

+                    return new xmlrpcresp(

+                        0,

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

+                        $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, '::'))

+            {

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

+            }

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

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

+                );

+            }

+

+            // 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)

+            {

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

+            }

+            try

+            {

+                // Allow mixed-convention servers

+                if (is_object($m))

+                {

+                    if($sysCall)

+                    {

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

+                    }

+                    else

+                    {

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

+                    }

+                    if (!is_a($r, 'xmlrpcresp'))

+                    {

+                        error_log("XML-RPC: ".__METHOD__.": function $func registered as method handler does not return an xmlrpcresp object");

+                        if (is_a($r, 'xmlrpcval'))

+                        {

+                            $r = new xmlrpcresp($r);

+                        }

+                        else

+                        {

+                            $r = new xmlrpcresp(

+                                0,

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

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

+                            );

+                        }

+                    }

+                }

+                else

+                {

+                    // call a 'plain php' function

+                    if($sysCall)

+                    {

+                        array_unshift($params, $this);

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

+                    }

+                    else

+                    {

+                        // 3rd API convention for method-handling functions: EPI-style

+                        if ($this->functions_parameters_type == 'epivals')

+                        {

+                            $r = call_user_func_array($func, array($methName, $params, $this->user_data));

+                            // mimic EPI behaviour: if we get an array that looks like an error, make it

+                            // 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']);

+                            }

+                            else

+                            {

+                                // functions using EPI api should NOT return resp objects,

+                                // so make sure we encode the return type correctly

+                                $r = new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api')));

+                            }

+                        }

+                        else

+                        {

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

+                        }

+                    }

+                    // the return type can be either an xmlrpcresp object or a plain php value...

+                    if (!is_a($r, 'xmlrpcresp'))

+                    {

+                        // what should we assume here about automatic encoding of datetimes

+                        // and php classes instances???

+                        $r = new xmlrpcresp(php_xmlrpc_encode($r, $this->phpvals_encoding_options));

+                    }

+                }

+            }

+            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)

+                {

+                    case 2:

+                        throw $e;

+                        break;

+                    case 1:

+                        $r = new xmlrpcresp(0, $e->getCode(), $e->getMessage());

+                        break;

+                    default:

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

+                }

+            }

+            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'])

+                {

+                    set_error_handler($GLOBALS['_xmlrpcs_prev_ehandler']);

+                }

+                else

+                {

+                    restore_error_handler();

+                }

+            }

+            return $r;

+        }

+

+        /**

+         * add a string to the 'internal debug message' (separate from 'user debug message')

+         * @param string $string

+         * @access private

+         */

+        function debugmsg($string)

+        {

+            $this->debug_info .= $string."\n";

+        }

+

+        /**

+         * @access private

+         */

+        function xml_header($charset_encoding='')

+        {

+            if ($charset_encoding != '')

+            {

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

+            }

+            else

+            {

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

+            }

+        }

+

+        /**

+         * A debugging routine: just echoes back the input packet as a string value

+         * DEPRECATED!

+         */

+        function echoInput()

+        {

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

+            print $r->serialize();

+        }

+    }

 ?>
\ No newline at end of file

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

 		}

 	}

lib/xmlrpc.inc

Braces +176 added lines, -250 removed lines

@@ -403,14 +403,12 @@ 
 					$GLOBALS['_xh']['isf'] = 2;

 					$GLOBALS['_xh']['isf_reason'] = 'missing top level xmlrpc element';

 					return;

-				}

-				else

+				} else

 				{

 					$GLOBALS['_xh']['rt'] = strtolower($name);

 					$GLOBALS['_xh']['rt'] = strtolower($name);

 				}

-			}

-			else

+			} else

 			{

 				// not top level element: see if parent is OK

 				$parent = end($GLOBALS['_xh']['stack']);

@@ -566,21 +564,20 @@ 
 						$temp = new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']);

 						// in case we got info about underlying php class, save it

 						// in the object we're rebuilding

-						if (isset($GLOBALS['_xh']['php_class']))

-							$temp->_php_class = $GLOBALS['_xh']['php_class'];

+						if (isset($GLOBALS['_xh']['php_class'])) {
+													$temp->_php_class = $GLOBALS['_xh']['php_class'];
+						}
 						// check if we are inside an array or struct:

 						// if value just built is inside an array, let's move it into array on the stack

 						$vscount = count($GLOBALS['_xh']['valuestack']);

 						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')

 						{

 							$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $temp;

-						}

-						else

+						} else

 						{

 							$GLOBALS['_xh']['value'] = $temp;

 						}

-					}

-					else

+					} else

 					{

 						/// @todo this needs to treat correctly php-serialized objects,

 						/// since std deserializing is done by php_xmlrpc_decode,

@@ -611,8 +608,7 @@ 
 					if ($name=='STRING')

 					{

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

-					}

-					elseif ($name=='DATETIME.ISO8601')

+					} elseif ($name=='DATETIME.ISO8601')

 					{

 						if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac']))

 						{

@@ -620,13 +616,11 @@ 
 						}

 						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];

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

-					}

-					elseif ($name=='BASE64')

+					} elseif ($name=='BASE64')

 					{

 						/// @todo check for failure of base64 decoding / catch warnings

 						$GLOBALS['_xh']['value']=base64_decode($GLOBALS['_xh']['ac']);

-					}

-					elseif ($name=='BOOLEAN')

+					} elseif ($name=='BOOLEAN')

 					{

 						// special case here: we translate boolean 1 or 0 into PHP

 						// constants true or false.

@@ -637,16 +631,15 @@ 
 						if ($GLOBALS['_xh']['ac']=='1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)

 						{

 							$GLOBALS['_xh']['value']=true;

-						}

-						else

+						} else

 						{

 							// log if receiveing something strange, even though we set the value to false anyway

-							if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0)

-								error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);

+							if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0) {
+															error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);
+							}
 							$GLOBALS['_xh']['value']=false;

 						}

-					}

-					elseif ($name=='DOUBLE')

+					} elseif ($name=='DOUBLE')

 					{

 						// we have a DOUBLE

 						// we must check that only 0123456789-.<space> are characters here

@@ -656,14 +649,12 @@ 
 							/// @todo: find a better way of throwing an error than this!

 							error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);

 							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';

-						}

-						else

+						} else

 						{

 							// it's ok, add it on

 							$GLOBALS['_xh']['value']=(double)$GLOBALS['_xh']['ac'];

 						}

-					}

-					else

+					} else

 					{

 						// we have an I4/INT

 						// we must check that only 0123456789-<space> are characters here

@@ -672,8 +663,7 @@ 
 							/// @todo find a better way of throwing an error than this!

 							error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);

 							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';

-						}

-						else

+						} else

 						{

 							// it's ok, add it on

 							$GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];

@@ -693,8 +683,9 @@ 
 					{

 						$vscount = count($GLOBALS['_xh']['valuestack']);

 						$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][$GLOBALS['_xh']['valuestack'][$vscount-1]['name']] = $GLOBALS['_xh']['value'];

-					} else

-						error_log('XML-RPC: missing VALUE inside STRUCT in received xml');

+					} else {
+											error_log('XML-RPC: missing VALUE inside STRUCT in received xml');
+					}
 					break;

 				case 'DATA':

 					//$GLOBALS['_xh']['ac']=''; // is this necessary?

@@ -718,9 +709,9 @@ 
 					{

 						$GLOBALS['_xh']['params'][]=$GLOBALS['_xh']['value'];

 						$GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];

-					}

-					else

-						error_log('XML-RPC: missing VALUE inside PARAM in received xml');

+					} else {
+											error_log('XML-RPC: missing VALUE inside PARAM in received xml');
+					}
 					break;

 				case 'METHODNAME':

 					$GLOBALS['_xh']['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);

@@ -916,8 +907,7 @@ 
 			if($path == '' || $path[0] != '/')

 			{

 				$this->path='/'.$path;

-			}

-			else

+			} else

 			{

 				$this->path=$path;

 			}

@@ -998,8 +988,7 @@ 
 			if ($is_dir)

 			{

 				$this->cacertdir = $cacert;

-			}

-			else

+			} else

 			{

 				$this->cacert = $cacert;

 			}

@@ -1067,13 +1056,14 @@ 
 		*/

 		function setAcceptedCompression($compmethod)

 		{

-			if ($compmethod == 'any')

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

-			else

-				if ($compmethod == false )

-					$this->accepted_compression = array();

-				else

-					$this->accepted_compression = array($compmethod);

+			if ($compmethod == 'any') {
+							$this->accepted_compression = array('gzip', 'deflate');
+			} else

+				if ($compmethod == false ) {
+									$this->accepted_compression = array();
+				} else {
+									$this->accepted_compression = array($compmethod);
+				}
 		}

 

 		/**

@@ -1110,8 +1100,7 @@ 
 				$this->cookies[$name]['domain'] = $domain;

 				$this->cookies[$name]['port'] = $port;

 				$this->cookies[$name]['version'] = 1;

-			}

-			else

+			} else

 			{

 				$this->cookies[$name]['version'] = 0;

 			}

@@ -1158,8 +1147,7 @@ 
 				// $msg is an array of xmlrpcmsg's

 				$r = $this->multicall($msg, $timeout, $method);

 				return $r;

-			}

-			elseif(is_string($msg))

+			} elseif(is_string($msg))

 			{

 				$n = new xmlrpcmsg('');

 				$n->payload = $msg;

@@ -1192,8 +1180,7 @@ 
 					$this->key,

 					$this->keypass

 				);

-			}

-			elseif($method == 'http11')

+			} elseif($method == 'http11')

 			{

 				$r =& $this->sendPayloadCURL(

 					$msg,

@@ -1215,8 +1202,7 @@ 
 					'http',

 					$this->keepalive

 				);

-			}

-			else

+			} else

 			{

 				$r =& $this->sendPayloadHTTP10(

 					$msg,

@@ -1267,8 +1253,7 @@ 
 						$payload = $a;

 						$encoding_hdr = "Content-Encoding: gzip\r\n";

 					}

-				}

-				else

+				} else

 				{

 					$a = @gzcompress($payload);

 					if($a)

@@ -1277,8 +1262,7 @@ 
 						$encoding_hdr = "Content-Encoding: deflate\r\n";

 					}

 				}

-			}

-			else

+			} else

 			{

 				$encoding_hdr = '';

 			}

@@ -1318,8 +1302,7 @@ 
 					}

 					$proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";

 				}

-			}

-			else

+			} else

 			{

 				$connectserver = $server;

 				$connectport = $port;

@@ -1338,14 +1321,16 @@ 
 					{

 						$version = ' $Version="' . $cookie['version'] . '";';

 						$cookieheader .= ' ' . $name . '="' . $cookie['value'] . '";';

-						if ($cookie['path'])

-							$cookieheader .= ' $Path="' . $cookie['path'] . '";';

-						if ($cookie['domain'])

-							$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';

-						if ($cookie['port'])

-							$cookieheader .= ' $Port="' . $cookie['port'] . '";';

-					}

-					else

+						if ($cookie['path']) {
+													$cookieheader .= ' $Path="' . $cookie['path'] . '";';
+						}
+						if ($cookie['domain']) {
+													$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';
+						}
+						if ($cookie['port']) {
+													$cookieheader .= ' $Port="' . $cookie['port'] . '";';
+						}
+					} else

 					{

 						$cookieheader .= ' ' . $name . '=' . $cookie['value'] . ";";

 					}

@@ -1379,8 +1364,7 @@ 
 			if($timeout>0)

 			{

 				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);

-			}

-			else

+			} else

 			{

 				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);

 			}

@@ -1390,8 +1374,7 @@ 
 				{

 					stream_set_timeout($fp, $timeout);

 				}

-			}

-			else

+			} else

 			{

 				$this->errstr='Connect error: '.$this->errstr;

 				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');

@@ -1404,8 +1387,7 @@ 
 				$this->errstr='Write error';

 				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);

 				return $r;

-			}

-			else

+			} else

 			{

 				// reset errno and errstr on successful socket connection

 				$this->errstr = '';

@@ -1472,8 +1454,7 @@ 
 				if($method == 'http')

 				{

 					$port = 80;

-				}

-				else

+				} else

 				{

 					$port = 443;

 				}

@@ -1497,8 +1478,7 @@ 
 						$payload = $a;

 						$encoding_hdr = 'Content-Encoding: gzip';

 					}

-				}

-				else

+				} else

 				{

 					$a = @gzcompress($payload);

 					if($a)

@@ -1507,8 +1487,7 @@ 
 						$encoding_hdr = 'Content-Encoding: deflate';

 					}

 				}

-			}

-			else

+			} else

 			{

 				$encoding_hdr = '';

 			}

@@ -1527,8 +1506,7 @@ 
 				{

 					$this->xmlrpc_curl_handle = $curl;

 				}

-			}

-			else

+			} else

 			{

 				$curl = $this->xmlrpc_curl_handle;

 			}

@@ -1559,9 +1537,9 @@ 
 				if (count($this->accepted_compression) == 1)

 				{

 					curl_setopt($curl, CURLOPT_ENCODING, $this->accepted_compression[0]);

-				}

-				else

-					curl_setopt($curl, CURLOPT_ENCODING, '');

+				} else {
+									curl_setopt($curl, CURLOPT_ENCODING, '');
+				}
 			}

 			// extra headers

 			$headers = array('Content-Type: ' . $msg->content_type , 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));

@@ -1589,8 +1567,7 @@ 
 				if (defined('CURLOPT_HTTPAUTH'))

 				{

 					curl_setopt($curl, CURLOPT_HTTPAUTH, $authtype);

-				}

-				else if ($authtype != 1)

+				} else if ($authtype != 1)

 				{

 					error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');

 				}

@@ -1655,8 +1632,7 @@ 
 					if (defined('CURLOPT_PROXYAUTH'))

 					{

 						curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyauthtype);

-					}

-					else if ($proxyauthtype != 1)

+					} else if ($proxyauthtype != 1)

 					{

 						error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');

 					}

@@ -1698,17 +1674,18 @@ 
 				print "---END---\n</PRE>";

 			}

 

-			if(!$result) /// @todo we should use a better check here - what if we get back '' or '0'?

+			if(!$result) {
+			    /// @todo we should use a better check here - what if we get back '' or '0'?

 			{

-				$this->errstr='no response';

+				$this->errstr='no response';
+			}
 				$resp=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl));

 				curl_close($curl);

 				if($keepalive)

 				{

 					$this->xmlrpc_curl_handle = null;

 				}

-			}

-			else

+			} else

 			{

 				if(!$keepalive)

 				{

@@ -1760,8 +1737,7 @@ 
 				{

 					// System.multicall succeeded

 					return $results;

-				}

-				else

+				} else

 				{

 					// either system.multicall is unsupported by server,

 					// or call failed for some other reason.

@@ -1769,21 +1745,18 @@ 
 					{

 						// Don't try it next time...

 						$this->no_multicall = true;

-					}

-					else

+					} else

 					{

 						if (is_a($results, 'xmlrpcresp'))

 						{

 							$result = $results;

-						}

-						else

+						} else

 						{

 							$result = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['multicall_error'], $GLOBALS['xmlrpcstr']['multicall_error']);

 						}

 					}

 				}

-			}

-			else

+			} else

 			{

 				// override fallback, in case careless user tries to do two

 				// opposite things at the same time

@@ -1799,8 +1772,7 @@ 
 				{

 					$results[] =& $this->send($msg, $timeout, $method);

 				}

-			}

-			else

+			} else

 			{

 				// user does NOT want to fallback on many single calls:

 				// since we should always return an array of responses,

@@ -1853,8 +1825,7 @@ 
 			if ($this->return_type == 'xml')

 			{

 					return $rets;

-			}

-			else if ($this->return_type == 'phpvals')

+			} else if ($this->return_type == 'phpvals')

 			{

 				///@todo test this code branch...

 				$rets = $result->value();

@@ -1904,8 +1875,7 @@ 
 					}

 				}

 				return $response;

-			}

-			else // return type == 'xmlrpcvals'

+			} else // return type == 'xmlrpcvals'

 			{

 				$rets = $result->value();

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

@@ -1992,8 +1962,7 @@ 
 				$this->errno = $fcode;

 				$this->errstr = $fstr;

 				//$this->errstr = htmlspecialchars($fstr); // XXX: encoding probably shouldn't be done here; fix later.

-			}

-			else

+			} else

 			{

 				// successful response

 				$this->val = $val;

@@ -2003,18 +1972,15 @@ 
 					if (is_object($this->val) && is_a($this->val, 'xmlrpcval'))

 					{

 						$this->valtyp = 'xmlrpcvals';

-					}

-					else if (is_string($this->val))

+					} else if (is_string($this->val))

 					{

 						$this->valtyp = 'xml';

 

-					}

-					else

+					} else

 					{

 						$this->valtyp = 'phpvals';

 					}

-				}

-				else

+				} else

 				{

 					// user declares type of resp value: believe him

 					$this->valtyp = $valtyp;

@@ -2076,15 +2042,15 @@ 
 		*/

 		function serialize($charset_encoding='')

 		{

-			if ($charset_encoding != '')

-				$this->content_type = 'text/xml; charset=' . $charset_encoding;

-			else

-				$this->content_type = 'text/xml';

+			if ($charset_encoding != '') {
+							$this->content_type = 'text/xml; charset=' . $charset_encoding;
+			} else {
+							$this->content_type = 'text/xml';
+			}
 			if ($GLOBALS['xmlrpc_null_apache_encoding'])

 			{

 				$result = "<methodResponse xmlns:ex=\"".$GLOBALS['xmlrpc_null_apache_encoding_ns']."\">\n";

-			}

-			else

+			} else

 			{

 			$result = "<methodResponse>\n";

 			}

@@ -2097,8 +2063,7 @@ 
 "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .

 xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</string></value>\n</member>\n" .

 "</struct>\n</value>\n</fault>";

-			}

-			else

+			} else

 			{

 				if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))

 				{

@@ -2107,14 +2072,12 @@ 
 						$result .= "<params>\n<param>\n" .

 							$this->val .

 							"</param>\n</params>";

-					}

-					else

+					} else

 					{

 						/// @todo try to build something serializable?

 						die('cannot serialize xmlrpcresp objects whose content is native php values');

 					}

-				}

-				else

+				} else

 				{

 					$result .= "<params>\n<param>\n" .

 						$this->val->serialize($charset_encoding) .

@@ -2167,8 +2130,7 @@ 
 			if ($charset_encoding != '')

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

@@ -2195,10 +2157,11 @@ 
 		*/

 		function createPayload($charset_encoding='')

 		{

-			if ($charset_encoding != '')

-				$this->content_type = 'text/xml; charset=' . $charset_encoding;

-			else

-				$this->content_type = 'text/xml';

+			if ($charset_encoding != '') {
+							$this->content_type = 'text/xml; charset=' . $charset_encoding;
+			} else {
+							$this->content_type = 'text/xml';
+			}
 			$this->payload=$this->xml_header($charset_encoding);

 			$this->payload.='<methodName>' . xmlrpc_encode_entitites($this->methodname, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</methodName>\n";

 			$this->payload.="<params>\n";

@@ -2252,8 +2215,7 @@ 
 			{

 				$this->params[]=$par;

 				return true;

-			}

-			else

+			} else

 			{

 				return false;

 			}

@@ -2314,15 +2276,13 @@ 
 					if($pos || is_int($pos))

 					{

 						$bd = $pos+4;

-					}

-					else

+					} else

 					{

 						$pos = strpos($data,"\n\n");

 						if($pos || is_int($pos))

 						{

 							$bd = $pos+2;

-						}

-						else

+						} else

 						{

 							// No separation between response headers and body: fault?

 							$bd = 0;

@@ -2333,8 +2293,7 @@ 
 						// this filters out all http headers from proxy.

 						// maybe we could take them into account, too?

 						$data = substr($data, $bd);

-					}

-					else

+					} else

 					{

 						error_log('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');

 						$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)');

@@ -2348,9 +2307,11 @@ 
 					$pos = strpos($data, 'HTTP', 12);

 					// server sent a Continue header without any (valid) content following...

 					// give the client a chance to know it

-					if(!$pos && !is_int($pos)) // works fine in php 3, 4 and 5

+					if(!$pos && !is_int($pos)) {
+					    // works fine in php 3, 4 and 5

 					{

-						break;

+						break;
+					}
 					}

 					$data = substr($data, $pos);

 				}

@@ -2371,15 +2332,13 @@ 
 				if($pos || is_int($pos))

 				{

 					$bd = $pos+4;

-				}

-				else

+				} else

 				{

 					$pos = strpos($data,"\n\n");

 					if($pos || is_int($pos))

 					{

 						$bd = $pos+2;

-					}

-					else

+					} else

 					{

 						// No separation between response headers and body: fault?

 						// we could take some action here instead of going on...

@@ -2406,8 +2365,7 @@ 
 								// version 2 cookies:

 								// there could be many cookies on one line, comma separated

 								$cookies = explode(',', $arr[1]);

-							}

-							else

+							} else

 							{

 								$cookies = array($arr[1]);

 							}

@@ -2415,10 +2373,11 @@ 
 							{

 								// glue together all received cookies, using a comma to separate them

 								// (same as php does with getallheaders())

-								if (isset($GLOBALS['_xh']['headers'][$header_name]))

-									$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);

-								else

-									$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);

+								if (isset($GLOBALS['_xh']['headers'][$header_name])) {
+																	$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);
+								} else {
+																	$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);
+								}
 								// parse cookie attributes, in case user wants to correctly honour them

 								// feature creep: only allow rfc-compliant cookie attributes?

 								// @todo support for server sending multiple time cookie with same name, but using different PATHs

@@ -2434,8 +2393,7 @@ 
 										$cookiename = $tag;

 										$GLOBALS['_xh']['cookies'][$tag] = array();

 										$GLOBALS['_xh']['cookies'][$cookiename]['value'] = urldecode($val);

-									}

-									else

+									} else

 									{

 										if ($tag != 'value')

 										{

@@ -2444,13 +2402,11 @@ 
 									}

 								}

 							}

-						}

-						else

+						} else

 						{

 							$GLOBALS['_xh']['headers'][$header_name] = trim($arr[1]);

 						}

-					}

-					elseif(isset($header_name))

+					} elseif(isset($header_name))

 					{

 						///	@todo version1 cookies might span multiple lines, thus breaking the parsing above

 						$GLOBALS['_xh']['headers'][$header_name] .= ' ' . trim($line);

@@ -2501,23 +2457,22 @@ 
 								if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))

 								{

 									$data = $degzdata;

-									if($this->debug)

-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";

-								}

-								elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

+									if($this->debug) {
+																		print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+									}
+								} elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

 								{

 									$data = $degzdata;

-									if($this->debug)

-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";

-								}

-								else

+									if($this->debug) {
+																		print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+									}
+								} else

 								{

 									error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');

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

 									return $r;

 								}

-							}

-							else

+							} else

 							{

 								error_log('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');

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

@@ -2570,8 +2525,7 @@ 
 					$r->raw_data = $data;

 					return $r;

 				}

-			}

-			else

+			} else

 			{

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

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

@@ -2651,8 +2605,7 @@ 
 			if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))

 			{

 				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');

-			}

-			else

+			} else

 			{

 				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);

 			}

@@ -2660,8 +2613,7 @@ 
 			if ($return_type == 'phpvals')

 			{

 				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');

-			}

-			else

+			} else

 			{

 				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');

 			}

@@ -2676,8 +2628,7 @@ 
 				if((xml_get_current_line_number($parser)) == 1)

 				{

 					$errstr = 'XML error at line 1, check URL';

-				}

-				else

+				} else

 				{

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

 						xml_error_string(xml_get_error_code($parser)),

@@ -2716,8 +2667,7 @@ 
 				// indicating something odd went on

 				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],

 					$GLOBALS['xmlrpcstr']['invalid_return']);

-			}

-			else

+			} else

 			{

 				if ($this->debug)

 				{

@@ -2741,8 +2691,7 @@ 
 						$errstr_v = $v->structmem('faultString');

 						$errno = $errno_v->scalarval();

 						$errstr = $errstr_v->scalarval();

-					}

-					else

+					} else

 					{

 						$errno = $v['faultCode'];

 						$errstr = $v['faultString'];

@@ -2755,8 +2704,7 @@ 
 					}

 

 					$r = new xmlrpcresp(0, $errno, $errstr);

-				}

-				else

+				} else

 				{

 					$r=new xmlrpcresp($v, 0, '', $return_type);

 				}

@@ -2864,8 +2812,7 @@ 
 				if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))

 				{

 					$val=true;

-				}

-				else

+				} else

 				{

 					$val=false;

 				}

@@ -2910,14 +2857,12 @@ 
 				$this->mytype=$GLOBALS['xmlrpcTypes']['array'];

 				$this->me['array']=$vals;

 				return 1;

-			}

-			elseif($this->mytype==2)

+			} elseif($this->mytype==2)

 			{

 				// we're adding to an array here

 				$this->me['array'] = array_merge($this->me['array'], $vals);

 				return 1;

-			}

-			else

+			} else

 			{

 				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');

 				return 0;

@@ -2939,14 +2884,12 @@ 
 				$this->mytype=$GLOBALS['xmlrpcTypes']['struct'];

 				$this->me['struct']=$vals;

 				return 1;

-			}

-			elseif($this->mytype==3)

+			} elseif($this->mytype==3)

 			{

 				// we're adding to a struct here

 				$this->me['struct'] = array_merge($this->me['struct'], $vals);

 				return 1;

-			}

-			else

+			} else

 			{

 				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');

 				return 0;

@@ -3050,8 +2993,7 @@ 
 							if ($GLOBALS['xmlrpc_null_apache_encoding'])

 							{

 								$rs.="<ex:nil/>";

-							}

-							else

+							} else

 							{

 								$rs.="<nil/>";

 							}

@@ -3067,8 +3009,7 @@ 
 					if ($this->_php_class)

 					{

 						$rs.='<struct php_class="' . $this->_php_class . "\">\n";

-					}

-					else

+					} else

 					{

 						$rs.="<struct>\n";

 					}

@@ -3296,16 +3237,14 @@ 
 		if(!$utc)

 		{

 			$t=strftime("%Y%m%dT%H:%M:%S", $timet);

-		}

-		else

+		} else

 		{

 			if(function_exists('gmstrftime'))

 			{

 				// gmstrftime doesn't exist in some versions

 				// of PHP

 				$t=gmstrftime("%Y%m%dT%H:%M:%S", $timet);

-			}

-			else

+			} else

 			{

 				$t=strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));

 			}

@@ -3327,8 +3266,7 @@ 
 			if($utc)

 			{

 				$t=gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

-			}

-			else

+			} else

 			{

 				$t=mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

 			}

@@ -3396,8 +3334,7 @@ 
 						$result = new Datetime();

 						$result->setTimestamp($out);

 						return $result;

-					}

-					elseif (is_a($out, 'Datetime'))

+					} elseif (is_a($out, 'Datetime'))

 					{

 						return $out;

 					}

@@ -3426,8 +3363,7 @@ 
 						$obj->$key = php_xmlrpc_decode($value, $options);

 					}

 					return $obj;

-				}

-				else

+				} else

 				{

 					$arr = array();

 					while(list($key,$value)=$xmlrpc_val->structeach())

@@ -3453,8 +3389,7 @@ 
 	if(function_exists('xmlrpc_decode'))

 	{

 		define('XMLRPC_EPI_ENABLED','1');

-	}

-	else

+	} else

 	{

 		define('XMLRPC_EPI_ENABLED','0');

 	}

@@ -3482,10 +3417,11 @@ 
 		switch($type)

 		{

 			case 'string':

-				if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val))

-					$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']);

-				else

-					$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcString']);

+				if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val)) {
+									$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']);
+				} else {
+									$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcString']);
+				}
 				break;

 			case 'integer':

 				$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcInt']);

@@ -3520,8 +3456,7 @@ 
 				if($ko)

 				{

 					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);

-				}

-				else

+				} else

 				{

 					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcArray']);

 				}

@@ -3530,12 +3465,10 @@ 
 				if(is_a($php_val, 'xmlrpcval'))

 				{

 					$xmlrpc_val = $php_val;

-				}

-				else if(is_a($php_val, 'DateTime'))

+				} else if(is_a($php_val, 'DateTime'))

 				{

 					$xmlrpc_val = new xmlrpcval($php_val->format('Ymd\TH:i:s'), $GLOBALS['xmlrpcStruct']);

-				}

-				else

+				} else

 				{

 					$arr = array();

 					reset($php_val);

@@ -3556,12 +3489,10 @@ 
 				if (in_array('extension_api', $options))

 				{

 					$xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcString']);

-				}

-				else if (in_array('null_extension', $options))

+				} else if (in_array('null_extension', $options))

 				{

 					$xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcNull']);

-				}

-				else

+				} else

 				{

 					$xmlrpc_val = new xmlrpcval();

 				}

@@ -3570,8 +3501,7 @@ 
 				if (in_array('extension_api', $options))

 				{

 					$xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);

-				}

-				else

+				} else

 				{

 					$xmlrpc_val = new xmlrpcval();

 				}

@@ -3633,8 +3563,7 @@ 
 		if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))

 		{

 			xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');

-		}

-		else

+		} else

 		{

 			xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);

 		}

@@ -3651,9 +3580,11 @@ 
 			return false;

 		}

 		xml_parser_free($parser);

-		if ($GLOBALS['_xh']['isf'] > 1) // test that $GLOBALS['_xh']['value'] is an obj, too???

+		if ($GLOBALS['_xh']['isf'] > 1) {
+		    // test that $GLOBALS['_xh']['value'] is an obj, too???

 		{

-			error_log($GLOBALS['_xh']['isf_reason']);

+			error_log($GLOBALS['_xh']['isf_reason']);
+		}
 			return false;

 		}

 		switch ($GLOBALS['_xh']['rt'])

@@ -3665,8 +3596,7 @@ 
 					$vc = $v->structmem('faultCode');

 					$vs = $v->structmem('faultString');

 					$r = new xmlrpcresp(0, $vc->scalarval(), $vs->scalarval());

-				}

-				else

+				} else

 				{

 					$r = new xmlrpcresp($v);

 				}

@@ -3787,12 +3717,10 @@ 
 		if(preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlchunk))

 		{

 			return 'UCS-4';

-		}

-		elseif(preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))

+		} elseif(preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))

 		{

 			return 'UTF-16';

-		}

-		elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))

+		} elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))

 		{

 			return 'UTF-8';

 		}

@@ -3815,8 +3743,7 @@ 
 			if($encoding_prefs)

 			{

 				$enc = mb_detect_encoding($xmlchunk, $encoding_prefs);

-			}

-			else

+			} else

 			{

 				$enc = mb_detect_encoding($xmlchunk);

 			}

@@ -3827,8 +3754,7 @@ 
 				$enc = 'US-'.$enc;

 			}

 			return $enc;

-		}

-		else

+		} else

 		{

 			// no encoding specified: as per HTTP1.1 assume it is iso-8859-1?

 			// Both RFC 2616 (HTTP 1.1) and 1945 (HTTP 1.0) clearly state that for text/xxx content types

@@ -3851,12 +3777,10 @@ 
 		if (preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlChunk))

 		{

 			return true;

-		}

-		elseif (preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlChunk))

+		} elseif (preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlChunk))

 		{

 			return true;

-		}

-		elseif (preg_match('/^(\xEF\xBB\xBF)/', $xmlChunk))

+		} elseif (preg_match('/^(\xEF\xBB\xBF)/', $xmlChunk))

 		{

 			return true;

 		}

@@ -3891,16 +3815,18 @@ 
 				'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'UTF-8',

 				'EUC-JP', 'EUC-', 'EUC-KR', 'EUC-CN')

 		);

-		if (is_string($validlist))

-			$validlist = explode(',', $validlist);

-		if (@in_array(strtoupper($encoding), $validlist))

-			return true;

-		else

-		{

-			if (array_key_exists($encoding, $charset_supersets))

-				foreach ($validlist as $allowed)

+		if (is_string($validlist)) {
+					$validlist = explode(',', $validlist);
+		}
+		if (@in_array(strtoupper($encoding), $validlist)) {
+					return true;
+		} else

+		{

+			if (array_key_exists($encoding, $charset_supersets)) {
+							foreach ($validlist as $allowed)

 					if (in_array($allowed, $charset_supersets[$encoding]))

-						return true;

+						return true;
+			}
 			return false;

 		}

 	}

Doc Comments +9 added lines, -4 removed lines

@@ -1239,6 +1239,7 @@ 
 

 		/**

 		* @access private

+		* @param integer $port
 		*/

 		function &sendPayloadHTTP10($msg, $server, $port, $timeout=0,

 			$username='', $password='', $authtype=1, $proxyhost='',

@@ -1427,6 +1428,7 @@ 
 

 		/**

 		* @access private

+		* @param integer $port
 		*/

 		function &sendPayloadHTTPS($msg, $server, $port, $timeout=0, $username='',

 			$password='', $authtype=1, $cert='',$certpass='', $cacert='', $cacertdir='',

@@ -1818,6 +1820,8 @@ 
 		* Returns either an array of xmlrpcreponses, an xmlrpc error response

 		* or false (when received response does not respect valid multicall syntax)

 		* @access private

+		* @param integer $timeout
+		* @param string $method
 		*/

 		function _try_multicall($msgs, $timeout, $method)

 		{

@@ -2044,7 +2048,7 @@ 
 

 		/**

 		* Returns the value received by the server.

-		* @return mixed the xmlrpcval object returned by the server. Might be an xml string or php value if the response has been created by specially configured xmlrpc_client objects

+		* @return integer the xmlrpcval object returned by the server. Might be an xml string or php value if the response has been created by specially configured xmlrpc_client objects

 		* @access public

 		*/

 		function value()

@@ -2137,7 +2141,7 @@ 
 

 		/**

 		* @param string $meth the name of the method to invoke

-		* @param array $pars array of parameters to be passed to the method (xmlrpcval objects)

+		* @param integer $pars array of parameters to be passed to the method (xmlrpcval objects)

 		*/

 		function __construct($meth, $pars=0)

 		{

@@ -2302,6 +2306,7 @@ 
 		/**

 		* Parses HTTP headers and separates them from data.

 		* @access private

+		* @param string $data
 		*/

 		function &parseResponseHeaders(&$data, $headers_processed=false)

 		{

@@ -2776,7 +2781,7 @@ 
 		var $_php_class=null;

 

 		/**

-		* @param mixed $val

+		* @param integer $val

 		* @param string $type any valid xmlrpc type name (lowercase). If null, 'string' is assumed

 		*/

 		function __construct($val=-1, $type='')

@@ -2843,7 +2848,7 @@ 
 

 		/**

 		* Add a single php value to an (unitialized) xmlrpcval

-		* @param mixed $val

+		* @param boolean $val

 		* @param string $type

 		* @return int 1 or 0 on failure

 		*/

Indentation +3815 added lines, -3815 removed lines

@@ -34,98 +34,98 @@ 
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 // OF THE POSSIBILITY OF SUCH DAMAGE.

 

-	if(!function_exists('xml_parser_create'))

-	{

-		// For PHP 4 onward, XML functionality is always compiled-in on windows:

-		// no more need to dl-open it. It might have been compiled out on *nix...

-		if(strtoupper(substr(PHP_OS, 0, 3) != 'WIN'))

-		{

-			dl('xml.so');

-		}

-	}

-

-	// G. Giunta 2005/01/29: declare global these variables,

-	// so that xmlrpc.inc will work even if included from within a function

-	// Milosch: 2005/08/07 - explicitly request these via $GLOBALS where used.

-	$GLOBALS['xmlrpcI4']='i4';

-	$GLOBALS['xmlrpcInt']='int';

-	$GLOBALS['xmlrpcBoolean']='boolean';

-	$GLOBALS['xmlrpcDouble']='double';

-	$GLOBALS['xmlrpcString']='string';

-	$GLOBALS['xmlrpcDateTime']='dateTime.iso8601';

-	$GLOBALS['xmlrpcBase64']='base64';

-	$GLOBALS['xmlrpcArray']='array';

-	$GLOBALS['xmlrpcStruct']='struct';

-	$GLOBALS['xmlrpcValue']='undefined';

-

-	$GLOBALS['xmlrpcTypes']=array(

-		$GLOBALS['xmlrpcI4']       => 1,

-		$GLOBALS['xmlrpcInt']      => 1,

-		$GLOBALS['xmlrpcBoolean']  => 1,

-		$GLOBALS['xmlrpcString']   => 1,

-		$GLOBALS['xmlrpcDouble']   => 1,

-		$GLOBALS['xmlrpcDateTime'] => 1,

-		$GLOBALS['xmlrpcBase64']   => 1,

-		$GLOBALS['xmlrpcArray']    => 2,

-		$GLOBALS['xmlrpcStruct']   => 3

-	);

-

-	$GLOBALS['xmlrpc_valid_parents'] = array(

-		'VALUE' => array('MEMBER', 'DATA', 'PARAM', 'FAULT'),

-		'BOOLEAN' => array('VALUE'),

-		'I4' => array('VALUE'),

-		'INT' => array('VALUE'),

-		'STRING' => array('VALUE'),

-		'DOUBLE' => array('VALUE'),

-		'DATETIME.ISO8601' => array('VALUE'),

-		'BASE64' => array('VALUE'),

-		'MEMBER' => array('STRUCT'),

-		'NAME' => array('MEMBER'),

-		'DATA' => array('ARRAY'),

-		'ARRAY' => array('VALUE'),

-		'STRUCT' => array('VALUE'),

-		'PARAM' => array('PARAMS'),

-		'METHODNAME' => array('METHODCALL'),

-		'PARAMS' => array('METHODCALL', 'METHODRESPONSE'),

-		'FAULT' => array('METHODRESPONSE'),

-		'NIL' => array('VALUE'), // only used when extension activated

-		'EX:NIL' => array('VALUE') // only used when extension activated

-	);

-

-	// define extra types for supporting NULL (useful for json or <NIL/>)

-	$GLOBALS['xmlrpcNull']='null';

-	$GLOBALS['xmlrpcTypes']['null']=1;

-

-	// Not in use anymore since 2.0. Shall we remove it?

-	/// @deprecated

-	$GLOBALS['xmlEntities']=array(

-		'amp'  => '&',

-		'quot' => '"',

-		'lt'   => '<',

-		'gt'   => '>',

-		'apos' => "'"

-	);

-

-	// tables used for transcoding different charsets into us-ascii xml

-

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

-	$GLOBALS['xml_iso88591_Entities']['in'] = array();

-	$GLOBALS['xml_iso88591_Entities']['out'] = array();

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

-	{

-		$GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);

-		$GLOBALS['xml_iso88591_Entities']['out'][] = '&#'.$i.';';

-	}

-	for ($i = 160; $i < 256; $i++)

-	{

-		$GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);

-		$GLOBALS['xml_iso88591_Entities']['out'][] = '&#'.$i.';';

-	}

-

-	/// @todo add to iso table the characters from cp_1252 range, i.e. 128 to 159?

-	/// These will NOT be present in true ISO-8859-1, but will save the unwary

-	/// windows user from sending junk (though no luck when reciving them...)

-  /*

+    if(!function_exists('xml_parser_create'))

+    {

+        // For PHP 4 onward, XML functionality is always compiled-in on windows:

+        // no more need to dl-open it. It might have been compiled out on *nix...

+        if(strtoupper(substr(PHP_OS, 0, 3) != 'WIN'))

+        {

+            dl('xml.so');

+        }

+    }

+

+    // G. Giunta 2005/01/29: declare global these variables,

+    // so that xmlrpc.inc will work even if included from within a function

+    // Milosch: 2005/08/07 - explicitly request these via $GLOBALS where used.

+    $GLOBALS['xmlrpcI4']='i4';

+    $GLOBALS['xmlrpcInt']='int';

+    $GLOBALS['xmlrpcBoolean']='boolean';

+    $GLOBALS['xmlrpcDouble']='double';

+    $GLOBALS['xmlrpcString']='string';

+    $GLOBALS['xmlrpcDateTime']='dateTime.iso8601';

+    $GLOBALS['xmlrpcBase64']='base64';

+    $GLOBALS['xmlrpcArray']='array';

+    $GLOBALS['xmlrpcStruct']='struct';

+    $GLOBALS['xmlrpcValue']='undefined';

+

+    $GLOBALS['xmlrpcTypes']=array(

+        $GLOBALS['xmlrpcI4']       => 1,

+        $GLOBALS['xmlrpcInt']      => 1,

+        $GLOBALS['xmlrpcBoolean']  => 1,

+        $GLOBALS['xmlrpcString']   => 1,

+        $GLOBALS['xmlrpcDouble']   => 1,

+        $GLOBALS['xmlrpcDateTime'] => 1,

+        $GLOBALS['xmlrpcBase64']   => 1,

+        $GLOBALS['xmlrpcArray']    => 2,

+        $GLOBALS['xmlrpcStruct']   => 3

+    );

+

+    $GLOBALS['xmlrpc_valid_parents'] = array(

+        'VALUE' => array('MEMBER', 'DATA', 'PARAM', 'FAULT'),

+        'BOOLEAN' => array('VALUE'),

+        'I4' => array('VALUE'),

+        'INT' => array('VALUE'),

+        'STRING' => array('VALUE'),

+        'DOUBLE' => array('VALUE'),

+        'DATETIME.ISO8601' => array('VALUE'),

+        'BASE64' => array('VALUE'),

+        'MEMBER' => array('STRUCT'),

+        'NAME' => array('MEMBER'),

+        'DATA' => array('ARRAY'),

+        'ARRAY' => array('VALUE'),

+        'STRUCT' => array('VALUE'),

+        'PARAM' => array('PARAMS'),

+        'METHODNAME' => array('METHODCALL'),

+        'PARAMS' => array('METHODCALL', 'METHODRESPONSE'),

+        'FAULT' => array('METHODRESPONSE'),

+        'NIL' => array('VALUE'), // only used when extension activated

+        'EX:NIL' => array('VALUE') // only used when extension activated

+    );

+

+    // define extra types for supporting NULL (useful for json or <NIL/>)

+    $GLOBALS['xmlrpcNull']='null';

+    $GLOBALS['xmlrpcTypes']['null']=1;

+

+    // Not in use anymore since 2.0. Shall we remove it?

+    /// @deprecated

+    $GLOBALS['xmlEntities']=array(

+        'amp'  => '&',

+        'quot' => '"',

+        'lt'   => '<',

+        'gt'   => '>',

+        'apos' => "'"

+    );

+

+    // tables used for transcoding different charsets into us-ascii xml

+

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

+    $GLOBALS['xml_iso88591_Entities']['in'] = array();

+    $GLOBALS['xml_iso88591_Entities']['out'] = array();

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

+    {

+        $GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);

+        $GLOBALS['xml_iso88591_Entities']['out'][] = '&#'.$i.';';

+    }

+    for ($i = 160; $i < 256; $i++)

+    {

+        $GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);

+        $GLOBALS['xml_iso88591_Entities']['out'][] = '&#'.$i.';';

+    }

+

+    /// @todo add to iso table the characters from cp_1252 range, i.e. 128 to 159?

+    /// These will NOT be present in true ISO-8859-1, but will save the unwary

+    /// windows user from sending junk (though no luck when reciving them...)

+    /*

 	$GLOBALS['xml_cp1252_Entities']=array();

 	for ($i = 128; $i < 160; $i++)

 	{

@@ -143,222 +143,222 @@ 
 	);

   */

 

-	$GLOBALS['xmlrpcerr'] = array(

-	'unknown_method'=>1,

-	'invalid_return'=>2,

-	'incorrect_params'=>3,

-	'introspect_unknown'=>4,

-	'http_error'=>5,

-	'no_data'=>6,

-	'no_ssl'=>7,

-	'curl_fail'=>8,

-	'invalid_request'=>15,

-	'no_curl'=>16,

-	'server_error'=>17,

-	'multicall_error'=>18,

-	'multicall_notstruct'=>9,

-	'multicall_nomethod'=>10,

-	'multicall_notstring'=>11,

-	'multicall_recursion'=>12,

-	'multicall_noparams'=>13,

-	'multicall_notarray'=>14,

-

-	'cannot_decompress'=>103,

-	'decompress_fail'=>104,

-	'dechunk_fail'=>105,

-	'server_cannot_decompress'=>106,

-	'server_decompress_fail'=>107

-	);

-

-	$GLOBALS['xmlrpcstr'] = array(

-	'unknown_method'=>'Unknown method',

-	'invalid_return'=>'Invalid return payload: enable debugging to examine incoming payload',

-	'incorrect_params'=>'Incorrect parameters passed to method',

-	'introspect_unknown'=>"Can't introspect: method unknown",

-	'http_error'=>"Didn't receive 200 OK from remote server.",

-	'no_data'=>'No data received from server.',

-	'no_ssl'=>'No SSL support compiled in.',

-	'curl_fail'=>'CURL error',

-	'invalid_request'=>'Invalid request payload',

-	'no_curl'=>'No CURL support compiled in.',

-	'server_error'=>'Internal server error',

-	'multicall_error'=>'Received from server invalid multicall response',

-	'multicall_notstruct'=>'system.multicall expected struct',

-	'multicall_nomethod'=>'missing methodName',

-	'multicall_notstring'=>'methodName is not a string',

-	'multicall_recursion'=>'recursive system.multicall forbidden',

-	'multicall_noparams'=>'missing params',

-	'multicall_notarray'=>'params is not an array',

-

-	'cannot_decompress'=>'Received from server compressed HTTP and cannot decompress',

-	'decompress_fail'=>'Received from server invalid compressed HTTP',

-	'dechunk_fail'=>'Received from server invalid chunked HTTP',

-	'server_cannot_decompress'=>'Received from client compressed HTTP request and cannot decompress',

-	'server_decompress_fail'=>'Received from client invalid compressed HTTP request'

-	);

-

-	// The charset encoding used by the server for received messages and

-	// by the client for received responses when received charset cannot be determined

-	// or is not supported

-	$GLOBALS['xmlrpc_defencoding']='UTF-8';

-

-	// The encoding used internally by PHP.

-	// String values received as xml will be converted to this, and php strings will be converted to xml

-	// as if having been coded with this

-	$GLOBALS['xmlrpc_internalencoding']='ISO-8859-1';

-

-	$GLOBALS['xmlrpcName']='XML-RPC for PHP';

-	$GLOBALS['xmlrpcVersion']='3.0.1';

-

-	// let user errors start at 800

-	$GLOBALS['xmlrpcerruser']=800;

-	// let XML parse errors start at 100

-	$GLOBALS['xmlrpcerrxml']=100;

-

-	// formulate backslashes for escaping regexp

-	// Not in use anymore since 2.0. Shall we remove it?

-	/// @deprecated

-	$GLOBALS['xmlrpc_backslash']=chr(92).chr(92);

-

-	// set to TRUE to enable correct decoding of <NIL/> and <EX:NIL/> values

-	$GLOBALS['xmlrpc_null_extension']=false;

-

-	// set to TRUE to enable encoding of php NULL values to <EX:NIL/> instead of <NIL/>

-	$GLOBALS['xmlrpc_null_apache_encoding']=false;

-	$GLOBALS['xmlrpc_null_apache_encoding_ns']='http://ws.apache.org/xmlrpc/namespaces/extensions';

-

-	// used to store state during parsing

-	// quick explanation of components:

-	//   ac - used to accumulate values

-	//   isf - used to indicate a parsing fault (2) or xmlrpcresp fault (1)

-	//   isf_reason - used for storing xmlrpcresp fault string

-	//   lv - used to indicate "looking for a value": implements

-	//        the logic to allow values with no types to be strings

-	//   params - used to store parameters in method calls

-	//   method - used to store method name

-	//   stack - array with genealogy of xml elements names:

-	//           used to validate nesting of xmlrpc elements

-	$GLOBALS['_xh']=null;

-

-	/**

-	* Convert a string to the correct XML representation in a target charset

-	* To help correct communication of non-ascii chars inside strings, regardless

-	* of the charset used when sending requests, parsing them, sending responses

-	* and parsing responses, an option is to convert all non-ascii chars present in the message

-	* into their equivalent 'charset entity'. Charset entities enumerated this way

-	* are independent of the charset encoding used to transmit them, and all XML

-	* parsers are bound to understand them.

-	* Note that in the std case we are not sending a charset encoding mime type

-	* along with http headers, so we are bound by RFC 3023 to emit strict us-ascii.

-	*

-	* @todo do a bit of basic benchmarking (strtr vs. str_replace)

-	* @todo	make usage of iconv() or recode_string() or mb_string() where available

-	*/

-	function xmlrpc_encode_entitites($data, $src_encoding='', $dest_encoding='')

-	{

-		if ($src_encoding == '')

-		{

-			// lame, but we know no better...

-			$src_encoding = $GLOBALS['xmlrpc_internalencoding'];

-		}

-

-		switch(strtoupper($src_encoding.'_'.$dest_encoding))

-		{

-			case 'ISO-8859-1_':

-			case 'ISO-8859-1_US-ASCII':

-				$escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);

-				$escaped_data = str_replace($GLOBALS['xml_iso88591_Entities']['in'], $GLOBALS['xml_iso88591_Entities']['out'], $escaped_data);

-				break;

-			case 'ISO-8859-1_UTF-8':

-				$escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);

-				$escaped_data = utf8_encode($escaped_data);

-				break;

-			case 'ISO-8859-1_ISO-8859-1':

-			case 'US-ASCII_US-ASCII':

-			case 'US-ASCII_UTF-8':

-			case 'US-ASCII_':

-			case 'US-ASCII_ISO-8859-1':

-			case 'UTF-8_UTF-8':

-			//case 'CP1252_CP1252':

-				$escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);

-				break;

-			case 'UTF-8_':

-			case 'UTF-8_US-ASCII':

-			case 'UTF-8_ISO-8859-1':

-	// NB: this will choke on invalid UTF-8, going most likely beyond EOF

-	$escaped_data = '';

-	// be kind to users creating string xmlrpcvals out of different php types

-	$data = (string) $data;

-	$ns = strlen ($data);

-	for ($nn = 0; $nn < $ns; $nn++)

-	{

-		$ch = $data[$nn];

-		$ii = ord($ch);

-		//1 7 0bbbbbbb (127)

-		if ($ii < 128)

-		{

-			/// @todo shall we replace this with a (supposedly) faster str_replace?

-			switch($ii){

-				case 34:

-					$escaped_data .= '&quot;';

-					break;

-				case 38:

-					$escaped_data .= '&amp;';

-					break;

-				case 39:

-					$escaped_data .= '&apos;';

-					break;

-				case 60:

-					$escaped_data .= '&lt;';

-					break;

-				case 62:

-					$escaped_data .= '&gt;';

-					break;

-				default:

-					$escaped_data .= $ch;

-			} // switch

-		}

-		//2 11 110bbbbb 10bbbbbb (2047)

-		else if ($ii>>5 == 6)

-		{

-			$b1 = ($ii & 31);

-			$ii = ord($data[$nn+1]);

-			$b2 = ($ii & 63);

-			$ii = ($b1 * 64) + $b2;

-			$ent = sprintf ('&#%d;', $ii);

-			$escaped_data .= $ent;

-			$nn += 1;

-		}

-		//3 16 1110bbbb 10bbbbbb 10bbbbbb

-		else if ($ii>>4 == 14)

-		{

-			$b1 = ($ii & 15);

-			$ii = ord($data[$nn+1]);

-			$b2 = ($ii & 63);

-			$ii = ord($data[$nn+2]);

-			$b3 = ($ii & 63);

-			$ii = ((($b1 * 64) + $b2) * 64) + $b3;

-			$ent = sprintf ('&#%d;', $ii);

-			$escaped_data .= $ent;

-			$nn += 2;

-		}

-		//4 21 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb

-		else if ($ii>>3 == 30)

-		{

-			$b1 = ($ii & 7);

-			$ii = ord($data[$nn+1]);

-			$b2 = ($ii & 63);

-			$ii = ord($data[$nn+2]);

-			$b3 = ($ii & 63);

-			$ii = ord($data[$nn+3]);

-			$b4 = ($ii & 63);

-			$ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;

-			$ent = sprintf ('&#%d;', $ii);

-			$escaped_data .= $ent;

-			$nn += 3;

-		}

-	}

-				break;

+    $GLOBALS['xmlrpcerr'] = array(

+    'unknown_method'=>1,

+    'invalid_return'=>2,

+    'incorrect_params'=>3,

+    'introspect_unknown'=>4,

+    'http_error'=>5,

+    'no_data'=>6,

+    'no_ssl'=>7,

+    'curl_fail'=>8,

+    'invalid_request'=>15,

+    'no_curl'=>16,

+    'server_error'=>17,

+    'multicall_error'=>18,

+    'multicall_notstruct'=>9,

+    'multicall_nomethod'=>10,

+    'multicall_notstring'=>11,

+    'multicall_recursion'=>12,

+    'multicall_noparams'=>13,

+    'multicall_notarray'=>14,

+

+    'cannot_decompress'=>103,

+    'decompress_fail'=>104,

+    'dechunk_fail'=>105,

+    'server_cannot_decompress'=>106,

+    'server_decompress_fail'=>107

+    );

+

+    $GLOBALS['xmlrpcstr'] = array(

+    'unknown_method'=>'Unknown method',

+    'invalid_return'=>'Invalid return payload: enable debugging to examine incoming payload',

+    'incorrect_params'=>'Incorrect parameters passed to method',

+    'introspect_unknown'=>"Can't introspect: method unknown",

+    'http_error'=>"Didn't receive 200 OK from remote server.",

+    'no_data'=>'No data received from server.',

+    'no_ssl'=>'No SSL support compiled in.',

+    'curl_fail'=>'CURL error',

+    'invalid_request'=>'Invalid request payload',

+    'no_curl'=>'No CURL support compiled in.',

+    'server_error'=>'Internal server error',

+    'multicall_error'=>'Received from server invalid multicall response',

+    'multicall_notstruct'=>'system.multicall expected struct',

+    'multicall_nomethod'=>'missing methodName',

+    'multicall_notstring'=>'methodName is not a string',

+    'multicall_recursion'=>'recursive system.multicall forbidden',

+    'multicall_noparams'=>'missing params',

+    'multicall_notarray'=>'params is not an array',

+

+    'cannot_decompress'=>'Received from server compressed HTTP and cannot decompress',

+    'decompress_fail'=>'Received from server invalid compressed HTTP',

+    'dechunk_fail'=>'Received from server invalid chunked HTTP',

+    'server_cannot_decompress'=>'Received from client compressed HTTP request and cannot decompress',

+    'server_decompress_fail'=>'Received from client invalid compressed HTTP request'

+    );

+

+    // The charset encoding used by the server for received messages and

+    // by the client for received responses when received charset cannot be determined

+    // or is not supported

+    $GLOBALS['xmlrpc_defencoding']='UTF-8';

+

+    // The encoding used internally by PHP.

+    // String values received as xml will be converted to this, and php strings will be converted to xml

+    // as if having been coded with this

+    $GLOBALS['xmlrpc_internalencoding']='ISO-8859-1';

+

+    $GLOBALS['xmlrpcName']='XML-RPC for PHP';

+    $GLOBALS['xmlrpcVersion']='3.0.1';

+

+    // let user errors start at 800

+    $GLOBALS['xmlrpcerruser']=800;

+    // let XML parse errors start at 100

+    $GLOBALS['xmlrpcerrxml']=100;

+

+    // formulate backslashes for escaping regexp

+    // Not in use anymore since 2.0. Shall we remove it?

+    /// @deprecated

+    $GLOBALS['xmlrpc_backslash']=chr(92).chr(92);

+

+    // set to TRUE to enable correct decoding of <NIL/> and <EX:NIL/> values

+    $GLOBALS['xmlrpc_null_extension']=false;

+

+    // set to TRUE to enable encoding of php NULL values to <EX:NIL/> instead of <NIL/>

+    $GLOBALS['xmlrpc_null_apache_encoding']=false;

+    $GLOBALS['xmlrpc_null_apache_encoding_ns']='http://ws.apache.org/xmlrpc/namespaces/extensions';

+

+    // used to store state during parsing

+    // quick explanation of components:

+    //   ac - used to accumulate values

+    //   isf - used to indicate a parsing fault (2) or xmlrpcresp fault (1)

+    //   isf_reason - used for storing xmlrpcresp fault string

+    //   lv - used to indicate "looking for a value": implements

+    //        the logic to allow values with no types to be strings

+    //   params - used to store parameters in method calls

+    //   method - used to store method name

+    //   stack - array with genealogy of xml elements names:

+    //           used to validate nesting of xmlrpc elements

+    $GLOBALS['_xh']=null;

+

+    /**

+     * Convert a string to the correct XML representation in a target charset

+     * To help correct communication of non-ascii chars inside strings, regardless

+     * of the charset used when sending requests, parsing them, sending responses

+     * and parsing responses, an option is to convert all non-ascii chars present in the message

+     * into their equivalent 'charset entity'. Charset entities enumerated this way

+     * are independent of the charset encoding used to transmit them, and all XML

+     * parsers are bound to understand them.

+     * Note that in the std case we are not sending a charset encoding mime type

+     * along with http headers, so we are bound by RFC 3023 to emit strict us-ascii.

+     *

+     * @todo do a bit of basic benchmarking (strtr vs. str_replace)

+     * @todo	make usage of iconv() or recode_string() or mb_string() where available

+     */

+    function xmlrpc_encode_entitites($data, $src_encoding='', $dest_encoding='')

+    {

+        if ($src_encoding == '')

+        {

+            // lame, but we know no better...

+            $src_encoding = $GLOBALS['xmlrpc_internalencoding'];

+        }

+

+        switch(strtoupper($src_encoding.'_'.$dest_encoding))

+        {

+            case 'ISO-8859-1_':

+            case 'ISO-8859-1_US-ASCII':

+                $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);

+                $escaped_data = str_replace($GLOBALS['xml_iso88591_Entities']['in'], $GLOBALS['xml_iso88591_Entities']['out'], $escaped_data);

+                break;

+            case 'ISO-8859-1_UTF-8':

+                $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);

+                $escaped_data = utf8_encode($escaped_data);

+                break;

+            case 'ISO-8859-1_ISO-8859-1':

+            case 'US-ASCII_US-ASCII':

+            case 'US-ASCII_UTF-8':

+            case 'US-ASCII_':

+            case 'US-ASCII_ISO-8859-1':

+            case 'UTF-8_UTF-8':

+            //case 'CP1252_CP1252':

+                $escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);

+                break;

+            case 'UTF-8_':

+            case 'UTF-8_US-ASCII':

+            case 'UTF-8_ISO-8859-1':

+    // NB: this will choke on invalid UTF-8, going most likely beyond EOF

+    $escaped_data = '';

+    // be kind to users creating string xmlrpcvals out of different php types

+    $data = (string) $data;

+    $ns = strlen ($data);

+    for ($nn = 0; $nn < $ns; $nn++)

+    {

+        $ch = $data[$nn];

+        $ii = ord($ch);

+        //1 7 0bbbbbbb (127)

+        if ($ii < 128)

+        {

+            /// @todo shall we replace this with a (supposedly) faster str_replace?

+            switch($ii){

+                case 34:

+                    $escaped_data .= '&quot;';

+                    break;

+                case 38:

+                    $escaped_data .= '&amp;';

+                    break;

+                case 39:

+                    $escaped_data .= '&apos;';

+                    break;

+                case 60:

+                    $escaped_data .= '&lt;';

+                    break;

+                case 62:

+                    $escaped_data .= '&gt;';

+                    break;

+                default:

+                    $escaped_data .= $ch;

+            } // switch

+        }

+        //2 11 110bbbbb 10bbbbbb (2047)

+        else if ($ii>>5 == 6)

+        {

+            $b1 = ($ii & 31);

+            $ii = ord($data[$nn+1]);

+            $b2 = ($ii & 63);

+            $ii = ($b1 * 64) + $b2;

+            $ent = sprintf ('&#%d;', $ii);

+            $escaped_data .= $ent;

+            $nn += 1;

+        }

+        //3 16 1110bbbb 10bbbbbb 10bbbbbb

+        else if ($ii>>4 == 14)

+        {

+            $b1 = ($ii & 15);

+            $ii = ord($data[$nn+1]);

+            $b2 = ($ii & 63);

+            $ii = ord($data[$nn+2]);

+            $b3 = ($ii & 63);

+            $ii = ((($b1 * 64) + $b2) * 64) + $b3;

+            $ent = sprintf ('&#%d;', $ii);

+            $escaped_data .= $ent;

+            $nn += 2;

+        }

+        //4 21 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb

+        else if ($ii>>3 == 30)

+        {

+            $b1 = ($ii & 7);

+            $ii = ord($data[$nn+1]);

+            $b2 = ($ii & 63);

+            $ii = ord($data[$nn+2]);

+            $b3 = ($ii & 63);

+            $ii = ord($data[$nn+3]);

+            $b4 = ($ii & 63);

+            $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;

+            $ent = sprintf ('&#%d;', $ii);

+            $escaped_data .= $ent;

+            $nn += 3;

+        }

+    }

+                break;

 /*

 			case 'CP1252_':

 			case 'CP1252_US-ASCII':

@@ -378,2443 +378,2443 @@ 
 				$escaped_data = str_replace($GLOBALS['xml_cp1252_Entities']['in'], $GLOBALS['xml_cp1252_Entities']['out'], $escaped_data);

 				break;

 */

-			default:

-				$escaped_data = '';

-				error_log("Converting from $src_encoding to $dest_encoding: not supported...");

-		}

-		return $escaped_data;

-	}

-

-	/// xml parser handler function for opening element tags

-	function xmlrpc_se($parser, $name, $attrs, $accept_single_vals=false)

-	{

-		// if invalid xmlrpc already detected, skip all processing

-		if ($GLOBALS['_xh']['isf'] < 2)

-		{

-			// check for correct element nesting

-			// top level element can only be of 2 types

-			/// @todo optimization creep: save this check into a bool variable, instead of using count() every time:

-			///       there is only a single top level element in xml anyway

-			if (count($GLOBALS['_xh']['stack']) == 0)

-			{

-				if ($name != 'METHODRESPONSE' && $name != 'METHODCALL' && (

-					$name != 'VALUE' && !$accept_single_vals))

-				{

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

-					$GLOBALS['_xh']['isf_reason'] = 'missing top level xmlrpc element';

-					return;

-				}

-				else

-				{

-					$GLOBALS['_xh']['rt'] = strtolower($name);

-					$GLOBALS['_xh']['rt'] = strtolower($name);

-				}

-			}

-			else

-			{

-				// not top level element: see if parent is OK

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

-				if (!array_key_exists($name, $GLOBALS['xmlrpc_valid_parents']) || !in_array($parent, $GLOBALS['xmlrpc_valid_parents'][$name]))

-				{

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

-					$GLOBALS['_xh']['isf_reason'] = "xmlrpc element $name cannot be child of $parent";

-					return;

-				}

-			}

-

-			switch($name)

-			{

-				// optimize for speed switch cases: most common cases first

-				case 'VALUE':

-					/// @todo we could check for 2 VALUE elements inside a MEMBER or PARAM element

-					$GLOBALS['_xh']['vt']='value'; // indicator: no value found yet

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

-					$GLOBALS['_xh']['lv']=1;

-					$GLOBALS['_xh']['php_class']=null;

-					break;

-				case 'I4':

-				case 'INT':

-				case 'STRING':

-				case 'BOOLEAN':

-				case 'DOUBLE':

-				case 'DATETIME.ISO8601':

-				case 'BASE64':

-					if ($GLOBALS['_xh']['vt']!='value')

-					{

-						//two data elements inside a value: an error occurred!

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

-						$GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";

-						return;

-					}

-					$GLOBALS['_xh']['ac']=''; // reset the accumulator

-					break;

-				case 'STRUCT':

-				case 'ARRAY':

-					if ($GLOBALS['_xh']['vt']!='value')

-					{

-						//two data elements inside a value: an error occurred!

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

-						$GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";

-						return;

-					}

-					// create an empty array to hold child values, and push it onto appropriate stack

-					$cur_val = array();

-					$cur_val['values'] = array();

-					$cur_val['type'] = $name;

-					// check for out-of-band information to rebuild php objs

-					// and in case it is found, save it

-					if (@isset($attrs['PHP_CLASS']))

-					{

-						$cur_val['php_class'] = $attrs['PHP_CLASS'];

-					}

-					$GLOBALS['_xh']['valuestack'][] = $cur_val;

-					$GLOBALS['_xh']['vt']='data'; // be prepared for a data element next

-					break;

-				case 'DATA':

-					if ($GLOBALS['_xh']['vt']!='data')

-					{

-						//two data elements inside a value: an error occurred!

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

-						$GLOBALS['_xh']['isf_reason'] = "found two data elements inside an array element";

-						return;

-					}

-				case 'METHODCALL':

-				case 'METHODRESPONSE':

-				case 'PARAMS':

-					// valid elements that add little to processing

-					break;

-				case 'METHODNAME':

-				case 'NAME':

-					/// @todo we could check for 2 NAME elements inside a MEMBER element

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

-					break;

-				case 'FAULT':

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

-					break;

-				case 'MEMBER':

-					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name']=''; // set member name to null, in case we do not find in the xml later on

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

-					// Drop trough intentionally

-				case 'PARAM':

-					// clear value type, so we can check later if no value has been passed for this param/member

-					$GLOBALS['_xh']['vt']=null;

-					break;

-				case 'NIL':

-				case 'EX:NIL':

-					if ($GLOBALS['xmlrpc_null_extension'])

-					{

-						if ($GLOBALS['_xh']['vt']!='value')

-						{

-							//two data elements inside a value: an error occurred!

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

-							$GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";

-							return;

-						}

-						$GLOBALS['_xh']['ac']=''; // reset the accumulator

-						break;

-					}

-					// we do not support the <NIL/> extension, so

-					// drop through intentionally

-				default:

-					/// INVALID ELEMENT: RAISE ISF so that it is later recognized!!!

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

-					$GLOBALS['_xh']['isf_reason'] = "found not-xmlrpc xml element $name";

-					break;

-			}

-

-			// Save current element name to stack, to validate nesting

-			$GLOBALS['_xh']['stack'][] = $name;

-

-			/// @todo optimization creep: move this inside the big switch() above

-			if($name!='VALUE')

-			{

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

-			}

-		}

-	}

-

-	/// Used in decoding xml chunks that might represent single xmlrpc values

-	function xmlrpc_se_any($parser, $name, $attrs)

-	{

-		xmlrpc_se($parser, $name, $attrs, true);

-	}

-

-	/// xml parser handler function for close element tags

-	function xmlrpc_ee($parser, $name, $rebuild_xmlrpcvals = true)

-	{

-		if ($GLOBALS['_xh']['isf'] < 2)

-		{

-			// push this element name from stack

-			// NB: if XML validates, correct opening/closing is guaranteed and

-			// we do not have to check for $name == $curr_elem.

-			// we also checked for proper nesting at start of elements...

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

-

-			switch($name)

-			{

-				case 'VALUE':

-					// This if() detects if no scalar was inside <VALUE></VALUE>

-					if ($GLOBALS['_xh']['vt']=='value')

-					{

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

-						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcString'];

-					}

-

-					if ($rebuild_xmlrpcvals)

-					{

-						// build the xmlrpc val out of the data received, and substitute it

-						$temp = new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']);

-						// in case we got info about underlying php class, save it

-						// in the object we're rebuilding

-						if (isset($GLOBALS['_xh']['php_class']))

-							$temp->_php_class = $GLOBALS['_xh']['php_class'];

-						// check if we are inside an array or struct:

-						// if value just built is inside an array, let's move it into array on the stack

-						$vscount = count($GLOBALS['_xh']['valuestack']);

-						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')

-						{

-							$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $temp;

-						}

-						else

-						{

-							$GLOBALS['_xh']['value'] = $temp;

-						}

-					}

-					else

-					{

-						/// @todo this needs to treat correctly php-serialized objects,

-						/// since std deserializing is done by php_xmlrpc_decode,

-						/// which we will not be calling...

-						if (isset($GLOBALS['_xh']['php_class']))

-						{

-						}

-

-						// check if we are inside an array or struct:

-						// if value just built is inside an array, let's move it into array on the stack

-						$vscount = count($GLOBALS['_xh']['valuestack']);

-						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')

-						{

-							$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $GLOBALS['_xh']['value'];

-						}

-					}

-					break;

-				case 'BOOLEAN':

-				case 'I4':

-				case 'INT':

-				case 'STRING':

-				case 'DOUBLE':

-				case 'DATETIME.ISO8601':

-				case 'BASE64':

-					$GLOBALS['_xh']['vt']=strtolower($name);

-					/// @todo: optimization creep - remove the if/elseif cycle below

-					/// since the case() in which we are already did that

-					if ($name=='STRING')

-					{

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

-					}

-					elseif ($name=='DATETIME.ISO8601')

-					{

-						if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac']))

-						{

-							error_log('XML-RPC: invalid value received in DATETIME: '.$GLOBALS['_xh']['ac']);

-						}

-						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];

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

-					}

-					elseif ($name=='BASE64')

-					{

-						/// @todo check for failure of base64 decoding / catch warnings

-						$GLOBALS['_xh']['value']=base64_decode($GLOBALS['_xh']['ac']);

-					}

-					elseif ($name=='BOOLEAN')

-					{

-						// special case here: we translate boolean 1 or 0 into PHP

-						// constants true or false.

-						// Strings 'true' and 'false' are accepted, even though the

-						// spec never mentions them (see eg. Blogger api docs)

-						// NB: this simple checks helps a lot sanitizing input, ie no

-						// security problems around here

-						if ($GLOBALS['_xh']['ac']=='1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)

-						{

-							$GLOBALS['_xh']['value']=true;

-						}

-						else

-						{

-							// log if receiveing something strange, even though we set the value to false anyway

-							if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0)

-								error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);

-							$GLOBALS['_xh']['value']=false;

-						}

-					}

-					elseif ($name=='DOUBLE')

-					{

-						// we have a DOUBLE

-						// we must check that only 0123456789-.<space> are characters here

-						// NOTE: regexp could be much stricter than this...

-						if (!preg_match('/^[+-eE0123456789 \t.]+$/', $GLOBALS['_xh']['ac']))

-						{

-							/// @todo: find a better way of throwing an error than this!

-							error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);

-							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';

-						}

-						else

-						{

-							// it's ok, add it on

-							$GLOBALS['_xh']['value']=(double)$GLOBALS['_xh']['ac'];

-						}

-					}

-					else

-					{

-						// we have an I4/INT

-						// we must check that only 0123456789-<space> are characters here

-						if (!preg_match('/^[+-]?[0123456789 \t]+$/', $GLOBALS['_xh']['ac']))

-						{

-							/// @todo find a better way of throwing an error than this!

-							error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);

-							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';

-						}

-						else

-						{

-							// it's ok, add it on

-							$GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];

-						}

-					}

-					//$GLOBALS['_xh']['ac']=''; // is this necessary?

-					$GLOBALS['_xh']['lv']=3; // indicate we've found a value

-					break;

-				case 'NAME':

-					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name'] = $GLOBALS['_xh']['ac'];

-					break;

-				case 'MEMBER':

-					//$GLOBALS['_xh']['ac']=''; // is this necessary?

-					// add to array in the stack the last element built,

-					// unless no VALUE was found

-					if ($GLOBALS['_xh']['vt'])

-					{

-						$vscount = count($GLOBALS['_xh']['valuestack']);

-						$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][$GLOBALS['_xh']['valuestack'][$vscount-1]['name']] = $GLOBALS['_xh']['value'];

-					} else

-						error_log('XML-RPC: missing VALUE inside STRUCT in received xml');

-					break;

-				case 'DATA':

-					//$GLOBALS['_xh']['ac']=''; // is this necessary?

-					$GLOBALS['_xh']['vt']=null; // reset this to check for 2 data elements in a row - even if they're empty

-					break;

-				case 'STRUCT':

-				case 'ARRAY':

-					// fetch out of stack array of values, and promote it to current value

-					$curr_val = array_pop($GLOBALS['_xh']['valuestack']);

-					$GLOBALS['_xh']['value'] = $curr_val['values'];

-					$GLOBALS['_xh']['vt']=strtolower($name);

-					if (isset($curr_val['php_class']))

-					{

-						$GLOBALS['_xh']['php_class'] = $curr_val['php_class'];

-					}

-					break;

-				case 'PARAM':

-					// add to array of params the current value,

-					// unless no VALUE was found

-					if ($GLOBALS['_xh']['vt'])

-					{

-						$GLOBALS['_xh']['params'][]=$GLOBALS['_xh']['value'];

-						$GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];

-					}

-					else

-						error_log('XML-RPC: missing VALUE inside PARAM in received xml');

-					break;

-				case 'METHODNAME':

-					$GLOBALS['_xh']['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);

-					break;

-				case 'NIL':

-				case 'EX:NIL':

-					if ($GLOBALS['xmlrpc_null_extension'])

-					{

-						$GLOBALS['_xh']['vt']='null';

-						$GLOBALS['_xh']['value']=null;

-						$GLOBALS['_xh']['lv']=3;

-						break;

-					}

-					// drop through intentionally if nil extension not enabled

-				case 'PARAMS':

-				case 'FAULT':

-				case 'METHODCALL':

-				case 'METHORESPONSE':

-					break;

-				default:

-					// End of INVALID ELEMENT!

-					// shall we add an assert here for unreachable code???

-					break;

-			}

-		}

-	}

-

-	/// Used in decoding xmlrpc requests/responses without rebuilding xmlrpc values

-	function xmlrpc_ee_fast($parser, $name)

-	{

-		xmlrpc_ee($parser, $name, false);

-	}

-

-	/// xml parser handler function for character data

-	function xmlrpc_cd($parser, $data)

-	{

-		// skip processing if xml fault already detected

-		if ($GLOBALS['_xh']['isf'] < 2)

-		{

-			// "lookforvalue==3" means that we've found an entire value

-			// and should discard any further character data

-			if($GLOBALS['_xh']['lv']!=3)

-			{

-				// G. Giunta 2006-08-23: useless change of 'lv' from 1 to 2

-				//if($GLOBALS['_xh']['lv']==1)

-				//{

-					// if we've found text and we're just in a <value> then

-					// say we've found a value

-					//$GLOBALS['_xh']['lv']=2;

-				//}

-				// we always initialize the accumulator before starting parsing, anyway...

-				//if(!@isset($GLOBALS['_xh']['ac']))

-				//{

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

-				//}

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

-			}

-		}

-	}

-

-	/// xml parser handler function for 'other stuff', ie. not char data or

-	/// element start/end tag. In fact it only gets called on unknown entities...

-	function xmlrpc_dh($parser, $data)

-	{

-		// skip processing if xml fault already detected

-		if ($GLOBALS['_xh']['isf'] < 2)

-		{

-			if(substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')

-			{

-				// G. Giunta 2006-08-25: useless change of 'lv' from 1 to 2

-				//if($GLOBALS['_xh']['lv']==1)

-				//{

-				//	$GLOBALS['_xh']['lv']=2;

-				//}

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

-			}

-		}

-		return true;

-	}

-

-	class xmlrpc_client

-	{

-		var $path;

-		var $server;

-		var $port=0;

-		var $method='http';

-		var $errno;

-		var $errstr;

-		var $debug=0;

-		var $username='';

-		var $password='';

-		var $authtype=1;

-		var $cert='';

-		var $certpass='';

-		var $cacert='';

-		var $cacertdir='';

-		var $key='';

-		var $keypass='';

-		var $verifypeer=true;

-		var $verifyhost=1;

-		var $no_multicall=false;

-		var $proxy='';

-		var $proxyport=0;

-		var $proxy_user='';

-		var $proxy_pass='';

-		var $proxy_authtype=1;

-		var $cookies=array();

-		var $extracurlopts=array();

-

-		/**

-		* List of http compression methods accepted by the client for responses.

-		* NB: PHP supports deflate, gzip compressions out of the box if compiled w. zlib

-		*

-		* NNB: you can set it to any non-empty array for HTTP11 and HTTPS, since

-		* in those cases it will be up to CURL to decide the compression methods

-		* it supports. You might check for the presence of 'zlib' in the output of

-		* curl_version() to determine wheter compression is supported or not

-		*/

-		var $accepted_compression = array();

-		/**

-		* Name of compression scheme to be used for sending requests.

-		* Either null, gzip or deflate

-		*/

-		var $request_compression = '';

-		/**

-		* CURL handle: used for keep-alive connections (PHP 4.3.8 up, see:

-		* http://curl.haxx.se/docs/faq.html#7.3)

-		*/

-		var $xmlrpc_curl_handle = null;

-		/// Whether to use persistent connections for http 1.1 and https

-		var $keepalive = false;

-		/// Charset encodings that can be decoded without problems by the client

-		var $accepted_charset_encodings = array();

-		/// Charset encoding to be used in serializing request. NULL = use ASCII

-		var $request_charset_encoding = '';

-		/**

-		* Decides the content of xmlrpcresp objects returned by calls to send()

-		* valid strings are 'xmlrpcvals', 'phpvals' or 'xml'

-		*/

-		var $return_type = 'xmlrpcvals';

-		/**

-		* Sent to servers in http headers

-		*/

-		var $user_agent;

-

-		/**

-		* @param string $path either the complete server URL or the PATH part of the xmlrc server URL, e.g. /xmlrpc/server.php

-		* @param string $server the server name / ip address

-		* @param integer $port the port the server is listening on, defaults to 80 or 443 depending on protocol used

-		* @param string $method the http protocol variant: defaults to 'http', 'https' and 'http11' can be used if CURL is installed

-		*/

-		function __construct($path, $server='', $port='', $method='')

-		{

-			// allow user to specify all params in $path

-			if($server == '' and $port == '' and $method == '')

-			{

-				$parts = parse_url($path);

-				$server = $parts['host'];

-				$path = isset($parts['path']) ? $parts['path'] : '';

-				if(isset($parts['query']))

-				{

-					$path .= '?'.$parts['query'];

-				}

-				if(isset($parts['fragment']))

-				{

-					$path .= '#'.$parts['fragment'];

-				}

-				if(isset($parts['port']))

-				{

-					$port = $parts['port'];

-				}

-				if(isset($parts['scheme']))

-				{

-					$method = $parts['scheme'];

-				}

-				if(isset($parts['user']))

-				{

-					$this->username = $parts['user'];

-				}

-				if(isset($parts['pass']))

-				{

-					$this->password = $parts['pass'];

-				}

-			}

-			if($path == '' || $path[0] != '/')

-			{

-				$this->path='/'.$path;

-			}

-			else

-			{

-				$this->path=$path;

-			}

-			$this->server=$server;

-			if($port != '')

-			{

-				$this->port=$port;

-			}

-			if($method != '')

-			{

-				$this->method=$method;

-			}

-

-			// if ZLIB is enabled, let the client by default accept compressed responses

-			if(function_exists('gzinflate') || (

-				function_exists('curl_init') && (($info = curl_version()) &&

-				((is_string($info) && strpos($info, 'zlib') !== null) || isset($info['libz_version'])))

-			))

-			{

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

-			}

-

-			// keepalives: enabled by default

-			$this->keepalive = true;

-

-			// by default the xml parser can support these 3 charset encodings

-			$this->accepted_charset_encodings = array('UTF-8', 'ISO-8859-1', 'US-ASCII');

-

-			// initialize user_agent string

-			$this->user_agent = $GLOBALS['xmlrpcName'] . ' ' . $GLOBALS['xmlrpcVersion'];

-		}

-

-		/**

-		* @deprecated

-		*/

-		function xmlrpc_client($path, $server='', $port='', $method='')

-		{

-			self::__construct($path, $server, $port, $method);

-		}

-

-		/**

-		* Enables/disables the echoing to screen of the xmlrpc responses received

-		* @param integer $in values 0, 1 and 2 are supported (2 = echo sent msg too, before received response)

-		* @access public

-		*/

-		function setDebug($in)

-		{

-			$this->debug=$in;

-		}

-

-		/**

-		* Add some http BASIC AUTH credentials, used by the client to authenticate

-		* @param string $u username

-		* @param string $p password

-		* @param integer $t auth type. See curl_setopt man page for supported auth types. Defaults to CURLAUTH_BASIC (basic auth)

-		* @access public

-		*/

-		function setCredentials($u, $p, $t=1)

-		{

-			$this->username=$u;

-			$this->password=$p;

-			$this->authtype=$t;

-		}

-

-		/**

-		* Add a client-side https certificate

-		* @param string $cert

-		* @param string $certpass

-		* @access public

-		*/

-		function setCertificate($cert, $certpass)

-		{

-			$this->cert = $cert;

-			$this->certpass = $certpass;

-		}

-

-		/**

-		* Add a CA certificate to verify server with (see man page about

-		* CURLOPT_CAINFO for more details)

-		* @param string $cacert certificate file name (or dir holding certificates)

-		* @param bool $is_dir set to true to indicate cacert is a dir. defaults to false

-		* @access public

-		*/

-		function setCaCertificate($cacert, $is_dir=false)

-		{

-			if ($is_dir)

-			{

-				$this->cacertdir = $cacert;

-			}

-			else

-			{

-				$this->cacert = $cacert;

-			}

-		}

-

-		/**

-		* Set attributes for SSL communication: private SSL key

-		* NB: does not work in older php/curl installs

-		* Thanks to Daniel Convissor

-		* @param string $key The name of a file containing a private SSL key

-		* @param string $keypass The secret password needed to use the private SSL key

-		* @access public

-		*/

-		function setKey($key, $keypass)

-		{

-			$this->key = $key;

-			$this->keypass = $keypass;

-		}

-

-		/**

-		* Set attributes for SSL communication: verify server certificate

-		* @param bool $i enable/disable verification of peer certificate

-		* @access public

-		*/

-		function setSSLVerifyPeer($i)

-		{

-			$this->verifypeer = $i;

-		}

-

-		/**

-		* Set attributes for SSL communication: verify match of server cert w. hostname

-		* @param int $i

-		* @access public

-		*/

-		function setSSLVerifyHost($i)

-		{

-			$this->verifyhost = $i;

-		}

-

-		/**

-		* Set proxy info

-		* @param string $proxyhost

-		* @param string $proxyport Defaults to 8080 for HTTP and 443 for HTTPS

-		* @param string $proxyusername Leave blank if proxy has public access

-		* @param string $proxypassword Leave blank if proxy has public access

-		* @param int $proxyauthtype set to constant CURLAUTH_NTLM to use NTLM auth with proxy

-		* @access public

-		*/

-		function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 1)

-		{

-			$this->proxy = $proxyhost;

-			$this->proxyport = $proxyport;

-			$this->proxy_user = $proxyusername;

-			$this->proxy_pass = $proxypassword;

-			$this->proxy_authtype = $proxyauthtype;

-		}

-

-		/**

-		* Enables/disables reception of compressed xmlrpc responses.

-		* Note that enabling reception of compressed responses merely adds some standard

-		* http headers to xmlrpc requests. It is up to the xmlrpc server to return

-		* compressed responses when receiving such requests.

-		* @param string $compmethod either 'gzip', 'deflate', 'any' or ''

-		* @access public

-		*/

-		function setAcceptedCompression($compmethod)

-		{

-			if ($compmethod == 'any')

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

-			else

-				if ($compmethod == false )

-					$this->accepted_compression = array();

-				else

-					$this->accepted_compression = array($compmethod);

-		}

-

-		/**

-		* Enables/disables http compression of xmlrpc request.

-		* Take care when sending compressed requests: servers might not support them

-		* (and automatic fallback to uncompressed requests is not yet implemented)

-		* @param string $compmethod either 'gzip', 'deflate' or ''

-		* @access public

-		*/

-		function setRequestCompression($compmethod)

-		{

-			$this->request_compression = $compmethod;

-		}

-

-		/**

-		* Adds a cookie to list of cookies that will be sent to server.

-		* NB: setting any param but name and value will turn the cookie into a 'version 1' cookie:

-		* do not do it unless you know what you are doing

-		* @param string $name

-		* @param string $value

-		* @param string $path

-		* @param string $domain

-		* @param int $port

-		* @access public

-		*

-		* @todo check correctness of urlencoding cookie value (copied from php way of doing it...)

-		*/

-		function setCookie($name, $value='', $path='', $domain='', $port=null)

-		{

-			$this->cookies[$name]['value'] = urlencode($value);

-			if ($path || $domain || $port)

-			{

-				$this->cookies[$name]['path'] = $path;

-				$this->cookies[$name]['domain'] = $domain;

-				$this->cookies[$name]['port'] = $port;

-				$this->cookies[$name]['version'] = 1;

-			}

-			else

-			{

-				$this->cookies[$name]['version'] = 0;

-			}

-		}

-

-		/**

-		* Directly set cURL options, for extra flexibility

-		* It allows eg. to bind client to a specific IP interface / address

-		* @param array $options

-		*/

-		function SetCurlOptions( $options )

-		{

-			$this->extracurlopts = $options;

-		}

-

-		/**

-		* Set user-agent string that will be used by this client instance

-		* in http headers sent to the server

-		*/

-		function SetUserAgent( $agentstring )

-		{

-			$this->user_agent = $agentstring;

-		}

-

-		/**

-		* Send an xmlrpc request

-		* @param mixed $msg The message object, or an array of messages for using multicall, or the complete xml representation of a request

-		* @param integer $timeout Connection timeout, in seconds, If unspecified, a platform specific timeout will apply

-		* @param string $method if left unspecified, the http protocol chosen during creation of the object will be used

-		* @return xmlrpcresp

-		* @access public

-		*/

-		function& send($msg, $timeout=0, $method='')

-		{

-			// if user deos not specify http protocol, use native method of this client

-			// (i.e. method set during call to constructor)

-			if($method == '')

-			{

-				$method = $this->method;

-			}

-

-			if(is_array($msg))

-			{

-				// $msg is an array of xmlrpcmsg's

-				$r = $this->multicall($msg, $timeout, $method);

-				return $r;

-			}

-			elseif(is_string($msg))

-			{

-				$n = new xmlrpcmsg('');

-				$n->payload = $msg;

-				$msg = $n;

-			}

-

-			// where msg is an xmlrpcmsg

-			$msg->debug=$this->debug;

-

-			if($method == 'https')

-			{

-				$r =& $this->sendPayloadHTTPS(

-					$msg,

-					$this->server,

-					$this->port,

-					$timeout,

-					$this->username,

-					$this->password,

-					$this->authtype,

-					$this->cert,

-					$this->certpass,

-					$this->cacert,

-					$this->cacertdir,

-					$this->proxy,

-					$this->proxyport,

-					$this->proxy_user,

-					$this->proxy_pass,

-					$this->proxy_authtype,

-					$this->keepalive,

-					$this->key,

-					$this->keypass

-				);

-			}

-			elseif($method == 'http11')

-			{

-				$r =& $this->sendPayloadCURL(

-					$msg,

-					$this->server,

-					$this->port,

-					$timeout,

-					$this->username,

-					$this->password,

-					$this->authtype,

-					null,

-					null,

-					null,

-					null,

-					$this->proxy,

-					$this->proxyport,

-					$this->proxy_user,

-					$this->proxy_pass,

-					$this->proxy_authtype,

-					'http',

-					$this->keepalive

-				);

-			}

-			else

-			{

-				$r =& $this->sendPayloadHTTP10(

-					$msg,

-					$this->server,

-					$this->port,

-					$timeout,

-					$this->username,

-					$this->password,

-					$this->authtype,

-					$this->proxy,

-					$this->proxyport,

-					$this->proxy_user,

-					$this->proxy_pass,

-					$this->proxy_authtype

-				);

-			}

-

-			return $r;

-		}

-

-		/**

-		* @access private

-		*/

-		function &sendPayloadHTTP10($msg, $server, $port, $timeout=0,

-			$username='', $password='', $authtype=1, $proxyhost='',

-			$proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1)

-		{

-			if($port==0)

-			{

-				$port=80;

-			}

-

-			// Only create the payload if it was not created previously

-			if(empty($msg->payload))

-			{

-				$msg->createPayload($this->request_charset_encoding);

-			}

-

-			$payload = $msg->payload;

-			// Deflate request body and set appropriate request headers

-			if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))

-			{

-				if($this->request_compression == 'gzip')

-				{

-					$a = @gzencode($payload);

-					if($a)

-					{

-						$payload = $a;

-						$encoding_hdr = "Content-Encoding: gzip\r\n";

-					}

-				}

-				else

-				{

-					$a = @gzcompress($payload);

-					if($a)

-					{

-						$payload = $a;

-						$encoding_hdr = "Content-Encoding: deflate\r\n";

-					}

-				}

-			}

-			else

-			{

-				$encoding_hdr = '';

-			}

-

-			// thanks to Grant Rauscher <grant7@firstworld.net> for this

-			$credentials='';

-			if($username!='')

-			{

-				$credentials='Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";

-				if ($authtype != 1)

-				{

-					error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');

-				}

-			}

-

-			$accepted_encoding = '';

-			if(is_array($this->accepted_compression) && count($this->accepted_compression))

-			{

-				$accepted_encoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";

-			}

-

-			$proxy_credentials = '';

-			if($proxyhost)

-			{

-				if($proxyport == 0)

-				{

-					$proxyport = 8080;

-				}

-				$connectserver = $proxyhost;

-				$connectport = $proxyport;

-				$uri = 'http://'.$server.':'.$port.$this->path;

-				if($proxyusername != '')

-				{

-					if ($proxyauthtype != 1)

-					{

-						error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');

-					}

-					$proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";

-				}

-			}

-			else

-			{

-				$connectserver = $server;

-				$connectport = $port;

-				$uri = $this->path;

-			}

-

-			// Cookie generation, as per rfc2965 (version 1 cookies) or

-			// netscape's rules (version 0 cookies)

-			$cookieheader='';

-			if (count($this->cookies))

-			{

-				$version = '';

-				foreach ($this->cookies as $name => $cookie)

-				{

-					if ($cookie['version'])

-					{

-						$version = ' $Version="' . $cookie['version'] . '";';

-						$cookieheader .= ' ' . $name . '="' . $cookie['value'] . '";';

-						if ($cookie['path'])

-							$cookieheader .= ' $Path="' . $cookie['path'] . '";';

-						if ($cookie['domain'])

-							$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';

-						if ($cookie['port'])

-							$cookieheader .= ' $Port="' . $cookie['port'] . '";';

-					}

-					else

-					{

-						$cookieheader .= ' ' . $name . '=' . $cookie['value'] . ";";

-					}

-				}

-				$cookieheader = 'Cookie:' . $version . substr($cookieheader, 0, -1) . "\r\n";

-			}

-

-			// omit port if 80

-			$port = ($port == 80) ? '' : (':' . $port);

-

-			$op= 'POST ' . $uri. " HTTP/1.0\r\n" .

-				'User-Agent: ' . $this->user_agent . "\r\n" .

-				'Host: '. $server . $port . "\r\n" .

-				$credentials .

-				$proxy_credentials .

-				$accepted_encoding .

-				$encoding_hdr .

-				'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .

-				$cookieheader .

-				'Content-Type: ' . $msg->content_type . "\r\nContent-Length: " .

-				strlen($payload) . "\r\n\r\n" .

-				$payload;

-

-			if($this->debug > 1)

-			{

-				print "<PRE>\n---SENDING---\n" . htmlentities($op) . "\n---END---\n</PRE>";

-				// let the client see this now in case http times out...

-				flush();

-			}

-

-			if($timeout>0)

-			{

-				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);

-			}

-			else

-			{

-				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);

-			}

-			if($fp)

-			{

-				if($timeout>0 && function_exists('stream_set_timeout'))

-				{

-					stream_set_timeout($fp, $timeout);

-				}

-			}

-			else

-			{

-				$this->errstr='Connect error: '.$this->errstr;

-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');

-				return $r;

-			}

-

-			if(!fputs($fp, $op, strlen($op)))

-			{

-				fclose($fp);

-				$this->errstr='Write error';

-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);

-				return $r;

-			}

-			else

-			{

-				// reset errno and errstr on successful socket connection

-				$this->errstr = '';

-			}

-			// G. Giunta 2005/10/24: close socket before parsing.

-			// should yield slightly better execution times, and make easier recursive calls (e.g. to follow http redirects)

-			$ipd='';

-			do

-			{

-				// shall we check for $data === FALSE?

-				// as per the manual, it signals an error

-				$ipd.=fread($fp, 32768);

-			} while(!feof($fp));

-			fclose($fp);

-			$r =& $msg->parseResponse($ipd, false, $this->return_type);

-			return $r;

-

-		}

-

-		/**

-		* @access private

-		*/

-		function &sendPayloadHTTPS($msg, $server, $port, $timeout=0, $username='',

-			$password='', $authtype=1, $cert='',$certpass='', $cacert='', $cacertdir='',

-			$proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1,

-			$keepalive=false, $key='', $keypass='')

-		{

-			$r =& $this->sendPayloadCURL($msg, $server, $port, $timeout, $username,

-				$password, $authtype, $cert, $certpass, $cacert, $cacertdir, $proxyhost, $proxyport,

-				$proxyusername, $proxypassword, $proxyauthtype, 'https', $keepalive, $key, $keypass);

-			return $r;

-		}

-

-		/**

-		* Contributed by Justin Miller <justin@voxel.net>

-		* Requires curl to be built into PHP

-		* NB: CURL versions before 7.11.10 cannot use proxy to talk to https servers!

-		* @access private

-		*/

-		function &sendPayloadCURL($msg, $server, $port, $timeout=0, $username='',

-			$password='', $authtype=1, $cert='', $certpass='', $cacert='', $cacertdir='',

-			$proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1, $method='https',

-			$keepalive=false, $key='', $keypass='')

-		{

-			if(!function_exists('curl_init'))

-			{

-				$this->errstr='CURL unavailable on this install';

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

-				return $r;

-			}

-			if($method == 'https')

-			{

-				if(($info = curl_version()) &&

-					((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version']))))

-				{

-					$this->errstr='SSL unavailable on this install';

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

-					return $r;

-				}

-			}

-

-			if($port == 0)

-			{

-				if($method == 'http')

-				{

-					$port = 80;

-				}

-				else

-				{

-					$port = 443;

-				}

-			}

-

-			// Only create the payload if it was not created previously

-			if(empty($msg->payload))

-			{

-				$msg->createPayload($this->request_charset_encoding);

-			}

-

-			// Deflate request body and set appropriate request headers

-			$payload = $msg->payload;

-			if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))

-			{

-				if($this->request_compression == 'gzip')

-				{

-					$a = @gzencode($payload);

-					if($a)

-					{

-						$payload = $a;

-						$encoding_hdr = 'Content-Encoding: gzip';

-					}

-				}

-				else

-				{

-					$a = @gzcompress($payload);

-					if($a)

-					{

-						$payload = $a;

-						$encoding_hdr = 'Content-Encoding: deflate';

-					}

-				}

-			}

-			else

-			{

-				$encoding_hdr = '';

-			}

-

-			if($this->debug > 1)

-			{

-				print "<PRE>\n---SENDING---\n" . htmlentities($payload) . "\n---END---\n</PRE>";

-				// let the client see this now in case http times out...

-				flush();

-			}

-

-			if(!$keepalive || !$this->xmlrpc_curl_handle)

-			{

-				$curl = curl_init($method . '://' . $server . ':' . $port . $this->path);

-				if($keepalive)

-				{

-					$this->xmlrpc_curl_handle = $curl;

-				}

-			}

-			else

-			{

-				$curl = $this->xmlrpc_curl_handle;

-			}

-

-			// results into variable

-			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);

-

-			if($this->debug)

-			{

-				curl_setopt($curl, CURLOPT_VERBOSE, 1);

-			}

-			curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);

-			// required for XMLRPC: post the data

-			curl_setopt($curl, CURLOPT_POST, 1);

-			// the data

-			curl_setopt($curl, CURLOPT_POSTFIELDS, $payload);

-

-			// return the header too

-			curl_setopt($curl, CURLOPT_HEADER, 1);

-

-			// NB: if we set an empty string, CURL will add http header indicating

-			// ALL methods it is supporting. This is possibly a better option than

-			// letting the user tell what curl can / cannot do...

-			if(is_array($this->accepted_compression) && count($this->accepted_compression))

-			{

-				//curl_setopt($curl, CURLOPT_ENCODING, implode(',', $this->accepted_compression));

-				// empty string means 'any supported by CURL' (shall we catch errors in case CURLOPT_SSLKEY undefined ?)

-				if (count($this->accepted_compression) == 1)

-				{

-					curl_setopt($curl, CURLOPT_ENCODING, $this->accepted_compression[0]);

-				}

-				else

-					curl_setopt($curl, CURLOPT_ENCODING, '');

-			}

-			// extra headers

-			$headers = array('Content-Type: ' . $msg->content_type , 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));

-			// if no keepalive is wanted, let the server know it in advance

-			if(!$keepalive)

-			{

-				$headers[] = 'Connection: close';

-			}

-			// request compression header

-			if($encoding_hdr)

-			{

-				$headers[] = $encoding_hdr;

-			}

-

-			curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);

-			// timeout is borked

-			if($timeout)

-			{

-				curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);

-			}

-

-			if($username && $password)

-			{

-				curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);

-				if (defined('CURLOPT_HTTPAUTH'))

-				{

-					curl_setopt($curl, CURLOPT_HTTPAUTH, $authtype);

-				}

-				else if ($authtype != 1)

-				{

-					error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');

-				}

-			}

-

-			if($method == 'https')

-			{

-				// set cert file

-				if($cert)

-				{

-					curl_setopt($curl, CURLOPT_SSLCERT, $cert);

-				}

-				// set cert password

-				if($certpass)

-				{

-					curl_setopt($curl, CURLOPT_SSLCERTPASSWD, $certpass);

-				}

-				// whether to verify remote host's cert

-				curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifypeer);

-				// set ca certificates file/dir

-				if($cacert)

-				{

-					curl_setopt($curl, CURLOPT_CAINFO, $cacert);

-				}

-				if($cacertdir)

-				{

-					curl_setopt($curl, CURLOPT_CAPATH, $cacertdir);

-				}

-				// set key file (shall we catch errors in case CURLOPT_SSLKEY undefined ?)

-				if($key)

-				{

-					curl_setopt($curl, CURLOPT_SSLKEY, $key);

-				}

-				// set key password (shall we catch errors in case CURLOPT_SSLKEY undefined ?)

-				if($keypass)

-				{

-					curl_setopt($curl, CURLOPT_SSLKEYPASSWD, $keypass);

-				}

-

-				// Upgrade transparently to more stringent check for versions of php which do not support otherwise.

-				// Doing it in constructor would be cleaner; doing it here saves us a couple of function calls

-				if($this->verifyhost == 1 && $info = curl_version() && version_compare($info['version'], '7.28.1') >= 0)

-				{

-					$this->verifyhost = 2;

-				}

-				// whether to verify cert's common name (CN); 0 for no, 1 to verify that it exists, and 2 to verify that it matches the hostname used

-				curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, $this->verifyhost);

-			}

-

-			// proxy info

-			if($proxyhost)

-			{

-				if($proxyport == 0)

-				{

-					$proxyport = 8080; // NB: even for HTTPS, local connection is on port 8080

-				}

-				curl_setopt($curl, CURLOPT_PROXY, $proxyhost.':'.$proxyport);

-				//curl_setopt($curl, CURLOPT_PROXYPORT,$proxyport);

-				if($proxyusername)

-				{

-					curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyusername.':'.$proxypassword);

-					if (defined('CURLOPT_PROXYAUTH'))

-					{

-						curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyauthtype);

-					}

-					else if ($proxyauthtype != 1)

-					{

-						error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');

-					}

-				}

-			}

-

-			// NB: should we build cookie http headers by hand rather than let CURL do it?

-			// the following code does not honour 'expires', 'path' and 'domain' cookie attributes

-			// set to client obj the the user...

-			if (count($this->cookies))

-			{

-				$cookieheader = '';

-				foreach ($this->cookies as $name => $cookie)

-				{

-					$cookieheader .= $name . '=' . $cookie['value'] . '; ';

-				}

-				curl_setopt($curl, CURLOPT_COOKIE, substr($cookieheader, 0, -2));

-			}

-

-			foreach ($this->extracurlopts as $opt => $val)

-			{

-				curl_setopt($curl, $opt, $val);

-			}

-

-			$result = curl_exec($curl);

-

-			if ($this->debug > 1)

-			{

-				print "<PRE>\n---CURL INFO---\n";

-				foreach(curl_getinfo($curl) as $name => $val)

-				{

-					if (is_array($val))

-					{

-						$val = implode("\n", $val);

-					}

-					print $name . ': ' . htmlentities($val) . "\n";

-				}

-

-				print "---END---\n</PRE>";

-			}

-

-			if(!$result) /// @todo we should use a better check here - what if we get back '' or '0'?

-			{

-				$this->errstr='no response';

-				$resp=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl));

-				curl_close($curl);

-				if($keepalive)

-				{

-					$this->xmlrpc_curl_handle = null;

-				}

-			}

-			else

-			{

-				if(!$keepalive)

-				{

-					curl_close($curl);

-				}

-				$resp =& $msg->parseResponse($result, true, $this->return_type);

-				// if we got back a 302, we can not reuse the curl handle for later calls

-				if($resp->faultCode() == $GLOBALS['xmlrpcerr']['http_error'] && $keepalive)

-				{

-					curl_close($curl);

-					$this->xmlrpc_curl_handle = null;

-				}

-			}

-			return $resp;

-		}

-

-		/**

-		* Send an array of request messages and return an array of responses.

-		* Unless $this->no_multicall has been set to true, it will try first

-		* to use one single xmlrpc call to server method system.multicall, and

-		* revert to sending many successive calls in case of failure.

-		* This failure is also stored in $this->no_multicall for subsequent calls.

-		* Unfortunately, there is no server error code universally used to denote

-		* the fact that multicall is unsupported, so there is no way to reliably

-		* distinguish between that and a temporary failure.

-		* If you are sure that server supports multicall and do not want to

-		* fallback to using many single calls, set the fourth parameter to FALSE.

-		*

-		* NB: trying to shoehorn extra functionality into existing syntax has resulted

-		* in pretty much convoluted code...

-		*

-		* @param array $msgs an array of xmlrpcmsg objects

-		* @param integer $timeout connection timeout (in seconds)

-		* @param string $method the http protocol variant to be used

-		* @param boolean fallback When true, upon receiving an error during multicall, multiple single calls will be attempted

-		* @return array

-		* @access public

-		*/

-		function multicall($msgs, $timeout=0, $method='', $fallback=true)

-		{

-			if ($method == '')

-			{

-				$method = $this->method;

-			}

-			if(!$this->no_multicall)

-			{

-				$results = $this->_try_multicall($msgs, $timeout, $method);

-				if(is_array($results))

-				{

-					// System.multicall succeeded

-					return $results;

-				}

-				else

-				{

-					// either system.multicall is unsupported by server,

-					// or call failed for some other reason.

-					if ($fallback)

-					{

-						// Don't try it next time...

-						$this->no_multicall = true;

-					}

-					else

-					{

-						if (is_a($results, 'xmlrpcresp'))

-						{

-							$result = $results;

-						}

-						else

-						{

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

-						}

-					}

-				}

-			}

-			else

-			{

-				// override fallback, in case careless user tries to do two

-				// opposite things at the same time

-				$fallback = true;

-			}

-

-			$results = array();

-			if ($fallback)

-			{

-				// system.multicall is (probably) unsupported by server:

-				// emulate multicall via multiple requests

-				foreach($msgs as $msg)

-				{

-					$results[] =& $this->send($msg, $timeout, $method);

-				}

-			}

-			else

-			{

-				// user does NOT want to fallback on many single calls:

-				// since we should always return an array of responses,

-				// return an array with the same error repeated n times

-				foreach($msgs as $msg)

-				{

-					$results[] = $result;

-				}

-			}

-			return $results;

-		}

-

-		/**

-		* Attempt to boxcar $msgs via system.multicall.

-		* Returns either an array of xmlrpcreponses, an xmlrpc error response

-		* or false (when received response does not respect valid multicall syntax)

-		* @access private

-		*/

-		function _try_multicall($msgs, $timeout, $method)

-		{

-			// Construct multicall message

-			$calls = array();

-			foreach($msgs as $msg)

-			{

-				$call['methodName'] = new xmlrpcval($msg->method(),'string');

-				$numParams = $msg->getNumParams();

-				$params = array();

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

-				{

-					$params[$i] = $msg->getParam($i);

-				}

-				$call['params'] = new xmlrpcval($params, 'array');

-				$calls[] = new xmlrpcval($call, 'struct');

-			}

-			$multicall = new xmlrpcmsg('system.multicall');

-			$multicall->addParam(new xmlrpcval($calls, 'array'));

-

-			// Attempt RPC call

-			$result =& $this->send($multicall, $timeout, $method);

-

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

-			{

-				// call to system.multicall failed

-				return $result;

-			}

-

-			// Unpack responses.

-			$rets = $result->value();

-

-			if ($this->return_type == 'xml')

-			{

-					return $rets;

-			}

-			else if ($this->return_type == 'phpvals')

-			{

-				///@todo test this code branch...

-				$rets = $result->value();

-				if(!is_array($rets))

-				{

-					return false;		// bad return type from system.multicall

-				}

-				$numRets = count($rets);

-				if($numRets != count($msgs))

-				{

-					return false;		// wrong number of return values.

-				}

-

-				$response = array();

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

-				{

-					$val = $rets[$i];

-					if (!is_array($val)) {

-						return false;

-					}

-					switch(count($val))

-					{

-						case 1:

-							if(!isset($val[0]))

-							{

-								return false;		// Bad value

-							}

-							// Normal return value

-							$response[$i] = new xmlrpcresp($val[0], 0, '', 'phpvals');

-							break;

-						case 2:

-							///	@todo remove usage of @: it is apparently quite slow

-							$code = @$val['faultCode'];

-							if(!is_int($code))

-							{

-								return false;

-							}

-							$str = @$val['faultString'];

-							if(!is_string($str))

-							{

-								return false;

-							}

-							$response[$i] = new xmlrpcresp(0, $code, $str);

-							break;

-						default:

-							return false;

-					}

-				}

-				return $response;

-			}

-			else // return type == 'xmlrpcvals'

-			{

-				$rets = $result->value();

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

-				{

-					return false;		// bad return type from system.multicall

-				}

-				$numRets = $rets->arraysize();

-				if($numRets != count($msgs))

-				{

-					return false;		// wrong number of return values.

-				}

-

-				$response = array();

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

-				{

-					$val = $rets->arraymem($i);

-					switch($val->kindOf())

-					{

-						case 'array':

-							if($val->arraysize() != 1)

-							{

-								return false;		// Bad value

-							}

-							// Normal return value

-							$response[$i] = new xmlrpcresp($val->arraymem(0));

-							break;

-						case 'struct':

-							$code = $val->structmem('faultCode');

-							if($code->kindOf() != 'scalar' || $code->scalartyp() != 'int')

-							{

-								return false;

-							}

-							$str = $val->structmem('faultString');

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

-							{

-								return false;

-							}

-							$response[$i] = new xmlrpcresp(0, $code->scalarval(), $str->scalarval());

-							break;

-						default:

-							return false;

-					}

-				}

-				return $response;

-			}

-		}

-	} // end class xmlrpc_client

-

-	class xmlrpcresp

-	{

-		var $val = 0;

-		var $valtyp;

-		var $errno = 0;

-		var $errstr = '';

-		var $payload;

-		var $hdrs = array();

-		var $_cookies = array();

-		var $content_type = 'text/xml';

-		var $raw_data = '';

-

-		/**

-		* @param mixed $val either an xmlrpcval obj, a php value or the xml serialization of an xmlrpcval (a string)

-		* @param integer $fcode set it to anything but 0 to create an error response

-		* @param string $fstr the error string, in case of an error response

-		* @param string $valtyp either 'xmlrpcvals', 'phpvals' or 'xml'

-		*

-		* @todo add check that $val / $fcode / $fstr is of correct type???

-		* NB: as of now we do not do it, since it might be either an xmlrpcval or a plain

-		* php val, or a complete xml chunk, depending on usage of xmlrpc_client::send() inside which creator is called...

-		*/

-		function __construct($val, $fcode = 0, $fstr = '', $valtyp='')

-		{

-			if($fcode != 0)

-			{

-				// error response

-				$this->errno = $fcode;

-				$this->errstr = $fstr;

-				//$this->errstr = htmlspecialchars($fstr); // XXX: encoding probably shouldn't be done here; fix later.

-			}

-			else

-			{

-				// successful response

-				$this->val = $val;

-				if ($valtyp == '')

-				{

-					// user did not declare type of response value: try to guess it

-					if (is_object($this->val) && is_a($this->val, 'xmlrpcval'))

-					{

-						$this->valtyp = 'xmlrpcvals';

-					}

-					else if (is_string($this->val))

-					{

-						$this->valtyp = 'xml';

-

-					}

-					else

-					{

-						$this->valtyp = 'phpvals';

-					}

-				}

-				else

-				{

-					// user declares type of resp value: believe him

-					$this->valtyp = $valtyp;

-				}

-			}

-		}

-

-		/**

-		* @deprecated

-		*/

-		function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp='')

-		{

-			self::__construct($val, $fcode, $fstr, $valtyp);

-		}

-

-		/**

-		* Returns the error code of the response.

-		* @return integer the error code of this response (0 for not-error responses)

-		* @access public

-		*/

-		function faultCode()

-		{

-			return $this->errno;

-		}

-

-		/**

-		* Returns the error code of the response.

-		* @return string the error string of this response ('' for not-error responses)

-		* @access public

-		*/

-		function faultString()

-		{

-			return $this->errstr;

-		}

-

-		/**

-		* Returns the value received by the server.

-		* @return mixed the xmlrpcval object returned by the server. Might be an xml string or php value if the response has been created by specially configured xmlrpc_client objects

-		* @access public

-		*/

-		function value()

-		{

-			return $this->val;

-		}

-

-		/**

-		* Returns an array with the cookies received from the server.

-		* Array has the form: $cookiename => array ('value' => $val, $attr1 => $val1, $attr2 = $val2, ...)

-		* with attributes being e.g. 'expires', 'path', domain'.

-		* NB: cookies sent as 'expired' by the server (i.e. with an expiry date in the past)

-		* are still present in the array. It is up to the user-defined code to decide

-		* how to use the received cookies, and whether they have to be sent back with the next

-		* request to the server (using xmlrpc_client::setCookie) or not

-		* @return array array of cookies received from the server

-		* @access public

-		*/

-		function cookies()

-		{

-			return $this->_cookies;

-		}

-

-		/**

-		* Returns xml representation of the response. XML prologue not included

-		* @param string $charset_encoding the charset to be used for serialization. if null, US-ASCII is assumed

-		* @return string the xml representation of the response

-		* @access public

-		*/

-		function serialize($charset_encoding='')

-		{

-			if ($charset_encoding != '')

-				$this->content_type = 'text/xml; charset=' . $charset_encoding;

-			else

-				$this->content_type = 'text/xml';

-			if ($GLOBALS['xmlrpc_null_apache_encoding'])

-			{

-				$result = "<methodResponse xmlns:ex=\"".$GLOBALS['xmlrpc_null_apache_encoding_ns']."\">\n";

-			}

-			else

-			{

-			$result = "<methodResponse>\n";

-			}

-			if($this->errno)

-			{

-				// G. Giunta 2005/2/13: let non-ASCII response messages be tolerated by clients

-				// by xml-encoding non ascii chars

-				$result .= "<fault>\n" .

+            default:

+                $escaped_data = '';

+                error_log("Converting from $src_encoding to $dest_encoding: not supported...");

+        }

+        return $escaped_data;

+    }

+

+    /// xml parser handler function for opening element tags

+    function xmlrpc_se($parser, $name, $attrs, $accept_single_vals=false)

+    {

+        // if invalid xmlrpc already detected, skip all processing

+        if ($GLOBALS['_xh']['isf'] < 2)

+        {

+            // check for correct element nesting

+            // top level element can only be of 2 types

+            /// @todo optimization creep: save this check into a bool variable, instead of using count() every time:

+            ///       there is only a single top level element in xml anyway

+            if (count($GLOBALS['_xh']['stack']) == 0)

+            {

+                if ($name != 'METHODRESPONSE' && $name != 'METHODCALL' && (

+                    $name != 'VALUE' && !$accept_single_vals))

+                {

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

+                    $GLOBALS['_xh']['isf_reason'] = 'missing top level xmlrpc element';

+                    return;

+                }

+                else

+                {

+                    $GLOBALS['_xh']['rt'] = strtolower($name);

+                    $GLOBALS['_xh']['rt'] = strtolower($name);

+                }

+            }

+            else

+            {

+                // not top level element: see if parent is OK

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

+                if (!array_key_exists($name, $GLOBALS['xmlrpc_valid_parents']) || !in_array($parent, $GLOBALS['xmlrpc_valid_parents'][$name]))

+                {

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

+                    $GLOBALS['_xh']['isf_reason'] = "xmlrpc element $name cannot be child of $parent";

+                    return;

+                }

+            }

+

+            switch($name)

+            {

+                // optimize for speed switch cases: most common cases first

+                case 'VALUE':

+                    /// @todo we could check for 2 VALUE elements inside a MEMBER or PARAM element

+                    $GLOBALS['_xh']['vt']='value'; // indicator: no value found yet

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

+                    $GLOBALS['_xh']['lv']=1;

+                    $GLOBALS['_xh']['php_class']=null;

+                    break;

+                case 'I4':

+                case 'INT':

+                case 'STRING':

+                case 'BOOLEAN':

+                case 'DOUBLE':

+                case 'DATETIME.ISO8601':

+                case 'BASE64':

+                    if ($GLOBALS['_xh']['vt']!='value')

+                    {

+                        //two data elements inside a value: an error occurred!

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

+                        $GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";

+                        return;

+                    }

+                    $GLOBALS['_xh']['ac']=''; // reset the accumulator

+                    break;

+                case 'STRUCT':

+                case 'ARRAY':

+                    if ($GLOBALS['_xh']['vt']!='value')

+                    {

+                        //two data elements inside a value: an error occurred!

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

+                        $GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";

+                        return;

+                    }

+                    // create an empty array to hold child values, and push it onto appropriate stack

+                    $cur_val = array();

+                    $cur_val['values'] = array();

+                    $cur_val['type'] = $name;

+                    // check for out-of-band information to rebuild php objs

+                    // and in case it is found, save it

+                    if (@isset($attrs['PHP_CLASS']))

+                    {

+                        $cur_val['php_class'] = $attrs['PHP_CLASS'];

+                    }

+                    $GLOBALS['_xh']['valuestack'][] = $cur_val;

+                    $GLOBALS['_xh']['vt']='data'; // be prepared for a data element next

+                    break;

+                case 'DATA':

+                    if ($GLOBALS['_xh']['vt']!='data')

+                    {

+                        //two data elements inside a value: an error occurred!

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

+                        $GLOBALS['_xh']['isf_reason'] = "found two data elements inside an array element";

+                        return;

+                    }

+                case 'METHODCALL':

+                case 'METHODRESPONSE':

+                case 'PARAMS':

+                    // valid elements that add little to processing

+                    break;

+                case 'METHODNAME':

+                case 'NAME':

+                    /// @todo we could check for 2 NAME elements inside a MEMBER element

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

+                    break;

+                case 'FAULT':

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

+                    break;

+                case 'MEMBER':

+                    $GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name']=''; // set member name to null, in case we do not find in the xml later on

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

+                    // Drop trough intentionally

+                case 'PARAM':

+                    // clear value type, so we can check later if no value has been passed for this param/member

+                    $GLOBALS['_xh']['vt']=null;

+                    break;

+                case 'NIL':

+                case 'EX:NIL':

+                    if ($GLOBALS['xmlrpc_null_extension'])

+                    {

+                        if ($GLOBALS['_xh']['vt']!='value')

+                        {

+                            //two data elements inside a value: an error occurred!

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

+                            $GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";

+                            return;

+                        }

+                        $GLOBALS['_xh']['ac']=''; // reset the accumulator

+                        break;

+                    }

+                    // we do not support the <NIL/> extension, so

+                    // drop through intentionally

+                default:

+                    /// INVALID ELEMENT: RAISE ISF so that it is later recognized!!!

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

+                    $GLOBALS['_xh']['isf_reason'] = "found not-xmlrpc xml element $name";

+                    break;

+            }

+

+            // Save current element name to stack, to validate nesting

+            $GLOBALS['_xh']['stack'][] = $name;

+

+            /// @todo optimization creep: move this inside the big switch() above

+            if($name!='VALUE')

+            {

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

+            }

+        }

+    }

+

+    /// Used in decoding xml chunks that might represent single xmlrpc values

+    function xmlrpc_se_any($parser, $name, $attrs)

+    {

+        xmlrpc_se($parser, $name, $attrs, true);

+    }

+

+    /// xml parser handler function for close element tags

+    function xmlrpc_ee($parser, $name, $rebuild_xmlrpcvals = true)

+    {

+        if ($GLOBALS['_xh']['isf'] < 2)

+        {

+            // push this element name from stack

+            // NB: if XML validates, correct opening/closing is guaranteed and

+            // we do not have to check for $name == $curr_elem.

+            // we also checked for proper nesting at start of elements...

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

+

+            switch($name)

+            {

+                case 'VALUE':

+                    // This if() detects if no scalar was inside <VALUE></VALUE>

+                    if ($GLOBALS['_xh']['vt']=='value')

+                    {

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

+                        $GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcString'];

+                    }

+

+                    if ($rebuild_xmlrpcvals)

+                    {

+                        // build the xmlrpc val out of the data received, and substitute it

+                        $temp = new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']);

+                        // in case we got info about underlying php class, save it

+                        // in the object we're rebuilding

+                        if (isset($GLOBALS['_xh']['php_class']))

+                            $temp->_php_class = $GLOBALS['_xh']['php_class'];

+                        // check if we are inside an array or struct:

+                        // if value just built is inside an array, let's move it into array on the stack

+                        $vscount = count($GLOBALS['_xh']['valuestack']);

+                        if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')

+                        {

+                            $GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $temp;

+                        }

+                        else

+                        {

+                            $GLOBALS['_xh']['value'] = $temp;

+                        }

+                    }

+                    else

+                    {

+                        /// @todo this needs to treat correctly php-serialized objects,

+                        /// since std deserializing is done by php_xmlrpc_decode,

+                        /// which we will not be calling...

+                        if (isset($GLOBALS['_xh']['php_class']))

+                        {

+                        }

+

+                        // check if we are inside an array or struct:

+                        // if value just built is inside an array, let's move it into array on the stack

+                        $vscount = count($GLOBALS['_xh']['valuestack']);

+                        if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')

+                        {

+                            $GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $GLOBALS['_xh']['value'];

+                        }

+                    }

+                    break;

+                case 'BOOLEAN':

+                case 'I4':

+                case 'INT':

+                case 'STRING':

+                case 'DOUBLE':

+                case 'DATETIME.ISO8601':

+                case 'BASE64':

+                    $GLOBALS['_xh']['vt']=strtolower($name);

+                    /// @todo: optimization creep - remove the if/elseif cycle below

+                    /// since the case() in which we are already did that

+                    if ($name=='STRING')

+                    {

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

+                    }

+                    elseif ($name=='DATETIME.ISO8601')

+                    {

+                        if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac']))

+                        {

+                            error_log('XML-RPC: invalid value received in DATETIME: '.$GLOBALS['_xh']['ac']);

+                        }

+                        $GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];

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

+                    }

+                    elseif ($name=='BASE64')

+                    {

+                        /// @todo check for failure of base64 decoding / catch warnings

+                        $GLOBALS['_xh']['value']=base64_decode($GLOBALS['_xh']['ac']);

+                    }

+                    elseif ($name=='BOOLEAN')

+                    {

+                        // special case here: we translate boolean 1 or 0 into PHP

+                        // constants true or false.

+                        // Strings 'true' and 'false' are accepted, even though the

+                        // spec never mentions them (see eg. Blogger api docs)

+                        // NB: this simple checks helps a lot sanitizing input, ie no

+                        // security problems around here

+                        if ($GLOBALS['_xh']['ac']=='1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)

+                        {

+                            $GLOBALS['_xh']['value']=true;

+                        }

+                        else

+                        {

+                            // log if receiveing something strange, even though we set the value to false anyway

+                            if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0)

+                                error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);

+                            $GLOBALS['_xh']['value']=false;

+                        }

+                    }

+                    elseif ($name=='DOUBLE')

+                    {

+                        // we have a DOUBLE

+                        // we must check that only 0123456789-.<space> are characters here

+                        // NOTE: regexp could be much stricter than this...

+                        if (!preg_match('/^[+-eE0123456789 \t.]+$/', $GLOBALS['_xh']['ac']))

+                        {

+                            /// @todo: find a better way of throwing an error than this!

+                            error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);

+                            $GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';

+                        }

+                        else

+                        {

+                            // it's ok, add it on

+                            $GLOBALS['_xh']['value']=(double)$GLOBALS['_xh']['ac'];

+                        }

+                    }

+                    else

+                    {

+                        // we have an I4/INT

+                        // we must check that only 0123456789-<space> are characters here

+                        if (!preg_match('/^[+-]?[0123456789 \t]+$/', $GLOBALS['_xh']['ac']))

+                        {

+                            /// @todo find a better way of throwing an error than this!

+                            error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);

+                            $GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';

+                        }

+                        else

+                        {

+                            // it's ok, add it on

+                            $GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];

+                        }

+                    }

+                    //$GLOBALS['_xh']['ac']=''; // is this necessary?

+                    $GLOBALS['_xh']['lv']=3; // indicate we've found a value

+                    break;

+                case 'NAME':

+                    $GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name'] = $GLOBALS['_xh']['ac'];

+                    break;

+                case 'MEMBER':

+                    //$GLOBALS['_xh']['ac']=''; // is this necessary?

+                    // add to array in the stack the last element built,

+                    // unless no VALUE was found

+                    if ($GLOBALS['_xh']['vt'])

+                    {

+                        $vscount = count($GLOBALS['_xh']['valuestack']);

+                        $GLOBALS['_xh']['valuestack'][$vscount-1]['values'][$GLOBALS['_xh']['valuestack'][$vscount-1]['name']] = $GLOBALS['_xh']['value'];

+                    } else

+                        error_log('XML-RPC: missing VALUE inside STRUCT in received xml');

+                    break;

+                case 'DATA':

+                    //$GLOBALS['_xh']['ac']=''; // is this necessary?

+                    $GLOBALS['_xh']['vt']=null; // reset this to check for 2 data elements in a row - even if they're empty

+                    break;

+                case 'STRUCT':

+                case 'ARRAY':

+                    // fetch out of stack array of values, and promote it to current value

+                    $curr_val = array_pop($GLOBALS['_xh']['valuestack']);

+                    $GLOBALS['_xh']['value'] = $curr_val['values'];

+                    $GLOBALS['_xh']['vt']=strtolower($name);

+                    if (isset($curr_val['php_class']))

+                    {

+                        $GLOBALS['_xh']['php_class'] = $curr_val['php_class'];

+                    }

+                    break;

+                case 'PARAM':

+                    // add to array of params the current value,

+                    // unless no VALUE was found

+                    if ($GLOBALS['_xh']['vt'])

+                    {

+                        $GLOBALS['_xh']['params'][]=$GLOBALS['_xh']['value'];

+                        $GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];

+                    }

+                    else

+                        error_log('XML-RPC: missing VALUE inside PARAM in received xml');

+                    break;

+                case 'METHODNAME':

+                    $GLOBALS['_xh']['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);

+                    break;

+                case 'NIL':

+                case 'EX:NIL':

+                    if ($GLOBALS['xmlrpc_null_extension'])

+                    {

+                        $GLOBALS['_xh']['vt']='null';

+                        $GLOBALS['_xh']['value']=null;

+                        $GLOBALS['_xh']['lv']=3;

+                        break;

+                    }

+                    // drop through intentionally if nil extension not enabled

+                case 'PARAMS':

+                case 'FAULT':

+                case 'METHODCALL':

+                case 'METHORESPONSE':

+                    break;

+                default:

+                    // End of INVALID ELEMENT!

+                    // shall we add an assert here for unreachable code???

+                    break;

+            }

+        }

+    }

+

+    /// Used in decoding xmlrpc requests/responses without rebuilding xmlrpc values

+    function xmlrpc_ee_fast($parser, $name)

+    {

+        xmlrpc_ee($parser, $name, false);

+    }

+

+    /// xml parser handler function for character data

+    function xmlrpc_cd($parser, $data)

+    {

+        // skip processing if xml fault already detected

+        if ($GLOBALS['_xh']['isf'] < 2)

+        {

+            // "lookforvalue==3" means that we've found an entire value

+            // and should discard any further character data

+            if($GLOBALS['_xh']['lv']!=3)

+            {

+                // G. Giunta 2006-08-23: useless change of 'lv' from 1 to 2

+                //if($GLOBALS['_xh']['lv']==1)

+                //{

+                    // if we've found text and we're just in a <value> then

+                    // say we've found a value

+                    //$GLOBALS['_xh']['lv']=2;

+                //}

+                // we always initialize the accumulator before starting parsing, anyway...

+                //if(!@isset($GLOBALS['_xh']['ac']))

+                //{

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

+                //}

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

+            }

+        }

+    }

+

+    /// xml parser handler function for 'other stuff', ie. not char data or

+    /// element start/end tag. In fact it only gets called on unknown entities...

+    function xmlrpc_dh($parser, $data)

+    {

+        // skip processing if xml fault already detected

+        if ($GLOBALS['_xh']['isf'] < 2)

+        {

+            if(substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')

+            {

+                // G. Giunta 2006-08-25: useless change of 'lv' from 1 to 2

+                //if($GLOBALS['_xh']['lv']==1)

+                //{

+                //	$GLOBALS['_xh']['lv']=2;

+                //}

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

+            }

+        }

+        return true;

+    }

+

+    class xmlrpc_client

+    {

+        var $path;

+        var $server;

+        var $port=0;

+        var $method='http';

+        var $errno;

+        var $errstr;

+        var $debug=0;

+        var $username='';

+        var $password='';

+        var $authtype=1;

+        var $cert='';

+        var $certpass='';

+        var $cacert='';

+        var $cacertdir='';

+        var $key='';

+        var $keypass='';

+        var $verifypeer=true;

+        var $verifyhost=1;

+        var $no_multicall=false;

+        var $proxy='';

+        var $proxyport=0;

+        var $proxy_user='';

+        var $proxy_pass='';

+        var $proxy_authtype=1;

+        var $cookies=array();

+        var $extracurlopts=array();

+

+        /**

+         * List of http compression methods accepted by the client for responses.

+         * NB: PHP supports deflate, gzip compressions out of the box if compiled w. zlib

+         *

+         * NNB: you can set it to any non-empty array for HTTP11 and HTTPS, since

+         * in those cases it will be up to CURL to decide the compression methods

+         * it supports. You might check for the presence of 'zlib' in the output of

+         * curl_version() to determine wheter compression is supported or not

+         */

+        var $accepted_compression = array();

+        /**

+         * Name of compression scheme to be used for sending requests.

+         * Either null, gzip or deflate

+         */

+        var $request_compression = '';

+        /**

+         * CURL handle: used for keep-alive connections (PHP 4.3.8 up, see:

+         * http://curl.haxx.se/docs/faq.html#7.3)

+         */

+        var $xmlrpc_curl_handle = null;

+        /// Whether to use persistent connections for http 1.1 and https

+        var $keepalive = false;

+        /// Charset encodings that can be decoded without problems by the client

+        var $accepted_charset_encodings = array();

+        /// Charset encoding to be used in serializing request. NULL = use ASCII

+        var $request_charset_encoding = '';

+        /**

+         * Decides the content of xmlrpcresp objects returned by calls to send()

+         * valid strings are 'xmlrpcvals', 'phpvals' or 'xml'

+         */

+        var $return_type = 'xmlrpcvals';

+        /**

+         * Sent to servers in http headers

+         */

+        var $user_agent;

+

+        /**

+         * @param string $path either the complete server URL or the PATH part of the xmlrc server URL, e.g. /xmlrpc/server.php

+         * @param string $server the server name / ip address

+         * @param integer $port the port the server is listening on, defaults to 80 or 443 depending on protocol used

+         * @param string $method the http protocol variant: defaults to 'http', 'https' and 'http11' can be used if CURL is installed

+         */

+        function __construct($path, $server='', $port='', $method='')

+        {

+            // allow user to specify all params in $path

+            if($server == '' and $port == '' and $method == '')

+            {

+                $parts = parse_url($path);

+                $server = $parts['host'];

+                $path = isset($parts['path']) ? $parts['path'] : '';

+                if(isset($parts['query']))

+                {

+                    $path .= '?'.$parts['query'];

+                }

+                if(isset($parts['fragment']))

+                {

+                    $path .= '#'.$parts['fragment'];

+                }

+                if(isset($parts['port']))

+                {

+                    $port = $parts['port'];

+                }

+                if(isset($parts['scheme']))

+                {

+                    $method = $parts['scheme'];

+                }

+                if(isset($parts['user']))

+                {

+                    $this->username = $parts['user'];

+                }

+                if(isset($parts['pass']))

+                {

+                    $this->password = $parts['pass'];

+                }

+            }

+            if($path == '' || $path[0] != '/')

+            {

+                $this->path='/'.$path;

+            }

+            else

+            {

+                $this->path=$path;

+            }

+            $this->server=$server;

+            if($port != '')

+            {

+                $this->port=$port;

+            }

+            if($method != '')

+            {

+                $this->method=$method;

+            }

+

+            // if ZLIB is enabled, let the client by default accept compressed responses

+            if(function_exists('gzinflate') || (

+                function_exists('curl_init') && (($info = curl_version()) &&

+                ((is_string($info) && strpos($info, 'zlib') !== null) || isset($info['libz_version'])))

+            ))

+            {

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

+            }

+

+            // keepalives: enabled by default

+            $this->keepalive = true;

+

+            // by default the xml parser can support these 3 charset encodings

+            $this->accepted_charset_encodings = array('UTF-8', 'ISO-8859-1', 'US-ASCII');

+

+            // initialize user_agent string

+            $this->user_agent = $GLOBALS['xmlrpcName'] . ' ' . $GLOBALS['xmlrpcVersion'];

+        }

+

+        /**

+         * @deprecated

+         */

+        function xmlrpc_client($path, $server='', $port='', $method='')

+        {

+            self::__construct($path, $server, $port, $method);

+        }

+

+        /**

+         * Enables/disables the echoing to screen of the xmlrpc responses received

+         * @param integer $in values 0, 1 and 2 are supported (2 = echo sent msg too, before received response)

+         * @access public

+         */

+        function setDebug($in)

+        {

+            $this->debug=$in;

+        }

+

+        /**

+         * Add some http BASIC AUTH credentials, used by the client to authenticate

+         * @param string $u username

+         * @param string $p password

+         * @param integer $t auth type. See curl_setopt man page for supported auth types. Defaults to CURLAUTH_BASIC (basic auth)

+         * @access public

+         */

+        function setCredentials($u, $p, $t=1)

+        {

+            $this->username=$u;

+            $this->password=$p;

+            $this->authtype=$t;

+        }

+

+        /**

+         * Add a client-side https certificate

+         * @param string $cert

+         * @param string $certpass

+         * @access public

+         */

+        function setCertificate($cert, $certpass)

+        {

+            $this->cert = $cert;

+            $this->certpass = $certpass;

+        }

+

+        /**

+         * Add a CA certificate to verify server with (see man page about

+         * CURLOPT_CAINFO for more details)

+         * @param string $cacert certificate file name (or dir holding certificates)

+         * @param bool $is_dir set to true to indicate cacert is a dir. defaults to false

+         * @access public

+         */

+        function setCaCertificate($cacert, $is_dir=false)

+        {

+            if ($is_dir)

+            {

+                $this->cacertdir = $cacert;

+            }

+            else

+            {

+                $this->cacert = $cacert;

+            }

+        }

+

+        /**

+         * Set attributes for SSL communication: private SSL key

+         * NB: does not work in older php/curl installs

+         * Thanks to Daniel Convissor

+         * @param string $key The name of a file containing a private SSL key

+         * @param string $keypass The secret password needed to use the private SSL key

+         * @access public

+         */

+        function setKey($key, $keypass)

+        {

+            $this->key = $key;

+            $this->keypass = $keypass;

+        }

+

+        /**

+         * Set attributes for SSL communication: verify server certificate

+         * @param bool $i enable/disable verification of peer certificate

+         * @access public

+         */

+        function setSSLVerifyPeer($i)

+        {

+            $this->verifypeer = $i;

+        }

+

+        /**

+         * Set attributes for SSL communication: verify match of server cert w. hostname

+         * @param int $i

+         * @access public

+         */

+        function setSSLVerifyHost($i)

+        {

+            $this->verifyhost = $i;

+        }

+

+        /**

+         * Set proxy info

+         * @param string $proxyhost

+         * @param string $proxyport Defaults to 8080 for HTTP and 443 for HTTPS

+         * @param string $proxyusername Leave blank if proxy has public access

+         * @param string $proxypassword Leave blank if proxy has public access

+         * @param int $proxyauthtype set to constant CURLAUTH_NTLM to use NTLM auth with proxy

+         * @access public

+         */

+        function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 1)

+        {

+            $this->proxy = $proxyhost;

+            $this->proxyport = $proxyport;

+            $this->proxy_user = $proxyusername;

+            $this->proxy_pass = $proxypassword;

+            $this->proxy_authtype = $proxyauthtype;

+        }

+

+        /**

+         * Enables/disables reception of compressed xmlrpc responses.

+         * Note that enabling reception of compressed responses merely adds some standard

+         * http headers to xmlrpc requests. It is up to the xmlrpc server to return

+         * compressed responses when receiving such requests.

+         * @param string $compmethod either 'gzip', 'deflate', 'any' or ''

+         * @access public

+         */

+        function setAcceptedCompression($compmethod)

+        {

+            if ($compmethod == 'any')

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

+            else

+                if ($compmethod == false )

+                    $this->accepted_compression = array();

+                else

+                    $this->accepted_compression = array($compmethod);

+        }

+

+        /**

+         * Enables/disables http compression of xmlrpc request.

+         * Take care when sending compressed requests: servers might not support them

+         * (and automatic fallback to uncompressed requests is not yet implemented)

+         * @param string $compmethod either 'gzip', 'deflate' or ''

+         * @access public

+         */

+        function setRequestCompression($compmethod)

+        {

+            $this->request_compression = $compmethod;

+        }

+

+        /**

+         * Adds a cookie to list of cookies that will be sent to server.

+         * NB: setting any param but name and value will turn the cookie into a 'version 1' cookie:

+         * do not do it unless you know what you are doing

+         * @param string $name

+         * @param string $value

+         * @param string $path

+         * @param string $domain

+         * @param int $port

+         * @access public

+         *

+         * @todo check correctness of urlencoding cookie value (copied from php way of doing it...)

+         */

+        function setCookie($name, $value='', $path='', $domain='', $port=null)

+        {

+            $this->cookies[$name]['value'] = urlencode($value);

+            if ($path || $domain || $port)

+            {

+                $this->cookies[$name]['path'] = $path;

+                $this->cookies[$name]['domain'] = $domain;

+                $this->cookies[$name]['port'] = $port;

+                $this->cookies[$name]['version'] = 1;

+            }

+            else

+            {

+                $this->cookies[$name]['version'] = 0;

+            }

+        }

+

+        /**

+         * Directly set cURL options, for extra flexibility

+         * It allows eg. to bind client to a specific IP interface / address

+         * @param array $options

+         */

+        function SetCurlOptions( $options )

+        {

+            $this->extracurlopts = $options;

+        }

+

+        /**

+         * Set user-agent string that will be used by this client instance

+         * in http headers sent to the server

+         */

+        function SetUserAgent( $agentstring )

+        {

+            $this->user_agent = $agentstring;

+        }

+

+        /**

+         * Send an xmlrpc request

+         * @param mixed $msg The message object, or an array of messages for using multicall, or the complete xml representation of a request

+         * @param integer $timeout Connection timeout, in seconds, If unspecified, a platform specific timeout will apply

+         * @param string $method if left unspecified, the http protocol chosen during creation of the object will be used

+         * @return xmlrpcresp

+         * @access public

+         */

+        function& send($msg, $timeout=0, $method='')

+        {

+            // if user deos not specify http protocol, use native method of this client

+            // (i.e. method set during call to constructor)

+            if($method == '')

+            {

+                $method = $this->method;

+            }

+

+            if(is_array($msg))

+            {

+                // $msg is an array of xmlrpcmsg's

+                $r = $this->multicall($msg, $timeout, $method);

+                return $r;

+            }

+            elseif(is_string($msg))

+            {

+                $n = new xmlrpcmsg('');

+                $n->payload = $msg;

+                $msg = $n;

+            }

+

+            // where msg is an xmlrpcmsg

+            $msg->debug=$this->debug;

+

+            if($method == 'https')

+            {

+                $r =& $this->sendPayloadHTTPS(

+                    $msg,

+                    $this->server,

+                    $this->port,

+                    $timeout,

+                    $this->username,

+                    $this->password,

+                    $this->authtype,

+                    $this->cert,

+                    $this->certpass,

+                    $this->cacert,

+                    $this->cacertdir,

+                    $this->proxy,

+                    $this->proxyport,

+                    $this->proxy_user,

+                    $this->proxy_pass,

+                    $this->proxy_authtype,

+                    $this->keepalive,

+                    $this->key,

+                    $this->keypass

+                );

+            }

+            elseif($method == 'http11')

+            {

+                $r =& $this->sendPayloadCURL(

+                    $msg,

+                    $this->server,

+                    $this->port,

+                    $timeout,

+                    $this->username,

+                    $this->password,

+                    $this->authtype,

+                    null,

+                    null,

+                    null,

+                    null,

+                    $this->proxy,

+                    $this->proxyport,

+                    $this->proxy_user,

+                    $this->proxy_pass,

+                    $this->proxy_authtype,

+                    'http',

+                    $this->keepalive

+                );

+            }

+            else

+            {

+                $r =& $this->sendPayloadHTTP10(

+                    $msg,

+                    $this->server,

+                    $this->port,

+                    $timeout,

+                    $this->username,

+                    $this->password,

+                    $this->authtype,

+                    $this->proxy,

+                    $this->proxyport,

+                    $this->proxy_user,

+                    $this->proxy_pass,

+                    $this->proxy_authtype

+                );

+            }

+

+            return $r;

+        }

+

+        /**

+         * @access private

+         */

+        function &sendPayloadHTTP10($msg, $server, $port, $timeout=0,

+            $username='', $password='', $authtype=1, $proxyhost='',

+            $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1)

+        {

+            if($port==0)

+            {

+                $port=80;

+            }

+

+            // Only create the payload if it was not created previously

+            if(empty($msg->payload))

+            {

+                $msg->createPayload($this->request_charset_encoding);

+            }

+

+            $payload = $msg->payload;

+            // Deflate request body and set appropriate request headers

+            if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))

+            {

+                if($this->request_compression == 'gzip')

+                {

+                    $a = @gzencode($payload);

+                    if($a)

+                    {

+                        $payload = $a;

+                        $encoding_hdr = "Content-Encoding: gzip\r\n";

+                    }

+                }

+                else

+                {

+                    $a = @gzcompress($payload);

+                    if($a)

+                    {

+                        $payload = $a;

+                        $encoding_hdr = "Content-Encoding: deflate\r\n";

+                    }

+                }

+            }

+            else

+            {

+                $encoding_hdr = '';

+            }

+

+            // thanks to Grant Rauscher <grant7@firstworld.net> for this

+            $credentials='';

+            if($username!='')

+            {

+                $credentials='Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";

+                if ($authtype != 1)

+                {

+                    error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');

+                }

+            }

+

+            $accepted_encoding = '';

+            if(is_array($this->accepted_compression) && count($this->accepted_compression))

+            {

+                $accepted_encoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";

+            }

+

+            $proxy_credentials = '';

+            if($proxyhost)

+            {

+                if($proxyport == 0)

+                {

+                    $proxyport = 8080;

+                }

+                $connectserver = $proxyhost;

+                $connectport = $proxyport;

+                $uri = 'http://'.$server.':'.$port.$this->path;

+                if($proxyusername != '')

+                {

+                    if ($proxyauthtype != 1)

+                    {

+                        error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');

+                    }

+                    $proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";

+                }

+            }

+            else

+            {

+                $connectserver = $server;

+                $connectport = $port;

+                $uri = $this->path;

+            }

+

+            // Cookie generation, as per rfc2965 (version 1 cookies) or

+            // netscape's rules (version 0 cookies)

+            $cookieheader='';

+            if (count($this->cookies))

+            {

+                $version = '';

+                foreach ($this->cookies as $name => $cookie)

+                {

+                    if ($cookie['version'])

+                    {

+                        $version = ' $Version="' . $cookie['version'] . '";';

+                        $cookieheader .= ' ' . $name . '="' . $cookie['value'] . '";';

+                        if ($cookie['path'])

+                            $cookieheader .= ' $Path="' . $cookie['path'] . '";';

+                        if ($cookie['domain'])

+                            $cookieheader .= ' $Domain="' . $cookie['domain'] . '";';

+                        if ($cookie['port'])

+                            $cookieheader .= ' $Port="' . $cookie['port'] . '";';

+                    }

+                    else

+                    {

+                        $cookieheader .= ' ' . $name . '=' . $cookie['value'] . ";";

+                    }

+                }

+                $cookieheader = 'Cookie:' . $version . substr($cookieheader, 0, -1) . "\r\n";

+            }

+

+            // omit port if 80

+            $port = ($port == 80) ? '' : (':' . $port);

+

+            $op= 'POST ' . $uri. " HTTP/1.0\r\n" .

+                'User-Agent: ' . $this->user_agent . "\r\n" .

+                'Host: '. $server . $port . "\r\n" .

+                $credentials .

+                $proxy_credentials .

+                $accepted_encoding .

+                $encoding_hdr .

+                'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .

+                $cookieheader .

+                'Content-Type: ' . $msg->content_type . "\r\nContent-Length: " .

+                strlen($payload) . "\r\n\r\n" .

+                $payload;

+

+            if($this->debug > 1)

+            {

+                print "<PRE>\n---SENDING---\n" . htmlentities($op) . "\n---END---\n</PRE>";

+                // let the client see this now in case http times out...

+                flush();

+            }

+

+            if($timeout>0)

+            {

+                $fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);

+            }

+            else

+            {

+                $fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);

+            }

+            if($fp)

+            {

+                if($timeout>0 && function_exists('stream_set_timeout'))

+                {

+                    stream_set_timeout($fp, $timeout);

+                }

+            }

+            else

+            {

+                $this->errstr='Connect error: '.$this->errstr;

+                $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');

+                return $r;

+            }

+

+            if(!fputs($fp, $op, strlen($op)))

+            {

+                fclose($fp);

+                $this->errstr='Write error';

+                $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);

+                return $r;

+            }

+            else

+            {

+                // reset errno and errstr on successful socket connection

+                $this->errstr = '';

+            }

+            // G. Giunta 2005/10/24: close socket before parsing.

+            // should yield slightly better execution times, and make easier recursive calls (e.g. to follow http redirects)

+            $ipd='';

+            do

+            {

+                // shall we check for $data === FALSE?

+                // as per the manual, it signals an error

+                $ipd.=fread($fp, 32768);

+            } while(!feof($fp));

+            fclose($fp);

+            $r =& $msg->parseResponse($ipd, false, $this->return_type);

+            return $r;

+

+        }

+

+        /**

+         * @access private

+         */

+        function &sendPayloadHTTPS($msg, $server, $port, $timeout=0, $username='',

+            $password='', $authtype=1, $cert='',$certpass='', $cacert='', $cacertdir='',

+            $proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1,

+            $keepalive=false, $key='', $keypass='')

+        {

+            $r =& $this->sendPayloadCURL($msg, $server, $port, $timeout, $username,

+                $password, $authtype, $cert, $certpass, $cacert, $cacertdir, $proxyhost, $proxyport,

+                $proxyusername, $proxypassword, $proxyauthtype, 'https', $keepalive, $key, $keypass);

+            return $r;

+        }

+

+        /**

+         * Contributed by Justin Miller <justin@voxel.net>

+         * Requires curl to be built into PHP

+         * NB: CURL versions before 7.11.10 cannot use proxy to talk to https servers!

+         * @access private

+         */

+        function &sendPayloadCURL($msg, $server, $port, $timeout=0, $username='',

+            $password='', $authtype=1, $cert='', $certpass='', $cacert='', $cacertdir='',

+            $proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1, $method='https',

+            $keepalive=false, $key='', $keypass='')

+        {

+            if(!function_exists('curl_init'))

+            {

+                $this->errstr='CURL unavailable on this install';

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

+                return $r;

+            }

+            if($method == 'https')

+            {

+                if(($info = curl_version()) &&

+                    ((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version']))))

+                {

+                    $this->errstr='SSL unavailable on this install';

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

+                    return $r;

+                }

+            }

+

+            if($port == 0)

+            {

+                if($method == 'http')

+                {

+                    $port = 80;

+                }

+                else

+                {

+                    $port = 443;

+                }

+            }

+

+            // Only create the payload if it was not created previously

+            if(empty($msg->payload))

+            {

+                $msg->createPayload($this->request_charset_encoding);

+            }

+

+            // Deflate request body and set appropriate request headers

+            $payload = $msg->payload;

+            if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))

+            {

+                if($this->request_compression == 'gzip')

+                {

+                    $a = @gzencode($payload);

+                    if($a)

+                    {

+                        $payload = $a;

+                        $encoding_hdr = 'Content-Encoding: gzip';

+                    }

+                }

+                else

+                {

+                    $a = @gzcompress($payload);

+                    if($a)

+                    {

+                        $payload = $a;

+                        $encoding_hdr = 'Content-Encoding: deflate';

+                    }

+                }

+            }

+            else

+            {

+                $encoding_hdr = '';

+            }

+

+            if($this->debug > 1)

+            {

+                print "<PRE>\n---SENDING---\n" . htmlentities($payload) . "\n---END---\n</PRE>";

+                // let the client see this now in case http times out...

+                flush();

+            }

+

+            if(!$keepalive || !$this->xmlrpc_curl_handle)

+            {

+                $curl = curl_init($method . '://' . $server . ':' . $port . $this->path);

+                if($keepalive)

+                {

+                    $this->xmlrpc_curl_handle = $curl;

+                }

+            }

+            else

+            {

+                $curl = $this->xmlrpc_curl_handle;

+            }

+

+            // results into variable

+            curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);

+

+            if($this->debug)

+            {

+                curl_setopt($curl, CURLOPT_VERBOSE, 1);

+            }

+            curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);

+            // required for XMLRPC: post the data

+            curl_setopt($curl, CURLOPT_POST, 1);

+            // the data

+            curl_setopt($curl, CURLOPT_POSTFIELDS, $payload);

+

+            // return the header too

+            curl_setopt($curl, CURLOPT_HEADER, 1);

+

+            // NB: if we set an empty string, CURL will add http header indicating

+            // ALL methods it is supporting. This is possibly a better option than

+            // letting the user tell what curl can / cannot do...

+            if(is_array($this->accepted_compression) && count($this->accepted_compression))

+            {

+                //curl_setopt($curl, CURLOPT_ENCODING, implode(',', $this->accepted_compression));

+                // empty string means 'any supported by CURL' (shall we catch errors in case CURLOPT_SSLKEY undefined ?)

+                if (count($this->accepted_compression) == 1)

+                {

+                    curl_setopt($curl, CURLOPT_ENCODING, $this->accepted_compression[0]);

+                }

+                else

+                    curl_setopt($curl, CURLOPT_ENCODING, '');

+            }

+            // extra headers

+            $headers = array('Content-Type: ' . $msg->content_type , 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));

+            // if no keepalive is wanted, let the server know it in advance

+            if(!$keepalive)

+            {

+                $headers[] = 'Connection: close';

+            }

+            // request compression header

+            if($encoding_hdr)

+            {

+                $headers[] = $encoding_hdr;

+            }

+

+            curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);

+            // timeout is borked

+            if($timeout)

+            {

+                curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);

+            }

+

+            if($username && $password)

+            {

+                curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);

+                if (defined('CURLOPT_HTTPAUTH'))

+                {

+                    curl_setopt($curl, CURLOPT_HTTPAUTH, $authtype);

+                }

+                else if ($authtype != 1)

+                {

+                    error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');

+                }

+            }

+

+            if($method == 'https')

+            {

+                // set cert file

+                if($cert)

+                {

+                    curl_setopt($curl, CURLOPT_SSLCERT, $cert);

+                }

+                // set cert password

+                if($certpass)

+                {

+                    curl_setopt($curl, CURLOPT_SSLCERTPASSWD, $certpass);

+                }

+                // whether to verify remote host's cert

+                curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifypeer);

+                // set ca certificates file/dir

+                if($cacert)

+                {

+                    curl_setopt($curl, CURLOPT_CAINFO, $cacert);

+                }

+                if($cacertdir)

+                {

+                    curl_setopt($curl, CURLOPT_CAPATH, $cacertdir);

+                }

+                // set key file (shall we catch errors in case CURLOPT_SSLKEY undefined ?)

+                if($key)

+                {

+                    curl_setopt($curl, CURLOPT_SSLKEY, $key);

+                }

+                // set key password (shall we catch errors in case CURLOPT_SSLKEY undefined ?)

+                if($keypass)

+                {

+                    curl_setopt($curl, CURLOPT_SSLKEYPASSWD, $keypass);

+                }

+

+                // Upgrade transparently to more stringent check for versions of php which do not support otherwise.

+                // Doing it in constructor would be cleaner; doing it here saves us a couple of function calls

+                if($this->verifyhost == 1 && $info = curl_version() && version_compare($info['version'], '7.28.1') >= 0)

+                {

+                    $this->verifyhost = 2;

+                }

+                // whether to verify cert's common name (CN); 0 for no, 1 to verify that it exists, and 2 to verify that it matches the hostname used

+                curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, $this->verifyhost);

+            }

+

+            // proxy info

+            if($proxyhost)

+            {

+                if($proxyport == 0)

+                {

+                    $proxyport = 8080; // NB: even for HTTPS, local connection is on port 8080

+                }

+                curl_setopt($curl, CURLOPT_PROXY, $proxyhost.':'.$proxyport);

+                //curl_setopt($curl, CURLOPT_PROXYPORT,$proxyport);

+                if($proxyusername)

+                {

+                    curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyusername.':'.$proxypassword);

+                    if (defined('CURLOPT_PROXYAUTH'))

+                    {

+                        curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyauthtype);

+                    }

+                    else if ($proxyauthtype != 1)

+                    {

+                        error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');

+                    }

+                }

+            }

+

+            // NB: should we build cookie http headers by hand rather than let CURL do it?

+            // the following code does not honour 'expires', 'path' and 'domain' cookie attributes

+            // set to client obj the the user...

+            if (count($this->cookies))

+            {

+                $cookieheader = '';

+                foreach ($this->cookies as $name => $cookie)

+                {

+                    $cookieheader .= $name . '=' . $cookie['value'] . '; ';

+                }

+                curl_setopt($curl, CURLOPT_COOKIE, substr($cookieheader, 0, -2));

+            }

+

+            foreach ($this->extracurlopts as $opt => $val)

+            {

+                curl_setopt($curl, $opt, $val);

+            }

+

+            $result = curl_exec($curl);

+

+            if ($this->debug > 1)

+            {

+                print "<PRE>\n---CURL INFO---\n";

+                foreach(curl_getinfo($curl) as $name => $val)

+                {

+                    if (is_array($val))

+                    {

+                        $val = implode("\n", $val);

+                    }

+                    print $name . ': ' . htmlentities($val) . "\n";

+                }

+

+                print "---END---\n</PRE>";

+            }

+

+            if(!$result) /// @todo we should use a better check here - what if we get back '' or '0'?

+            {

+                $this->errstr='no response';

+                $resp=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl));

+                curl_close($curl);

+                if($keepalive)

+                {

+                    $this->xmlrpc_curl_handle = null;

+                }

+            }

+            else

+            {

+                if(!$keepalive)

+                {

+                    curl_close($curl);

+                }

+                $resp =& $msg->parseResponse($result, true, $this->return_type);

+                // if we got back a 302, we can not reuse the curl handle for later calls

+                if($resp->faultCode() == $GLOBALS['xmlrpcerr']['http_error'] && $keepalive)

+                {

+                    curl_close($curl);

+                    $this->xmlrpc_curl_handle = null;

+                }

+            }

+            return $resp;

+        }

+

+        /**

+         * Send an array of request messages and return an array of responses.

+         * Unless $this->no_multicall has been set to true, it will try first

+         * to use one single xmlrpc call to server method system.multicall, and

+         * revert to sending many successive calls in case of failure.

+         * This failure is also stored in $this->no_multicall for subsequent calls.

+         * Unfortunately, there is no server error code universally used to denote

+         * the fact that multicall is unsupported, so there is no way to reliably

+         * distinguish between that and a temporary failure.

+         * If you are sure that server supports multicall and do not want to

+         * fallback to using many single calls, set the fourth parameter to FALSE.

+         *

+         * NB: trying to shoehorn extra functionality into existing syntax has resulted

+         * in pretty much convoluted code...

+         *

+         * @param array $msgs an array of xmlrpcmsg objects

+         * @param integer $timeout connection timeout (in seconds)

+         * @param string $method the http protocol variant to be used

+         * @param boolean fallback When true, upon receiving an error during multicall, multiple single calls will be attempted

+         * @return array

+         * @access public

+         */

+        function multicall($msgs, $timeout=0, $method='', $fallback=true)

+        {

+            if ($method == '')

+            {

+                $method = $this->method;

+            }

+            if(!$this->no_multicall)

+            {

+                $results = $this->_try_multicall($msgs, $timeout, $method);

+                if(is_array($results))

+                {

+                    // System.multicall succeeded

+                    return $results;

+                }

+                else

+                {

+                    // either system.multicall is unsupported by server,

+                    // or call failed for some other reason.

+                    if ($fallback)

+                    {

+                        // Don't try it next time...

+                        $this->no_multicall = true;

+                    }

+                    else

+                    {

+                        if (is_a($results, 'xmlrpcresp'))

+                        {

+                            $result = $results;

+                        }

+                        else

+                        {

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

+                        }

+                    }

+                }

+            }

+            else

+            {

+                // override fallback, in case careless user tries to do two

+                // opposite things at the same time

+                $fallback = true;

+            }

+

+            $results = array();

+            if ($fallback)

+            {

+                // system.multicall is (probably) unsupported by server:

+                // emulate multicall via multiple requests

+                foreach($msgs as $msg)

+                {

+                    $results[] =& $this->send($msg, $timeout, $method);

+                }

+            }

+            else

+            {

+                // user does NOT want to fallback on many single calls:

+                // since we should always return an array of responses,

+                // return an array with the same error repeated n times

+                foreach($msgs as $msg)

+                {

+                    $results[] = $result;

+                }

+            }

+            return $results;

+        }

+

+        /**

+         * Attempt to boxcar $msgs via system.multicall.

+         * Returns either an array of xmlrpcreponses, an xmlrpc error response

+         * or false (when received response does not respect valid multicall syntax)

+         * @access private

+         */

+        function _try_multicall($msgs, $timeout, $method)

+        {

+            // Construct multicall message

+            $calls = array();

+            foreach($msgs as $msg)

+            {

+                $call['methodName'] = new xmlrpcval($msg->method(),'string');

+                $numParams = $msg->getNumParams();

+                $params = array();

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

+                {

+                    $params[$i] = $msg->getParam($i);

+                }

+                $call['params'] = new xmlrpcval($params, 'array');

+                $calls[] = new xmlrpcval($call, 'struct');

+            }

+            $multicall = new xmlrpcmsg('system.multicall');

+            $multicall->addParam(new xmlrpcval($calls, 'array'));

+

+            // Attempt RPC call

+            $result =& $this->send($multicall, $timeout, $method);

+

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

+            {

+                // call to system.multicall failed

+                return $result;

+            }

+

+            // Unpack responses.

+            $rets = $result->value();

+

+            if ($this->return_type == 'xml')

+            {

+                    return $rets;

+            }

+            else if ($this->return_type == 'phpvals')

+            {

+                ///@todo test this code branch...

+                $rets = $result->value();

+                if(!is_array($rets))

+                {

+                    return false;		// bad return type from system.multicall

+                }

+                $numRets = count($rets);

+                if($numRets != count($msgs))

+                {

+                    return false;		// wrong number of return values.

+                }

+

+                $response = array();

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

+                {

+                    $val = $rets[$i];

+                    if (!is_array($val)) {

+                        return false;

+                    }

+                    switch(count($val))

+                    {

+                        case 1:

+                            if(!isset($val[0]))

+                            {

+                                return false;		// Bad value

+                            }

+                            // Normal return value

+                            $response[$i] = new xmlrpcresp($val[0], 0, '', 'phpvals');

+                            break;

+                        case 2:

+                            ///	@todo remove usage of @: it is apparently quite slow

+                            $code = @$val['faultCode'];

+                            if(!is_int($code))

+                            {

+                                return false;

+                            }

+                            $str = @$val['faultString'];

+                            if(!is_string($str))

+                            {

+                                return false;

+                            }

+                            $response[$i] = new xmlrpcresp(0, $code, $str);

+                            break;

+                        default:

+                            return false;

+                    }

+                }

+                return $response;

+            }

+            else // return type == 'xmlrpcvals'

+            {

+                $rets = $result->value();

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

+                {

+                    return false;		// bad return type from system.multicall

+                }

+                $numRets = $rets->arraysize();

+                if($numRets != count($msgs))

+                {

+                    return false;		// wrong number of return values.

+                }

+

+                $response = array();

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

+                {

+                    $val = $rets->arraymem($i);

+                    switch($val->kindOf())

+                    {

+                        case 'array':

+                            if($val->arraysize() != 1)

+                            {

+                                return false;		// Bad value

+                            }

+                            // Normal return value

+                            $response[$i] = new xmlrpcresp($val->arraymem(0));

+                            break;

+                        case 'struct':

+                            $code = $val->structmem('faultCode');

+                            if($code->kindOf() != 'scalar' || $code->scalartyp() != 'int')

+                            {

+                                return false;

+                            }

+                            $str = $val->structmem('faultString');

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

+                            {

+                                return false;

+                            }

+                            $response[$i] = new xmlrpcresp(0, $code->scalarval(), $str->scalarval());

+                            break;

+                        default:

+                            return false;

+                    }

+                }

+                return $response;

+            }

+        }

+    } // end class xmlrpc_client

+

+    class xmlrpcresp

+    {

+        var $val = 0;

+        var $valtyp;

+        var $errno = 0;

+        var $errstr = '';

+        var $payload;

+        var $hdrs = array();

+        var $_cookies = array();

+        var $content_type = 'text/xml';

+        var $raw_data = '';

+

+        /**

+         * @param mixed $val either an xmlrpcval obj, a php value or the xml serialization of an xmlrpcval (a string)

+         * @param integer $fcode set it to anything but 0 to create an error response

+         * @param string $fstr the error string, in case of an error response

+         * @param string $valtyp either 'xmlrpcvals', 'phpvals' or 'xml'

+         *

+         * @todo add check that $val / $fcode / $fstr is of correct type???

+         * NB: as of now we do not do it, since it might be either an xmlrpcval or a plain

+         * php val, or a complete xml chunk, depending on usage of xmlrpc_client::send() inside which creator is called...

+         */

+        function __construct($val, $fcode = 0, $fstr = '', $valtyp='')

+        {

+            if($fcode != 0)

+            {

+                // error response

+                $this->errno = $fcode;

+                $this->errstr = $fstr;

+                //$this->errstr = htmlspecialchars($fstr); // XXX: encoding probably shouldn't be done here; fix later.

+            }

+            else

+            {

+                // successful response

+                $this->val = $val;

+                if ($valtyp == '')

+                {

+                    // user did not declare type of response value: try to guess it

+                    if (is_object($this->val) && is_a($this->val, 'xmlrpcval'))

+                    {

+                        $this->valtyp = 'xmlrpcvals';

+                    }

+                    else if (is_string($this->val))

+                    {

+                        $this->valtyp = 'xml';

+

+                    }

+                    else

+                    {

+                        $this->valtyp = 'phpvals';

+                    }

+                }

+                else

+                {

+                    // user declares type of resp value: believe him

+                    $this->valtyp = $valtyp;

+                }

+            }

+        }

+

+        /**

+         * @deprecated

+         */

+        function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp='')

+        {

+            self::__construct($val, $fcode, $fstr, $valtyp);

+        }

+

+        /**

+         * Returns the error code of the response.

+         * @return integer the error code of this response (0 for not-error responses)

+         * @access public

+         */

+        function faultCode()

+        {

+            return $this->errno;

+        }

+

+        /**

+         * Returns the error code of the response.

+         * @return string the error string of this response ('' for not-error responses)

+         * @access public

+         */

+        function faultString()

+        {

+            return $this->errstr;

+        }

+

+        /**

+         * Returns the value received by the server.

+         * @return mixed the xmlrpcval object returned by the server. Might be an xml string or php value if the response has been created by specially configured xmlrpc_client objects

+         * @access public

+         */

+        function value()

+        {

+            return $this->val;

+        }

+

+        /**

+         * Returns an array with the cookies received from the server.

+         * Array has the form: $cookiename => array ('value' => $val, $attr1 => $val1, $attr2 = $val2, ...)

+         * with attributes being e.g. 'expires', 'path', domain'.

+         * NB: cookies sent as 'expired' by the server (i.e. with an expiry date in the past)

+         * are still present in the array. It is up to the user-defined code to decide

+         * how to use the received cookies, and whether they have to be sent back with the next

+         * request to the server (using xmlrpc_client::setCookie) or not

+         * @return array array of cookies received from the server

+         * @access public

+         */

+        function cookies()

+        {

+            return $this->_cookies;

+        }

+

+        /**

+         * Returns xml representation of the response. XML prologue not included

+         * @param string $charset_encoding the charset to be used for serialization. if null, US-ASCII is assumed

+         * @return string the xml representation of the response

+         * @access public

+         */

+        function serialize($charset_encoding='')

+        {

+            if ($charset_encoding != '')

+                $this->content_type = 'text/xml; charset=' . $charset_encoding;

+            else

+                $this->content_type = 'text/xml';

+            if ($GLOBALS['xmlrpc_null_apache_encoding'])

+            {

+                $result = "<methodResponse xmlns:ex=\"".$GLOBALS['xmlrpc_null_apache_encoding_ns']."\">\n";

+            }

+            else

+            {

+            $result = "<methodResponse>\n";

+            }

+            if($this->errno)

+            {

+                // G. Giunta 2005/2/13: let non-ASCII response messages be tolerated by clients

+                // by xml-encoding non ascii chars

+                $result .= "<fault>\n" .

 "<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .

 "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .

 xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</string></value>\n</member>\n" .

 "</struct>\n</value>\n</fault>";

-			}

-			else

-			{

-				if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))

-				{

-					if (is_string($this->val) && $this->valtyp == 'xml')

-					{

-						$result .= "<params>\n<param>\n" .

-							$this->val .

-							"</param>\n</params>";

-					}

-					else

-					{

-						/// @todo try to build something serializable?

-						die('cannot serialize xmlrpcresp objects whose content is native php values');

-					}

-				}

-				else

-				{

-					$result .= "<params>\n<param>\n" .

-						$this->val->serialize($charset_encoding) .

-						"</param>\n</params>";

-				}

-			}

-			$result .= "\n</methodResponse>";

-			$this->payload = $result;

-			return $result;

-		}

-	}

-

-	class xmlrpcmsg

-	{

-		var $payload;

-		var $methodname;

-		var $params=array();

-		var $debug=0;

-		var $content_type = 'text/xml';

-

-		/**

-		* @param string $meth the name of the method to invoke

-		* @param array $pars array of parameters to be passed to the method (xmlrpcval objects)

-		*/

-		function __construct($meth, $pars=0)

-		{

-			$this->methodname=$meth;

-			if(is_array($pars) && count($pars)>0)

-			{

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

-				{

-					$this->addParam($pars[$i]);

-				}

-			}

-		}

-

-				/**

-		* @deprecated

-		*/

-		function xmlrpcmsg($meth, $pars=0)

-		{

-			self::__construct($meth, $pars);

-		}

-

-		/**

-		* @access private

-		*/

-		function xml_header($charset_encoding='')

-		{

-			if ($charset_encoding != '')

-			{

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

-			}

-			else

-			{

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

-			}

-		}

-

-		/**

-		* @access private

-		*/

-		function xml_footer()

-		{

-			return '</methodCall>';

-		}

-

-		/**

-		* @access private

-		*/

-		function kindOf()

-		{

-			return 'msg';

-		}

-

-		/**

-		* @access private

-		*/

-		function createPayload($charset_encoding='')

-		{

-			if ($charset_encoding != '')

-				$this->content_type = 'text/xml; charset=' . $charset_encoding;

-			else

-				$this->content_type = 'text/xml';

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

-			$this->payload.='<methodName>' . xmlrpc_encode_entitites($this->methodname, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</methodName>\n";

-			$this->payload.="<params>\n";

-			for($i=0; $i<count($this->params); $i++)

-			{

-				$p=$this->params[$i];

-				$this->payload.="<param>\n" . $p->serialize($charset_encoding) .

-				"</param>\n";

-			}

-			$this->payload.="</params>\n";

-			$this->payload.=$this->xml_footer();

-		}

-

-		/**

-		* Gets/sets the xmlrpc method to be invoked

-		* @param string $meth the method to be set (leave empty not to set it)

-		* @return string the method that will be invoked

-		* @access public

-		*/

-		function method($meth='')

-		{

-			if($meth!='')

-			{

-				$this->methodname=$meth;

-			}

-			return $this->methodname;

-		}

-

-		/**

-		* Returns xml representation of the message. XML prologue included

-		* @param string $charset_encoding

-		* @return string the xml representation of the message, xml prologue included

-		* @access public

-		*/

-		function serialize($charset_encoding='')

-		{

-			$this->createPayload($charset_encoding);

-			return $this->payload;

-		}

-

-		/**

-		* Add a parameter to the list of parameters to be used upon method invocation

-		* @param xmlrpcval $par

-		* @return boolean false on failure

-		* @access public

-		*/

-		function addParam($par)

-		{

-			// add check: do not add to self params which are not xmlrpcvals

-			if(is_object($par) && is_a($par, 'xmlrpcval'))

-			{

-				$this->params[]=$par;

-				return true;

-			}

-			else

-			{

-				return false;

-			}

-		}

-

-		/**

-		* Returns the nth parameter in the message. The index zero-based.

-		* @param integer $i the index of the parameter to fetch (zero based)

-		* @return xmlrpcval the i-th parameter

-		* @access public

-		*/

-		function getParam($i) { return $this->params[$i]; }

-

-		/**

-		* Returns the number of parameters in the messge.

-		* @return integer the number of parameters currently set

-		* @access public

-		*/

-		function getNumParams() { return count($this->params); }

-

-		/**

-		* Given an open file handle, read all data available and parse it as axmlrpc response.

-		* NB: the file handle is not closed by this function.

-		* NNB: might have trouble in rare cases to work on network streams, as we

-		*      check for a read of 0 bytes instead of feof($fp).

-		*      But since checking for feof(null) returns false, we would risk an

-		*      infinite loop in that case, because we cannot trust the caller

-		*      to give us a valid pointer to an open file...

-		* @access public

-		* @param resource $fp stream pointer

-		* @return xmlrpcresp

-		* @todo add 2nd & 3rd param to be passed to ParseResponse() ???

-		*/

-		function &parseResponseFile($fp)

-		{

-			$ipd='';

-			while($data=fread($fp, 32768))

-			{

-				$ipd.=$data;

-			}

-			//fclose($fp);

-			$r =& $this->parseResponse($ipd);

-			return $r;

-		}

-

-		/**

-		* Parses HTTP headers and separates them from data.

-		* @access private

-		*/

-		function &parseResponseHeaders(&$data, $headers_processed=false)

-		{

-				// Support "web-proxy-tunelling" connections for https through proxies

-				if(preg_match('/^HTTP\/1\.[0-1] 200 Connection established/', $data))

-				{

-					// Look for CR/LF or simple LF as line separator,

-					// (even though it is not valid http)

-					$pos = strpos($data,"\r\n\r\n");

-					if($pos || is_int($pos))

-					{

-						$bd = $pos+4;

-					}

-					else

-					{

-						$pos = strpos($data,"\n\n");

-						if($pos || is_int($pos))

-						{

-							$bd = $pos+2;

-						}

-						else

-						{

-							// No separation between response headers and body: fault?

-							$bd = 0;

-						}

-					}

-					if ($bd)

-					{

-						// this filters out all http headers from proxy.

-						// maybe we could take them into account, too?

-						$data = substr($data, $bd);

-					}

-					else

-					{

-						error_log('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');

-						$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)');

-						return $r;

-					}

-				}

-

-				// Strip HTTP 1.1 100 Continue header if present

-				while(preg_match('/^HTTP\/1\.1 1[0-9]{2} /', $data))

-				{

-					$pos = strpos($data, 'HTTP', 12);

-					// server sent a Continue header without any (valid) content following...

-					// give the client a chance to know it

-					if(!$pos && !is_int($pos)) // works fine in php 3, 4 and 5

-					{

-						break;

-					}

-					$data = substr($data, $pos);

-				}

-				if(!preg_match('/^HTTP\/[0-9.]+ 200 /', $data))

-				{

-					$errstr= substr($data, 0, strpos($data, "\n")-1);

-					error_log('XML-RPC: '.__METHOD__.': HTTP error, got response: ' .$errstr);

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

-					return $r;

-				}

-

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

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

-

-				// be tolerant to usage of \n instead of \r\n to separate headers and data

-				// (even though it is not valid http)

-				$pos = strpos($data,"\r\n\r\n");

-				if($pos || is_int($pos))

-				{

-					$bd = $pos+4;

-				}

-				else

-				{

-					$pos = strpos($data,"\n\n");

-					if($pos || is_int($pos))

-					{

-						$bd = $pos+2;

-					}

-					else

-					{

-						// No separation between response headers and body: fault?

-						// we could take some action here instead of going on...

-						$bd = 0;

-					}

-				}

-				// be tolerant to line endings, and extra empty lines

-				$ar = preg_split("/\r?\n/", trim(substr($data, 0, $pos)));

-				while(list(,$line) = @each($ar))

-				{

-					// take care of multi-line headers and cookies

-					$arr = explode(':',$line,2);

-					if(count($arr) > 1)

-					{

-						$header_name = strtolower(trim($arr[0]));

-						/// @todo some other headers (the ones that allow a CSV list of values)

-						/// do allow many values to be passed using multiple header lines.

-						/// We should add content to $GLOBALS['_xh']['headers'][$header_name]

-						/// instead of replacing it for those...

-						if ($header_name == 'set-cookie' || $header_name == 'set-cookie2')

-						{

-							if ($header_name == 'set-cookie2')

-							{

-								// version 2 cookies:

-								// there could be many cookies on one line, comma separated

-								$cookies = explode(',', $arr[1]);

-							}

-							else

-							{

-								$cookies = array($arr[1]);

-							}

-							foreach ($cookies as $cookie)

-							{

-								// glue together all received cookies, using a comma to separate them

-								// (same as php does with getallheaders())

-								if (isset($GLOBALS['_xh']['headers'][$header_name]))

-									$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);

-								else

-									$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);

-								// parse cookie attributes, in case user wants to correctly honour them

-								// feature creep: only allow rfc-compliant cookie attributes?

-								// @todo support for server sending multiple time cookie with same name, but using different PATHs

-								$cookie = explode(';', $cookie);

-								foreach ($cookie as $pos => $val)

-								{

-									$val = explode('=', $val, 2);

-									$tag = trim($val[0]);

-									$val = trim(@$val[1]);

-									/// @todo with version 1 cookies, we should strip leading and trailing " chars

-									if ($pos == 0)

-									{

-										$cookiename = $tag;

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

-										$GLOBALS['_xh']['cookies'][$cookiename]['value'] = urldecode($val);

-									}

-									else

-									{

-										if ($tag != 'value')

-										{

-											$GLOBALS['_xh']['cookies'][$cookiename][$tag] = $val;

-										}

-									}

-								}

-							}

-						}

-						else

-						{

-							$GLOBALS['_xh']['headers'][$header_name] = trim($arr[1]);

-						}

-					}

-					elseif(isset($header_name))

-					{

-						///	@todo version1 cookies might span multiple lines, thus breaking the parsing above

-						$GLOBALS['_xh']['headers'][$header_name] .= ' ' . trim($line);

-					}

-				}

-

-				$data = substr($data, $bd);

-

-				if($this->debug && count($GLOBALS['_xh']['headers']))

-				{

-					print '<PRE>';

-					foreach($GLOBALS['_xh']['headers'] as $header => $value)

-					{

-						print htmlentities("HEADER: $header: $value\n");

-					}

-					foreach($GLOBALS['_xh']['cookies'] as $header => $value)

-					{

-						print htmlentities("COOKIE: $header={$value['value']}\n");

-					}

-					print "</PRE>\n";

-				}

-

-				// if CURL was used for the call, http headers have been processed,

-				// and dechunking + reinflating have been carried out

-				if(!$headers_processed)

-				{

-					// Decode chunked encoding sent by http 1.1 servers

-					if(isset($GLOBALS['_xh']['headers']['transfer-encoding']) && $GLOBALS['_xh']['headers']['transfer-encoding'] == 'chunked')

-					{

-						if(!$data = decode_chunked($data))

-						{

-							error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');

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

-							return $r;

-						}

-					}

-

-					// Decode gzip-compressed stuff

-					// code shamelessly inspired from nusoap library by Dietrich Ayala

-					if(isset($GLOBALS['_xh']['headers']['content-encoding']))

-					{

-						$GLOBALS['_xh']['headers']['content-encoding'] = str_replace('x-', '', $GLOBALS['_xh']['headers']['content-encoding']);

-						if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' || $GLOBALS['_xh']['headers']['content-encoding'] == 'gzip')

-						{

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

-							if(function_exists('gzinflate'))

-							{

-								if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))

-								{

-									$data = $degzdata;

-									if($this->debug)

-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";

-								}

-								elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

-								{

-									$data = $degzdata;

-									if($this->debug)

-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";

-								}

-								else

-								{

-									error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');

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

-									return $r;

-								}

-							}

-							else

-							{

-								error_log('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');

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

-								return $r;

-							}

-						}

-					}

-				} // end of 'if needed, de-chunk, re-inflate response'

-

-				// real stupid hack to avoid PHP complaining about returning NULL by ref

-				$r = null;

-				$r =& $r;

-				return $r;

-		}

-

-		/**

-		* Parse the xmlrpc response contained in the string $data and return an xmlrpcresp object.

-		* @param string $data the xmlrpc response, eventually including http headers

-		* @param bool $headers_processed when true prevents parsing HTTP headers for interpretation of content-encoding and consequent decoding

-		* @param string $return_type decides return type, i.e. content of response->value(). Either 'xmlrpcvals', 'xml' or 'phpvals'

-		* @return xmlrpcresp

-		* @access public

-		*/

-		function &parseResponse($data='', $headers_processed=false, $return_type='xmlrpcvals')

-		{

-			if($this->debug)

-			{

-				//by maHo, replaced htmlspecialchars with htmlentities

-				print "<PRE>---GOT---\n" . htmlentities($data) . "\n---END---\n</PRE>";

-			}

-

-			if($data == '')

-			{

-				error_log('XML-RPC: '.__METHOD__.': no response received from server.');

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

-				return $r;

-			}

-

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

-

-			$raw_data = $data;

-			// parse the HTTP headers of the response, if present, and separate them from data

-			if(substr($data, 0, 4) == 'HTTP')

-			{

-				$r =& $this->parseResponseHeaders($data, $headers_processed);

-				if ($r)

-				{

-					// failed processing of HTTP response headers

-					// save into response obj the full payload received, for debugging

-					$r->raw_data = $data;

-					return $r;

-				}

-			}

-			else

-			{

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

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

-			}

-

-			if($this->debug)

-			{

-				$start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');

-				if ($start)

-				{

-					$start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');

-					$end = strpos($data, '-->', $start);

-					$comments = substr($data, $start, $end-$start);

-					print "<PRE>---SERVER DEBUG INFO (DECODED) ---\n\t".htmlentities(str_replace("\n", "\n\t", base64_decode($comments)))."\n---END---\n</PRE>";

-				}

-			}

-

-			// be tolerant of extra whitespace in response body

-			$data = trim($data);

-

-			/// @todo return an error msg if $data=='' ?

-

-			// be tolerant of junk after methodResponse (e.g. javascript ads automatically inserted by free hosts)

-			// idea from Luca Mariano <luca.mariano@email.it> originally in PEARified version of the lib

-			$pos = strrpos($data, '</methodResponse>');

-			if($pos !== false)

-			{

-				$data = substr($data, 0, $pos+17);

-			}

-

-			// if user wants back raw xml, give it to him

-			if ($return_type == 'xml')

-			{

-				$r = new xmlrpcresp($data, 0, '', 'xml');

-				$r->hdrs = $GLOBALS['_xh']['headers'];

-				$r->_cookies = $GLOBALS['_xh']['cookies'];

-				$r->raw_data = $raw_data;

-				return $r;

-			}

-

-			// try to 'guestimate' the character encoding of the received response

-			$resp_encoding = guess_encoding(@$GLOBALS['_xh']['headers']['content-type'], $data);

-

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

-			//$GLOBALS['_xh']['qt']=''; //unused...

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

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

-			$GLOBALS['_xh']['isf']=0; // 0 = OK, 1 for xmlrpc fault responses, 2 = invalid xmlrpc

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

-			$GLOBALS['_xh']['rt']=''; // 'methodcall or 'methodresponse'

-

-			// Since parsing will fail if charset is not specified in the xml prologue,

-			// the encoding is not UTF8 and there are non-ascii chars in the text, we try to work round that...

-			// The following code might be better for mb_string enabled installs, but

-			// makes the lib about 200% slower...

-			//if (!is_valid_charset($resp_encoding, array('UTF-8')))

-			if (!in_array($resp_encoding, array('UTF-8', 'US-ASCII')) && !has_encoding($data)) {

-				if ($resp_encoding == 'ISO-8859-1') {

-					$data = utf8_encode($data);

-				} else {

-					if (extension_loaded('mbstring')) {

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

-					} else {

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

-					}

-				}

-			}

-

-			$parser = xml_parser_create();

-			xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);

-			// G. Giunta 2005/02/13: PHP internally uses ISO-8859-1, so we have to tell

-			// the xml parser to give us back data in the expected charset.

-			// What if internal encoding is not in one of the 3 allowed?

-			// we use the broadest one, ie. utf8

-			// This allows to send data which is native in various charset,

-			// by extending xmlrpc_encode_entitites() and setting xmlrpc_internalencoding

-			if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))

-			{

-				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');

-			}

-			else

-			{

-				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);

-			}

-

-			if ($return_type == 'phpvals')

-			{

-				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');

-			}

-			else

-			{

-				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');

-			}

-

-			xml_set_character_data_handler($parser, 'xmlrpc_cd');

-			xml_set_default_handler($parser, 'xmlrpc_dh');

-

-			// first error check: xml not well formed

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

-			{

-				// thanks to Peter Kocks <peter.kocks@baygate.com>

-				if((xml_get_current_line_number($parser)) == 1)

-				{

-					$errstr = 'XML error at line 1, check URL';

-				}

-				else

-				{

-					$errstr = sprintf('XML error: %s at line %d, column %d',

-						xml_error_string(xml_get_error_code($parser)),

-						xml_get_current_line_number($parser), xml_get_current_column_number($parser));

-				}

-				error_log($errstr);

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

-				xml_parser_free($parser);

-				if($this->debug)

-				{

-					print $errstr;

-				}

-				$r->hdrs = $GLOBALS['_xh']['headers'];

-				$r->_cookies = $GLOBALS['_xh']['cookies'];

-				$r->raw_data = $raw_data;

-				return $r;

-			}

-			xml_parser_free($parser);

-			// second error check: xml well formed but not xml-rpc compliant

-			if ($GLOBALS['_xh']['isf'] > 1)

-			{

-				if ($this->debug)

-				{

-					/// @todo echo something for user?

-				}

-

-				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],

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

-			}

-			// third error check: parsing of the response has somehow gone boink.

-			// NB: shall we omit this check, since we trust the parsing code?

-			elseif ($return_type == 'xmlrpcvals' && !is_object($GLOBALS['_xh']['value']))

-			{

-				// something odd has happened

-				// and it's time to generate a client side error

-				// indicating something odd went on

-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],

-					$GLOBALS['xmlrpcstr']['invalid_return']);

-			}

-			else

-			{

-				if ($this->debug)

-				{

-					print "<PRE>---PARSED---\n";

-					// somehow htmlentities chokes on var_export, and some full html string...

-					//print htmlentitites(var_export($GLOBALS['_xh']['value'], true));

-					print htmlspecialchars(var_export($GLOBALS['_xh']['value'], true));

-					print "\n---END---</PRE>";

-				}

-

-				// note that using =& will raise an error if $GLOBALS['_xh']['st'] does not generate an object.

-				$v =& $GLOBALS['_xh']['value'];

-

-				if($GLOBALS['_xh']['isf'])

-				{

-					/// @todo we should test here if server sent an int and a string,

-					/// and/or coerce them into such...

-					if ($return_type == 'xmlrpcvals')

-					{

-						$errno_v = $v->structmem('faultCode');

-						$errstr_v = $v->structmem('faultString');

-						$errno = $errno_v->scalarval();

-						$errstr = $errstr_v->scalarval();

-					}

-					else

-					{

-						$errno = $v['faultCode'];

-						$errstr = $v['faultString'];

-					}

-

-					if($errno == 0)

-					{

-						// FAULT returned, errno needs to reflect that

-						$errno = -1;

-					}

-

-					$r = new xmlrpcresp(0, $errno, $errstr);

-				}

-				else

-				{

-					$r=new xmlrpcresp($v, 0, '', $return_type);

-				}

-			}

-

-			$r->hdrs = $GLOBALS['_xh']['headers'];

-			$r->_cookies = $GLOBALS['_xh']['cookies'];

-			$r->raw_data = $raw_data;

-			return $r;

-		}

-	}

-

-	class xmlrpcval

-	{

-		var $me=array();

-		var $mytype=0;

-		var $_php_class=null;

-

-		/**

-		* @param mixed $val

-		* @param string $type any valid xmlrpc type name (lowercase). If null, 'string' is assumed

-		*/

-		function __construct($val=-1, $type='')

-		{

-			/// @todo: optimization creep - do not call addXX, do it all inline.

-			/// downside: booleans will not be coerced anymore

-			if($val!==-1 || $type!='')

-			{

-				// optimization creep: inlined all work done by constructor

-				switch($type)

-				{

-					case '':

-						$this->mytype=1;

-						$this->me['string']=$val;

-						break;

-					case 'i4':

-					case 'int':

-					case 'double':

-					case 'string':

-					case 'boolean':

-					case 'dateTime.iso8601':

-					case 'base64':

-					case 'null':

-						$this->mytype=1;

-						$this->me[$type]=$val;

-						break;

-					case 'array':

-						$this->mytype=2;

-						$this->me['array']=$val;

-						break;

-					case 'struct':

-						$this->mytype=3;

-						$this->me['struct']=$val;

-						break;

-					default:

-						error_log("XML-RPC: ".__METHOD__.": not a known type ($type)");

-				}

-				/*if($type=='')

+            }

+            else

+            {

+                if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))

+                {

+                    if (is_string($this->val) && $this->valtyp == 'xml')

+                    {

+                        $result .= "<params>\n<param>\n" .

+                            $this->val .

+                            "</param>\n</params>";

+                    }

+                    else

+                    {

+                        /// @todo try to build something serializable?

+                        die('cannot serialize xmlrpcresp objects whose content is native php values');

+                    }

+                }

+                else

+                {

+                    $result .= "<params>\n<param>\n" .

+                        $this->val->serialize($charset_encoding) .

+                        "</param>\n</params>";

+                }

+            }

+            $result .= "\n</methodResponse>";

+            $this->payload = $result;

+            return $result;

+        }

+    }

+

+    class xmlrpcmsg

+    {

+        var $payload;

+        var $methodname;

+        var $params=array();

+        var $debug=0;

+        var $content_type = 'text/xml';

+

+        /**

+         * @param string $meth the name of the method to invoke

+         * @param array $pars array of parameters to be passed to the method (xmlrpcval objects)

+         */

+        function __construct($meth, $pars=0)

+        {

+            $this->methodname=$meth;

+            if(is_array($pars) && count($pars)>0)

+            {

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

+                {

+                    $this->addParam($pars[$i]);

+                }

+            }

+        }

+

+                /**

+                 * @deprecated

+                 */

+        function xmlrpcmsg($meth, $pars=0)

+        {

+            self::__construct($meth, $pars);

+        }

+

+        /**

+         * @access private

+         */

+        function xml_header($charset_encoding='')

+        {

+            if ($charset_encoding != '')

+            {

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

+            }

+            else

+            {

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

+            }

+        }

+

+        /**

+         * @access private

+         */

+        function xml_footer()

+        {

+            return '</methodCall>';

+        }

+

+        /**

+         * @access private

+         */

+        function kindOf()

+        {

+            return 'msg';

+        }

+

+        /**

+         * @access private

+         */

+        function createPayload($charset_encoding='')

+        {

+            if ($charset_encoding != '')

+                $this->content_type = 'text/xml; charset=' . $charset_encoding;

+            else

+                $this->content_type = 'text/xml';

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

+            $this->payload.='<methodName>' . xmlrpc_encode_entitites($this->methodname, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</methodName>\n";

+            $this->payload.="<params>\n";

+            for($i=0; $i<count($this->params); $i++)

+            {

+                $p=$this->params[$i];

+                $this->payload.="<param>\n" . $p->serialize($charset_encoding) .

+                "</param>\n";

+            }

+            $this->payload.="</params>\n";

+            $this->payload.=$this->xml_footer();

+        }

+

+        /**

+         * Gets/sets the xmlrpc method to be invoked

+         * @param string $meth the method to be set (leave empty not to set it)

+         * @return string the method that will be invoked

+         * @access public

+         */

+        function method($meth='')

+        {

+            if($meth!='')

+            {

+                $this->methodname=$meth;

+            }

+            return $this->methodname;

+        }

+

+        /**

+         * Returns xml representation of the message. XML prologue included

+         * @param string $charset_encoding

+         * @return string the xml representation of the message, xml prologue included

+         * @access public

+         */

+        function serialize($charset_encoding='')

+        {

+            $this->createPayload($charset_encoding);

+            return $this->payload;

+        }

+

+        /**

+         * Add a parameter to the list of parameters to be used upon method invocation

+         * @param xmlrpcval $par

+         * @return boolean false on failure

+         * @access public

+         */

+        function addParam($par)

+        {

+            // add check: do not add to self params which are not xmlrpcvals

+            if(is_object($par) && is_a($par, 'xmlrpcval'))

+            {

+                $this->params[]=$par;

+                return true;

+            }

+            else

+            {

+                return false;

+            }

+        }

+

+        /**

+         * Returns the nth parameter in the message. The index zero-based.

+         * @param integer $i the index of the parameter to fetch (zero based)

+         * @return xmlrpcval the i-th parameter

+         * @access public

+         */

+        function getParam($i) { return $this->params[$i]; }

+

+        /**

+         * Returns the number of parameters in the messge.

+         * @return integer the number of parameters currently set

+         * @access public

+         */

+        function getNumParams() { return count($this->params); }

+

+        /**

+         * Given an open file handle, read all data available and parse it as axmlrpc response.

+         * NB: the file handle is not closed by this function.

+         * NNB: might have trouble in rare cases to work on network streams, as we

+         *      check for a read of 0 bytes instead of feof($fp).

+         *      But since checking for feof(null) returns false, we would risk an

+         *      infinite loop in that case, because we cannot trust the caller

+         *      to give us a valid pointer to an open file...

+         * @access public

+         * @param resource $fp stream pointer

+         * @return xmlrpcresp

+         * @todo add 2nd & 3rd param to be passed to ParseResponse() ???

+         */

+        function &parseResponseFile($fp)

+        {

+            $ipd='';

+            while($data=fread($fp, 32768))

+            {

+                $ipd.=$data;

+            }

+            //fclose($fp);

+            $r =& $this->parseResponse($ipd);

+            return $r;

+        }

+

+        /**

+         * Parses HTTP headers and separates them from data.

+         * @access private

+         */

+        function &parseResponseHeaders(&$data, $headers_processed=false)

+        {

+                // Support "web-proxy-tunelling" connections for https through proxies

+                if(preg_match('/^HTTP\/1\.[0-1] 200 Connection established/', $data))

+                {

+                    // Look for CR/LF or simple LF as line separator,

+                    // (even though it is not valid http)

+                    $pos = strpos($data,"\r\n\r\n");

+                    if($pos || is_int($pos))

+                    {

+                        $bd = $pos+4;

+                    }

+                    else

+                    {

+                        $pos = strpos($data,"\n\n");

+                        if($pos || is_int($pos))

+                        {

+                            $bd = $pos+2;

+                        }

+                        else

+                        {

+                            // No separation between response headers and body: fault?

+                            $bd = 0;

+                        }

+                    }

+                    if ($bd)

+                    {

+                        // this filters out all http headers from proxy.

+                        // maybe we could take them into account, too?

+                        $data = substr($data, $bd);

+                    }

+                    else

+                    {

+                        error_log('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');

+                        $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)');

+                        return $r;

+                    }

+                }

+

+                // Strip HTTP 1.1 100 Continue header if present

+                while(preg_match('/^HTTP\/1\.1 1[0-9]{2} /', $data))

+                {

+                    $pos = strpos($data, 'HTTP', 12);

+                    // server sent a Continue header without any (valid) content following...

+                    // give the client a chance to know it

+                    if(!$pos && !is_int($pos)) // works fine in php 3, 4 and 5

+                    {

+                        break;

+                    }

+                    $data = substr($data, $pos);

+                }

+                if(!preg_match('/^HTTP\/[0-9.]+ 200 /', $data))

+                {

+                    $errstr= substr($data, 0, strpos($data, "\n")-1);

+                    error_log('XML-RPC: '.__METHOD__.': HTTP error, got response: ' .$errstr);

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

+                    return $r;

+                }

+

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

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

+

+                // be tolerant to usage of \n instead of \r\n to separate headers and data

+                // (even though it is not valid http)

+                $pos = strpos($data,"\r\n\r\n");

+                if($pos || is_int($pos))

+                {

+                    $bd = $pos+4;

+                }

+                else

+                {

+                    $pos = strpos($data,"\n\n");

+                    if($pos || is_int($pos))

+                    {

+                        $bd = $pos+2;

+                    }

+                    else

+                    {

+                        // No separation between response headers and body: fault?

+                        // we could take some action here instead of going on...

+                        $bd = 0;

+                    }

+                }

+                // be tolerant to line endings, and extra empty lines

+                $ar = preg_split("/\r?\n/", trim(substr($data, 0, $pos)));

+                while(list(,$line) = @each($ar))

+                {

+                    // take care of multi-line headers and cookies

+                    $arr = explode(':',$line,2);

+                    if(count($arr) > 1)

+                    {

+                        $header_name = strtolower(trim($arr[0]));

+                        /// @todo some other headers (the ones that allow a CSV list of values)

+                        /// do allow many values to be passed using multiple header lines.

+                        /// We should add content to $GLOBALS['_xh']['headers'][$header_name]

+                        /// instead of replacing it for those...

+                        if ($header_name == 'set-cookie' || $header_name == 'set-cookie2')

+                        {

+                            if ($header_name == 'set-cookie2')

+                            {

+                                // version 2 cookies:

+                                // there could be many cookies on one line, comma separated

+                                $cookies = explode(',', $arr[1]);

+                            }

+                            else

+                            {

+                                $cookies = array($arr[1]);

+                            }

+                            foreach ($cookies as $cookie)

+                            {

+                                // glue together all received cookies, using a comma to separate them

+                                // (same as php does with getallheaders())

+                                if (isset($GLOBALS['_xh']['headers'][$header_name]))

+                                    $GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);

+                                else

+                                    $GLOBALS['_xh']['headers'][$header_name] = trim($cookie);

+                                // parse cookie attributes, in case user wants to correctly honour them

+                                // feature creep: only allow rfc-compliant cookie attributes?

+                                // @todo support for server sending multiple time cookie with same name, but using different PATHs

+                                $cookie = explode(';', $cookie);

+                                foreach ($cookie as $pos => $val)

+                                {

+                                    $val = explode('=', $val, 2);

+                                    $tag = trim($val[0]);

+                                    $val = trim(@$val[1]);

+                                    /// @todo with version 1 cookies, we should strip leading and trailing " chars

+                                    if ($pos == 0)

+                                    {

+                                        $cookiename = $tag;

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

+                                        $GLOBALS['_xh']['cookies'][$cookiename]['value'] = urldecode($val);

+                                    }

+                                    else

+                                    {

+                                        if ($tag != 'value')

+                                        {

+                                            $GLOBALS['_xh']['cookies'][$cookiename][$tag] = $val;

+                                        }

+                                    }

+                                }

+                            }

+                        }

+                        else

+                        {

+                            $GLOBALS['_xh']['headers'][$header_name] = trim($arr[1]);

+                        }

+                    }

+                    elseif(isset($header_name))

+                    {

+                        ///	@todo version1 cookies might span multiple lines, thus breaking the parsing above

+                        $GLOBALS['_xh']['headers'][$header_name] .= ' ' . trim($line);

+                    }

+                }

+

+                $data = substr($data, $bd);

+

+                if($this->debug && count($GLOBALS['_xh']['headers']))

+                {

+                    print '<PRE>';

+                    foreach($GLOBALS['_xh']['headers'] as $header => $value)

+                    {

+                        print htmlentities("HEADER: $header: $value\n");

+                    }

+                    foreach($GLOBALS['_xh']['cookies'] as $header => $value)

+                    {

+                        print htmlentities("COOKIE: $header={$value['value']}\n");

+                    }

+                    print "</PRE>\n";

+                }

+

+                // if CURL was used for the call, http headers have been processed,

+                // and dechunking + reinflating have been carried out

+                if(!$headers_processed)

+                {

+                    // Decode chunked encoding sent by http 1.1 servers

+                    if(isset($GLOBALS['_xh']['headers']['transfer-encoding']) && $GLOBALS['_xh']['headers']['transfer-encoding'] == 'chunked')

+                    {

+                        if(!$data = decode_chunked($data))

+                        {

+                            error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');

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

+                            return $r;

+                        }

+                    }

+

+                    // Decode gzip-compressed stuff

+                    // code shamelessly inspired from nusoap library by Dietrich Ayala

+                    if(isset($GLOBALS['_xh']['headers']['content-encoding']))

+                    {

+                        $GLOBALS['_xh']['headers']['content-encoding'] = str_replace('x-', '', $GLOBALS['_xh']['headers']['content-encoding']);

+                        if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' || $GLOBALS['_xh']['headers']['content-encoding'] == 'gzip')

+                        {

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

+                            if(function_exists('gzinflate'))

+                            {

+                                if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))

+                                {

+                                    $data = $degzdata;

+                                    if($this->debug)

+                                    print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";

+                                }

+                                elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

+                                {

+                                    $data = $degzdata;

+                                    if($this->debug)

+                                    print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";

+                                }

+                                else

+                                {

+                                    error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');

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

+                                    return $r;

+                                }

+                            }

+                            else

+                            {

+                                error_log('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');

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

+                                return $r;

+                            }

+                        }

+                    }

+                } // end of 'if needed, de-chunk, re-inflate response'

+

+                // real stupid hack to avoid PHP complaining about returning NULL by ref

+                $r = null;

+                $r =& $r;

+                return $r;

+        }

+

+        /**

+         * Parse the xmlrpc response contained in the string $data and return an xmlrpcresp object.

+         * @param string $data the xmlrpc response, eventually including http headers

+         * @param bool $headers_processed when true prevents parsing HTTP headers for interpretation of content-encoding and consequent decoding

+         * @param string $return_type decides return type, i.e. content of response->value(). Either 'xmlrpcvals', 'xml' or 'phpvals'

+         * @return xmlrpcresp

+         * @access public

+         */

+        function &parseResponse($data='', $headers_processed=false, $return_type='xmlrpcvals')

+        {

+            if($this->debug)

+            {

+                //by maHo, replaced htmlspecialchars with htmlentities

+                print "<PRE>---GOT---\n" . htmlentities($data) . "\n---END---\n</PRE>";

+            }

+

+            if($data == '')

+            {

+                error_log('XML-RPC: '.__METHOD__.': no response received from server.');

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

+                return $r;

+            }

+

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

+

+            $raw_data = $data;

+            // parse the HTTP headers of the response, if present, and separate them from data

+            if(substr($data, 0, 4) == 'HTTP')

+            {

+                $r =& $this->parseResponseHeaders($data, $headers_processed);

+                if ($r)

+                {

+                    // failed processing of HTTP response headers

+                    // save into response obj the full payload received, for debugging

+                    $r->raw_data = $data;

+                    return $r;

+                }

+            }

+            else

+            {

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

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

+            }

+

+            if($this->debug)

+            {

+                $start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');

+                if ($start)

+                {

+                    $start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');

+                    $end = strpos($data, '-->', $start);

+                    $comments = substr($data, $start, $end-$start);

+                    print "<PRE>---SERVER DEBUG INFO (DECODED) ---\n\t".htmlentities(str_replace("\n", "\n\t", base64_decode($comments)))."\n---END---\n</PRE>";

+                }

+            }

+

+            // be tolerant of extra whitespace in response body

+            $data = trim($data);

+

+            /// @todo return an error msg if $data=='' ?

+

+            // be tolerant of junk after methodResponse (e.g. javascript ads automatically inserted by free hosts)

+            // idea from Luca Mariano <luca.mariano@email.it> originally in PEARified version of the lib

+            $pos = strrpos($data, '</methodResponse>');

+            if($pos !== false)

+            {

+                $data = substr($data, 0, $pos+17);

+            }

+

+            // if user wants back raw xml, give it to him

+            if ($return_type == 'xml')

+            {

+                $r = new xmlrpcresp($data, 0, '', 'xml');

+                $r->hdrs = $GLOBALS['_xh']['headers'];

+                $r->_cookies = $GLOBALS['_xh']['cookies'];

+                $r->raw_data = $raw_data;

+                return $r;

+            }

+

+            // try to 'guestimate' the character encoding of the received response

+            $resp_encoding = guess_encoding(@$GLOBALS['_xh']['headers']['content-type'], $data);

+

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

+            //$GLOBALS['_xh']['qt']=''; //unused...

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

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

+            $GLOBALS['_xh']['isf']=0; // 0 = OK, 1 for xmlrpc fault responses, 2 = invalid xmlrpc

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

+            $GLOBALS['_xh']['rt']=''; // 'methodcall or 'methodresponse'

+

+            // Since parsing will fail if charset is not specified in the xml prologue,

+            // the encoding is not UTF8 and there are non-ascii chars in the text, we try to work round that...

+            // The following code might be better for mb_string enabled installs, but

+            // makes the lib about 200% slower...

+            //if (!is_valid_charset($resp_encoding, array('UTF-8')))

+            if (!in_array($resp_encoding, array('UTF-8', 'US-ASCII')) && !has_encoding($data)) {

+                if ($resp_encoding == 'ISO-8859-1') {

+                    $data = utf8_encode($data);

+                } else {

+                    if (extension_loaded('mbstring')) {

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

+                    } else {

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

+                    }

+                }

+            }

+

+            $parser = xml_parser_create();

+            xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);

+            // G. Giunta 2005/02/13: PHP internally uses ISO-8859-1, so we have to tell

+            // the xml parser to give us back data in the expected charset.

+            // What if internal encoding is not in one of the 3 allowed?

+            // we use the broadest one, ie. utf8

+            // This allows to send data which is native in various charset,

+            // by extending xmlrpc_encode_entitites() and setting xmlrpc_internalencoding

+            if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))

+            {

+                xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');

+            }

+            else

+            {

+                xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);

+            }

+

+            if ($return_type == 'phpvals')

+            {

+                xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');

+            }

+            else

+            {

+                xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');

+            }

+

+            xml_set_character_data_handler($parser, 'xmlrpc_cd');

+            xml_set_default_handler($parser, 'xmlrpc_dh');

+

+            // first error check: xml not well formed

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

+            {

+                // thanks to Peter Kocks <peter.kocks@baygate.com>

+                if((xml_get_current_line_number($parser)) == 1)

+                {

+                    $errstr = 'XML error at line 1, check URL';

+                }

+                else

+                {

+                    $errstr = sprintf('XML error: %s at line %d, column %d',

+                        xml_error_string(xml_get_error_code($parser)),

+                        xml_get_current_line_number($parser), xml_get_current_column_number($parser));

+                }

+                error_log($errstr);

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

+                xml_parser_free($parser);

+                if($this->debug)

+                {

+                    print $errstr;

+                }

+                $r->hdrs = $GLOBALS['_xh']['headers'];

+                $r->_cookies = $GLOBALS['_xh']['cookies'];

+                $r->raw_data = $raw_data;

+                return $r;

+            }

+            xml_parser_free($parser);

+            // second error check: xml well formed but not xml-rpc compliant

+            if ($GLOBALS['_xh']['isf'] > 1)

+            {

+                if ($this->debug)

+                {

+                    /// @todo echo something for user?

+                }

+

+                $r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],

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

+            }

+            // third error check: parsing of the response has somehow gone boink.

+            // NB: shall we omit this check, since we trust the parsing code?

+            elseif ($return_type == 'xmlrpcvals' && !is_object($GLOBALS['_xh']['value']))

+            {

+                // something odd has happened

+                // and it's time to generate a client side error

+                // indicating something odd went on

+                $r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],

+                    $GLOBALS['xmlrpcstr']['invalid_return']);

+            }

+            else

+            {

+                if ($this->debug)

+                {

+                    print "<PRE>---PARSED---\n";

+                    // somehow htmlentities chokes on var_export, and some full html string...

+                    //print htmlentitites(var_export($GLOBALS['_xh']['value'], true));

+                    print htmlspecialchars(var_export($GLOBALS['_xh']['value'], true));

+                    print "\n---END---</PRE>";

+                }

+

+                // note that using =& will raise an error if $GLOBALS['_xh']['st'] does not generate an object.

+                $v =& $GLOBALS['_xh']['value'];

+

+                if($GLOBALS['_xh']['isf'])

+                {

+                    /// @todo we should test here if server sent an int and a string,

+                    /// and/or coerce them into such...

+                    if ($return_type == 'xmlrpcvals')

+                    {

+                        $errno_v = $v->structmem('faultCode');

+                        $errstr_v = $v->structmem('faultString');

+                        $errno = $errno_v->scalarval();

+                        $errstr = $errstr_v->scalarval();

+                    }

+                    else

+                    {

+                        $errno = $v['faultCode'];

+                        $errstr = $v['faultString'];

+                    }

+

+                    if($errno == 0)

+                    {

+                        // FAULT returned, errno needs to reflect that

+                        $errno = -1;

+                    }

+

+                    $r = new xmlrpcresp(0, $errno, $errstr);

+                }

+                else

+                {

+                    $r=new xmlrpcresp($v, 0, '', $return_type);

+                }

+            }

+

+            $r->hdrs = $GLOBALS['_xh']['headers'];

+            $r->_cookies = $GLOBALS['_xh']['cookies'];

+            $r->raw_data = $raw_data;

+            return $r;

+        }

+    }

+

+    class xmlrpcval

+    {

+        var $me=array();

+        var $mytype=0;

+        var $_php_class=null;

+

+        /**

+         * @param mixed $val

+         * @param string $type any valid xmlrpc type name (lowercase). If null, 'string' is assumed

+         */

+        function __construct($val=-1, $type='')

+        {

+            /// @todo: optimization creep - do not call addXX, do it all inline.

+            /// downside: booleans will not be coerced anymore

+            if($val!==-1 || $type!='')

+            {

+                // optimization creep: inlined all work done by constructor

+                switch($type)

+                {

+                    case '':

+                        $this->mytype=1;

+                        $this->me['string']=$val;

+                        break;

+                    case 'i4':

+                    case 'int':

+                    case 'double':

+                    case 'string':

+                    case 'boolean':

+                    case 'dateTime.iso8601':

+                    case 'base64':

+                    case 'null':

+                        $this->mytype=1;

+                        $this->me[$type]=$val;

+                        break;

+                    case 'array':

+                        $this->mytype=2;

+                        $this->me['array']=$val;

+                        break;

+                    case 'struct':

+                        $this->mytype=3;

+                        $this->me['struct']=$val;

+                        break;

+                    default:

+                        error_log("XML-RPC: ".__METHOD__.": not a known type ($type)");

+                }

+                /*if($type=='')

 				{

 					$type='string';

 				}

@@ -2830,1079 +2830,1079 @@ 
 				{

 					$this->addStruct($val);

 				}*/

-			}

-		}

-

-		/**

-		* @deprecated

-		*/

-		function xmlrpcval($val=-1, $type='')

-		{

-			self::__construct($val, $type);

-		}

-

-		/**

-		* Add a single php value to an (unitialized) xmlrpcval

-		* @param mixed $val

-		* @param string $type

-		* @return int 1 or 0 on failure

-		*/

-		function addScalar($val, $type='string')

-		{

-			$typeof=@$GLOBALS['xmlrpcTypes'][$type];

-			if($typeof!=1)

-			{

-				error_log("XML-RPC: ".__METHOD__.": not a scalar type ($type)");

-				return 0;

-			}

-

-			// coerce booleans into correct values

-			// NB: we should either do it for datetimes, integers and doubles, too,

-			// or just plain remove this check, implemented on booleans only...

-			if($type==$GLOBALS['xmlrpcBoolean'])

-			{

-				if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))

-				{

-					$val=true;

-				}

-				else

-				{

-					$val=false;

-				}

-			}

-

-			switch($this->mytype)

-			{

-				case 1:

-					error_log('XML-RPC: '.__METHOD__.': scalar xmlrpcval can have only one value');

-					return 0;

-				case 3:

-					error_log('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpcval');

-					return 0;

-				case 2:

-					// we're adding a scalar value to an array here

-					//$ar=$this->me['array'];

-					//$ar[]=new xmlrpcval($val, $type);

-					//$this->me['array']=$ar;

-					// Faster (?) avoid all the costly array-copy-by-val done here...

-					$this->me['array'][]=new xmlrpcval($val, $type);

-					return 1;

-				default:

-					// a scalar, so set the value and remember we're scalar

-					$this->me[$type]=$val;

-					$this->mytype=$typeof;

-					return 1;

-			}

-		}

-

-		/**

-		* Add an array of xmlrpcval objects to an xmlrpcval

-		* @param array $vals

-		* @return int 1 or 0 on failure

-		* @access public

-		*

-		* @todo add some checking for $vals to be an array of xmlrpcvals?

-		*/

-		function addArray($vals)

-		{

-			if($this->mytype==0)

-			{

-				$this->mytype=$GLOBALS['xmlrpcTypes']['array'];

-				$this->me['array']=$vals;

-				return 1;

-			}

-			elseif($this->mytype==2)

-			{

-				// we're adding to an array here

-				$this->me['array'] = array_merge($this->me['array'], $vals);

-				return 1;

-			}

-			else

-			{

-				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');

-				return 0;

-			}

-		}

-

-		/**

-		* Add an array of named xmlrpcval objects to an xmlrpcval

-		* @param array $vals

-		* @return int 1 or 0 on failure

-		* @access public

-		*

-		* @todo add some checking for $vals to be an array?

-		*/

-		function addStruct($vals)

-		{

-			if($this->mytype==0)

-			{

-				$this->mytype=$GLOBALS['xmlrpcTypes']['struct'];

-				$this->me['struct']=$vals;

-				return 1;

-			}

-			elseif($this->mytype==3)

-			{

-				// we're adding to a struct here

-				$this->me['struct'] = array_merge($this->me['struct'], $vals);

-				return 1;

-			}

-			else

-			{

-				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');

-				return 0;

-			}

-		}

-

-		// poor man's version of print_r ???

-		// DEPRECATED!

-		function dump($ar)

-		{

-			foreach($ar as $key => $val)

-			{

-				echo "$key => $val<br />";

-				if($key == 'array')

-				{

-					while(list($key2, $val2) = each($val))

-					{

-						echo "-- $key2 => $val2<br />";

-					}

-				}

-			}

-		}

-

-		/**

-		* Returns a string containing "struct", "array" or "scalar" describing the base type of the value

-		* @return string

-		* @access public

-		*/

-		function kindOf()

-		{

-			switch($this->mytype)

-			{

-				case 3:

-					return 'struct';

-					break;

-				case 2:

-					return 'array';

-					break;

-				case 1:

-					return 'scalar';

-					break;

-				default:

-					return 'undef';

-			}

-		}

-

-		/**

-		* @access private

-		*/

-		function serializedata($typ, $val, $charset_encoding='')

-		{

-			$rs='';

-			switch(@$GLOBALS['xmlrpcTypes'][$typ])

-			{

-				case 1:

-					switch($typ)

-					{

-						case $GLOBALS['xmlrpcBase64']:

-							$rs.="<${typ}>" . base64_encode($val) . "</${typ}>";

-							break;

-						case $GLOBALS['xmlrpcBoolean']:

-							$rs.="<${typ}>" . ($val ? '1' : '0') . "</${typ}>";

-							break;

-						case $GLOBALS['xmlrpcString']:

-							// G. Giunta 2005/2/13: do NOT use htmlentities, since

-							// it will produce named html entities, which are invalid xml

-							$rs.="<${typ}>" . xmlrpc_encode_entitites($val, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding). "</${typ}>";

-							break;

-						case $GLOBALS['xmlrpcInt']:

-						case $GLOBALS['xmlrpcI4']:

-							$rs.="<${typ}>".(int)$val."</${typ}>";

-							break;

-						case $GLOBALS['xmlrpcDouble']:

-							// avoid using standard conversion of float to string because it is locale-dependent,

-							// and also because the xmlrpc spec forbids exponential notation.

-							// sprintf('%F') could be most likely ok but it fails eg. on 2e-14.

-							// The code below tries its best at keeping max precision while avoiding exp notation,

-							// but there is of course no limit in the number of decimal places to be used...

-							$rs.="<${typ}>".preg_replace('/\\.?0+$/','',number_format((double)$val, 128, '.', ''))."</${typ}>";

-							break;

-						case $GLOBALS['xmlrpcDateTime']:

-							if (is_string($val))

-							{

-								$rs.="<${typ}>${val}</${typ}>";

-							}

-							else if(is_a($val, 'DateTime'))

-							{

-								$rs.="<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>";

-							}

-							else if(is_int($val))

-							{

-								$rs.="<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>";

-							}

-							else

-							{

-								// not really a good idea here: but what shall we output anyway? left for backward compat...

-								$rs.="<${typ}>${val}</${typ}>";

-							}

-							break;

-						case $GLOBALS['xmlrpcNull']:

-							if ($GLOBALS['xmlrpc_null_apache_encoding'])

-							{

-								$rs.="<ex:nil/>";

-							}

-							else

-							{

-								$rs.="<nil/>";

-							}

-							break;

-						default:

-							// no standard type value should arrive here, but provide a possibility

-							// for xmlrpcvals of unknown type...

-							$rs.="<${typ}>${val}</${typ}>";

-					}

-					break;

-				case 3:

-					// struct

-					if ($this->_php_class)

-					{

-						$rs.='<struct php_class="' . $this->_php_class . "\">\n";

-					}

-					else

-					{

-						$rs.="<struct>\n";

-					}

-					foreach($val as $key2 => $val2)

-					{

-						$rs.='<member><name>'.xmlrpc_encode_entitites($key2, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</name>\n";

-						//$rs.=$this->serializeval($val2);

-						$rs.=$val2->serialize($charset_encoding);

-						$rs.="</member>\n";

-					}

-					$rs.='</struct>';

-					break;

-				case 2:

-					// array

-					$rs.="<array>\n<data>\n";

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

-					{

-						//$rs.=$this->serializeval($val[$i]);

-						$rs.=$val[$i]->serialize($charset_encoding);

-					}

-					$rs.="</data>\n</array>";

-					break;

-				default:

-					break;

-			}

-			return $rs;

-		}

-

-		/**

-		* Returns xml representation of the value. XML prologue not included

-		* @param string $charset_encoding the charset to be used for serialization. if null, US-ASCII is assumed

-		* @return string

-		* @access public

-		*/

-		function serialize($charset_encoding='')

-		{

-			// add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...

-			//if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))

-			//{

-				reset($this->me);

-				list($typ, $val) = each($this->me);

-				return '<value>' . $this->serializedata($typ, $val, $charset_encoding) . "</value>\n";

-			//}

-		}

-

-		// DEPRECATED

-		function serializeval($o)

-		{

-			// add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...

-			//if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))

-			//{

-				$ar=$o->me;

-				reset($ar);

-				list($typ, $val) = each($ar);

-				return '<value>' . $this->serializedata($typ, $val) . "</value>\n";

-			//}

-		}

-

-		/**

-		* Checks whether a struct member with a given name is present.

-		* Works only on xmlrpcvals of type struct.

-		* @param string $m the name of the struct member to be looked up

-		* @return boolean

-		* @access public

-		*/

-		function structmemexists($m)

-		{

-			return array_key_exists($m, $this->me['struct']);

-		}

-

-		/**

-		* Returns the value of a given struct member (an xmlrpcval object in itself).

-		* Will raise a php warning if struct member of given name does not exist

-		* @param string $m the name of the struct member to be looked up

-		* @return xmlrpcval

-		* @access public

-		*/

-		function structmem($m)

-		{

-			return $this->me['struct'][$m];

-		}

-

-		/**

-		* Reset internal pointer for xmlrpcvals of type struct.

-		* @access public

-		*/

-		function structreset()

-		{

-			reset($this->me['struct']);

-		}

-

-		/**

-		* Return next member element for xmlrpcvals of type struct.

-		* @return xmlrpcval

-		* @access public

-		*/

-		function structeach()

-		{

-			return each($this->me['struct']);

-		}

-

-		// DEPRECATED! this code looks like it is very fragile and has not been fixed

-		// for a long long time. Shall we remove it for 2.0?

-		function getval()

-		{

-			// UNSTABLE

-			reset($this->me);

-			list($a,$b)=each($this->me);

-			// contributed by I Sofer, 2001-03-24

-			// add support for nested arrays to scalarval

-			// i've created a new method here, so as to

-			// preserve back compatibility

-

-			if(is_array($b))

-			{

-				@reset($b);

-				while(list($id,$cont) = @each($b))

-				{

-					$b[$id] = $cont->scalarval();

-				}

-			}

-

-			// add support for structures directly encoding php objects

-			if(is_object($b))

-			{

-				$t = get_object_vars($b);

-				@reset($t);

-				while(list($id,$cont) = @each($t))

-				{

-					$t[$id] = $cont->scalarval();

-				}

-				@reset($t);

-				while(list($id,$cont) = @each($t))

-				{

-					@$b->$id = $cont;

-				}

-			}

-			// end contrib

-			return $b;

-		}

-

-		/**

-		* Returns the value of a scalar xmlrpcval

-		* @return mixed

-		* @access public

-		*/

-		function scalarval()

-		{

-			reset($this->me);

-			list(,$b)=each($this->me);

-			return $b;

-		}

-

-		/**

-		* Returns the type of the xmlrpcval.

-		* For integers, 'int' is always returned in place of 'i4'

-		* @return string

-		* @access public

-		*/

-		function scalartyp()

-		{

-			reset($this->me);

-			list($a,)=each($this->me);

-			if($a==$GLOBALS['xmlrpcI4'])

-			{

-				$a=$GLOBALS['xmlrpcInt'];

-			}

-			return $a;

-		}

-

-		/**

-		* Returns the m-th member of an xmlrpcval of struct type

-		* @param integer $m the index of the value to be retrieved (zero based)

-		* @return xmlrpcval

-		* @access public

-		*/

-		function arraymem($m)

-		{

-			return $this->me['array'][$m];

-		}

-

-		/**

-		* Returns the number of members in an xmlrpcval of array type

-		* @return integer

-		* @access public

-		*/

-		function arraysize()

-		{

-			return count($this->me['array']);

-		}

-

-		/**

-		* Returns the number of members in an xmlrpcval of struct type

-		* @return integer

-		* @access public

-		*/

-		function structsize()

-		{

-			return count($this->me['struct']);

-		}

-	}

-

-

-	// date helpers

-

-	/**

-	* Given a timestamp, return the corresponding ISO8601 encoded string.

-	*

-	* Really, timezones ought to be supported

-	* but the XML-RPC spec says:

-	*

-	* "Don't assume a timezone. It should be specified by the server in its

-	* documentation what assumptions it makes about timezones."

-	*

-	* These routines always assume localtime unless

-	* $utc is set to 1, in which case UTC is assumed

-	* and an adjustment for locale is made when encoding

-	*

-	* @param int $timet (timestamp)

-	* @param int $utc (0 or 1)

-	* @return string

-	*/

-	function iso8601_encode($timet, $utc=0)

-	{

-		if(!$utc)

-		{

-			$t=strftime("%Y%m%dT%H:%M:%S", $timet);

-		}

-		else

-		{

-			if(function_exists('gmstrftime'))

-			{

-				// gmstrftime doesn't exist in some versions

-				// of PHP

-				$t=gmstrftime("%Y%m%dT%H:%M:%S", $timet);

-			}

-			else

-			{

-				$t=strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));

-			}

-		}

-		return $t;

-	}

-

-	/**

-	* Given an ISO8601 date string, return a timet in the localtime, or UTC

-	* @param string $idate

-	* @param int $utc either 0 or 1

-	* @return int (datetime)

-	*/

-	function iso8601_decode($idate, $utc=0)

-	{

-		$t=0;

-		if(preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/', $idate, $regs))

-		{

-			if($utc)

-			{

-				$t=gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

-			}

-			else

-			{

-				$t=mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

-			}

-		}

-		return $t;

-	}

-

-	/**

-	* Takes an xmlrpc value in PHP xmlrpcval object format and translates it into native PHP types.

-	*

-	* Works with xmlrpc message objects as input, too.

-	*

-	* Given proper options parameter, can rebuild generic php object instances

-	* (provided those have been encoded to xmlrpc format using a corresponding

-	* option in php_xmlrpc_encode())

-	* PLEASE NOTE that rebuilding php objects involves calling their constructor function.

-	* This means that the remote communication end can decide which php code will

-	* get executed on your server, leaving the door possibly open to 'php-injection'

-	* style of attacks (provided you have some classes defined on your server that

-	* might wreak havoc if instances are built outside an appropriate context).

-	* Make sure you trust the remote server/client before eanbling this!

-	*

-	* @author Dan Libby (dan@libby.com)

-	*

-	* @param xmlrpcval $xmlrpc_val

-	* @param array $options if 'decode_php_objs' is set in the options array, xmlrpc structs can be decoded into php objects; if 'dates_as_objects' is set xmlrpc datetimes are decoded as php DateTime objects (standard is

-	* @return mixed

-	*/

-	function php_xmlrpc_decode($xmlrpc_val, $options=array())

-	{

-		switch($xmlrpc_val->kindOf())

-		{

-			case 'scalar':

-				if (in_array('extension_api', $options))

-				{

-					reset($xmlrpc_val->me);

-					list($typ,$val) = each($xmlrpc_val->me);

-					switch ($typ)

-					{

-						case 'dateTime.iso8601':

-							$xmlrpc_val->scalar = $val;

-							$xmlrpc_val->xmlrpc_type = 'datetime';

-							$xmlrpc_val->timestamp = iso8601_decode($val);

-							return $xmlrpc_val;

-						case 'base64':

-							$xmlrpc_val->scalar = $val;

-							$xmlrpc_val->type = $typ;

-							return $xmlrpc_val;

-						default:

-							return $xmlrpc_val->scalarval();

-					}

-				}

-				if (in_array('dates_as_objects', $options) && $xmlrpc_val->scalartyp() == 'dateTime.iso8601')

-				{

-					// we return a Datetime object instead of a string

-					// since now the constructor of xmlrpcval accepts safely strings, ints and datetimes,

-					// we cater to all 3 cases here

-					$out = $xmlrpc_val->scalarval();

-					if (is_string($out))

-					{

-						$out = strtotime($out);

-					}

-					if (is_int($out))

-					{

-						$result = new Datetime();

-						$result->setTimestamp($out);

-						return $result;

-					}

-					elseif (is_a($out, 'Datetime'))

-					{

-						return $out;

-					}

-				}

-				return $xmlrpc_val->scalarval();

-			case 'array':

-				$size = $xmlrpc_val->arraysize();

-				$arr = array();

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

-				{

-					$arr[] = php_xmlrpc_decode($xmlrpc_val->arraymem($i), $options);

-				}

-				return $arr;

-			case 'struct':

-				$xmlrpc_val->structreset();

-				// If user said so, try to rebuild php objects for specific struct vals.

-				/// @todo should we raise a warning for class not found?

-				// shall we check for proper subclass of xmlrpcval instead of

-				// presence of _php_class to detect what we can do?

-				if (in_array('decode_php_objs', $options) && $xmlrpc_val->_php_class != ''

-					&& class_exists($xmlrpc_val->_php_class))

-				{

-					$obj = @new $xmlrpc_val->_php_class;

-					while(list($key,$value)=$xmlrpc_val->structeach())

-					{

-						$obj->$key = php_xmlrpc_decode($value, $options);

-					}

-					return $obj;

-				}

-				else

-				{

-					$arr = array();

-					while(list($key,$value)=$xmlrpc_val->structeach())

-					{

-						$arr[$key] = php_xmlrpc_decode($value, $options);

-					}

-					return $arr;

-				}

-			case 'msg':

-				$paramcount = $xmlrpc_val->getNumParams();

-				$arr = array();

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

-				{

-					$arr[] = php_xmlrpc_decode($xmlrpc_val->getParam($i));

-				}

-				return $arr;

-			}

-	}

-

-	// This constant left here only for historical reasons...

-	// it was used to decide if we have to define xmlrpc_encode on our own, but

-	// we do not do it anymore

-	if(function_exists('xmlrpc_decode'))

-	{

-		define('XMLRPC_EPI_ENABLED','1');

-	}

-	else

-	{

-		define('XMLRPC_EPI_ENABLED','0');

-	}

-

-	/**

-	* Takes native php types and encodes them into xmlrpc PHP object format.

-	* It will not re-encode xmlrpcval objects.

-	*

-	* Feature creep -- could support more types via optional type argument

-	* (string => datetime support has been added, ??? => base64 not yet)

-	*

-	* If given a proper options parameter, php object instances will be encoded

-	* into 'special' xmlrpc values, that can later be decoded into php objects

-	* by calling php_xmlrpc_decode() with a corresponding option

-	*

-	* @author Dan Libby (dan@libby.com)

-	*

-	* @param mixed $php_val the value to be converted into an xmlrpcval object

-	* @param array $options	can include 'encode_php_objs', 'auto_dates', 'null_extension' or 'extension_api'

-	* @return xmlrpcval

-	*/

-	function php_xmlrpc_encode($php_val, $options=array())

-	{

-		$type = gettype($php_val);

-		switch($type)

-		{

-			case 'string':

-				if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val))

-					$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']);

-				else

-					$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcString']);

-				break;

-			case 'integer':

-				$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcInt']);

-				break;

-			case 'double':

-				$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDouble']);

-				break;

-				// <G_Giunta_2001-02-29>

-				// Add support for encoding/decoding of booleans, since they are supported in PHP

-			case 'boolean':

-				$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcBoolean']);

-				break;

-				// </G_Giunta_2001-02-29>

-			case 'array':

-				// PHP arrays can be encoded to either xmlrpc structs or arrays,

-				// depending on wheter they are hashes or plain 0..n integer indexed

-				// A shorter one-liner would be

-				// $tmp = array_diff(array_keys($php_val), range(0, count($php_val)-1));

-				// but execution time skyrockets!

-				$j = 0;

-				$arr = array();

-				$ko = false;

-				foreach($php_val as $key => $val)

-				{

-					$arr[$key] = php_xmlrpc_encode($val, $options);

-					if(!$ko && $key !== $j)

-					{

-						$ko = true;

-					}

-					$j++;

-				}

-				if($ko)

-				{

-					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);

-				}

-				else

-				{

-					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcArray']);

-				}

-				break;

-			case 'object':

-				if(is_a($php_val, 'xmlrpcval'))

-				{

-					$xmlrpc_val = $php_val;

-				}

-				else if(is_a($php_val, 'DateTime'))

-				{

-					$xmlrpc_val = new xmlrpcval($php_val->format('Ymd\TH:i:s'), $GLOBALS['xmlrpcStruct']);

-				}

-				else

-				{

-					$arr = array();

-					reset($php_val);

-					while(list($k,$v) = each($php_val))

-					{

-						$arr[$k] = php_xmlrpc_encode($v, $options);

-					}

-					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);

-					if (in_array('encode_php_objs', $options))

-					{

-						// let's save original class name into xmlrpcval:

-						// might be useful later on...

-						$xmlrpc_val->_php_class = get_class($php_val);

-					}

-				}

-				break;

-			case 'NULL':

-				if (in_array('extension_api', $options))

-				{

-					$xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcString']);

-				}

-				else if (in_array('null_extension', $options))

-				{

-					$xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcNull']);

-				}

-				else

-				{

-					$xmlrpc_val = new xmlrpcval();

-				}

-				break;

-			case 'resource':

-				if (in_array('extension_api', $options))

-				{

-					$xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);

-				}

-				else

-				{

-					$xmlrpc_val = new xmlrpcval();

-				}

-			// catch "user function", "unknown type"

-			default:

-				// giancarlo pinerolo <ping@alt.it>

-				// it has to return

-				// an empty object in case, not a boolean.

-				$xmlrpc_val = new xmlrpcval();

-				break;

-			}

-			return $xmlrpc_val;

-	}

-

-	/**

-	* Convert the xml representation of a method response, method request or single

-	* xmlrpc value into the appropriate object (a.k.a. deserialize)

-	* @param string $xml_val

-	* @param array $options

-	* @return mixed false on error, or an instance of either xmlrpcval, xmlrpcmsg or xmlrpcresp

-	*/

-	function php_xmlrpc_decode_xml($xml_val, $options=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;

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

-

-		// 'guestimate' encoding

-		$val_encoding = guess_encoding('', $xml_val);

-

-		// Since parsing will fail if charset is not specified in the xml prologue,

-		// the encoding is not UTF8 and there are non-ascii chars in the text, we try to work round that...

-		// The following code might be better for mb_string enabled installs, but

-		// makes the lib about 200% slower...

-		//if (!is_valid_charset($val_encoding, array('UTF-8')))

-		if (!in_array($val_encoding, array('UTF-8', 'US-ASCII')) && !has_encoding($xml_val)) {

-			if ($val_encoding == 'ISO-8859-1') {

-				$xml_val = utf8_encode($xml_val);

-			} else {

-				if (extension_loaded('mbstring')) {

-					$xml_val = mb_convert_encoding($xml_val, 'UTF-8', $val_encoding);

-				} else {

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

-				}

-			}

-		}

-

-		$parser = xml_parser_create();

-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);

-		// What if internal encoding is not in one of the 3 allowed?

-		// we use the broadest one, ie. utf8!

-		if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))

-		{

-			xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');

-		}

-		else

-		{

-			xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);

-		}

-		xml_set_element_handler($parser, 'xmlrpc_se_any', 'xmlrpc_ee');

-		xml_set_character_data_handler($parser, 'xmlrpc_cd');

-		xml_set_default_handler($parser, 'xmlrpc_dh');

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

-		{

-			$errstr = sprintf('XML error: %s at line %d, column %d',

-						xml_error_string(xml_get_error_code($parser)),

-						xml_get_current_line_number($parser), xml_get_current_column_number($parser));

-			error_log($errstr);

-			xml_parser_free($parser);

-			return false;

-		}

-		xml_parser_free($parser);

-		if ($GLOBALS['_xh']['isf'] > 1) // test that $GLOBALS['_xh']['value'] is an obj, too???

-		{

-			error_log($GLOBALS['_xh']['isf_reason']);

-			return false;

-		}

-		switch ($GLOBALS['_xh']['rt'])

-		{

-			case 'methodresponse':

-				$v =& $GLOBALS['_xh']['value'];

-				if ($GLOBALS['_xh']['isf'] == 1)

-				{

-					$vc = $v->structmem('faultCode');

-					$vs = $v->structmem('faultString');

-					$r = new xmlrpcresp(0, $vc->scalarval(), $vs->scalarval());

-				}

-				else

-				{

-					$r = new xmlrpcresp($v);

-				}

-				return $r;

-			case 'methodcall':

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

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

-				{

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

-				}

-				return $m;

-			case 'value':

-				return $GLOBALS['_xh']['value'];

-			default:

-				return false;

-		}

-	}

-

-	/**

-	* decode a string that is encoded w/ "chunked" transfer encoding

-	* as defined in rfc2068 par. 19.4.6

-	* code shamelessly stolen from nusoap library by Dietrich Ayala

-	*

-	* @param string $buffer the string to be decoded

-	* @return string

-	*/

-	function decode_chunked($buffer)

-	{

-		// length := 0

-		$length = 0;

-		$new = '';

-

-		// read chunk-size, chunk-extension (if any) and crlf

-		// get the position of the linebreak

-		$chunkend = strpos($buffer,"\r\n") + 2;

-		$temp = substr($buffer,0,$chunkend);

-		$chunk_size = hexdec( trim($temp) );

-		$chunkstart = $chunkend;

-		while($chunk_size > 0)

-		{

-			$chunkend = strpos($buffer, "\r\n", $chunkstart + $chunk_size);

-

-			// just in case we got a broken connection

-			if($chunkend == false)

-			{

-				$chunk = substr($buffer,$chunkstart);

-				// append chunk-data to entity-body

-				$new .= $chunk;

-				$length += strlen($chunk);

-				break;

-			}

-

-			// read chunk-data and crlf

-			$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);

-			// append chunk-data to entity-body

-			$new .= $chunk;

-			// length := length + chunk-size

-			$length += strlen($chunk);

-			// read chunk-size and crlf

-			$chunkstart = $chunkend + 2;

-

-			$chunkend = strpos($buffer,"\r\n",$chunkstart)+2;

-			if($chunkend == false)

-			{

-				break; //just in case we got a broken connection

-			}

-			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);

-			$chunk_size = hexdec( trim($temp) );

-			$chunkstart = $chunkend;

-		}

-		return $new;

-	}

-

-	/**

-	* xml charset encoding guessing helper function.

-	* Tries to determine the charset encoding of an XML chunk received over HTTP.

-	* NB: according to the spec (RFC 3023), if text/xml content-type is received over HTTP without a content-type,

-	* we SHOULD assume it is strictly US-ASCII. But we try to be more tolerant of unconforming (legacy?) clients/servers,

-	* which will be most probably using UTF-8 anyway...

-	*

-	* @param string $httpheader the http Content-type header

-	* @param string $xmlchunk xml content buffer

-	* @param string $encoding_prefs comma separated list of character encodings to be used as default (when mb extension is enabled)

-	* @return string

-	*

-	* @todo explore usage of mb_http_input(): does it detect http headers + post data? if so, use it instead of hand-detection!!!

-	*/

-	function guess_encoding($httpheader='', $xmlchunk='', $encoding_prefs=null)

-	{

-		// discussion: see http://www.yale.edu/pclt/encoding/

-		// 1 - test if encoding is specified in HTTP HEADERS

-

-		//Details:

-		// LWS:           (\13\10)?( |\t)+

-		// token:         (any char but excluded stuff)+

-		// quoted string: " (any char but double quotes and cointrol chars)* "

-		// header:        Content-type = ...; charset=value(; ...)*

-		//   where value is of type token, no LWS allowed between 'charset' and value

-		// Note: we do not check for invalid chars in VALUE:

-		//   this had better be done using pure ereg as below

-		// Note 2: we might be removing whitespace/tabs that ought to be left in if

-		//   the received charset is a quoted string. But nobody uses such charset names...

-

-		/// @todo this test will pass if ANY header has charset specification, not only Content-Type. Fix it?

-		$matches = array();

-		if(preg_match('/;\s*charset\s*=([^;]+)/i', $httpheader, $matches))

-		{

-			return strtoupper(trim($matches[1], " \t\""));

-		}

-

-		// 2 - scan the first bytes of the data for a UTF-16 (or other) BOM pattern

-		//     (source: http://www.w3.org/TR/2000/REC-xml-20001006)

-		//     NOTE: actually, according to the spec, even if we find the BOM and determine

-		//     an encoding, we should check if there is an encoding specified

-		//     in the xml declaration, and verify if they match.

-		/// @todo implement check as described above?

-		/// @todo implement check for first bytes of string even without a BOM? (It sure looks harder than for cases WITH a BOM)

-		if(preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlchunk))

-		{

-			return 'UCS-4';

-		}

-		elseif(preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))

-		{

-			return 'UTF-16';

-		}

-		elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))

-		{

-			return 'UTF-8';

-		}

-

-		// 3 - test if encoding is specified in the xml declaration

-		// Details:

-		// SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+

-		// EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*

-		if (preg_match('/^<\?xml\s+version\s*=\s*'. "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".

-			'\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",

-			$xmlchunk, $matches))

-		{

-			return strtoupper(substr($matches[2], 1, -1));

-		}

-

-		// 4 - if mbstring is available, let it do the guesswork

-		// NB: we favour finding an encoding that is compatible with what we can process

-		if(extension_loaded('mbstring'))

-		{

-			if($encoding_prefs)

-			{

-				$enc = mb_detect_encoding($xmlchunk, $encoding_prefs);

-			}

-			else

-			{

-				$enc = mb_detect_encoding($xmlchunk);

-			}

-			// NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...

-			// IANA also likes better US-ASCII, so go with it

-			if($enc == 'ASCII')

-			{

-				$enc = 'US-'.$enc;

-			}

-			return $enc;

-		}

-		else

-		{

-			// no encoding specified: as per HTTP1.1 assume it is iso-8859-1?

-			// Both RFC 2616 (HTTP 1.1) and 1945 (HTTP 1.0) clearly state that for text/xxx content types

-			// this should be the standard. And we should be getting text/xml as request and response.

-			// BUT we have to be backward compatible with the lib, which always used UTF-8 as default...

-			return $GLOBALS['xmlrpc_defencoding'];

-		}

-	}

-

-	/**

-	 * Helper function: checks if an xml chunk as a charset declaration (BOM or in the xml declaration)

-	 *

-	 * @param string $xmlChunk

-	 * @return bool

-	 */

-	function has_encoding($xmlChunk)

-	{

-		// scan the first bytes of the data for a UTF-16 (or other) BOM pattern

-		//	 (source: http://www.w3.org/TR/2000/REC-xml-20001006)

-		if (preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlChunk))

-		{

-			return true;

-		}

-		elseif (preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlChunk))

-		{

-			return true;

-		}

-		elseif (preg_match('/^(\xEF\xBB\xBF)/', $xmlChunk))

-		{

-			return true;

-		}

-

-		// test if encoding is specified in the xml declaration

-		// Details:

-		// SPACE:		(#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+

-		// EQ:			SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*

-		if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .

-			'\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",

-			$xmlChunk, $matches))

-		{

-			return true;

-		}

-

-		return false;

-	}

-

-	/**

-	* Checks if a given charset encoding is present in a list of encodings or

-	* if it is a valid subset of any encoding in the list

-	* @param string $encoding charset to be tested

-	* @param mixed $validlist comma separated list of valid charsets (or array of charsets)

-	* @return bool

-	*/

-	function is_valid_charset($encoding, $validlist)

-	{

-		$charset_supersets = array(

-			'US-ASCII' => array ('ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',

-				'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8',

-				'ISO-8859-9', 'ISO-8859-10', 'ISO-8859-11', 'ISO-8859-12',

-				'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'UTF-8',

-				'EUC-JP', 'EUC-', 'EUC-KR', 'EUC-CN')

-		);

-		if (is_string($validlist))

-			$validlist = explode(',', $validlist);

-		if (@in_array(strtoupper($encoding), $validlist))

-			return true;

-		else

-		{

-			if (array_key_exists($encoding, $charset_supersets))

-				foreach ($validlist as $allowed)

-					if (in_array($allowed, $charset_supersets[$encoding]))

-						return true;

-			return false;

-		}

-	}

+            }

+        }

+

+        /**

+         * @deprecated

+         */

+        function xmlrpcval($val=-1, $type='')

+        {

+            self::__construct($val, $type);

+        }

+

+        /**

+         * Add a single php value to an (unitialized) xmlrpcval

+         * @param mixed $val

+         * @param string $type

+         * @return int 1 or 0 on failure

+         */

+        function addScalar($val, $type='string')

+        {

+            $typeof=@$GLOBALS['xmlrpcTypes'][$type];

+            if($typeof!=1)

+            {

+                error_log("XML-RPC: ".__METHOD__.": not a scalar type ($type)");

+                return 0;

+            }

+

+            // coerce booleans into correct values

+            // NB: we should either do it for datetimes, integers and doubles, too,

+            // or just plain remove this check, implemented on booleans only...

+            if($type==$GLOBALS['xmlrpcBoolean'])

+            {

+                if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))

+                {

+                    $val=true;

+                }

+                else

+                {

+                    $val=false;

+                }

+            }

+

+            switch($this->mytype)

+            {

+                case 1:

+                    error_log('XML-RPC: '.__METHOD__.': scalar xmlrpcval can have only one value');

+                    return 0;

+                case 3:

+                    error_log('XML-RPC: '.__METHOD__.': cannot add anonymous scalar to struct xmlrpcval');

+                    return 0;

+                case 2:

+                    // we're adding a scalar value to an array here

+                    //$ar=$this->me['array'];

+                    //$ar[]=new xmlrpcval($val, $type);

+                    //$this->me['array']=$ar;

+                    // Faster (?) avoid all the costly array-copy-by-val done here...

+                    $this->me['array'][]=new xmlrpcval($val, $type);

+                    return 1;

+                default:

+                    // a scalar, so set the value and remember we're scalar

+                    $this->me[$type]=$val;

+                    $this->mytype=$typeof;

+                    return 1;

+            }

+        }

+

+        /**

+         * Add an array of xmlrpcval objects to an xmlrpcval

+         * @param array $vals

+         * @return int 1 or 0 on failure

+         * @access public

+         *

+         * @todo add some checking for $vals to be an array of xmlrpcvals?

+         */

+        function addArray($vals)

+        {

+            if($this->mytype==0)

+            {

+                $this->mytype=$GLOBALS['xmlrpcTypes']['array'];

+                $this->me['array']=$vals;

+                return 1;

+            }

+            elseif($this->mytype==2)

+            {

+                // we're adding to an array here

+                $this->me['array'] = array_merge($this->me['array'], $vals);

+                return 1;

+            }

+            else

+            {

+                error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');

+                return 0;

+            }

+        }

+

+        /**

+         * Add an array of named xmlrpcval objects to an xmlrpcval

+         * @param array $vals

+         * @return int 1 or 0 on failure

+         * @access public

+         *

+         * @todo add some checking for $vals to be an array?

+         */

+        function addStruct($vals)

+        {

+            if($this->mytype==0)

+            {

+                $this->mytype=$GLOBALS['xmlrpcTypes']['struct'];

+                $this->me['struct']=$vals;

+                return 1;

+            }

+            elseif($this->mytype==3)

+            {

+                // we're adding to a struct here

+                $this->me['struct'] = array_merge($this->me['struct'], $vals);

+                return 1;

+            }

+            else

+            {

+                error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');

+                return 0;

+            }

+        }

+

+        // poor man's version of print_r ???

+        // DEPRECATED!

+        function dump($ar)

+        {

+            foreach($ar as $key => $val)

+            {

+                echo "$key => $val<br />";

+                if($key == 'array')

+                {

+                    while(list($key2, $val2) = each($val))

+                    {

+                        echo "-- $key2 => $val2<br />";

+                    }

+                }

+            }

+        }

+

+        /**

+         * Returns a string containing "struct", "array" or "scalar" describing the base type of the value

+         * @return string

+         * @access public

+         */

+        function kindOf()

+        {

+            switch($this->mytype)

+            {

+                case 3:

+                    return 'struct';

+                    break;

+                case 2:

+                    return 'array';

+                    break;

+                case 1:

+                    return 'scalar';

+                    break;

+                default:

+                    return 'undef';

+            }

+        }

+

+        /**

+         * @access private

+         */

+        function serializedata($typ, $val, $charset_encoding='')

+        {

+            $rs='';

+            switch(@$GLOBALS['xmlrpcTypes'][$typ])

+            {

+                case 1:

+                    switch($typ)

+                    {

+                        case $GLOBALS['xmlrpcBase64']:

+                            $rs.="<${typ}>" . base64_encode($val) . "</${typ}>";

+                            break;

+                        case $GLOBALS['xmlrpcBoolean']:

+                            $rs.="<${typ}>" . ($val ? '1' : '0') . "</${typ}>";

+                            break;

+                        case $GLOBALS['xmlrpcString']:

+                            // G. Giunta 2005/2/13: do NOT use htmlentities, since

+                            // it will produce named html entities, which are invalid xml

+                            $rs.="<${typ}>" . xmlrpc_encode_entitites($val, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding). "</${typ}>";

+                            break;

+                        case $GLOBALS['xmlrpcInt']:

+                        case $GLOBALS['xmlrpcI4']:

+                            $rs.="<${typ}>".(int)$val."</${typ}>";

+                            break;

+                        case $GLOBALS['xmlrpcDouble']:

+                            // avoid using standard conversion of float to string because it is locale-dependent,

+                            // and also because the xmlrpc spec forbids exponential notation.

+                            // sprintf('%F') could be most likely ok but it fails eg. on 2e-14.

+                            // The code below tries its best at keeping max precision while avoiding exp notation,

+                            // but there is of course no limit in the number of decimal places to be used...

+                            $rs.="<${typ}>".preg_replace('/\\.?0+$/','',number_format((double)$val, 128, '.', ''))."</${typ}>";

+                            break;

+                        case $GLOBALS['xmlrpcDateTime']:

+                            if (is_string($val))

+                            {

+                                $rs.="<${typ}>${val}</${typ}>";

+                            }

+                            else if(is_a($val, 'DateTime'))

+                            {

+                                $rs.="<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>";

+                            }

+                            else if(is_int($val))

+                            {

+                                $rs.="<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>";

+                            }

+                            else

+                            {

+                                // not really a good idea here: but what shall we output anyway? left for backward compat...

+                                $rs.="<${typ}>${val}</${typ}>";

+                            }

+                            break;

+                        case $GLOBALS['xmlrpcNull']:

+                            if ($GLOBALS['xmlrpc_null_apache_encoding'])

+                            {

+                                $rs.="<ex:nil/>";

+                            }

+                            else

+                            {

+                                $rs.="<nil/>";

+                            }

+                            break;

+                        default:

+                            // no standard type value should arrive here, but provide a possibility

+                            // for xmlrpcvals of unknown type...

+                            $rs.="<${typ}>${val}</${typ}>";

+                    }

+                    break;

+                case 3:

+                    // struct

+                    if ($this->_php_class)

+                    {

+                        $rs.='<struct php_class="' . $this->_php_class . "\">\n";

+                    }

+                    else

+                    {

+                        $rs.="<struct>\n";

+                    }

+                    foreach($val as $key2 => $val2)

+                    {

+                        $rs.='<member><name>'.xmlrpc_encode_entitites($key2, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</name>\n";

+                        //$rs.=$this->serializeval($val2);

+                        $rs.=$val2->serialize($charset_encoding);

+                        $rs.="</member>\n";

+                    }

+                    $rs.='</struct>';

+                    break;

+                case 2:

+                    // array

+                    $rs.="<array>\n<data>\n";

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

+                    {

+                        //$rs.=$this->serializeval($val[$i]);

+                        $rs.=$val[$i]->serialize($charset_encoding);

+                    }

+                    $rs.="</data>\n</array>";

+                    break;

+                default:

+                    break;

+            }

+            return $rs;

+        }

+

+        /**

+         * Returns xml representation of the value. XML prologue not included

+         * @param string $charset_encoding the charset to be used for serialization. if null, US-ASCII is assumed

+         * @return string

+         * @access public

+         */

+        function serialize($charset_encoding='')

+        {

+            // add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...

+            //if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))

+            //{

+                reset($this->me);

+                list($typ, $val) = each($this->me);

+                return '<value>' . $this->serializedata($typ, $val, $charset_encoding) . "</value>\n";

+            //}

+        }

+

+        // DEPRECATED

+        function serializeval($o)

+        {

+            // add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...

+            //if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))

+            //{

+                $ar=$o->me;

+                reset($ar);

+                list($typ, $val) = each($ar);

+                return '<value>' . $this->serializedata($typ, $val) . "</value>\n";

+            //}

+        }

+

+        /**

+         * Checks whether a struct member with a given name is present.

+         * Works only on xmlrpcvals of type struct.

+         * @param string $m the name of the struct member to be looked up

+         * @return boolean

+         * @access public

+         */

+        function structmemexists($m)

+        {

+            return array_key_exists($m, $this->me['struct']);

+        }

+

+        /**

+         * Returns the value of a given struct member (an xmlrpcval object in itself).

+         * Will raise a php warning if struct member of given name does not exist

+         * @param string $m the name of the struct member to be looked up

+         * @return xmlrpcval

+         * @access public

+         */

+        function structmem($m)

+        {

+            return $this->me['struct'][$m];

+        }

+

+        /**

+         * Reset internal pointer for xmlrpcvals of type struct.

+         * @access public

+         */

+        function structreset()

+        {

+            reset($this->me['struct']);

+        }

+

+        /**

+         * Return next member element for xmlrpcvals of type struct.

+         * @return xmlrpcval

+         * @access public

+         */

+        function structeach()

+        {

+            return each($this->me['struct']);

+        }

+

+        // DEPRECATED! this code looks like it is very fragile and has not been fixed

+        // for a long long time. Shall we remove it for 2.0?

+        function getval()

+        {

+            // UNSTABLE

+            reset($this->me);

+            list($a,$b)=each($this->me);

+            // contributed by I Sofer, 2001-03-24

+            // add support for nested arrays to scalarval

+            // i've created a new method here, so as to

+            // preserve back compatibility

+

+            if(is_array($b))

+            {

+                @reset($b);

+                while(list($id,$cont) = @each($b))

+                {

+                    $b[$id] = $cont->scalarval();

+                }

+            }

+

+            // add support for structures directly encoding php objects

+            if(is_object($b))

+            {

+                $t = get_object_vars($b);

+                @reset($t);

+                while(list($id,$cont) = @each($t))

+                {

+                    $t[$id] = $cont->scalarval();

+                }

+                @reset($t);

+                while(list($id,$cont) = @each($t))

+                {

+                    @$b->$id = $cont;

+                }

+            }

+            // end contrib

+            return $b;

+        }

+

+        /**

+         * Returns the value of a scalar xmlrpcval

+         * @return mixed

+         * @access public

+         */

+        function scalarval()

+        {

+            reset($this->me);

+            list(,$b)=each($this->me);

+            return $b;

+        }

+

+        /**

+         * Returns the type of the xmlrpcval.

+         * For integers, 'int' is always returned in place of 'i4'

+         * @return string

+         * @access public

+         */

+        function scalartyp()

+        {

+            reset($this->me);

+            list($a,)=each($this->me);

+            if($a==$GLOBALS['xmlrpcI4'])

+            {

+                $a=$GLOBALS['xmlrpcInt'];

+            }

+            return $a;

+        }

+

+        /**

+         * Returns the m-th member of an xmlrpcval of struct type

+         * @param integer $m the index of the value to be retrieved (zero based)

+         * @return xmlrpcval

+         * @access public

+         */

+        function arraymem($m)

+        {

+            return $this->me['array'][$m];

+        }

+

+        /**

+         * Returns the number of members in an xmlrpcval of array type

+         * @return integer

+         * @access public

+         */

+        function arraysize()

+        {

+            return count($this->me['array']);

+        }

+

+        /**

+         * Returns the number of members in an xmlrpcval of struct type

+         * @return integer

+         * @access public

+         */

+        function structsize()

+        {

+            return count($this->me['struct']);

+        }

+    }

+

+

+    // date helpers

+

+    /**

+     * Given a timestamp, return the corresponding ISO8601 encoded string.

+     *

+     * Really, timezones ought to be supported

+     * but the XML-RPC spec says:

+     *

+     * "Don't assume a timezone. It should be specified by the server in its

+     * documentation what assumptions it makes about timezones."

+     *

+     * These routines always assume localtime unless

+     * $utc is set to 1, in which case UTC is assumed

+     * and an adjustment for locale is made when encoding

+     *

+     * @param int $timet (timestamp)

+     * @param int $utc (0 or 1)

+     * @return string

+     */

+    function iso8601_encode($timet, $utc=0)

+    {

+        if(!$utc)

+        {

+            $t=strftime("%Y%m%dT%H:%M:%S", $timet);

+        }

+        else

+        {

+            if(function_exists('gmstrftime'))

+            {

+                // gmstrftime doesn't exist in some versions

+                // of PHP

+                $t=gmstrftime("%Y%m%dT%H:%M:%S", $timet);

+            }

+            else

+            {

+                $t=strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));

+            }

+        }

+        return $t;

+    }

+

+    /**

+     * Given an ISO8601 date string, return a timet in the localtime, or UTC

+     * @param string $idate

+     * @param int $utc either 0 or 1

+     * @return int (datetime)

+     */

+    function iso8601_decode($idate, $utc=0)

+    {

+        $t=0;

+        if(preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/', $idate, $regs))

+        {

+            if($utc)

+            {

+                $t=gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

+            }

+            else

+            {

+                $t=mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

+            }

+        }

+        return $t;

+    }

+

+    /**

+     * Takes an xmlrpc value in PHP xmlrpcval object format and translates it into native PHP types.

+     *

+     * Works with xmlrpc message objects as input, too.

+     *

+     * Given proper options parameter, can rebuild generic php object instances

+     * (provided those have been encoded to xmlrpc format using a corresponding

+     * option in php_xmlrpc_encode())

+     * PLEASE NOTE that rebuilding php objects involves calling their constructor function.

+     * This means that the remote communication end can decide which php code will

+     * get executed on your server, leaving the door possibly open to 'php-injection'

+     * style of attacks (provided you have some classes defined on your server that

+     * might wreak havoc if instances are built outside an appropriate context).

+     * Make sure you trust the remote server/client before eanbling this!

+     *

+     * @author Dan Libby (dan@libby.com)

+     *

+     * @param xmlrpcval $xmlrpc_val

+     * @param array $options if 'decode_php_objs' is set in the options array, xmlrpc structs can be decoded into php objects; if 'dates_as_objects' is set xmlrpc datetimes are decoded as php DateTime objects (standard is

+     * @return mixed

+     */

+    function php_xmlrpc_decode($xmlrpc_val, $options=array())

+    {

+        switch($xmlrpc_val->kindOf())

+        {

+            case 'scalar':

+                if (in_array('extension_api', $options))

+                {

+                    reset($xmlrpc_val->me);

+                    list($typ,$val) = each($xmlrpc_val->me);

+                    switch ($typ)

+                    {

+                        case 'dateTime.iso8601':

+                            $xmlrpc_val->scalar = $val;

+                            $xmlrpc_val->xmlrpc_type = 'datetime';

+                            $xmlrpc_val->timestamp = iso8601_decode($val);

+                            return $xmlrpc_val;

+                        case 'base64':

+                            $xmlrpc_val->scalar = $val;

+                            $xmlrpc_val->type = $typ;

+                            return $xmlrpc_val;

+                        default:

+                            return $xmlrpc_val->scalarval();

+                    }

+                }

+                if (in_array('dates_as_objects', $options) && $xmlrpc_val->scalartyp() == 'dateTime.iso8601')

+                {

+                    // we return a Datetime object instead of a string

+                    // since now the constructor of xmlrpcval accepts safely strings, ints and datetimes,

+                    // we cater to all 3 cases here

+                    $out = $xmlrpc_val->scalarval();

+                    if (is_string($out))

+                    {

+                        $out = strtotime($out);

+                    }

+                    if (is_int($out))

+                    {

+                        $result = new Datetime();

+                        $result->setTimestamp($out);

+                        return $result;

+                    }

+                    elseif (is_a($out, 'Datetime'))

+                    {

+                        return $out;

+                    }

+                }

+                return $xmlrpc_val->scalarval();

+            case 'array':

+                $size = $xmlrpc_val->arraysize();

+                $arr = array();

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

+                {

+                    $arr[] = php_xmlrpc_decode($xmlrpc_val->arraymem($i), $options);

+                }

+                return $arr;

+            case 'struct':

+                $xmlrpc_val->structreset();

+                // If user said so, try to rebuild php objects for specific struct vals.

+                /// @todo should we raise a warning for class not found?

+                // shall we check for proper subclass of xmlrpcval instead of

+                // presence of _php_class to detect what we can do?

+                if (in_array('decode_php_objs', $options) && $xmlrpc_val->_php_class != ''

+                    && class_exists($xmlrpc_val->_php_class))

+                {

+                    $obj = @new $xmlrpc_val->_php_class;

+                    while(list($key,$value)=$xmlrpc_val->structeach())

+                    {

+                        $obj->$key = php_xmlrpc_decode($value, $options);

+                    }

+                    return $obj;

+                }

+                else

+                {

+                    $arr = array();

+                    while(list($key,$value)=$xmlrpc_val->structeach())

+                    {

+                        $arr[$key] = php_xmlrpc_decode($value, $options);

+                    }

+                    return $arr;

+                }

+            case 'msg':

+                $paramcount = $xmlrpc_val->getNumParams();

+                $arr = array();

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

+                {

+                    $arr[] = php_xmlrpc_decode($xmlrpc_val->getParam($i));

+                }

+                return $arr;

+            }

+    }

+

+    // This constant left here only for historical reasons...

+    // it was used to decide if we have to define xmlrpc_encode on our own, but

+    // we do not do it anymore

+    if(function_exists('xmlrpc_decode'))

+    {

+        define('XMLRPC_EPI_ENABLED','1');

+    }

+    else

+    {

+        define('XMLRPC_EPI_ENABLED','0');

+    }

+

+    /**

+     * Takes native php types and encodes them into xmlrpc PHP object format.

+     * It will not re-encode xmlrpcval objects.

+     *

+     * Feature creep -- could support more types via optional type argument

+     * (string => datetime support has been added, ??? => base64 not yet)

+     *

+     * If given a proper options parameter, php object instances will be encoded

+     * into 'special' xmlrpc values, that can later be decoded into php objects

+     * by calling php_xmlrpc_decode() with a corresponding option

+     *

+     * @author Dan Libby (dan@libby.com)

+     *

+     * @param mixed $php_val the value to be converted into an xmlrpcval object

+     * @param array $options	can include 'encode_php_objs', 'auto_dates', 'null_extension' or 'extension_api'

+     * @return xmlrpcval

+     */

+    function php_xmlrpc_encode($php_val, $options=array())

+    {

+        $type = gettype($php_val);

+        switch($type)

+        {

+            case 'string':

+                if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val))

+                    $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']);

+                else

+                    $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcString']);

+                break;

+            case 'integer':

+                $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcInt']);

+                break;

+            case 'double':

+                $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDouble']);

+                break;

+                // <G_Giunta_2001-02-29>

+                // Add support for encoding/decoding of booleans, since they are supported in PHP

+            case 'boolean':

+                $xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcBoolean']);

+                break;

+                // </G_Giunta_2001-02-29>

+            case 'array':

+                // PHP arrays can be encoded to either xmlrpc structs or arrays,

+                // depending on wheter they are hashes or plain 0..n integer indexed

+                // A shorter one-liner would be

+                // $tmp = array_diff(array_keys($php_val), range(0, count($php_val)-1));

+                // but execution time skyrockets!

+                $j = 0;

+                $arr = array();

+                $ko = false;

+                foreach($php_val as $key => $val)

+                {

+                    $arr[$key] = php_xmlrpc_encode($val, $options);

+                    if(!$ko && $key !== $j)

+                    {

+                        $ko = true;

+                    }

+                    $j++;

+                }

+                if($ko)

+                {

+                    $xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);

+                }

+                else

+                {

+                    $xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcArray']);

+                }

+                break;

+            case 'object':

+                if(is_a($php_val, 'xmlrpcval'))

+                {

+                    $xmlrpc_val = $php_val;

+                }

+                else if(is_a($php_val, 'DateTime'))

+                {

+                    $xmlrpc_val = new xmlrpcval($php_val->format('Ymd\TH:i:s'), $GLOBALS['xmlrpcStruct']);

+                }

+                else

+                {

+                    $arr = array();

+                    reset($php_val);

+                    while(list($k,$v) = each($php_val))

+                    {

+                        $arr[$k] = php_xmlrpc_encode($v, $options);

+                    }

+                    $xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);

+                    if (in_array('encode_php_objs', $options))

+                    {

+                        // let's save original class name into xmlrpcval:

+                        // might be useful later on...

+                        $xmlrpc_val->_php_class = get_class($php_val);

+                    }

+                }

+                break;

+            case 'NULL':

+                if (in_array('extension_api', $options))

+                {

+                    $xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcString']);

+                }

+                else if (in_array('null_extension', $options))

+                {

+                    $xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcNull']);

+                }

+                else

+                {

+                    $xmlrpc_val = new xmlrpcval();

+                }

+                break;

+            case 'resource':

+                if (in_array('extension_api', $options))

+                {

+                    $xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);

+                }

+                else

+                {

+                    $xmlrpc_val = new xmlrpcval();

+                }

+            // catch "user function", "unknown type"

+            default:

+                // giancarlo pinerolo <ping@alt.it>

+                // it has to return

+                // an empty object in case, not a boolean.

+                $xmlrpc_val = new xmlrpcval();

+                break;

+            }

+            return $xmlrpc_val;

+    }

+

+    /**

+     * Convert the xml representation of a method response, method request or single

+     * xmlrpc value into the appropriate object (a.k.a. deserialize)

+     * @param string $xml_val

+     * @param array $options

+     * @return mixed false on error, or an instance of either xmlrpcval, xmlrpcmsg or xmlrpcresp

+     */

+    function php_xmlrpc_decode_xml($xml_val, $options=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;

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

+

+        // 'guestimate' encoding

+        $val_encoding = guess_encoding('', $xml_val);

+

+        // Since parsing will fail if charset is not specified in the xml prologue,

+        // the encoding is not UTF8 and there are non-ascii chars in the text, we try to work round that...

+        // The following code might be better for mb_string enabled installs, but

+        // makes the lib about 200% slower...

+        //if (!is_valid_charset($val_encoding, array('UTF-8')))

+        if (!in_array($val_encoding, array('UTF-8', 'US-ASCII')) && !has_encoding($xml_val)) {

+            if ($val_encoding == 'ISO-8859-1') {

+                $xml_val = utf8_encode($xml_val);

+            } else {

+                if (extension_loaded('mbstring')) {

+                    $xml_val = mb_convert_encoding($xml_val, 'UTF-8', $val_encoding);

+                } else {

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

+                }

+            }

+        }

+

+        $parser = xml_parser_create();

+        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);

+        // What if internal encoding is not in one of the 3 allowed?

+        // we use the broadest one, ie. utf8!

+        if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))

+        {

+            xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');

+        }

+        else

+        {

+            xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);

+        }

+        xml_set_element_handler($parser, 'xmlrpc_se_any', 'xmlrpc_ee');

+        xml_set_character_data_handler($parser, 'xmlrpc_cd');

+        xml_set_default_handler($parser, 'xmlrpc_dh');

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

+        {

+            $errstr = sprintf('XML error: %s at line %d, column %d',

+                        xml_error_string(xml_get_error_code($parser)),

+                        xml_get_current_line_number($parser), xml_get_current_column_number($parser));

+            error_log($errstr);

+            xml_parser_free($parser);

+            return false;

+        }

+        xml_parser_free($parser);

+        if ($GLOBALS['_xh']['isf'] > 1) // test that $GLOBALS['_xh']['value'] is an obj, too???

+        {

+            error_log($GLOBALS['_xh']['isf_reason']);

+            return false;

+        }

+        switch ($GLOBALS['_xh']['rt'])

+        {

+            case 'methodresponse':

+                $v =& $GLOBALS['_xh']['value'];

+                if ($GLOBALS['_xh']['isf'] == 1)

+                {

+                    $vc = $v->structmem('faultCode');

+                    $vs = $v->structmem('faultString');

+                    $r = new xmlrpcresp(0, $vc->scalarval(), $vs->scalarval());

+                }

+                else

+                {

+                    $r = new xmlrpcresp($v);

+                }

+                return $r;

+            case 'methodcall':

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

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

+                {

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

+                }

+                return $m;

+            case 'value':

+                return $GLOBALS['_xh']['value'];

+            default:

+                return false;

+        }

+    }

+

+    /**

+     * decode a string that is encoded w/ "chunked" transfer encoding

+     * as defined in rfc2068 par. 19.4.6

+     * code shamelessly stolen from nusoap library by Dietrich Ayala

+     *

+     * @param string $buffer the string to be decoded

+     * @return string

+     */

+    function decode_chunked($buffer)

+    {

+        // length := 0

+        $length = 0;

+        $new = '';

+

+        // read chunk-size, chunk-extension (if any) and crlf

+        // get the position of the linebreak

+        $chunkend = strpos($buffer,"\r\n") + 2;

+        $temp = substr($buffer,0,$chunkend);

+        $chunk_size = hexdec( trim($temp) );

+        $chunkstart = $chunkend;

+        while($chunk_size > 0)

+        {

+            $chunkend = strpos($buffer, "\r\n", $chunkstart + $chunk_size);

+

+            // just in case we got a broken connection

+            if($chunkend == false)

+            {

+                $chunk = substr($buffer,$chunkstart);

+                // append chunk-data to entity-body

+                $new .= $chunk;

+                $length += strlen($chunk);

+                break;

+            }

+

+            // read chunk-data and crlf

+            $chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);

+            // append chunk-data to entity-body

+            $new .= $chunk;

+            // length := length + chunk-size

+            $length += strlen($chunk);

+            // read chunk-size and crlf

+            $chunkstart = $chunkend + 2;

+

+            $chunkend = strpos($buffer,"\r\n",$chunkstart)+2;

+            if($chunkend == false)

+            {

+                break; //just in case we got a broken connection

+            }

+            $temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);

+            $chunk_size = hexdec( trim($temp) );

+            $chunkstart = $chunkend;

+        }

+        return $new;

+    }

+

+    /**

+     * xml charset encoding guessing helper function.

+     * Tries to determine the charset encoding of an XML chunk received over HTTP.

+     * NB: according to the spec (RFC 3023), if text/xml content-type is received over HTTP without a content-type,

+     * we SHOULD assume it is strictly US-ASCII. But we try to be more tolerant of unconforming (legacy?) clients/servers,

+     * which will be most probably using UTF-8 anyway...

+     *

+     * @param string $httpheader the http Content-type header

+     * @param string $xmlchunk xml content buffer

+     * @param string $encoding_prefs comma separated list of character encodings to be used as default (when mb extension is enabled)

+     * @return string

+     *

+     * @todo explore usage of mb_http_input(): does it detect http headers + post data? if so, use it instead of hand-detection!!!

+     */

+    function guess_encoding($httpheader='', $xmlchunk='', $encoding_prefs=null)

+    {

+        // discussion: see http://www.yale.edu/pclt/encoding/

+        // 1 - test if encoding is specified in HTTP HEADERS

+

+        //Details:

+        // LWS:           (\13\10)?( |\t)+

+        // token:         (any char but excluded stuff)+

+        // quoted string: " (any char but double quotes and cointrol chars)* "

+        // header:        Content-type = ...; charset=value(; ...)*

+        //   where value is of type token, no LWS allowed between 'charset' and value

+        // Note: we do not check for invalid chars in VALUE:

+        //   this had better be done using pure ereg as below

+        // Note 2: we might be removing whitespace/tabs that ought to be left in if

+        //   the received charset is a quoted string. But nobody uses such charset names...

+

+        /// @todo this test will pass if ANY header has charset specification, not only Content-Type. Fix it?

+        $matches = array();

+        if(preg_match('/;\s*charset\s*=([^;]+)/i', $httpheader, $matches))

+        {

+            return strtoupper(trim($matches[1], " \t\""));

+        }

+

+        // 2 - scan the first bytes of the data for a UTF-16 (or other) BOM pattern

+        //     (source: http://www.w3.org/TR/2000/REC-xml-20001006)

+        //     NOTE: actually, according to the spec, even if we find the BOM and determine

+        //     an encoding, we should check if there is an encoding specified

+        //     in the xml declaration, and verify if they match.

+        /// @todo implement check as described above?

+        /// @todo implement check for first bytes of string even without a BOM? (It sure looks harder than for cases WITH a BOM)

+        if(preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlchunk))

+        {

+            return 'UCS-4';

+        }

+        elseif(preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))

+        {

+            return 'UTF-16';

+        }

+        elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))

+        {

+            return 'UTF-8';

+        }

+

+        // 3 - test if encoding is specified in the xml declaration

+        // Details:

+        // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+

+        // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*

+        if (preg_match('/^<\?xml\s+version\s*=\s*'. "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".

+            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",

+            $xmlchunk, $matches))

+        {

+            return strtoupper(substr($matches[2], 1, -1));

+        }

+

+        // 4 - if mbstring is available, let it do the guesswork

+        // NB: we favour finding an encoding that is compatible with what we can process

+        if(extension_loaded('mbstring'))

+        {

+            if($encoding_prefs)

+            {

+                $enc = mb_detect_encoding($xmlchunk, $encoding_prefs);

+            }

+            else

+            {

+                $enc = mb_detect_encoding($xmlchunk);

+            }

+            // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...

+            // IANA also likes better US-ASCII, so go with it

+            if($enc == 'ASCII')

+            {

+                $enc = 'US-'.$enc;

+            }

+            return $enc;

+        }

+        else

+        {

+            // no encoding specified: as per HTTP1.1 assume it is iso-8859-1?

+            // Both RFC 2616 (HTTP 1.1) and 1945 (HTTP 1.0) clearly state that for text/xxx content types

+            // this should be the standard. And we should be getting text/xml as request and response.

+            // BUT we have to be backward compatible with the lib, which always used UTF-8 as default...

+            return $GLOBALS['xmlrpc_defencoding'];

+        }

+    }

+

+    /**

+     * Helper function: checks if an xml chunk as a charset declaration (BOM or in the xml declaration)

+     *

+     * @param string $xmlChunk

+     * @return bool

+     */

+    function has_encoding($xmlChunk)

+    {

+        // scan the first bytes of the data for a UTF-16 (or other) BOM pattern

+        //	 (source: http://www.w3.org/TR/2000/REC-xml-20001006)

+        if (preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlChunk))

+        {

+            return true;

+        }

+        elseif (preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlChunk))

+        {

+            return true;

+        }

+        elseif (preg_match('/^(\xEF\xBB\xBF)/', $xmlChunk))

+        {

+            return true;

+        }

+

+        // test if encoding is specified in the xml declaration

+        // Details:

+        // SPACE:		(#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+

+        // EQ:			SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*

+        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .

+            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",

+            $xmlChunk, $matches))

+        {

+            return true;

+        }

+

+        return false;

+    }

+

+    /**

+     * Checks if a given charset encoding is present in a list of encodings or

+     * if it is a valid subset of any encoding in the list

+     * @param string $encoding charset to be tested

+     * @param mixed $validlist comma separated list of valid charsets (or array of charsets)

+     * @return bool

+     */

+    function is_valid_charset($encoding, $validlist)

+    {

+        $charset_supersets = array(

+            'US-ASCII' => array ('ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',

+                'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8',

+                'ISO-8859-9', 'ISO-8859-10', 'ISO-8859-11', 'ISO-8859-12',

+                'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'UTF-8',

+                'EUC-JP', 'EUC-', 'EUC-KR', 'EUC-CN')

+        );

+        if (is_string($validlist))

+            $validlist = explode(',', $validlist);

+        if (@in_array(strtoupper($encoding), $validlist))

+            return true;

+        else

+        {

+            if (array_key_exists($encoding, $charset_supersets))

+                foreach ($validlist as $allowed)

+                    if (in_array($allowed, $charset_supersets[$encoding]))

+                        return true;

+            return false;

+        }

+    }

 

 ?>
\ No newline at end of file

Spacing +567 added lines, -567 removed lines

@@ -34,11 +34,11 @@ 
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 // OF THE POSSIBILITY OF SUCH DAMAGE.

 

-	if(!function_exists('xml_parser_create'))

+	if (!function_exists('xml_parser_create'))

 	{

 		// For PHP 4 onward, XML functionality is always compiled-in on windows:

 		// no more need to dl-open it. It might have been compiled out on *nix...

-		if(strtoupper(substr(PHP_OS, 0, 3) != 'WIN'))

+		if (strtoupper(substr(PHP_OS, 0, 3) != 'WIN'))

 		{

 			dl('xml.so');

 		}

@@ -47,18 +47,18 @@ 
 	// G. Giunta 2005/01/29: declare global these variables,

 	// so that xmlrpc.inc will work even if included from within a function

 	// Milosch: 2005/08/07 - explicitly request these via $GLOBALS where used.

-	$GLOBALS['xmlrpcI4']='i4';

-	$GLOBALS['xmlrpcInt']='int';

-	$GLOBALS['xmlrpcBoolean']='boolean';

-	$GLOBALS['xmlrpcDouble']='double';

-	$GLOBALS['xmlrpcString']='string';

-	$GLOBALS['xmlrpcDateTime']='dateTime.iso8601';

-	$GLOBALS['xmlrpcBase64']='base64';

-	$GLOBALS['xmlrpcArray']='array';

-	$GLOBALS['xmlrpcStruct']='struct';

-	$GLOBALS['xmlrpcValue']='undefined';

-

-	$GLOBALS['xmlrpcTypes']=array(

+	$GLOBALS['xmlrpcI4'] = 'i4';

+	$GLOBALS['xmlrpcInt'] = 'int';

+	$GLOBALS['xmlrpcBoolean'] = 'boolean';

+	$GLOBALS['xmlrpcDouble'] = 'double';

+	$GLOBALS['xmlrpcString'] = 'string';

+	$GLOBALS['xmlrpcDateTime'] = 'dateTime.iso8601';

+	$GLOBALS['xmlrpcBase64'] = 'base64';

+	$GLOBALS['xmlrpcArray'] = 'array';

+	$GLOBALS['xmlrpcStruct'] = 'struct';

+	$GLOBALS['xmlrpcValue'] = 'undefined';

+

+	$GLOBALS['xmlrpcTypes'] = array(

 		$GLOBALS['xmlrpcI4']       => 1,

 		$GLOBALS['xmlrpcInt']      => 1,

 		$GLOBALS['xmlrpcBoolean']  => 1,

@@ -93,12 +93,12 @@ 
 	);

 

 	// define extra types for supporting NULL (useful for json or <NIL/>)

-	$GLOBALS['xmlrpcNull']='null';

-	$GLOBALS['xmlrpcTypes']['null']=1;

+	$GLOBALS['xmlrpcNull'] = 'null';

+	$GLOBALS['xmlrpcTypes']['null'] = 1;

 

 	// Not in use anymore since 2.0. Shall we remove it?

 	/// @deprecated

-	$GLOBALS['xmlEntities']=array(

+	$GLOBALS['xmlEntities'] = array(

 		'amp'  => '&',

 		'quot' => '"',

 		'lt'   => '<',

@@ -108,15 +108,15 @@ 
 

 	// tables used for transcoding different charsets into us-ascii xml

 

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

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

 	$GLOBALS['xml_iso88591_Entities']['in'] = array();

 	$GLOBALS['xml_iso88591_Entities']['out'] = array();

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

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

 	{

 		$GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);

 		$GLOBALS['xml_iso88591_Entities']['out'][] = '&#'.$i.';';

 	}

-	for ($i = 160; $i < 256; $i++)

+	for ($i = 160; $i<256; $i++)

 	{

 		$GLOBALS['xml_iso88591_Entities']['in'][] = chr($i);

 		$GLOBALS['xml_iso88591_Entities']['out'][] = '&#'.$i.';';

@@ -200,32 +200,32 @@ 
 	// The charset encoding used by the server for received messages and

 	// by the client for received responses when received charset cannot be determined

 	// or is not supported

-	$GLOBALS['xmlrpc_defencoding']='UTF-8';

+	$GLOBALS['xmlrpc_defencoding'] = 'UTF-8';

 

 	// The encoding used internally by PHP.

 	// String values received as xml will be converted to this, and php strings will be converted to xml

 	// as if having been coded with this

-	$GLOBALS['xmlrpc_internalencoding']='ISO-8859-1';

+	$GLOBALS['xmlrpc_internalencoding'] = 'ISO-8859-1';

 

-	$GLOBALS['xmlrpcName']='XML-RPC for PHP';

-	$GLOBALS['xmlrpcVersion']='3.0.1';

+	$GLOBALS['xmlrpcName'] = 'XML-RPC for PHP';

+	$GLOBALS['xmlrpcVersion'] = '3.0.1';

 

 	// let user errors start at 800

-	$GLOBALS['xmlrpcerruser']=800;

+	$GLOBALS['xmlrpcerruser'] = 800;

 	// let XML parse errors start at 100

-	$GLOBALS['xmlrpcerrxml']=100;

+	$GLOBALS['xmlrpcerrxml'] = 100;

 

 	// formulate backslashes for escaping regexp

 	// Not in use anymore since 2.0. Shall we remove it?

 	/// @deprecated

-	$GLOBALS['xmlrpc_backslash']=chr(92).chr(92);

+	$GLOBALS['xmlrpc_backslash'] = chr(92).chr(92);

 

 	// set to TRUE to enable correct decoding of <NIL/> and <EX:NIL/> values

-	$GLOBALS['xmlrpc_null_extension']=false;

+	$GLOBALS['xmlrpc_null_extension'] = false;

 

 	// set to TRUE to enable encoding of php NULL values to <EX:NIL/> instead of <NIL/>

-	$GLOBALS['xmlrpc_null_apache_encoding']=false;

-	$GLOBALS['xmlrpc_null_apache_encoding_ns']='http://ws.apache.org/xmlrpc/namespaces/extensions';

+	$GLOBALS['xmlrpc_null_apache_encoding'] = false;

+	$GLOBALS['xmlrpc_null_apache_encoding_ns'] = 'http://ws.apache.org/xmlrpc/namespaces/extensions';

 

 	// used to store state during parsing

 	// quick explanation of components:

@@ -238,7 +238,7 @@ 
 	//   method - used to store method name

 	//   stack - array with genealogy of xml elements names:

 	//           used to validate nesting of xmlrpc elements

-	$GLOBALS['_xh']=null;

+	$GLOBALS['_xh'] = null;

 

 	/**

 	* Convert a string to the correct XML representation in a target charset

@@ -254,7 +254,7 @@ 
 	* @todo do a bit of basic benchmarking (strtr vs. str_replace)

 	* @todo	make usage of iconv() or recode_string() or mb_string() where available

 	*/

-	function xmlrpc_encode_entitites($data, $src_encoding='', $dest_encoding='')

+	function xmlrpc_encode_entitites($data, $src_encoding = '', $dest_encoding = '')

 	{

 		if ($src_encoding == '')

 		{

@@ -262,7 +262,7 @@ 
 			$src_encoding = $GLOBALS['xmlrpc_internalencoding'];

 		}

 

-		switch(strtoupper($src_encoding.'_'.$dest_encoding))

+		switch (strtoupper($src_encoding.'_'.$dest_encoding))

 		{

 			case 'ISO-8859-1_':

 			case 'ISO-8859-1_US-ASCII':

@@ -289,16 +289,16 @@ 
 	$escaped_data = '';

 	// be kind to users creating string xmlrpcvals out of different php types

 	$data = (string) $data;

-	$ns = strlen ($data);

-	for ($nn = 0; $nn < $ns; $nn++)

+	$ns = strlen($data);

+	for ($nn = 0; $nn<$ns; $nn++)

 	{

 		$ch = $data[$nn];

 		$ii = ord($ch);

 		//1 7 0bbbbbbb (127)

-		if ($ii < 128)

+		if ($ii<128)

 		{

 			/// @todo shall we replace this with a (supposedly) faster str_replace?

-			switch($ii){

+			switch ($ii) {

 				case 34:

 					$escaped_data .= '&quot;';

 					break;

@@ -319,31 +319,31 @@ 
 			} // switch

 		}

 		//2 11 110bbbbb 10bbbbbb (2047)

-		else if ($ii>>5 == 6)

+		else if ($ii >> 5 == 6)

 		{

 			$b1 = ($ii & 31);

 			$ii = ord($data[$nn+1]);

 			$b2 = ($ii & 63);

-			$ii = ($b1 * 64) + $b2;

-			$ent = sprintf ('&#%d;', $ii);

+			$ii = ($b1 * 64)+$b2;

+			$ent = sprintf('&#%d;', $ii);

 			$escaped_data .= $ent;

 			$nn += 1;

 		}

 		//3 16 1110bbbb 10bbbbbb 10bbbbbb

-		else if ($ii>>4 == 14)

+		else if ($ii >> 4 == 14)

 		{

 			$b1 = ($ii & 15);

 			$ii = ord($data[$nn+1]);

 			$b2 = ($ii & 63);

 			$ii = ord($data[$nn+2]);

 			$b3 = ($ii & 63);

-			$ii = ((($b1 * 64) + $b2) * 64) + $b3;

-			$ent = sprintf ('&#%d;', $ii);

+			$ii = ((($b1 * 64)+$b2) * 64)+$b3;

+			$ent = sprintf('&#%d;', $ii);

 			$escaped_data .= $ent;

 			$nn += 2;

 		}

 		//4 21 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb

-		else if ($ii>>3 == 30)

+		else if ($ii >> 3 == 30)

 		{

 			$b1 = ($ii & 7);

 			$ii = ord($data[$nn+1]);

@@ -352,8 +352,8 @@ 
 			$b3 = ($ii & 63);

 			$ii = ord($data[$nn+3]);

 			$b4 = ($ii & 63);

-			$ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;

-			$ent = sprintf ('&#%d;', $ii);

+			$ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4;

+			$ent = sprintf('&#%d;', $ii);

 			$escaped_data .= $ent;

 			$nn += 3;

 		}

@@ -386,10 +386,10 @@ 
 	}

 

 	/// xml parser handler function for opening element tags

-	function xmlrpc_se($parser, $name, $attrs, $accept_single_vals=false)

+	function xmlrpc_se($parser, $name, $attrs, $accept_single_vals = false)

 	{

 		// if invalid xmlrpc already detected, skip all processing

-		if ($GLOBALS['_xh']['isf'] < 2)

+		if ($GLOBALS['_xh']['isf']<2)

 		{

 			// check for correct element nesting

 			// top level element can only be of 2 types

@@ -422,15 +422,15 @@ 
 				}

 			}

 

-			switch($name)

+			switch ($name)

 			{

 				// optimize for speed switch cases: most common cases first

 				case 'VALUE':

 					/// @todo we could check for 2 VALUE elements inside a MEMBER or PARAM element

-					$GLOBALS['_xh']['vt']='value'; // indicator: no value found yet

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

-					$GLOBALS['_xh']['lv']=1;

-					$GLOBALS['_xh']['php_class']=null;

+					$GLOBALS['_xh']['vt'] = 'value'; // indicator: no value found yet

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

+					$GLOBALS['_xh']['lv'] = 1;

+					$GLOBALS['_xh']['php_class'] = null;

 					break;

 				case 'I4':

 				case 'INT':

@@ -439,18 +439,18 @@ 
 				case 'DOUBLE':

 				case 'DATETIME.ISO8601':

 				case 'BASE64':

-					if ($GLOBALS['_xh']['vt']!='value')

+					if ($GLOBALS['_xh']['vt'] != 'value')

 					{

 						//two data elements inside a value: an error occurred!

 						$GLOBALS['_xh']['isf'] = 2;

 						$GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";

 						return;

 					}

-					$GLOBALS['_xh']['ac']=''; // reset the accumulator

+					$GLOBALS['_xh']['ac'] = ''; // reset the accumulator

 					break;

 				case 'STRUCT':

 				case 'ARRAY':

-					if ($GLOBALS['_xh']['vt']!='value')

+					if ($GLOBALS['_xh']['vt'] != 'value')

 					{

 						//two data elements inside a value: an error occurred!

 						$GLOBALS['_xh']['isf'] = 2;

@@ -468,10 +468,10 @@ 
 						$cur_val['php_class'] = $attrs['PHP_CLASS'];

 					}

 					$GLOBALS['_xh']['valuestack'][] = $cur_val;

-					$GLOBALS['_xh']['vt']='data'; // be prepared for a data element next

+					$GLOBALS['_xh']['vt'] = 'data'; // be prepared for a data element next

 					break;

 				case 'DATA':

-					if ($GLOBALS['_xh']['vt']!='data')

+					if ($GLOBALS['_xh']['vt'] != 'data')

 					{

 						//two data elements inside a value: an error occurred!

 						$GLOBALS['_xh']['isf'] = 2;

@@ -486,31 +486,31 @@ 
 				case 'METHODNAME':

 				case 'NAME':

 					/// @todo we could check for 2 NAME elements inside a MEMBER element

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

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

 					break;

 				case 'FAULT':

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

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

 					break;

 				case 'MEMBER':

-					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name']=''; // set member name to null, in case we do not find in the xml later on

+					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name'] = ''; // set member name to null, in case we do not find in the xml later on

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

 					// Drop trough intentionally

 				case 'PARAM':

 					// clear value type, so we can check later if no value has been passed for this param/member

-					$GLOBALS['_xh']['vt']=null;

+					$GLOBALS['_xh']['vt'] = null;

 					break;

 				case 'NIL':

 				case 'EX:NIL':

 					if ($GLOBALS['xmlrpc_null_extension'])

 					{

-						if ($GLOBALS['_xh']['vt']!='value')

+						if ($GLOBALS['_xh']['vt'] != 'value')

 						{

 							//two data elements inside a value: an error occurred!

 							$GLOBALS['_xh']['isf'] = 2;

 							$GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";

 							return;

 						}

-						$GLOBALS['_xh']['ac']=''; // reset the accumulator

+						$GLOBALS['_xh']['ac'] = ''; // reset the accumulator

 						break;

 					}

 					// we do not support the <NIL/> extension, so

@@ -526,9 +526,9 @@ 
 			$GLOBALS['_xh']['stack'][] = $name;

 

 			/// @todo optimization creep: move this inside the big switch() above

-			if($name!='VALUE')

+			if ($name != 'VALUE')

 			{

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

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

 			}

 		}

 	}

@@ -542,7 +542,7 @@ 
 	/// xml parser handler function for close element tags

 	function xmlrpc_ee($parser, $name, $rebuild_xmlrpcvals = true)

 	{

-		if ($GLOBALS['_xh']['isf'] < 2)

+		if ($GLOBALS['_xh']['isf']<2)

 		{

 			// push this element name from stack

 			// NB: if XML validates, correct opening/closing is guaranteed and

@@ -550,14 +550,14 @@ 
 			// we also checked for proper nesting at start of elements...

 			$curr_elem = array_pop($GLOBALS['_xh']['stack']);

 

-			switch($name)

+			switch ($name)

 			{

 				case 'VALUE':

 					// This if() detects if no scalar was inside <VALUE></VALUE>

-					if ($GLOBALS['_xh']['vt']=='value')

+					if ($GLOBALS['_xh']['vt'] == 'value')

 					{

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

-						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcString'];

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

+						$GLOBALS['_xh']['vt'] = $GLOBALS['xmlrpcString'];

 					}

 

 					if ($rebuild_xmlrpcvals)

@@ -571,7 +571,7 @@ 
 						// check if we are inside an array or struct:

 						// if value just built is inside an array, let's move it into array on the stack

 						$vscount = count($GLOBALS['_xh']['valuestack']);

-						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')

+						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type'] == 'ARRAY')

 						{

 							$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $temp;

 						}

@@ -592,7 +592,7 @@ 
 						// check if we are inside an array or struct:

 						// if value just built is inside an array, let's move it into array on the stack

 						$vscount = count($GLOBALS['_xh']['valuestack']);

-						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')

+						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type'] == 'ARRAY')

 						{

 							$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $GLOBALS['_xh']['value'];

 						}

@@ -605,28 +605,28 @@ 
 				case 'DOUBLE':

 				case 'DATETIME.ISO8601':

 				case 'BASE64':

-					$GLOBALS['_xh']['vt']=strtolower($name);

+					$GLOBALS['_xh']['vt'] = strtolower($name);

 					/// @todo: optimization creep - remove the if/elseif cycle below

 					/// since the case() in which we are already did that

-					if ($name=='STRING')

+					if ($name == 'STRING')

 					{

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

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

 					}

-					elseif ($name=='DATETIME.ISO8601')

+					elseif ($name == 'DATETIME.ISO8601')

 					{

 						if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac']))

 						{

 							error_log('XML-RPC: invalid value received in DATETIME: '.$GLOBALS['_xh']['ac']);

 						}

-						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];

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

+						$GLOBALS['_xh']['vt'] = $GLOBALS['xmlrpcDateTime'];

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

 					}

-					elseif ($name=='BASE64')

+					elseif ($name == 'BASE64')

 					{

 						/// @todo check for failure of base64 decoding / catch warnings

-						$GLOBALS['_xh']['value']=base64_decode($GLOBALS['_xh']['ac']);

+						$GLOBALS['_xh']['value'] = base64_decode($GLOBALS['_xh']['ac']);

 					}

-					elseif ($name=='BOOLEAN')

+					elseif ($name == 'BOOLEAN')

 					{

 						// special case here: we translate boolean 1 or 0 into PHP

 						// constants true or false.

@@ -634,19 +634,19 @@ 
 						// spec never mentions them (see eg. Blogger api docs)

 						// NB: this simple checks helps a lot sanitizing input, ie no

 						// security problems around here

-						if ($GLOBALS['_xh']['ac']=='1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)

+						if ($GLOBALS['_xh']['ac'] == '1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)

 						{

-							$GLOBALS['_xh']['value']=true;

+							$GLOBALS['_xh']['value'] = true;

 						}

 						else

 						{

 							// log if receiveing something strange, even though we set the value to false anyway

-							if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0)

+							if ($GLOBALS['_xh']['ac'] != '0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0)

 								error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);

-							$GLOBALS['_xh']['value']=false;

+							$GLOBALS['_xh']['value'] = false;

 						}

 					}

-					elseif ($name=='DOUBLE')

+					elseif ($name == 'DOUBLE')

 					{

 						// we have a DOUBLE

 						// we must check that only 0123456789-.<space> are characters here

@@ -655,12 +655,12 @@ 
 						{

 							/// @todo: find a better way of throwing an error than this!

 							error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);

-							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';

+							$GLOBALS['_xh']['value'] = 'ERROR_NON_NUMERIC_FOUND';

 						}

 						else

 						{

 							// it's ok, add it on

-							$GLOBALS['_xh']['value']=(double)$GLOBALS['_xh']['ac'];

+							$GLOBALS['_xh']['value'] = (double) $GLOBALS['_xh']['ac'];

 						}

 					}

 					else

@@ -671,16 +671,16 @@ 
 						{

 							/// @todo find a better way of throwing an error than this!

 							error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);

-							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';

+							$GLOBALS['_xh']['value'] = 'ERROR_NON_NUMERIC_FOUND';

 						}

 						else

 						{

 							// it's ok, add it on

-							$GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];

+							$GLOBALS['_xh']['value'] = (int) $GLOBALS['_xh']['ac'];

 						}

 					}

 					//$GLOBALS['_xh']['ac']=''; // is this necessary?

-					$GLOBALS['_xh']['lv']=3; // indicate we've found a value

+					$GLOBALS['_xh']['lv'] = 3; // indicate we've found a value

 					break;

 				case 'NAME':

 					$GLOBALS['_xh']['valuestack'][count($GLOBALS['_xh']['valuestack'])-1]['name'] = $GLOBALS['_xh']['ac'];

@@ -698,14 +698,14 @@ 
 					break;

 				case 'DATA':

 					//$GLOBALS['_xh']['ac']=''; // is this necessary?

-					$GLOBALS['_xh']['vt']=null; // reset this to check for 2 data elements in a row - even if they're empty

+					$GLOBALS['_xh']['vt'] = null; // reset this to check for 2 data elements in a row - even if they're empty

 					break;

 				case 'STRUCT':

 				case 'ARRAY':

 					// fetch out of stack array of values, and promote it to current value

 					$curr_val = array_pop($GLOBALS['_xh']['valuestack']);

 					$GLOBALS['_xh']['value'] = $curr_val['values'];

-					$GLOBALS['_xh']['vt']=strtolower($name);

+					$GLOBALS['_xh']['vt'] = strtolower($name);

 					if (isset($curr_val['php_class']))

 					{

 						$GLOBALS['_xh']['php_class'] = $curr_val['php_class'];

@@ -716,22 +716,22 @@ 
 					// unless no VALUE was found

 					if ($GLOBALS['_xh']['vt'])

 					{

-						$GLOBALS['_xh']['params'][]=$GLOBALS['_xh']['value'];

-						$GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];

+						$GLOBALS['_xh']['params'][] = $GLOBALS['_xh']['value'];

+						$GLOBALS['_xh']['pt'][] = $GLOBALS['_xh']['vt'];

 					}

 					else

 						error_log('XML-RPC: missing VALUE inside PARAM in received xml');

 					break;

 				case 'METHODNAME':

-					$GLOBALS['_xh']['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);

+					$GLOBALS['_xh']['method'] = preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);

 					break;

 				case 'NIL':

 				case 'EX:NIL':

 					if ($GLOBALS['xmlrpc_null_extension'])

 					{

-						$GLOBALS['_xh']['vt']='null';

-						$GLOBALS['_xh']['value']=null;

-						$GLOBALS['_xh']['lv']=3;

+						$GLOBALS['_xh']['vt'] = 'null';

+						$GLOBALS['_xh']['value'] = null;

+						$GLOBALS['_xh']['lv'] = 3;

 						break;

 					}

 					// drop through intentionally if nil extension not enabled

@@ -758,11 +758,11 @@ 
 	function xmlrpc_cd($parser, $data)

 	{

 		// skip processing if xml fault already detected

-		if ($GLOBALS['_xh']['isf'] < 2)

+		if ($GLOBALS['_xh']['isf']<2)

 		{

 			// "lookforvalue==3" means that we've found an entire value

 			// and should discard any further character data

-			if($GLOBALS['_xh']['lv']!=3)

+			if ($GLOBALS['_xh']['lv'] != 3)

 			{

 				// G. Giunta 2006-08-23: useless change of 'lv' from 1 to 2

 				//if($GLOBALS['_xh']['lv']==1)

@@ -776,7 +776,7 @@ 
 				//{

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

 				//}

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

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

 			}

 		}

 	}

@@ -786,16 +786,16 @@ 
 	function xmlrpc_dh($parser, $data)

 	{

 		// skip processing if xml fault already detected

-		if ($GLOBALS['_xh']['isf'] < 2)

+		if ($GLOBALS['_xh']['isf']<2)

 		{

-			if(substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')

+			if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')

 			{

 				// G. Giunta 2006-08-25: useless change of 'lv' from 1 to 2

 				//if($GLOBALS['_xh']['lv']==1)

 				//{

 				//	$GLOBALS['_xh']['lv']=2;

 				//}

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

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

 			}

 		}

 		return true;

@@ -805,30 +805,30 @@ 
 	{

 		var $path;

 		var $server;

-		var $port=0;

-		var $method='http';

+		var $port = 0;

+		var $method = 'http';

 		var $errno;

 		var $errstr;

-		var $debug=0;

-		var $username='';

-		var $password='';

-		var $authtype=1;

-		var $cert='';

-		var $certpass='';

-		var $cacert='';

-		var $cacertdir='';

-		var $key='';

-		var $keypass='';

-		var $verifypeer=true;

-		var $verifyhost=1;

-		var $no_multicall=false;

-		var $proxy='';

-		var $proxyport=0;

-		var $proxy_user='';

-		var $proxy_pass='';

-		var $proxy_authtype=1;

-		var $cookies=array();

-		var $extracurlopts=array();

+		var $debug = 0;

+		var $username = '';

+		var $password = '';

+		var $authtype = 1;

+		var $cert = '';

+		var $certpass = '';

+		var $cacert = '';

+		var $cacertdir = '';

+		var $key = '';

+		var $keypass = '';

+		var $verifypeer = true;

+		var $verifyhost = 1;

+		var $no_multicall = false;

+		var $proxy = '';

+		var $proxyport = 0;

+		var $proxy_user = '';

+		var $proxy_pass = '';

+		var $proxy_authtype = 1;

+		var $cookies = array();

+		var $extracurlopts = array();

 

 		/**

 		* List of http compression methods accepted by the client for responses.

@@ -872,59 +872,59 @@ 
 		* @param integer $port the port the server is listening on, defaults to 80 or 443 depending on protocol used

 		* @param string $method the http protocol variant: defaults to 'http', 'https' and 'http11' can be used if CURL is installed

 		*/

-		function __construct($path, $server='', $port='', $method='')

+		function __construct($path, $server = '', $port = '', $method = '')

 		{

 			// allow user to specify all params in $path

-			if($server == '' and $port == '' and $method == '')

+			if ($server == '' and $port == '' and $method == '')

 			{

 				$parts = parse_url($path);

 				$server = $parts['host'];

 				$path = isset($parts['path']) ? $parts['path'] : '';

-				if(isset($parts['query']))

+				if (isset($parts['query']))

 				{

 					$path .= '?'.$parts['query'];

 				}

-				if(isset($parts['fragment']))

+				if (isset($parts['fragment']))

 				{

 					$path .= '#'.$parts['fragment'];

 				}

-				if(isset($parts['port']))

+				if (isset($parts['port']))

 				{

 					$port = $parts['port'];

 				}

-				if(isset($parts['scheme']))

+				if (isset($parts['scheme']))

 				{

 					$method = $parts['scheme'];

 				}

-				if(isset($parts['user']))

+				if (isset($parts['user']))

 				{

 					$this->username = $parts['user'];

 				}

-				if(isset($parts['pass']))

+				if (isset($parts['pass']))

 				{

 					$this->password = $parts['pass'];

 				}

 			}

-			if($path == '' || $path[0] != '/')

+			if ($path == '' || $path[0] != '/')

 			{

-				$this->path='/'.$path;

+				$this->path = '/'.$path;

 			}

 			else

 			{

-				$this->path=$path;

+				$this->path = $path;

 			}

-			$this->server=$server;

-			if($port != '')

+			$this->server = $server;

+			if ($port != '')

 			{

-				$this->port=$port;

+				$this->port = $port;

 			}

-			if($method != '')

+			if ($method != '')

 			{

-				$this->method=$method;

+				$this->method = $method;

 			}

 

 			// if ZLIB is enabled, let the client by default accept compressed responses

-			if(function_exists('gzinflate') || (

+			if (function_exists('gzinflate') || (

 				function_exists('curl_init') && (($info = curl_version()) &&

 				((is_string($info) && strpos($info, 'zlib') !== null) || isset($info['libz_version'])))

 			))

@@ -939,13 +939,13 @@ 
 			$this->accepted_charset_encodings = array('UTF-8', 'ISO-8859-1', 'US-ASCII');

 

 			// initialize user_agent string

-			$this->user_agent = $GLOBALS['xmlrpcName'] . ' ' . $GLOBALS['xmlrpcVersion'];

+			$this->user_agent = $GLOBALS['xmlrpcName'].' '.$GLOBALS['xmlrpcVersion'];

 		}

 

 		/**

 		* @deprecated

 		*/

-		function xmlrpc_client($path, $server='', $port='', $method='')

+		function xmlrpc_client($path, $server = '', $port = '', $method = '')

 		{

 			self::__construct($path, $server, $port, $method);

 		}

@@ -957,7 +957,7 @@ 
 		*/

 		function setDebug($in)

 		{

-			$this->debug=$in;

+			$this->debug = $in;

 		}

 

 		/**

@@ -967,11 +967,11 @@ 
 		* @param integer $t auth type. See curl_setopt man page for supported auth types. Defaults to CURLAUTH_BASIC (basic auth)

 		* @access public

 		*/

-		function setCredentials($u, $p, $t=1)

+		function setCredentials($u, $p, $t = 1)

 		{

-			$this->username=$u;

-			$this->password=$p;

-			$this->authtype=$t;

+			$this->username = $u;

+			$this->password = $p;

+			$this->authtype = $t;

 		}

 

 		/**

@@ -993,7 +993,7 @@ 
 		* @param bool $is_dir set to true to indicate cacert is a dir. defaults to false

 		* @access public

 		*/

-		function setCaCertificate($cacert, $is_dir=false)

+		function setCaCertificate($cacert, $is_dir = false)

 		{

 			if ($is_dir)

 			{

@@ -1070,7 +1070,7 @@ 
 			if ($compmethod == 'any')

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

 			else

-				if ($compmethod == false )

+				if ($compmethod == false)

 					$this->accepted_compression = array();

 				else

 					$this->accepted_compression = array($compmethod);

@@ -1101,7 +1101,7 @@ 
 		*

 		* @todo check correctness of urlencoding cookie value (copied from php way of doing it...)

 		*/

-		function setCookie($name, $value='', $path='', $domain='', $port=null)

+		function setCookie($name, $value = '', $path = '', $domain = '', $port = null)

 		{

 			$this->cookies[$name]['value'] = urlencode($value);

 			if ($path || $domain || $port)

@@ -1122,7 +1122,7 @@ 
 		* It allows eg. to bind client to a specific IP interface / address

 		* @param array $options

 		*/

-		function SetCurlOptions( $options )

+		function SetCurlOptions($options)

 		{

 			$this->extracurlopts = $options;

 		}

@@ -1131,7 +1131,7 @@ 
 		* Set user-agent string that will be used by this client instance

 		* in http headers sent to the server

 		*/

-		function SetUserAgent( $agentstring )

+		function SetUserAgent($agentstring)

 		{

 			$this->user_agent = $agentstring;

 		}

@@ -1144,22 +1144,22 @@ 
 		* @return xmlrpcresp

 		* @access public

 		*/

-		function& send($msg, $timeout=0, $method='')

+		function& send($msg, $timeout = 0, $method = '')

 		{

 			// if user deos not specify http protocol, use native method of this client

 			// (i.e. method set during call to constructor)

-			if($method == '')

+			if ($method == '')

 			{

 				$method = $this->method;

 			}

 

-			if(is_array($msg))

+			if (is_array($msg))

 			{

 				// $msg is an array of xmlrpcmsg's

 				$r = $this->multicall($msg, $timeout, $method);

 				return $r;

 			}

-			elseif(is_string($msg))

+			elseif (is_string($msg))

 			{

 				$n = new xmlrpcmsg('');

 				$n->payload = $msg;

@@ -1167,11 +1167,11 @@ 
 			}

 

 			// where msg is an xmlrpcmsg

-			$msg->debug=$this->debug;

+			$msg->debug = $this->debug;

 

-			if($method == 'https')

+			if ($method == 'https')

 			{

-				$r =& $this->sendPayloadHTTPS(

+				$r = & $this->sendPayloadHTTPS(

 					$msg,

 					$this->server,

 					$this->port,

@@ -1193,9 +1193,9 @@ 
 					$this->keypass

 				);

 			}

-			elseif($method == 'http11')

+			elseif ($method == 'http11')

 			{

-				$r =& $this->sendPayloadCURL(

+				$r = & $this->sendPayloadCURL(

 					$msg,

 					$this->server,

 					$this->port,

@@ -1218,7 +1218,7 @@ 
 			}

 			else

 			{

-				$r =& $this->sendPayloadHTTP10(

+				$r = & $this->sendPayloadHTTP10(

 					$msg,

 					$this->server,

 					$this->port,

@@ -1240,29 +1240,29 @@ 
 		/**

 		* @access private

 		*/

-		function &sendPayloadHTTP10($msg, $server, $port, $timeout=0,

-			$username='', $password='', $authtype=1, $proxyhost='',

-			$proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1)

+		function &sendPayloadHTTP10($msg, $server, $port, $timeout = 0,

+			$username = '', $password = '', $authtype = 1, $proxyhost = '',

+			$proxyport = 0, $proxyusername = '', $proxypassword = '', $proxyauthtype = 1)

 		{

-			if($port==0)

+			if ($port == 0)

 			{

-				$port=80;

+				$port = 80;

 			}

 

 			// Only create the payload if it was not created previously

-			if(empty($msg->payload))

+			if (empty($msg->payload))

 			{

 				$msg->createPayload($this->request_charset_encoding);

 			}

 

 			$payload = $msg->payload;

 			// Deflate request body and set appropriate request headers

-			if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))

+			if (function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))

 			{

-				if($this->request_compression == 'gzip')

+				if ($this->request_compression == 'gzip')

 				{

 					$a = @gzencode($payload);

-					if($a)

+					if ($a)

 					{

 						$payload = $a;

 						$encoding_hdr = "Content-Encoding: gzip\r\n";

@@ -1271,7 +1271,7 @@ 
 				else

 				{

 					$a = @gzcompress($payload);

-					if($a)

+					if ($a)

 					{

 						$payload = $a;

 						$encoding_hdr = "Content-Encoding: deflate\r\n";

@@ -1284,10 +1284,10 @@ 
 			}

 

 			// thanks to Grant Rauscher <grant7@firstworld.net> for this

-			$credentials='';

-			if($username!='')

+			$credentials = '';

+			if ($username != '')

 			{

-				$credentials='Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";

+				$credentials = 'Authorization: Basic '.base64_encode($username.':'.$password)."\r\n";

 				if ($authtype != 1)

 				{

 					error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');

@@ -1295,28 +1295,28 @@ 
 			}

 

 			$accepted_encoding = '';

-			if(is_array($this->accepted_compression) && count($this->accepted_compression))

+			if (is_array($this->accepted_compression) && count($this->accepted_compression))

 			{

-				$accepted_encoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";

+				$accepted_encoding = 'Accept-Encoding: '.implode(', ', $this->accepted_compression)."\r\n";

 			}

 

 			$proxy_credentials = '';

-			if($proxyhost)

+			if ($proxyhost)

 			{

-				if($proxyport == 0)

+				if ($proxyport == 0)

 				{

 					$proxyport = 8080;

 				}

 				$connectserver = $proxyhost;

 				$connectport = $proxyport;

 				$uri = 'http://'.$server.':'.$port.$this->path;

-				if($proxyusername != '')

+				if ($proxyusername != '')

 				{

 					if ($proxyauthtype != 1)

 					{

 						error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');

 					}

-					$proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";

+					$proxy_credentials = 'Proxy-Authorization: Basic '.base64_encode($proxyusername.':'.$proxypassword)."\r\n";

 				}

 			}

 			else

@@ -1328,7 +1328,7 @@ 
 

 			// Cookie generation, as per rfc2965 (version 1 cookies) or

 			// netscape's rules (version 0 cookies)

-			$cookieheader='';

+			$cookieheader = '';

 			if (count($this->cookies))

 			{

 				$version = '';

@@ -1336,73 +1336,73 @@ 
 				{

 					if ($cookie['version'])

 					{

-						$version = ' $Version="' . $cookie['version'] . '";';

-						$cookieheader .= ' ' . $name . '="' . $cookie['value'] . '";';

+						$version = ' $Version="'.$cookie['version'].'";';

+						$cookieheader .= ' '.$name.'="'.$cookie['value'].'";';

 						if ($cookie['path'])

-							$cookieheader .= ' $Path="' . $cookie['path'] . '";';

+							$cookieheader .= ' $Path="'.$cookie['path'].'";';

 						if ($cookie['domain'])

-							$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';

+							$cookieheader .= ' $Domain="'.$cookie['domain'].'";';

 						if ($cookie['port'])

-							$cookieheader .= ' $Port="' . $cookie['port'] . '";';

+							$cookieheader .= ' $Port="'.$cookie['port'].'";';

 					}

 					else

 					{

-						$cookieheader .= ' ' . $name . '=' . $cookie['value'] . ";";

+						$cookieheader .= ' '.$name.'='.$cookie['value'].";";

 					}

 				}

-				$cookieheader = 'Cookie:' . $version . substr($cookieheader, 0, -1) . "\r\n";

+				$cookieheader = 'Cookie:'.$version.substr($cookieheader, 0, -1)."\r\n";

 			}

 

 			// omit port if 80

-			$port = ($port == 80) ? '' : (':' . $port);

-

-			$op= 'POST ' . $uri. " HTTP/1.0\r\n" .

-				'User-Agent: ' . $this->user_agent . "\r\n" .

-				'Host: '. $server . $port . "\r\n" .

-				$credentials .

-				$proxy_credentials .

-				$accepted_encoding .

-				$encoding_hdr .

-				'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings) . "\r\n" .

-				$cookieheader .

-				'Content-Type: ' . $msg->content_type . "\r\nContent-Length: " .

-				strlen($payload) . "\r\n\r\n" .

+			$port = ($port == 80) ? '' : (':'.$port);

+

+			$op = 'POST '.$uri." HTTP/1.0\r\n".

+				'User-Agent: '.$this->user_agent."\r\n".

+				'Host: '.$server.$port."\r\n".

+				$credentials.

+				$proxy_credentials.

+				$accepted_encoding.

+				$encoding_hdr.

+				'Accept-Charset: '.implode(',', $this->accepted_charset_encodings)."\r\n".

+				$cookieheader.

+				'Content-Type: '.$msg->content_type."\r\nContent-Length: ".

+				strlen($payload)."\r\n\r\n".

 				$payload;

 

-			if($this->debug > 1)

+			if ($this->debug>1)

 			{

-				print "<PRE>\n---SENDING---\n" . htmlentities($op) . "\n---END---\n</PRE>";

+				print "<PRE>\n---SENDING---\n".htmlentities($op)."\n---END---\n</PRE>";

 				// let the client see this now in case http times out...

 				flush();

 			}

 

-			if($timeout>0)

+			if ($timeout>0)

 			{

-				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);

+				$fp = @fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);

 			}

 			else

 			{

-				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);

+				$fp = @fsockopen($connectserver, $connectport, $this->errno, $this->errstr);

 			}

-			if($fp)

+			if ($fp)

 			{

-				if($timeout>0 && function_exists('stream_set_timeout'))

+				if ($timeout>0 && function_exists('stream_set_timeout'))

 				{

 					stream_set_timeout($fp, $timeout);

 				}

 			}

 			else

 			{

-				$this->errstr='Connect error: '.$this->errstr;

-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');

+				$this->errstr = 'Connect error: '.$this->errstr;

+				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr.' ('.$this->errno.')');

 				return $r;

 			}

 

-			if(!fputs($fp, $op, strlen($op)))

+			if (!fputs($fp, $op, strlen($op)))

 			{

 				fclose($fp);

-				$this->errstr='Write error';

-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);

+				$this->errstr = 'Write error';

+				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);

 				return $r;

 			}

 			else

@@ -1412,15 +1412,15 @@ 
 			}

 			// G. Giunta 2005/10/24: close socket before parsing.

 			// should yield slightly better execution times, and make easier recursive calls (e.g. to follow http redirects)

-			$ipd='';

+			$ipd = '';

 			do

 			{

 				// shall we check for $data === FALSE?

 				// as per the manual, it signals an error

-				$ipd.=fread($fp, 32768);

-			} while(!feof($fp));

+				$ipd .= fread($fp, 32768);

+			} while (!feof($fp));

 			fclose($fp);

-			$r =& $msg->parseResponse($ipd, false, $this->return_type);

+			$r = & $msg->parseResponse($ipd, false, $this->return_type);

 			return $r;

 

 		}

@@ -1428,12 +1428,12 @@ 
 		/**

 		* @access private

 		*/

-		function &sendPayloadHTTPS($msg, $server, $port, $timeout=0, $username='',

-			$password='', $authtype=1, $cert='',$certpass='', $cacert='', $cacertdir='',

-			$proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1,

-			$keepalive=false, $key='', $keypass='')

+		function &sendPayloadHTTPS($msg, $server, $port, $timeout = 0, $username = '',

+			$password = '', $authtype = 1, $cert = '', $certpass = '', $cacert = '', $cacertdir = '',

+			$proxyhost = '', $proxyport = 0, $proxyusername = '', $proxypassword = '', $proxyauthtype = 1,

+			$keepalive = false, $key = '', $keypass = '')

 		{

-			$r =& $this->sendPayloadCURL($msg, $server, $port, $timeout, $username,

+			$r = & $this->sendPayloadCURL($msg, $server, $port, $timeout, $username,

 				$password, $authtype, $cert, $certpass, $cacert, $cacertdir, $proxyhost, $proxyport,

 				$proxyusername, $proxypassword, $proxyauthtype, 'https', $keepalive, $key, $keypass);

 			return $r;

@@ -1445,31 +1445,31 @@ 
 		* NB: CURL versions before 7.11.10 cannot use proxy to talk to https servers!

 		* @access private

 		*/

-		function &sendPayloadCURL($msg, $server, $port, $timeout=0, $username='',

-			$password='', $authtype=1, $cert='', $certpass='', $cacert='', $cacertdir='',

-			$proxyhost='', $proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1, $method='https',

-			$keepalive=false, $key='', $keypass='')

+		function &sendPayloadCURL($msg, $server, $port, $timeout = 0, $username = '',

+			$password = '', $authtype = 1, $cert = '', $certpass = '', $cacert = '', $cacertdir = '',

+			$proxyhost = '', $proxyport = 0, $proxyusername = '', $proxypassword = '', $proxyauthtype = 1, $method = 'https',

+			$keepalive = false, $key = '', $keypass = '')

 		{

-			if(!function_exists('curl_init'))

+			if (!function_exists('curl_init'))

 			{

-				$this->errstr='CURL unavailable on this install';

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

+				$this->errstr = 'CURL unavailable on this install';

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

 				return $r;

 			}

-			if($method == 'https')

+			if ($method == 'https')

 			{

-				if(($info = curl_version()) &&

+				if (($info = curl_version()) &&

 					((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version']))))

 				{

-					$this->errstr='SSL unavailable on this install';

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

+					$this->errstr = 'SSL unavailable on this install';

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

 					return $r;

 				}

 			}

 

-			if($port == 0)

+			if ($port == 0)

 			{

-				if($method == 'http')

+				if ($method == 'http')

 				{

 					$port = 80;

 				}

@@ -1480,19 +1480,19 @@ 
 			}

 

 			// Only create the payload if it was not created previously

-			if(empty($msg->payload))

+			if (empty($msg->payload))

 			{

 				$msg->createPayload($this->request_charset_encoding);

 			}

 

 			// Deflate request body and set appropriate request headers

 			$payload = $msg->payload;

-			if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))

+			if (function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate'))

 			{

-				if($this->request_compression == 'gzip')

+				if ($this->request_compression == 'gzip')

 				{

 					$a = @gzencode($payload);

-					if($a)

+					if ($a)

 					{

 						$payload = $a;

 						$encoding_hdr = 'Content-Encoding: gzip';

@@ -1501,7 +1501,7 @@ 
 				else

 				{

 					$a = @gzcompress($payload);

-					if($a)

+					if ($a)

 					{

 						$payload = $a;

 						$encoding_hdr = 'Content-Encoding: deflate';

@@ -1513,17 +1513,17 @@ 
 				$encoding_hdr = '';

 			}

 

-			if($this->debug > 1)

+			if ($this->debug>1)

 			{

-				print "<PRE>\n---SENDING---\n" . htmlentities($payload) . "\n---END---\n</PRE>";

+				print "<PRE>\n---SENDING---\n".htmlentities($payload)."\n---END---\n</PRE>";

 				// let the client see this now in case http times out...

 				flush();

 			}

 

-			if(!$keepalive || !$this->xmlrpc_curl_handle)

+			if (!$keepalive || !$this->xmlrpc_curl_handle)

 			{

-				$curl = curl_init($method . '://' . $server . ':' . $port . $this->path);

-				if($keepalive)

+				$curl = curl_init($method.'://'.$server.':'.$port.$this->path);

+				if ($keepalive)

 				{

 					$this->xmlrpc_curl_handle = $curl;

 				}

@@ -1536,7 +1536,7 @@ 
 			// results into variable

 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);

 

-			if($this->debug)

+			if ($this->debug)

 			{

 				curl_setopt($curl, CURLOPT_VERBOSE, 1);

 			}

@@ -1552,7 +1552,7 @@ 
 			// NB: if we set an empty string, CURL will add http header indicating

 			// ALL methods it is supporting. This is possibly a better option than

 			// letting the user tell what curl can / cannot do...

-			if(is_array($this->accepted_compression) && count($this->accepted_compression))

+			if (is_array($this->accepted_compression) && count($this->accepted_compression))

 			{

 				//curl_setopt($curl, CURLOPT_ENCODING, implode(',', $this->accepted_compression));

 				// empty string means 'any supported by CURL' (shall we catch errors in case CURLOPT_SSLKEY undefined ?)

@@ -1564,26 +1564,26 @@ 
 					curl_setopt($curl, CURLOPT_ENCODING, '');

 			}

 			// extra headers

-			$headers = array('Content-Type: ' . $msg->content_type , 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));

+			$headers = array('Content-Type: '.$msg->content_type, 'Accept-Charset: '.implode(',', $this->accepted_charset_encodings));

 			// if no keepalive is wanted, let the server know it in advance

-			if(!$keepalive)

+			if (!$keepalive)

 			{

 				$headers[] = 'Connection: close';

 			}

 			// request compression header

-			if($encoding_hdr)

+			if ($encoding_hdr)

 			{

 				$headers[] = $encoding_hdr;

 			}

 

 			curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);

 			// timeout is borked

-			if($timeout)

+			if ($timeout)

 			{

-				curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout - 1);

+				curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 1 ? 1 : $timeout-1);

 			}

 

-			if($username && $password)

+			if ($username && $password)

 			{

 				curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);

 				if (defined('CURLOPT_HTTPAUTH'))

@@ -1596,43 +1596,43 @@ 
 				}

 			}

 

-			if($method == 'https')

+			if ($method == 'https')

 			{

 				// set cert file

-				if($cert)

+				if ($cert)

 				{

 					curl_setopt($curl, CURLOPT_SSLCERT, $cert);

 				}

 				// set cert password

-				if($certpass)

+				if ($certpass)

 				{

 					curl_setopt($curl, CURLOPT_SSLCERTPASSWD, $certpass);

 				}

 				// whether to verify remote host's cert

 				curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, $this->verifypeer);

 				// set ca certificates file/dir

-				if($cacert)

+				if ($cacert)

 				{

 					curl_setopt($curl, CURLOPT_CAINFO, $cacert);

 				}

-				if($cacertdir)

+				if ($cacertdir)

 				{

 					curl_setopt($curl, CURLOPT_CAPATH, $cacertdir);

 				}

 				// set key file (shall we catch errors in case CURLOPT_SSLKEY undefined ?)

-				if($key)

+				if ($key)

 				{

 					curl_setopt($curl, CURLOPT_SSLKEY, $key);

 				}

 				// set key password (shall we catch errors in case CURLOPT_SSLKEY undefined ?)

-				if($keypass)

+				if ($keypass)

 				{

 					curl_setopt($curl, CURLOPT_SSLKEYPASSWD, $keypass);

 				}

 

 				// Upgrade transparently to more stringent check for versions of php which do not support otherwise.

 				// Doing it in constructor would be cleaner; doing it here saves us a couple of function calls

-				if($this->verifyhost == 1 && $info = curl_version() && version_compare($info['version'], '7.28.1') >= 0)

+				if ($this->verifyhost == 1 && $info = curl_version() && version_compare($info['version'], '7.28.1')>=0)

 				{

 					$this->verifyhost = 2;

 				}

@@ -1641,15 +1641,15 @@ 
 			}

 

 			// proxy info

-			if($proxyhost)

+			if ($proxyhost)

 			{

-				if($proxyport == 0)

+				if ($proxyport == 0)

 				{

 					$proxyport = 8080; // NB: even for HTTPS, local connection is on port 8080

 				}

 				curl_setopt($curl, CURLOPT_PROXY, $proxyhost.':'.$proxyport);

 				//curl_setopt($curl, CURLOPT_PROXYPORT,$proxyport);

-				if($proxyusername)

+				if ($proxyusername)

 				{

 					curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyusername.':'.$proxypassword);

 					if (defined('CURLOPT_PROXYAUTH'))

@@ -1671,7 +1671,7 @@ 
 				$cookieheader = '';

 				foreach ($this->cookies as $name => $cookie)

 				{

-					$cookieheader .= $name . '=' . $cookie['value'] . '; ';

+					$cookieheader .= $name.'='.$cookie['value'].'; ';

 				}

 				curl_setopt($curl, CURLOPT_COOKIE, substr($cookieheader, 0, -2));

 			}

@@ -1683,40 +1683,40 @@ 
 

 			$result = curl_exec($curl);

 

-			if ($this->debug > 1)

+			if ($this->debug>1)

 			{

 				print "<PRE>\n---CURL INFO---\n";

-				foreach(curl_getinfo($curl) as $name => $val)

+				foreach (curl_getinfo($curl) as $name => $val)

 				{

 					if (is_array($val))

 					{

 						$val = implode("\n", $val);

 					}

-					print $name . ': ' . htmlentities($val) . "\n";

+					print $name.': '.htmlentities($val)."\n";

 				}

 

 				print "---END---\n</PRE>";

 			}

 

-			if(!$result) /// @todo we should use a better check here - what if we get back '' or '0'?

+			if (!$result) /// @todo we should use a better check here - what if we get back '' or '0'?

 			{

-				$this->errstr='no response';

-				$resp=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl));

+				$this->errstr = 'no response';

+				$resp = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail'].': '.curl_error($curl));

 				curl_close($curl);

-				if($keepalive)

+				if ($keepalive)

 				{

 					$this->xmlrpc_curl_handle = null;

 				}

 			}

 			else

 			{

-				if(!$keepalive)

+				if (!$keepalive)

 				{

 					curl_close($curl);

 				}

-				$resp =& $msg->parseResponse($result, true, $this->return_type);

+				$resp = & $msg->parseResponse($result, true, $this->return_type);

 				// if we got back a 302, we can not reuse the curl handle for later calls

-				if($resp->faultCode() == $GLOBALS['xmlrpcerr']['http_error'] && $keepalive)

+				if ($resp->faultCode() == $GLOBALS['xmlrpcerr']['http_error'] && $keepalive)

 				{

 					curl_close($curl);

 					$this->xmlrpc_curl_handle = null;

@@ -1747,16 +1747,16 @@ 
 		* @return array

 		* @access public

 		*/

-		function multicall($msgs, $timeout=0, $method='', $fallback=true)

+		function multicall($msgs, $timeout = 0, $method = '', $fallback = true)

 		{

 			if ($method == '')

 			{

 				$method = $this->method;

 			}

-			if(!$this->no_multicall)

+			if (!$this->no_multicall)

 			{

 				$results = $this->_try_multicall($msgs, $timeout, $method);

-				if(is_array($results))

+				if (is_array($results))

 				{

 					// System.multicall succeeded

 					return $results;

@@ -1795,9 +1795,9 @@ 
 			{

 				// system.multicall is (probably) unsupported by server:

 				// emulate multicall via multiple requests

-				foreach($msgs as $msg)

+				foreach ($msgs as $msg)

 				{

-					$results[] =& $this->send($msg, $timeout, $method);

+					$results[] = & $this->send($msg, $timeout, $method);

 				}

 			}

 			else

@@ -1805,7 +1805,7 @@ 
 				// user does NOT want to fallback on many single calls:

 				// since we should always return an array of responses,

 				// return an array with the same error repeated n times

-				foreach($msgs as $msg)

+				foreach ($msgs as $msg)

 				{

 					$results[] = $result;

 				}

@@ -1823,12 +1823,12 @@ 
 		{

 			// Construct multicall message

 			$calls = array();

-			foreach($msgs as $msg)

+			foreach ($msgs as $msg)

 			{

-				$call['methodName'] = new xmlrpcval($msg->method(),'string');

+				$call['methodName'] = new xmlrpcval($msg->method(), 'string');

 				$numParams = $msg->getNumParams();

 				$params = array();

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

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

 				{

 					$params[$i] = $msg->getParam($i);

 				}

@@ -1839,9 +1839,9 @@ 
 			$multicall->addParam(new xmlrpcval($calls, 'array'));

 

 			// Attempt RPC call

-			$result =& $this->send($multicall, $timeout, $method);

+			$result = & $this->send($multicall, $timeout, $method);

 

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

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

 			{

 				// call to system.multicall failed

 				return $result;

@@ -1858,29 +1858,29 @@ 
 			{

 				///@todo test this code branch...

 				$rets = $result->value();

-				if(!is_array($rets))

+				if (!is_array($rets))

 				{

-					return false;		// bad return type from system.multicall

+					return false; // bad return type from system.multicall

 				}

 				$numRets = count($rets);

-				if($numRets != count($msgs))

+				if ($numRets != count($msgs))

 				{

-					return false;		// wrong number of return values.

+					return false; // wrong number of return values.

 				}

 

 				$response = array();

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

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

 				{

 					$val = $rets[$i];

 					if (!is_array($val)) {

 						return false;

 					}

-					switch(count($val))

+					switch (count($val))

 					{

 						case 1:

-							if(!isset($val[0]))

+							if (!isset($val[0]))

 							{

-								return false;		// Bad value

+								return false; // Bad value

 							}

 							// Normal return value

 							$response[$i] = new xmlrpcresp($val[0], 0, '', 'phpvals');

@@ -1888,12 +1888,12 @@ 
 						case 2:

 							///	@todo remove usage of @: it is apparently quite slow

 							$code = @$val['faultCode'];

-							if(!is_int($code))

+							if (!is_int($code))

 							{

 								return false;

 							}

 							$str = @$val['faultString'];

-							if(!is_string($str))

+							if (!is_string($str))

 							{

 								return false;

 							}

@@ -1908,38 +1908,38 @@ 
 			else // return type == 'xmlrpcvals'

 			{

 				$rets = $result->value();

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

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

 				{

-					return false;		// bad return type from system.multicall

+					return false; // bad return type from system.multicall

 				}

 				$numRets = $rets->arraysize();

-				if($numRets != count($msgs))

+				if ($numRets != count($msgs))

 				{

-					return false;		// wrong number of return values.

+					return false; // wrong number of return values.

 				}

 

 				$response = array();

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

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

 				{

 					$val = $rets->arraymem($i);

-					switch($val->kindOf())

+					switch ($val->kindOf())

 					{

 						case 'array':

-							if($val->arraysize() != 1)

+							if ($val->arraysize() != 1)

 							{

-								return false;		// Bad value

+								return false; // Bad value

 							}

 							// Normal return value

 							$response[$i] = new xmlrpcresp($val->arraymem(0));

 							break;

 						case 'struct':

 							$code = $val->structmem('faultCode');

-							if($code->kindOf() != 'scalar' || $code->scalartyp() != 'int')

+							if ($code->kindOf() != 'scalar' || $code->scalartyp() != 'int')

 							{

 								return false;

 							}

 							$str = $val->structmem('faultString');

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

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

 							{

 								return false;

 							}

@@ -1976,9 +1976,9 @@ 
 		* NB: as of now we do not do it, since it might be either an xmlrpcval or a plain

 		* php val, or a complete xml chunk, depending on usage of xmlrpc_client::send() inside which creator is called...

 		*/

-		function __construct($val, $fcode = 0, $fstr = '', $valtyp='')

+		function __construct($val, $fcode = 0, $fstr = '', $valtyp = '')

 		{

-			if($fcode != 0)

+			if ($fcode != 0)

 			{

 				// error response

 				$this->errno = $fcode;

@@ -2017,7 +2017,7 @@ 
 		/**

 		* @deprecated

 		*/

-		function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp='')

+		function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp = '')

 		{

 			self::__construct($val, $fcode, $fstr, $valtyp);

 		}

@@ -2074,10 +2074,10 @@ 
 		* @return string the xml representation of the response

 		* @access public

 		*/

-		function serialize($charset_encoding='')

+		function serialize($charset_encoding = '')

 		{

 			if ($charset_encoding != '')

-				$this->content_type = 'text/xml; charset=' . $charset_encoding;

+				$this->content_type = 'text/xml; charset='.$charset_encoding;

 			else

 				$this->content_type = 'text/xml';

 			if ($GLOBALS['xmlrpc_null_apache_encoding'])

@@ -2088,24 +2088,24 @@ 
 			{

 			$result = "<methodResponse>\n";

 			}

-			if($this->errno)

+			if ($this->errno)

 			{

 				// G. Giunta 2005/2/13: let non-ASCII response messages be tolerated by clients

 				// by xml-encoding non ascii chars

-				$result .= "<fault>\n" .

-"<value>\n<struct><member><name>faultCode</name>\n<value><int>" . $this->errno .

-"</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .

-xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</string></value>\n</member>\n" .

+				$result .= "<fault>\n".

+"<value>\n<struct><member><name>faultCode</name>\n<value><int>".$this->errno.

+"</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>".

+xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</string></value>\n</member>\n".

 "</struct>\n</value>\n</fault>";

 			}

 			else

 			{

-				if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))

+				if (!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))

 				{

 					if (is_string($this->val) && $this->valtyp == 'xml')

 					{

-						$result .= "<params>\n<param>\n" .

-							$this->val .

+						$result .= "<params>\n<param>\n".

+							$this->val.

 							"</param>\n</params>";

 					}

 					else

@@ -2116,8 +2116,8 @@ 
 				}

 				else

 				{

-					$result .= "<params>\n<param>\n" .

-						$this->val->serialize($charset_encoding) .

+					$result .= "<params>\n<param>\n".

+						$this->val->serialize($charset_encoding).

 						"</param>\n</params>";

 				}

 			}

@@ -2131,20 +2131,20 @@ 
 	{

 		var $payload;

 		var $methodname;

-		var $params=array();

-		var $debug=0;

+		var $params = array();

+		var $debug = 0;

 		var $content_type = 'text/xml';

 

 		/**

 		* @param string $meth the name of the method to invoke

 		* @param array $pars array of parameters to be passed to the method (xmlrpcval objects)

 		*/

-		function __construct($meth, $pars=0)

+		function __construct($meth, $pars = 0)

 		{

-			$this->methodname=$meth;

-			if(is_array($pars) && count($pars)>0)

+			$this->methodname = $meth;

+			if (is_array($pars) && count($pars)>0)

 			{

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

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

 				{

 					$this->addParam($pars[$i]);

 				}

@@ -2154,7 +2154,7 @@ 
 				/**

 		* @deprecated

 		*/

-		function xmlrpcmsg($meth, $pars=0)

+		function xmlrpcmsg($meth, $pars = 0)

 		{

 			self::__construct($meth, $pars);

 		}

@@ -2162,15 +2162,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<methodCall>\n";

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

 			}

 			else

 			{

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

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

 			}

 		}

 

@@ -2193,23 +2193,23 @@ 
 		/**

 		* @access private

 		*/

-		function createPayload($charset_encoding='')

+		function createPayload($charset_encoding = '')

 		{

 			if ($charset_encoding != '')

-				$this->content_type = 'text/xml; charset=' . $charset_encoding;

+				$this->content_type = 'text/xml; charset='.$charset_encoding;

 			else

 				$this->content_type = 'text/xml';

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

-			$this->payload.='<methodName>' . xmlrpc_encode_entitites($this->methodname, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</methodName>\n";

-			$this->payload.="<params>\n";

-			for($i=0; $i<count($this->params); $i++)

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

+			$this->payload .= '<methodName>'.xmlrpc_encode_entitites($this->methodname, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</methodName>\n";

+			$this->payload .= "<params>\n";

+			for ($i = 0; $i<count($this->params); $i++)

 			{

-				$p=$this->params[$i];

-				$this->payload.="<param>\n" . $p->serialize($charset_encoding) .

+				$p = $this->params[$i];

+				$this->payload .= "<param>\n".$p->serialize($charset_encoding).

 				"</param>\n";

 			}

-			$this->payload.="</params>\n";

-			$this->payload.=$this->xml_footer();

+			$this->payload .= "</params>\n";

+			$this->payload .= $this->xml_footer();

 		}

 

 		/**

@@ -2218,11 +2218,11 @@ 
 		* @return string the method that will be invoked

 		* @access public

 		*/

-		function method($meth='')

+		function method($meth = '')

 		{

-			if($meth!='')

+			if ($meth != '')

 			{

-				$this->methodname=$meth;

+				$this->methodname = $meth;

 			}

 			return $this->methodname;

 		}

@@ -2233,7 +2233,7 @@ 
 		* @return string the xml representation of the message, xml prologue included

 		* @access public

 		*/

-		function serialize($charset_encoding='')

+		function serialize($charset_encoding = '')

 		{

 			$this->createPayload($charset_encoding);

 			return $this->payload;

@@ -2248,9 +2248,9 @@ 
 		function addParam($par)

 		{

 			// add check: do not add to self params which are not xmlrpcvals

-			if(is_object($par) && is_a($par, 'xmlrpcval'))

+			if (is_object($par) && is_a($par, 'xmlrpcval'))

 			{

-				$this->params[]=$par;

+				$this->params[] = $par;

 				return true;

 			}

 			else

@@ -2289,13 +2289,13 @@ 
 		*/

 		function &parseResponseFile($fp)

 		{

-			$ipd='';

-			while($data=fread($fp, 32768))

+			$ipd = '';

+			while ($data = fread($fp, 32768))

 			{

-				$ipd.=$data;

+				$ipd .= $data;

 			}

 			//fclose($fp);

-			$r =& $this->parseResponse($ipd);

+			$r = & $this->parseResponse($ipd);

 			return $r;

 		}

 

@@ -2303,22 +2303,22 @@ 
 		* Parses HTTP headers and separates them from data.

 		* @access private

 		*/

-		function &parseResponseHeaders(&$data, $headers_processed=false)

+		function &parseResponseHeaders(&$data, $headers_processed = false)

 		{

 				// Support "web-proxy-tunelling" connections for https through proxies

-				if(preg_match('/^HTTP\/1\.[0-1] 200 Connection established/', $data))

+				if (preg_match('/^HTTP\/1\.[0-1] 200 Connection established/', $data))

 				{

 					// Look for CR/LF or simple LF as line separator,

 					// (even though it is not valid http)

-					$pos = strpos($data,"\r\n\r\n");

-					if($pos || is_int($pos))

+					$pos = strpos($data, "\r\n\r\n");

+					if ($pos || is_int($pos))

 					{

 						$bd = $pos+4;

 					}

 					else

 					{

-						$pos = strpos($data,"\n\n");

-						if($pos || is_int($pos))

+						$pos = strpos($data, "\n\n");

+						if ($pos || is_int($pos))

 						{

 							$bd = $pos+2;

 						}

@@ -2337,28 +2337,28 @@ 
 					else

 					{

 						error_log('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');

-						$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)');

+						$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)');

 						return $r;

 					}

 				}

 

 				// Strip HTTP 1.1 100 Continue header if present

-				while(preg_match('/^HTTP\/1\.1 1[0-9]{2} /', $data))

+				while (preg_match('/^HTTP\/1\.1 1[0-9]{2} /', $data))

 				{

 					$pos = strpos($data, 'HTTP', 12);

 					// server sent a Continue header without any (valid) content following...

 					// give the client a chance to know it

-					if(!$pos && !is_int($pos)) // works fine in php 3, 4 and 5

+					if (!$pos && !is_int($pos)) // works fine in php 3, 4 and 5

 					{

 						break;

 					}

 					$data = substr($data, $pos);

 				}

-				if(!preg_match('/^HTTP\/[0-9.]+ 200 /', $data))

+				if (!preg_match('/^HTTP\/[0-9.]+ 200 /', $data))

 				{

-					$errstr= substr($data, 0, strpos($data, "\n")-1);

-					error_log('XML-RPC: '.__METHOD__.': HTTP error, got response: ' .$errstr);

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

+					$errstr = substr($data, 0, strpos($data, "\n")-1);

+					error_log('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);

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

 					return $r;

 				}

 

@@ -2367,15 +2367,15 @@ 
 

 				// be tolerant to usage of \n instead of \r\n to separate headers and data

 				// (even though it is not valid http)

-				$pos = strpos($data,"\r\n\r\n");

-				if($pos || is_int($pos))

+				$pos = strpos($data, "\r\n\r\n");

+				if ($pos || is_int($pos))

 				{

 					$bd = $pos+4;

 				}

 				else

 				{

-					$pos = strpos($data,"\n\n");

-					if($pos || is_int($pos))

+					$pos = strpos($data, "\n\n");

+					if ($pos || is_int($pos))

 					{

 						$bd = $pos+2;

 					}

@@ -2388,11 +2388,11 @@ 
 				}

 				// be tolerant to line endings, and extra empty lines

 				$ar = preg_split("/\r?\n/", trim(substr($data, 0, $pos)));

-				while(list(,$line) = @each($ar))

+				while (list(,$line) = @each($ar))

 				{

 					// take care of multi-line headers and cookies

-					$arr = explode(':',$line,2);

-					if(count($arr) > 1)

+					$arr = explode(':', $line, 2);

+					if (count($arr)>1)

 					{

 						$header_name = strtolower(trim($arr[0]));

 						/// @todo some other headers (the ones that allow a CSV list of values)

@@ -2416,7 +2416,7 @@ 
 								// glue together all received cookies, using a comma to separate them

 								// (same as php does with getallheaders())

 								if (isset($GLOBALS['_xh']['headers'][$header_name]))

-									$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);

+									$GLOBALS['_xh']['headers'][$header_name] .= ', '.trim($cookie);

 								else

 									$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);

 								// parse cookie attributes, in case user wants to correctly honour them

@@ -2450,23 +2450,23 @@ 
 							$GLOBALS['_xh']['headers'][$header_name] = trim($arr[1]);

 						}

 					}

-					elseif(isset($header_name))

+					elseif (isset($header_name))

 					{

 						///	@todo version1 cookies might span multiple lines, thus breaking the parsing above

-						$GLOBALS['_xh']['headers'][$header_name] .= ' ' . trim($line);

+						$GLOBALS['_xh']['headers'][$header_name] .= ' '.trim($line);

 					}

 				}

 

 				$data = substr($data, $bd);

 

-				if($this->debug && count($GLOBALS['_xh']['headers']))

+				if ($this->debug && count($GLOBALS['_xh']['headers']))

 				{

 					print '<PRE>';

-					foreach($GLOBALS['_xh']['headers'] as $header => $value)

+					foreach ($GLOBALS['_xh']['headers'] as $header => $value)

 					{

 						print htmlentities("HEADER: $header: $value\n");

 					}

-					foreach($GLOBALS['_xh']['cookies'] as $header => $value)

+					foreach ($GLOBALS['_xh']['cookies'] as $header => $value)

 					{

 						print htmlentities("COOKIE: $header={$value['value']}\n");

 					}

@@ -2475,12 +2475,12 @@ 
 

 				// if CURL was used for the call, http headers have been processed,

 				// and dechunking + reinflating have been carried out

-				if(!$headers_processed)

+				if (!$headers_processed)

 				{

 					// Decode chunked encoding sent by http 1.1 servers

-					if(isset($GLOBALS['_xh']['headers']['transfer-encoding']) && $GLOBALS['_xh']['headers']['transfer-encoding'] == 'chunked')

+					if (isset($GLOBALS['_xh']['headers']['transfer-encoding']) && $GLOBALS['_xh']['headers']['transfer-encoding'] == 'chunked')

 					{

-						if(!$data = decode_chunked($data))

+						if (!$data = decode_chunked($data))

 						{

 							error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');

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

@@ -2490,25 +2490,25 @@ 
 

 					// Decode gzip-compressed stuff

 					// code shamelessly inspired from nusoap library by Dietrich Ayala

-					if(isset($GLOBALS['_xh']['headers']['content-encoding']))

+					if (isset($GLOBALS['_xh']['headers']['content-encoding']))

 					{

 						$GLOBALS['_xh']['headers']['content-encoding'] = str_replace('x-', '', $GLOBALS['_xh']['headers']['content-encoding']);

-						if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' || $GLOBALS['_xh']['headers']['content-encoding'] == 'gzip')

+						if ($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' || $GLOBALS['_xh']['headers']['content-encoding'] == 'gzip')

 						{

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

-							if(function_exists('gzinflate'))

+							if (function_exists('gzinflate'))

 							{

-								if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))

+								if ($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))

 								{

 									$data = $degzdata;

-									if($this->debug)

-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";

+									if ($this->debug)

+									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n".htmlentities($data)."\n---END---</PRE>";

 								}

-								elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

+								elseif ($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

 								{

 									$data = $degzdata;

-									if($this->debug)

-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";

+									if ($this->debug)

+									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n".htmlentities($data)."\n---END---</PRE>";

 								}

 								else

 								{

@@ -2529,7 +2529,7 @@ 
 

 				// real stupid hack to avoid PHP complaining about returning NULL by ref

 				$r = null;

-				$r =& $r;

+				$r = & $r;

 				return $r;

 		}

 

@@ -2541,28 +2541,28 @@ 
 		* @return xmlrpcresp

 		* @access public

 		*/

-		function &parseResponse($data='', $headers_processed=false, $return_type='xmlrpcvals')

+		function &parseResponse($data = '', $headers_processed = false, $return_type = 'xmlrpcvals')

 		{

-			if($this->debug)

+			if ($this->debug)

 			{

 				//by maHo, replaced htmlspecialchars with htmlentities

-				print "<PRE>---GOT---\n" . htmlentities($data) . "\n---END---\n</PRE>";

+				print "<PRE>---GOT---\n".htmlentities($data)."\n---END---\n</PRE>";

 			}

 

-			if($data == '')

+			if ($data == '')

 			{

 				error_log('XML-RPC: '.__METHOD__.': no response received from server.');

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

 				return $r;

 			}

 

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

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

 

 			$raw_data = $data;

 			// parse the HTTP headers of the response, if present, and separate them from data

-			if(substr($data, 0, 4) == 'HTTP')

+			if (substr($data, 0, 4) == 'HTTP')

 			{

-				$r =& $this->parseResponseHeaders($data, $headers_processed);

+				$r = & $this->parseResponseHeaders($data, $headers_processed);

 				if ($r)

 				{

 					// failed processing of HTTP response headers

@@ -2577,7 +2577,7 @@ 
 				$GLOBALS['_xh']['cookies'] = array();

 			}

 

-			if($this->debug)

+			if ($this->debug)

 			{

 				$start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');

 				if ($start)

@@ -2597,7 +2597,7 @@ 
 			// be tolerant of junk after methodResponse (e.g. javascript ads automatically inserted by free hosts)

 			// idea from Luca Mariano <luca.mariano@email.it> originally in PEARified version of the lib

 			$pos = strrpos($data, '</methodResponse>');

-			if($pos !== false)

+			if ($pos !== false)

 			{

 				$data = substr($data, 0, $pos+17);

 			}

@@ -2615,13 +2615,13 @@ 
 			// try to 'guestimate' the character encoding of the received response

 			$resp_encoding = guess_encoding(@$GLOBALS['_xh']['headers']['content-type'], $data);

 

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

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

 			//$GLOBALS['_xh']['qt']=''; //unused...

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

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

-			$GLOBALS['_xh']['isf']=0; // 0 = OK, 1 for xmlrpc fault responses, 2 = invalid xmlrpc

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

-			$GLOBALS['_xh']['rt']=''; // 'methodcall or 'methodresponse'

+			$GLOBALS['_xh']['isf'] = 0; // 0 = OK, 1 for xmlrpc fault responses, 2 = invalid xmlrpc

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

+			$GLOBALS['_xh']['rt'] = ''; // 'methodcall or 'methodresponse'

 

 			// Since parsing will fail if charset is not specified in the xml prologue,

 			// the encoding is not UTF8 and there are non-ascii chars in the text, we try to work round that...

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

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

 					} else {

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

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

 					}

 				}

 			}

@@ -2670,10 +2670,10 @@ 
 			xml_set_default_handler($parser, 'xmlrpc_dh');

 

 			// first error check: xml not well formed

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

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

 			{

 				// thanks to Peter Kocks <peter.kocks@baygate.com>

-				if((xml_get_current_line_number($parser)) == 1)

+				if ((xml_get_current_line_number($parser)) == 1)

 				{

 					$errstr = 'XML error at line 1, check URL';

 				}

@@ -2684,9 +2684,9 @@ 
 						xml_get_current_line_number($parser), xml_get_current_column_number($parser));

 				}

 				error_log($errstr);

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

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

 				xml_parser_free($parser);

-				if($this->debug)

+				if ($this->debug)

 				{

 					print $errstr;

 				}

@@ -2697,7 +2697,7 @@ 
 			}

 			xml_parser_free($parser);

 			// second error check: xml well formed but not xml-rpc compliant

-			if ($GLOBALS['_xh']['isf'] > 1)

+			if ($GLOBALS['_xh']['isf']>1)

 			{

 				if ($this->debug)

 				{

@@ -2705,7 +2705,7 @@ 
 				}

 

 				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],

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

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

 			}

 			// third error check: parsing of the response has somehow gone boink.

 			// NB: shall we omit this check, since we trust the parsing code?

@@ -2714,7 +2714,7 @@ 
 				// something odd has happened

 				// and it's time to generate a client side error

 				// indicating something odd went on

-				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],

+				$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],

 					$GLOBALS['xmlrpcstr']['invalid_return']);

 			}

 			else

@@ -2729,9 +2729,9 @@ 
 				}

 

 				// note that using =& will raise an error if $GLOBALS['_xh']['st'] does not generate an object.

-				$v =& $GLOBALS['_xh']['value'];

+				$v = & $GLOBALS['_xh']['value'];

 

-				if($GLOBALS['_xh']['isf'])

+				if ($GLOBALS['_xh']['isf'])

 				{

 					/// @todo we should test here if server sent an int and a string,

 					/// and/or coerce them into such...

@@ -2748,7 +2748,7 @@ 
 						$errstr = $v['faultString'];

 					}

 

-					if($errno == 0)

+					if ($errno == 0)

 					{

 						// FAULT returned, errno needs to reflect that

 						$errno = -1;

@@ -2758,7 +2758,7 @@ 
 				}

 				else

 				{

-					$r=new xmlrpcresp($v, 0, '', $return_type);

+					$r = new xmlrpcresp($v, 0, '', $return_type);

 				}

 			}

 

@@ -2771,26 +2771,26 @@ 
 

 	class xmlrpcval

 	{

-		var $me=array();

-		var $mytype=0;

-		var $_php_class=null;

+		var $me = array();

+		var $mytype = 0;

+		var $_php_class = null;

 

 		/**

 		* @param mixed $val

 		* @param string $type any valid xmlrpc type name (lowercase). If null, 'string' is assumed

 		*/

-		function __construct($val=-1, $type='')

+		function __construct($val = -1, $type = '')

 		{

 			/// @todo: optimization creep - do not call addXX, do it all inline.

 			/// downside: booleans will not be coerced anymore

-			if($val!==-1 || $type!='')

+			if ($val !== -1 || $type != '')

 			{

 				// optimization creep: inlined all work done by constructor

-				switch($type)

+				switch ($type)

 				{

 					case '':

-						$this->mytype=1;

-						$this->me['string']=$val;

+						$this->mytype = 1;

+						$this->me['string'] = $val;

 						break;

 					case 'i4':

 					case 'int':

@@ -2800,16 +2800,16 @@ 
 					case 'dateTime.iso8601':

 					case 'base64':

 					case 'null':

-						$this->mytype=1;

-						$this->me[$type]=$val;

+						$this->mytype = 1;

+						$this->me[$type] = $val;

 						break;

 					case 'array':

-						$this->mytype=2;

-						$this->me['array']=$val;

+						$this->mytype = 2;

+						$this->me['array'] = $val;

 						break;

 					case 'struct':

-						$this->mytype=3;

-						$this->me['struct']=$val;

+						$this->mytype = 3;

+						$this->me['struct'] = $val;

 						break;

 					default:

 						error_log("XML-RPC: ".__METHOD__.": not a known type ($type)");

@@ -2836,7 +2836,7 @@ 
 		/**

 		* @deprecated

 		*/

-		function xmlrpcval($val=-1, $type='')

+		function xmlrpcval($val = -1, $type = '')

 		{

 			self::__construct($val, $type);

 		}

@@ -2847,10 +2847,10 @@ 
 		* @param string $type

 		* @return int 1 or 0 on failure

 		*/

-		function addScalar($val, $type='string')

+		function addScalar($val, $type = 'string')

 		{

-			$typeof=@$GLOBALS['xmlrpcTypes'][$type];

-			if($typeof!=1)

+			$typeof = @$GLOBALS['xmlrpcTypes'][$type];

+			if ($typeof != 1)

 			{

 				error_log("XML-RPC: ".__METHOD__.": not a scalar type ($type)");

 				return 0;

@@ -2859,19 +2859,19 @@ 
 			// coerce booleans into correct values

 			// NB: we should either do it for datetimes, integers and doubles, too,

 			// or just plain remove this check, implemented on booleans only...

-			if($type==$GLOBALS['xmlrpcBoolean'])

+			if ($type == $GLOBALS['xmlrpcBoolean'])

 			{

-				if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))

+				if (strcasecmp($val, 'true') == 0 || $val == 1 || ($val == true && strcasecmp($val, 'false')))

 				{

-					$val=true;

+					$val = true;

 				}

 				else

 				{

-					$val=false;

+					$val = false;

 				}

 			}

 

-			switch($this->mytype)

+			switch ($this->mytype)

 			{

 				case 1:

 					error_log('XML-RPC: '.__METHOD__.': scalar xmlrpcval can have only one value');

@@ -2885,12 +2885,12 @@ 
 					//$ar[]=new xmlrpcval($val, $type);

 					//$this->me['array']=$ar;

 					// Faster (?) avoid all the costly array-copy-by-val done here...

-					$this->me['array'][]=new xmlrpcval($val, $type);

+					$this->me['array'][] = new xmlrpcval($val, $type);

 					return 1;

 				default:

 					// a scalar, so set the value and remember we're scalar

-					$this->me[$type]=$val;

-					$this->mytype=$typeof;

+					$this->me[$type] = $val;

+					$this->mytype = $typeof;

 					return 1;

 			}

 		}

@@ -2905,13 +2905,13 @@ 
 		*/

 		function addArray($vals)

 		{

-			if($this->mytype==0)

+			if ($this->mytype == 0)

 			{

-				$this->mytype=$GLOBALS['xmlrpcTypes']['array'];

-				$this->me['array']=$vals;

+				$this->mytype = $GLOBALS['xmlrpcTypes']['array'];

+				$this->me['array'] = $vals;

 				return 1;

 			}

-			elseif($this->mytype==2)

+			elseif ($this->mytype == 2)

 			{

 				// we're adding to an array here

 				$this->me['array'] = array_merge($this->me['array'], $vals);

@@ -2919,7 +2919,7 @@ 
 			}

 			else

 			{

-				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');

+				error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');

 				return 0;

 			}

 		}

@@ -2934,13 +2934,13 @@ 
 		*/

 		function addStruct($vals)

 		{

-			if($this->mytype==0)

+			if ($this->mytype == 0)

 			{

-				$this->mytype=$GLOBALS['xmlrpcTypes']['struct'];

-				$this->me['struct']=$vals;

+				$this->mytype = $GLOBALS['xmlrpcTypes']['struct'];

+				$this->me['struct'] = $vals;

 				return 1;

 			}

-			elseif($this->mytype==3)

+			elseif ($this->mytype == 3)

 			{

 				// we're adding to a struct here

 				$this->me['struct'] = array_merge($this->me['struct'], $vals);

@@ -2948,7 +2948,7 @@ 
 			}

 			else

 			{

-				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');

+				error_log('XML-RPC: '.__METHOD__.': already initialized as a ['.$this->kindOf().']');

 				return 0;

 			}

 		}

@@ -2957,12 +2957,12 @@ 
 		// DEPRECATED!

 		function dump($ar)

 		{

-			foreach($ar as $key => $val)

+			foreach ($ar as $key => $val)

 			{

 				echo "$key => $val<br />";

-				if($key == 'array')

+				if ($key == 'array')

 				{

-					while(list($key2, $val2) = each($val))

+					while (list($key2, $val2) = each($val))

 					{

 						echo "-- $key2 => $val2<br />";

 					}

@@ -2977,7 +2977,7 @@ 
 		*/

 		function kindOf()

 		{

-			switch($this->mytype)

+			switch ($this->mytype)

 			{

 				case 3:

 					return 'struct';

@@ -2996,28 +2996,28 @@ 
 		/**

 		* @access private

 		*/

-		function serializedata($typ, $val, $charset_encoding='')

+		function serializedata($typ, $val, $charset_encoding = '')

 		{

-			$rs='';

-			switch(@$GLOBALS['xmlrpcTypes'][$typ])

+			$rs = '';

+			switch (@$GLOBALS['xmlrpcTypes'][$typ])

 			{

 				case 1:

-					switch($typ)

+					switch ($typ)

 					{

 						case $GLOBALS['xmlrpcBase64']:

-							$rs.="<${typ}>" . base64_encode($val) . "</${typ}>";

+							$rs .= "<${typ}>".base64_encode($val)."</${typ}>";

 							break;

 						case $GLOBALS['xmlrpcBoolean']:

-							$rs.="<${typ}>" . ($val ? '1' : '0') . "</${typ}>";

+							$rs .= "<${typ}>".($val ? '1' : '0')."</${typ}>";

 							break;

 						case $GLOBALS['xmlrpcString']:

 							// G. Giunta 2005/2/13: do NOT use htmlentities, since

 							// it will produce named html entities, which are invalid xml

-							$rs.="<${typ}>" . xmlrpc_encode_entitites($val, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding). "</${typ}>";

+							$rs .= "<${typ}>".xmlrpc_encode_entitites($val, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</${typ}>";

 							break;

 						case $GLOBALS['xmlrpcInt']:

 						case $GLOBALS['xmlrpcI4']:

-							$rs.="<${typ}>".(int)$val."</${typ}>";

+							$rs .= "<${typ}>".(int) $val."</${typ}>";

 							break;

 						case $GLOBALS['xmlrpcDouble']:

 							// avoid using standard conversion of float to string because it is locale-dependent,

@@ -3025,71 +3025,71 @@ 
 							// sprintf('%F') could be most likely ok but it fails eg. on 2e-14.

 							// The code below tries its best at keeping max precision while avoiding exp notation,

 							// but there is of course no limit in the number of decimal places to be used...

-							$rs.="<${typ}>".preg_replace('/\\.?0+$/','',number_format((double)$val, 128, '.', ''))."</${typ}>";

+							$rs .= "<${typ}>".preg_replace('/\\.?0+$/', '', number_format((double) $val, 128, '.', ''))."</${typ}>";

 							break;

 						case $GLOBALS['xmlrpcDateTime']:

 							if (is_string($val))

 							{

-								$rs.="<${typ}>${val}</${typ}>";

+								$rs .= "<${typ}>${val}</${typ}>";

 							}

-							else if(is_a($val, 'DateTime'))

+							else if (is_a($val, 'DateTime'))

 							{

-								$rs.="<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>";

+								$rs .= "<${typ}>".$val->format('Ymd\TH:i:s')."</${typ}>";

 							}

-							else if(is_int($val))

+							else if (is_int($val))

 							{

-								$rs.="<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>";

+								$rs .= "<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>";

 							}

 							else

 							{

 								// not really a good idea here: but what shall we output anyway? left for backward compat...

-								$rs.="<${typ}>${val}</${typ}>";

+								$rs .= "<${typ}>${val}</${typ}>";

 							}

 							break;

 						case $GLOBALS['xmlrpcNull']:

 							if ($GLOBALS['xmlrpc_null_apache_encoding'])

 							{

-								$rs.="<ex:nil/>";

+								$rs .= "<ex:nil/>";

 							}

 							else

 							{

-								$rs.="<nil/>";

+								$rs .= "<nil/>";

 							}

 							break;

 						default:

 							// no standard type value should arrive here, but provide a possibility

 							// for xmlrpcvals of unknown type...

-							$rs.="<${typ}>${val}</${typ}>";

+							$rs .= "<${typ}>${val}</${typ}>";

 					}

 					break;

 				case 3:

 					// struct

 					if ($this->_php_class)

 					{

-						$rs.='<struct php_class="' . $this->_php_class . "\">\n";

+						$rs .= '<struct php_class="'.$this->_php_class."\">\n";

 					}

 					else

 					{

-						$rs.="<struct>\n";

+						$rs .= "<struct>\n";

 					}

-					foreach($val as $key2 => $val2)

+					foreach ($val as $key2 => $val2)

 					{

-						$rs.='<member><name>'.xmlrpc_encode_entitites($key2, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</name>\n";

+						$rs .= '<member><name>'.xmlrpc_encode_entitites($key2, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding)."</name>\n";

 						//$rs.=$this->serializeval($val2);

-						$rs.=$val2->serialize($charset_encoding);

-						$rs.="</member>\n";

+						$rs .= $val2->serialize($charset_encoding);

+						$rs .= "</member>\n";

 					}

-					$rs.='</struct>';

+					$rs .= '</struct>';

 					break;

 				case 2:

 					// array

-					$rs.="<array>\n<data>\n";

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

+					$rs .= "<array>\n<data>\n";

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

 					{

 						//$rs.=$this->serializeval($val[$i]);

-						$rs.=$val[$i]->serialize($charset_encoding);

+						$rs .= $val[$i]->serialize($charset_encoding);

 					}

-					$rs.="</data>\n</array>";

+					$rs .= "</data>\n</array>";

 					break;

 				default:

 					break;

@@ -3103,14 +3103,14 @@ 
 		* @return string

 		* @access public

 		*/

-		function serialize($charset_encoding='')

+		function serialize($charset_encoding = '')

 		{

 			// add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...

 			//if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))

 			//{

 				reset($this->me);

 				list($typ, $val) = each($this->me);

-				return '<value>' . $this->serializedata($typ, $val, $charset_encoding) . "</value>\n";

+				return '<value>'.$this->serializedata($typ, $val, $charset_encoding)."</value>\n";

 			//}

 		}

 

@@ -3120,10 +3120,10 @@ 
 			// add check? slower, but helps to avoid recursion in serializing broken xmlrpcvals...

 			//if (is_object($o) && (get_class($o) == 'xmlrpcval' || is_subclass_of($o, 'xmlrpcval')))

 			//{

-				$ar=$o->me;

+				$ar = $o->me;

 				reset($ar);

 				list($typ, $val) = each($ar);

-				return '<value>' . $this->serializedata($typ, $val) . "</value>\n";

+				return '<value>'.$this->serializedata($typ, $val)."</value>\n";

 			//}

 		}

 

@@ -3176,32 +3176,32 @@ 
 		{

 			// UNSTABLE

 			reset($this->me);

-			list($a,$b)=each($this->me);

+			list($a, $b) = each($this->me);

 			// contributed by I Sofer, 2001-03-24

 			// add support for nested arrays to scalarval

 			// i've created a new method here, so as to

 			// preserve back compatibility

 

-			if(is_array($b))

+			if (is_array($b))

 			{

 				@reset($b);

-				while(list($id,$cont) = @each($b))

+				while (list($id, $cont) = @each($b))

 				{

 					$b[$id] = $cont->scalarval();

 				}

 			}

 

 			// add support for structures directly encoding php objects

-			if(is_object($b))

+			if (is_object($b))

 			{

 				$t = get_object_vars($b);

 				@reset($t);

-				while(list($id,$cont) = @each($t))

+				while (list($id, $cont) = @each($t))

 				{

 					$t[$id] = $cont->scalarval();

 				}

 				@reset($t);

-				while(list($id,$cont) = @each($t))

+				while (list($id, $cont) = @each($t))

 				{

 					@$b->$id = $cont;

 				}

@@ -3218,7 +3218,7 @@ 
 		function scalarval()

 		{

 			reset($this->me);

-			list(,$b)=each($this->me);

+			list(,$b) = each($this->me);

 			return $b;

 		}

 

@@ -3231,10 +3231,10 @@ 
 		function scalartyp()

 		{

 			reset($this->me);

-			list($a,)=each($this->me);

-			if($a==$GLOBALS['xmlrpcI4'])

+			list($a,) = each($this->me);

+			if ($a == $GLOBALS['xmlrpcI4'])

 			{

-				$a=$GLOBALS['xmlrpcInt'];

+				$a = $GLOBALS['xmlrpcInt'];

 			}

 			return $a;

 		}

@@ -3291,23 +3291,23 @@ 
 	* @param int $utc (0 or 1)

 	* @return string

 	*/

-	function iso8601_encode($timet, $utc=0)

+	function iso8601_encode($timet, $utc = 0)

 	{

-		if(!$utc)

+		if (!$utc)

 		{

-			$t=strftime("%Y%m%dT%H:%M:%S", $timet);

+			$t = strftime("%Y%m%dT%H:%M:%S", $timet);

 		}

 		else

 		{

-			if(function_exists('gmstrftime'))

+			if (function_exists('gmstrftime'))

 			{

 				// gmstrftime doesn't exist in some versions

 				// of PHP

-				$t=gmstrftime("%Y%m%dT%H:%M:%S", $timet);

+				$t = gmstrftime("%Y%m%dT%H:%M:%S", $timet);

 			}

 			else

 			{

-				$t=strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));

+				$t = strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));

 			}

 		}

 		return $t;

@@ -3319,18 +3319,18 @@ 
 	* @param int $utc either 0 or 1

 	* @return int (datetime)

 	*/

-	function iso8601_decode($idate, $utc=0)

+	function iso8601_decode($idate, $utc = 0)

 	{

-		$t=0;

-		if(preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/', $idate, $regs))

+		$t = 0;

+		if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/', $idate, $regs))

 		{

-			if($utc)

+			if ($utc)

 			{

-				$t=gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

+				$t = gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

 			}

 			else

 			{

-				$t=mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

+				$t = mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

 			}

 		}

 		return $t;

@@ -3357,15 +3357,15 @@ 
 	* @param array $options if 'decode_php_objs' is set in the options array, xmlrpc structs can be decoded into php objects; if 'dates_as_objects' is set xmlrpc datetimes are decoded as php DateTime objects (standard is

 	* @return mixed

 	*/

-	function php_xmlrpc_decode($xmlrpc_val, $options=array())

+	function php_xmlrpc_decode($xmlrpc_val, $options = array())

 	{

-		switch($xmlrpc_val->kindOf())

+		switch ($xmlrpc_val->kindOf())

 		{

 			case 'scalar':

 				if (in_array('extension_api', $options))

 				{

 					reset($xmlrpc_val->me);

-					list($typ,$val) = each($xmlrpc_val->me);

+					list($typ, $val) = each($xmlrpc_val->me);

 					switch ($typ)

 					{

 						case 'dateTime.iso8601':

@@ -3406,7 +3406,7 @@ 
 			case 'array':

 				$size = $xmlrpc_val->arraysize();

 				$arr = array();

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

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

 				{

 					$arr[] = php_xmlrpc_decode($xmlrpc_val->arraymem($i), $options);

 				}

@@ -3421,7 +3421,7 @@ 
 					&& class_exists($xmlrpc_val->_php_class))

 				{

 					$obj = @new $xmlrpc_val->_php_class;

-					while(list($key,$value)=$xmlrpc_val->structeach())

+					while (list($key, $value) = $xmlrpc_val->structeach())

 					{

 						$obj->$key = php_xmlrpc_decode($value, $options);

 					}

@@ -3430,7 +3430,7 @@ 
 				else

 				{

 					$arr = array();

-					while(list($key,$value)=$xmlrpc_val->structeach())

+					while (list($key, $value) = $xmlrpc_val->structeach())

 					{

 						$arr[$key] = php_xmlrpc_decode($value, $options);

 					}

@@ -3439,7 +3439,7 @@ 
 			case 'msg':

 				$paramcount = $xmlrpc_val->getNumParams();

 				$arr = array();

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

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

 				{

 					$arr[] = php_xmlrpc_decode($xmlrpc_val->getParam($i));

 				}

@@ -3450,13 +3450,13 @@ 
 	// This constant left here only for historical reasons...

 	// it was used to decide if we have to define xmlrpc_encode on our own, but

 	// we do not do it anymore

-	if(function_exists('xmlrpc_decode'))

+	if (function_exists('xmlrpc_decode'))

 	{

-		define('XMLRPC_EPI_ENABLED','1');

+		define('XMLRPC_EPI_ENABLED', '1');

 	}

 	else

 	{

-		define('XMLRPC_EPI_ENABLED','0');

+		define('XMLRPC_EPI_ENABLED', '0');

 	}

 

 	/**

@@ -3476,10 +3476,10 @@ 
 	* @param array $options	can include 'encode_php_objs', 'auto_dates', 'null_extension' or 'extension_api'

 	* @return xmlrpcval

 	*/

-	function php_xmlrpc_encode($php_val, $options=array())

+	function php_xmlrpc_encode($php_val, $options = array())

 	{

 		$type = gettype($php_val);

-		switch($type)

+		switch ($type)

 		{

 			case 'string':

 				if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val))

@@ -3508,16 +3508,16 @@ 
 				$j = 0;

 				$arr = array();

 				$ko = false;

-				foreach($php_val as $key => $val)

+				foreach ($php_val as $key => $val)

 				{

 					$arr[$key] = php_xmlrpc_encode($val, $options);

-					if(!$ko && $key !== $j)

+					if (!$ko && $key !== $j)

 					{

 						$ko = true;

 					}

 					$j++;

 				}

-				if($ko)

+				if ($ko)

 				{

 					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);

 				}

@@ -3527,11 +3527,11 @@ 
 				}

 				break;

 			case 'object':

-				if(is_a($php_val, 'xmlrpcval'))

+				if (is_a($php_val, 'xmlrpcval'))

 				{

 					$xmlrpc_val = $php_val;

 				}

-				else if(is_a($php_val, 'DateTime'))

+				else if (is_a($php_val, 'DateTime'))

 				{

 					$xmlrpc_val = new xmlrpcval($php_val->format('Ymd\TH:i:s'), $GLOBALS['xmlrpcStruct']);

 				}

@@ -3539,7 +3539,7 @@ 
 				{

 					$arr = array();

 					reset($php_val);

-					while(list($k,$v) = each($php_val))

+					while (list($k, $v) = each($php_val))

 					{

 						$arr[$k] = php_xmlrpc_encode($v, $options);

 					}

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

 				if (in_array('extension_api', $options))

 				{

-					$xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);

+					$xmlrpc_val = new xmlrpcval((int) $php_val, $GLOBALS['xmlrpcInt']);

 				}

 				else

 				{

@@ -3593,7 +3593,7 @@ 
 	* @param array $options

 	* @return mixed false on error, or an instance of either xmlrpcval, xmlrpcmsg or xmlrpcresp

 	*/

-	function php_xmlrpc_decode_xml($xml_val, $options=array())

+	function php_xmlrpc_decode_xml($xml_val, $options = array())

 	{

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

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

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

 					$xml_val = mb_convert_encoding($xml_val, 'UTF-8', $val_encoding);

 				} else {

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

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

 				}

 			}

 		}

@@ -3641,7 +3641,7 @@ 
 		xml_set_element_handler($parser, 'xmlrpc_se_any', 'xmlrpc_ee');

 		xml_set_character_data_handler($parser, 'xmlrpc_cd');

 		xml_set_default_handler($parser, 'xmlrpc_dh');

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

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

 		{

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

 						xml_error_string(xml_get_error_code($parser)),

@@ -3651,7 +3651,7 @@ 
 			return false;

 		}

 		xml_parser_free($parser);

-		if ($GLOBALS['_xh']['isf'] > 1) // test that $GLOBALS['_xh']['value'] is an obj, too???

+		if ($GLOBALS['_xh']['isf']>1) // test that $GLOBALS['_xh']['value'] is an obj, too???

 		{

 			error_log($GLOBALS['_xh']['isf_reason']);

 			return false;

@@ -3659,7 +3659,7 @@ 
 		switch ($GLOBALS['_xh']['rt'])

 		{

 			case 'methodresponse':

-				$v =& $GLOBALS['_xh']['value'];

+				$v = & $GLOBALS['_xh']['value'];

 				if ($GLOBALS['_xh']['isf'] == 1)

 				{

 					$vc = $v->structmem('faultCode');

@@ -3673,7 +3673,7 @@ 
 				return $r;

 			case 'methodcall':

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

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

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

 				{

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

 				}

@@ -3701,18 +3701,18 @@ 
 

 		// read chunk-size, chunk-extension (if any) and crlf

 		// get the position of the linebreak

-		$chunkend = strpos($buffer,"\r\n") + 2;

-		$temp = substr($buffer,0,$chunkend);

-		$chunk_size = hexdec( trim($temp) );

+		$chunkend = strpos($buffer, "\r\n")+2;

+		$temp = substr($buffer, 0, $chunkend);

+		$chunk_size = hexdec(trim($temp));

 		$chunkstart = $chunkend;

-		while($chunk_size > 0)

+		while ($chunk_size>0)

 		{

-			$chunkend = strpos($buffer, "\r\n", $chunkstart + $chunk_size);

+			$chunkend = strpos($buffer, "\r\n", $chunkstart+$chunk_size);

 

 			// just in case we got a broken connection

-			if($chunkend == false)

+			if ($chunkend == false)

 			{

-				$chunk = substr($buffer,$chunkstart);

+				$chunk = substr($buffer, $chunkstart);

 				// append chunk-data to entity-body

 				$new .= $chunk;

 				$length += strlen($chunk);

@@ -3720,21 +3720,21 @@ 
 			}

 

 			// read chunk-data and crlf

-			$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);

+			$chunk = substr($buffer, $chunkstart, $chunkend-$chunkstart);

 			// append chunk-data to entity-body

 			$new .= $chunk;

 			// length := length + chunk-size

 			$length += strlen($chunk);

 			// read chunk-size and crlf

-			$chunkstart = $chunkend + 2;

+			$chunkstart = $chunkend+2;

 

-			$chunkend = strpos($buffer,"\r\n",$chunkstart)+2;

-			if($chunkend == false)

+			$chunkend = strpos($buffer, "\r\n", $chunkstart)+2;

+			if ($chunkend == false)

 			{

 				break; //just in case we got a broken connection

 			}

-			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);

-			$chunk_size = hexdec( trim($temp) );

+			$temp = substr($buffer, $chunkstart, $chunkend-$chunkstart);

+			$chunk_size = hexdec(trim($temp));

 			$chunkstart = $chunkend;

 		}

 		return $new;

@@ -3754,7 +3754,7 @@ 
 	*

 	* @todo explore usage of mb_http_input(): does it detect http headers + post data? if so, use it instead of hand-detection!!!

 	*/

-	function guess_encoding($httpheader='', $xmlchunk='', $encoding_prefs=null)

+	function guess_encoding($httpheader = '', $xmlchunk = '', $encoding_prefs = null)

 	{

 		// discussion: see http://www.yale.edu/pclt/encoding/

 		// 1 - test if encoding is specified in HTTP HEADERS

@@ -3772,7 +3772,7 @@ 
 

 		/// @todo this test will pass if ANY header has charset specification, not only Content-Type. Fix it?

 		$matches = array();

-		if(preg_match('/;\s*charset\s*=([^;]+)/i', $httpheader, $matches))

+		if (preg_match('/;\s*charset\s*=([^;]+)/i', $httpheader, $matches))

 		{

 			return strtoupper(trim($matches[1], " \t\""));

 		}

@@ -3784,15 +3784,15 @@ 
 		//     in the xml declaration, and verify if they match.

 		/// @todo implement check as described above?

 		/// @todo implement check for first bytes of string even without a BOM? (It sure looks harder than for cases WITH a BOM)

-		if(preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlchunk))

+		if (preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlchunk))

 		{

 			return 'UCS-4';

 		}

-		elseif(preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))

+		elseif (preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))

 		{

 			return 'UTF-16';

 		}

-		elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))

+		elseif (preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))

 		{

 			return 'UTF-8';

 		}

@@ -3801,8 +3801,8 @@ 
 		// Details:

 		// SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+

 		// EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*

-		if (preg_match('/^<\?xml\s+version\s*=\s*'. "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".

-			'\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",

+		if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".

+			'\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",

 			$xmlchunk, $matches))

 		{

 			return strtoupper(substr($matches[2], 1, -1));

@@ -3810,9 +3810,9 @@ 
 

 		// 4 - if mbstring is available, let it do the guesswork

 		// NB: we favour finding an encoding that is compatible with what we can process

-		if(extension_loaded('mbstring'))

+		if (extension_loaded('mbstring'))

 		{

-			if($encoding_prefs)

+			if ($encoding_prefs)

 			{

 				$enc = mb_detect_encoding($xmlchunk, $encoding_prefs);

 			}

@@ -3822,7 +3822,7 @@ 
 			}

 			// NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...

 			// IANA also likes better US-ASCII, so go with it

-			if($enc == 'ASCII')

+			if ($enc == 'ASCII')

 			{

 				$enc = 'US-'.$enc;

 			}

@@ -3865,8 +3865,8 @@ 
 		// Details:

 		// SPACE:		(#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+

 		// EQ:			SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*

-		if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .

-			'\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",

+		if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".

+			'\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",

 			$xmlChunk, $matches))

 		{

 			return true;

@@ -3885,7 +3885,7 @@ 
 	function is_valid_charset($encoding, $validlist)

 	{

 		$charset_supersets = array(

-			'US-ASCII' => array ('ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',

+			'US-ASCII' => array('ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',

 				'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8',

 				'ISO-8859-9', 'ISO-8859-10', 'ISO-8859-11', 'ISO-8859-12',

 				'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'UTF-8',