gggeek / phpxmlrpc

lib/xmlrpc.inc

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.

@@ -869,7 +869,7 @@ 
 		/**

 		* @deprecated

 		*/

-		function xmlrpc_client($path, $server='', $port='', $method='')

+		function xmlrpc_client($path, $server = '', $port = '', $method = '')

 		{

 			self::__construct($path, $server, $port, $method);

 		}

@@ -880,59 +880,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'])))

 			))

@@ -947,7 +947,7 @@ 
 			$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'];

 		}

 

 		/**

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

 							}

@@ -1969,7 +1969,7 @@ 
 		/**

 		* @deprecated

 		*/

-		function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp='')

+		function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp = '')

 		{

 			self::__construct($val, $fcode, $fstr, $valtyp);

 		}

@@ -1984,9 +1984,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;

@@ -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,14 +2131,14 @@ 
 	{

 		var $payload;

 		var $methodname;

-		var $params=array();

-		var $debug=0;

+		var $params = array();

+		var $debug = 0;

 		var $content_type = 'text/xml';

 

 		/**

 		* @deprecated

 		*/

-		function xmlrpcmsg($meth, $pars=0)

+		function xmlrpcmsg($meth, $pars = 0)

 		{

 			self::__construct($meth, $pars);

 		}

@@ -2147,12 +2147,12 @@ 
 		* @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]);

 				}

@@ -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,14 +2771,14 @@ 
 

 	class xmlrpcval

 	{

-		var $me=array();

-		var $mytype=0;

-		var $_php_class=null;

+		var $me = array();

+		var $mytype = 0;

+		var $_php_class = null;

 

 		/**

 		* @deprecated

 		*/

-		function xmlrpcval($val=-1, $type='')

+		function xmlrpcval($val = -1, $type = '')

 		{

 			self::__construct($val, $type);

 		}

@@ -2787,18 +2787,18 @@ 
 		* @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':

@@ -2808,16 +2808,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)");

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