gggeek / phpxmlrpc

lib/xmlrpc.inc

Braces +176 added lines, -250 removed lines

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

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

 					return;

-				}

-				else

+				} else

 				{

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

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

 				}

-			}

-			else

+			} else

 			{

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

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

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

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

 						// in the object we're rebuilding

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

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

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

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

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

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

 						{

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

-						}

-						else

+						} else

 						{

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

 						}

-					}

-					else

+					} else

 					{

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

 						/// since std deserializing is done by php_xmlrpc_decode,

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

 					{

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

-					}

-					elseif ($name=='DATETIME.ISO8601')

+					} elseif ($name=='DATETIME.ISO8601')

 					{

 						if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac']))

 						{

@@ -620,13 +616,11 @@ 
 						}

 						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];

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

-					}

-					elseif ($name=='BASE64')

+					} elseif ($name=='BASE64')

 					{

 						/// @todo check for failure of base64 decoding / catch warnings

 						$GLOBALS['_xh']['value']=base64_decode($GLOBALS['_xh']['ac']);

-					}

-					elseif ($name=='BOOLEAN')

+					} elseif ($name=='BOOLEAN')

 					{

 						// special case here: we translate boolean 1 or 0 into PHP

 						// constants true or false.

@@ -637,16 +631,15 @@ 
 						if ($GLOBALS['_xh']['ac']=='1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)

 						{

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

-						}

-						else

+						} else

 						{

 							// log if receiveing something strange, even though we set the value to false anyway

-							if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0)

-								error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);

+							if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0) {
+															error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);
+							}
 							$GLOBALS['_xh']['value']=false;

 						}

-					}

-					elseif ($name=='DOUBLE')

+					} elseif ($name=='DOUBLE')

 					{

 						// we have a DOUBLE

 						// we must check that only 0123456789-.<space> are characters here

@@ -656,14 +649,12 @@ 
 							/// @todo: find a better way of throwing an error than this!

 							error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);

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

-						}

-						else

+						} else

 						{

 							// it's ok, add it on

 							$GLOBALS['_xh']['value']=(double)$GLOBALS['_xh']['ac'];

 						}

-					}

-					else

+					} else

 					{

 						// we have an I4/INT

 						// we must check that only 0123456789-<space> are characters here

@@ -672,8 +663,7 @@ 
 							/// @todo find a better way of throwing an error than this!

 							error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);

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

-						}

-						else

+						} else

 						{

 							// it's ok, add it on

 							$GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];

@@ -693,8 +683,9 @@ 
 					{

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

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

-					} else

-						error_log('XML-RPC: missing VALUE inside STRUCT in received xml');

+					} else {
+											error_log('XML-RPC: missing VALUE inside STRUCT in received xml');
+					}
 					break;

 				case 'DATA':

 					//$GLOBALS['_xh']['ac']=''; // is this necessary?

@@ -718,9 +709,9 @@ 
 					{

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

 						$GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];

-					}

-					else

-						error_log('XML-RPC: missing VALUE inside PARAM in received xml');

+					} else {
+											error_log('XML-RPC: missing VALUE inside PARAM in received xml');
+					}
 					break;

 				case 'METHODNAME':

 					$GLOBALS['_xh']['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);

@@ -909,8 +900,7 @@ 
 			if($path == '' || $path[0] != '/')

 			{

 				$this->path='/'.$path;

-			}

-			else

+			} else

 			{

 				$this->path=$path;

 			}

@@ -999,8 +989,7 @@ 
 			if ($is_dir)

 			{

 				$this->cacertdir = $cacert;

-			}

-			else

+			} else

 			{

 				$this->cacert = $cacert;

 			}

@@ -1078,13 +1067,14 @@ 
 		*/

 		function setAcceptedCompression($compmethod)

 		{

-			if ($compmethod == 'any')

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

-			else

-				if ($compmethod == false )

-					$this->accepted_compression = array();

-				else

-					$this->accepted_compression = array($compmethod);

+			if ($compmethod == 'any') {
+							$this->accepted_compression = array('gzip', 'deflate');
+			} else

+				if ($compmethod == false ) {
+									$this->accepted_compression = array();
+				} else {
+									$this->accepted_compression = array($compmethod);
+				}
 		}

 

 		/**

@@ -1121,8 +1111,7 @@ 
 				$this->cookies[$name]['domain'] = $domain;

 				$this->cookies[$name]['port'] = $port;

 				$this->cookies[$name]['version'] = 1;

-			}

-			else

+			} else

 			{

 				$this->cookies[$name]['version'] = 0;

 			}

@@ -1169,8 +1158,7 @@ 
 				// $msg is an array of xmlrpcmsg's

 				$r = $this->multicall($msg, $timeout, $method);

 				return $r;

-			}

-			elseif(is_string($msg))

+			} elseif(is_string($msg))

 			{

 				$n = new xmlrpcmsg('');

 				$n->payload = $msg;

@@ -1204,8 +1192,7 @@ 
 					$this->keypass,

 					$this->sslversion

 				);

-			}

-			elseif($method == 'http11')

+			} elseif($method == 'http11')

 			{

 				$r =& $this->sendPayloadCURL(

 					$msg,

@@ -1227,8 +1214,7 @@ 
 					'http',

 					$this->keepalive

 				);

-			}

-			else

+			} else

 			{

 				$r =& $this->sendPayloadHTTP10(

 					$msg,

@@ -1279,8 +1265,7 @@ 
 						$payload = $a;

 						$encoding_hdr = "Content-Encoding: gzip\r\n";

 					}

-				}

-				else

+				} else

 				{

 					$a = @gzcompress($payload);

 					if($a)

@@ -1289,8 +1274,7 @@ 
 						$encoding_hdr = "Content-Encoding: deflate\r\n";

 					}

 				}

-			}

-			else

+			} else

 			{

 				$encoding_hdr = '';

 			}

@@ -1330,8 +1314,7 @@ 
 					}

 					$proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";

 				}

-			}

-			else

+			} else

 			{

 				$connectserver = $server;

 				$connectport = $port;

@@ -1350,14 +1333,16 @@ 
 					{

 						$version = ' $Version="' . $cookie['version'] . '";';

 						$cookieheader .= ' ' . $name . '="' . $cookie['value'] . '";';

-						if ($cookie['path'])

-							$cookieheader .= ' $Path="' . $cookie['path'] . '";';

-						if ($cookie['domain'])

-							$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';

-						if ($cookie['port'])

-							$cookieheader .= ' $Port="' . $cookie['port'] . '";';

-					}

-					else

+						if ($cookie['path']) {
+													$cookieheader .= ' $Path="' . $cookie['path'] . '";';
+						}
+						if ($cookie['domain']) {
+													$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';
+						}
+						if ($cookie['port']) {
+													$cookieheader .= ' $Port="' . $cookie['port'] . '";';
+						}
+					} else

 					{

 						$cookieheader .= ' ' . $name . '=' . $cookie['value'] . ";";

 					}

@@ -1391,8 +1376,7 @@ 
 			if($timeout>0)

 			{

 				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);

-			}

-			else

+			} else

 			{

 				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);

 			}

@@ -1402,8 +1386,7 @@ 
 				{

 					stream_set_timeout($fp, $timeout);

 				}

-			}

-			else

+			} else

 			{

 				$this->errstr='Connect error: '.$this->errstr;

 				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');

@@ -1416,8 +1399,7 @@ 
 				$this->errstr='Write error';

 				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr);

 				return $r;

-			}

-			else

+			} else

 			{

 				// reset errno and errstr on successful socket connection

 				$this->errstr = '';

@@ -1484,8 +1466,7 @@ 
 				if($method == 'http')

 				{

 					$port = 80;

-				}

-				else

+				} else

 				{

 					$port = 443;

 				}

@@ -1509,8 +1490,7 @@ 
 						$payload = $a;

 						$encoding_hdr = 'Content-Encoding: gzip';

 					}

-				}

-				else

+				} else

 				{

 					$a = @gzcompress($payload);

 					if($a)

@@ -1519,8 +1499,7 @@ 
 						$encoding_hdr = 'Content-Encoding: deflate';

 					}

 				}

-			}

-			else

+			} else

 			{

 				$encoding_hdr = '';

 			}

@@ -1539,8 +1518,7 @@ 
 				{

 					$this->xmlrpc_curl_handle = $curl;

 				}

-			}

-			else

+			} else

 			{

 				$curl = $this->xmlrpc_curl_handle;

 			}

@@ -1571,9 +1549,9 @@ 
 				if (count($this->accepted_compression) == 1)

 				{

 					curl_setopt($curl, CURLOPT_ENCODING, $this->accepted_compression[0]);

-				}

-				else

-					curl_setopt($curl, CURLOPT_ENCODING, '');

+				} else {
+									curl_setopt($curl, CURLOPT_ENCODING, '');
+				}
 			}

 			// extra headers

 			$headers = array('Content-Type: ' . $msg->content_type , 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));

@@ -1601,8 +1579,7 @@ 
 				if (defined('CURLOPT_HTTPAUTH'))

 				{

 					curl_setopt($curl, CURLOPT_HTTPAUTH, $authtype);

-				}

-				else if ($authtype != 1)

+				} else if ($authtype != 1)

 				{

 					error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');

 				}

@@ -1669,8 +1646,7 @@ 
 					if (defined('CURLOPT_PROXYAUTH'))

 					{

 						curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyauthtype);

-					}

-					else if ($proxyauthtype != 1)

+					} else if ($proxyauthtype != 1)

 					{

 						error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');

 					}

@@ -1712,17 +1688,18 @@ 
 				print "---END---\n</PRE>";

 			}

 

-			if(!$result) /// @todo we should use a better check here - what if we get back '' or '0'?

+			if(!$result) {
+			    /// @todo we should use a better check here - what if we get back '' or '0'?

 			{

-				$this->errstr='no response';

+				$this->errstr='no response';
+			}
 				$resp=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl));

 				curl_close($curl);

 				if($keepalive)

 				{

 					$this->xmlrpc_curl_handle = null;

 				}

-			}

-			else

+			} else

 			{

 				if(!$keepalive)

 				{

@@ -1774,8 +1751,7 @@ 
 				{

 					// System.multicall succeeded

 					return $results;

-				}

-				else

+				} else

 				{

 					// either system.multicall is unsupported by server,

 					// or call failed for some other reason.

@@ -1783,21 +1759,18 @@ 
 					{

 						// Don't try it next time...

 						$this->no_multicall = true;

-					}

-					else

+					} else

 					{

 						if (is_a($results, 'xmlrpcresp'))

 						{

 							$result = $results;

-						}

-						else

+						} else

 						{

 							$result = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['multicall_error'], $GLOBALS['xmlrpcstr']['multicall_error']);

 						}

 					}

 				}

-			}

-			else

+			} else

 			{

 				// override fallback, in case careless user tries to do two

 				// opposite things at the same time

@@ -1813,8 +1786,7 @@ 
 				{

 					$results[] =& $this->send($msg, $timeout, $method);

 				}

-			}

-			else

+			} else

 			{

 				// user does NOT want to fallback on many single calls:

 				// since we should always return an array of responses,

@@ -1867,8 +1839,7 @@ 
 			if ($this->return_type == 'xml')

 			{

 					return $rets;

-			}

-			else if ($this->return_type == 'phpvals')

+			} else if ($this->return_type == 'phpvals')

 			{

 				///@todo test this code branch...

 				$rets = $result->value();

@@ -1918,8 +1889,7 @@ 
 					}

 				}

 				return $response;

-			}

-			else // return type == 'xmlrpcvals'

+			} else // return type == 'xmlrpcvals'

 			{

 				$rets = $result->value();

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

@@ -1998,8 +1968,7 @@ 
 				$this->errno = $fcode;

 				$this->errstr = $fstr;

 				//$this->errstr = htmlspecialchars($fstr); // XXX: encoding probably shouldn't be done here; fix later.

-			}

-			else

+			} else

 			{

 				// successful response

 				$this->val = $val;

@@ -2009,18 +1978,15 @@ 
 					if (is_object($this->val) && is_a($this->val, 'xmlrpcval'))

 					{

 						$this->valtyp = 'xmlrpcvals';

-					}

-					else if (is_string($this->val))

+					} else if (is_string($this->val))

 					{

 						$this->valtyp = 'xml';

 

-					}

-					else

+					} else

 					{

 						$this->valtyp = 'phpvals';

 					}

-				}

-				else

+				} else

 				{

 					// user declares type of resp value: believe him

 					$this->valtyp = $valtyp;

@@ -2090,15 +2056,15 @@ 
 		*/

 		function serialize($charset_encoding='')

 		{

-			if ($charset_encoding != '')

-				$this->content_type = 'text/xml; charset=' . $charset_encoding;

-			else

-				$this->content_type = 'text/xml';

+			if ($charset_encoding != '') {
+							$this->content_type = 'text/xml; charset=' . $charset_encoding;
+			} else {
+							$this->content_type = 'text/xml';
+			}
 			if ($GLOBALS['xmlrpc_null_apache_encoding'])

 			{

 				$result = "<methodResponse xmlns:ex=\"".$GLOBALS['xmlrpc_null_apache_encoding_ns']."\">\n";

-			}

-			else

+			} else

 			{

 			$result = "<methodResponse>\n";

 			}

@@ -2111,8 +2077,7 @@ 
 "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .

 xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</string></value>\n</member>\n" .

 "</struct>\n</value>\n</fault>";

-			}

-			else

+			} else

 			{

 				if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))

 				{

@@ -2121,14 +2086,12 @@ 
 						$result .= "<params>\n<param>\n" .

 							$this->val .

 							"</param>\n</params>";

-					}

-					else

+					} else

 					{

 						/// @todo try to build something serializable?

 						die('cannot serialize xmlrpcresp objects whose content is native php values');

 					}

-				}

-				else

+				} else

 				{

 					$result .= "<params>\n<param>\n" .

 						$this->val->serialize($charset_encoding) .

@@ -2181,8 +2144,7 @@ 
 			if ($charset_encoding != '')

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

@@ -2209,10 +2171,11 @@ 
 		*/

 		function createPayload($charset_encoding='')

 		{

-			if ($charset_encoding != '')

-				$this->content_type = 'text/xml; charset=' . $charset_encoding;

-			else

-				$this->content_type = 'text/xml';

+			if ($charset_encoding != '') {
+							$this->content_type = 'text/xml; charset=' . $charset_encoding;
+			} else {
+							$this->content_type = 'text/xml';
+			}
 			$this->payload=$this->xml_header($charset_encoding);

 			$this->payload.='<methodName>' . xmlrpc_encode_entitites($this->methodname, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</methodName>\n";

 			$this->payload.="<params>\n";

@@ -2266,8 +2229,7 @@ 
 			{

 				$this->params[]=$par;

 				return true;

-			}

-			else

+			} else

 			{

 				return false;

 			}

@@ -2328,15 +2290,13 @@ 
 					if($pos || is_int($pos))

 					{

 						$bd = $pos+4;

-					}

-					else

+					} else

 					{

 						$pos = strpos($data,"\n\n");

 						if($pos || is_int($pos))

 						{

 							$bd = $pos+2;

-						}

-						else

+						} else

 						{

 							// No separation between response headers and body: fault?

 							$bd = 0;

@@ -2347,8 +2307,7 @@ 
 						// this filters out all http headers from proxy.

 						// maybe we could take them into account, too?

 						$data = substr($data, $bd);

-					}

-					else

+					} else

 					{

 						error_log('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');

 						$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)');

@@ -2362,9 +2321,11 @@ 
 					$pos = strpos($data, 'HTTP', 12);

 					// server sent a Continue header without any (valid) content following...

 					// give the client a chance to know it

-					if(!$pos && !is_int($pos)) // works fine in php 3, 4 and 5

+					if(!$pos && !is_int($pos)) {
+					    // works fine in php 3, 4 and 5

 					{

-						break;

+						break;
+					}
 					}

 					$data = substr($data, $pos);

 				}

@@ -2385,15 +2346,13 @@ 
 				if($pos || is_int($pos))

 				{

 					$bd = $pos+4;

-				}

-				else

+				} else

 				{

 					$pos = strpos($data,"\n\n");

 					if($pos || is_int($pos))

 					{

 						$bd = $pos+2;

-					}

-					else

+					} else

 					{

 						// No separation between response headers and body: fault?

 						// we could take some action here instead of going on...

@@ -2420,8 +2379,7 @@ 
 								// version 2 cookies:

 								// there could be many cookies on one line, comma separated

 								$cookies = explode(',', $arr[1]);

-							}

-							else

+							} else

 							{

 								$cookies = array($arr[1]);

 							}

@@ -2429,10 +2387,11 @@ 
 							{

 								// glue together all received cookies, using a comma to separate them

 								// (same as php does with getallheaders())

-								if (isset($GLOBALS['_xh']['headers'][$header_name]))

-									$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);

-								else

-									$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);

+								if (isset($GLOBALS['_xh']['headers'][$header_name])) {
+																	$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);
+								} else {
+																	$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);
+								}
 								// parse cookie attributes, in case user wants to correctly honour them

 								// feature creep: only allow rfc-compliant cookie attributes?

 								// @todo support for server sending multiple time cookie with same name, but using different PATHs

@@ -2448,8 +2407,7 @@ 
 										$cookiename = $tag;

 										$GLOBALS['_xh']['cookies'][$tag] = array();

 										$GLOBALS['_xh']['cookies'][$cookiename]['value'] = urldecode($val);

-									}

-									else

+									} else

 									{

 										if ($tag != 'value')

 										{

@@ -2458,13 +2416,11 @@ 
 									}

 								}

 							}

-						}

-						else

+						} else

 						{

 							$GLOBALS['_xh']['headers'][$header_name] = trim($arr[1]);

 						}

-					}

-					elseif(isset($header_name))

+					} elseif(isset($header_name))

 					{

 						///	@todo version1 cookies might span multiple lines, thus breaking the parsing above

 						$GLOBALS['_xh']['headers'][$header_name] .= ' ' . trim($line);

@@ -2515,23 +2471,22 @@ 
 								if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))

 								{

 									$data = $degzdata;

-									if($this->debug)

-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";

-								}

-								elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

+									if($this->debug) {
+																		print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+									}
+								} elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))

 								{

 									$data = $degzdata;

-									if($this->debug)

-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";

-								}

-								else

+									if($this->debug) {
+																		print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+									}
+								} else

 								{

 									error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');

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

 									return $r;

 								}

-							}

-							else

+							} else

 							{

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

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

@@ -2584,8 +2539,7 @@ 
 					$r->raw_data = $data;

 					return $r;

 				}

-			}

-			else

+			} else

 			{

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

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

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

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

@@ -2674,8 +2627,7 @@ 
 			if ($return_type == 'phpvals')

 			{

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

-			}

-			else

+			} else

 			{

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

 			}

@@ -2690,8 +2642,7 @@ 
 				if((xml_get_current_line_number($parser)) == 1)

 				{

 					$errstr = 'XML error at line 1, check URL';

-				}

-				else

+				} else

 				{

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

 						xml_error_string(xml_get_error_code($parser)),

@@ -2730,8 +2681,7 @@ 
 				// indicating something odd went on

 				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],

 					$GLOBALS['xmlrpcstr']['invalid_return']);

-			}

-			else

+			} else

 			{

 				if ($this->debug)

 				{

@@ -2755,8 +2705,7 @@ 
 						$errstr_v = $v->structmem('faultString');

 						$errno = $errno_v->scalarval();

 						$errstr = $errstr_v->scalarval();

-					}

-					else

+					} else

 					{

 						$errno = $v['faultCode'];

 						$errstr = $v['faultString'];

@@ -2769,8 +2718,7 @@ 
 					}

 

 					$r = new xmlrpcresp(0, $errno, $errstr);

-				}

-				else

+				} else

 				{

 					$r=new xmlrpcresp($v, 0, '', $return_type);

 				}

@@ -2878,8 +2826,7 @@ 
 				if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))

 				{

 					$val=true;

-				}

-				else

+				} else

 				{

 					$val=false;

 				}

@@ -2924,14 +2871,12 @@ 
 				$this->mytype=$GLOBALS['xmlrpcTypes']['array'];

 				$this->me['array']=$vals;

 				return 1;

-			}

-			elseif($this->mytype==2)

+			} elseif($this->mytype==2)

 			{

 				// we're adding to an array here

 				$this->me['array'] = array_merge($this->me['array'], $vals);

 				return 1;

-			}

-			else

+			} else

 			{

 				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');

 				return 0;

@@ -2953,14 +2898,12 @@ 
 				$this->mytype=$GLOBALS['xmlrpcTypes']['struct'];

 				$this->me['struct']=$vals;

 				return 1;

-			}

-			elseif($this->mytype==3)

+			} elseif($this->mytype==3)

 			{

 				// we're adding to a struct here

 				$this->me['struct'] = array_merge($this->me['struct'], $vals);

 				return 1;

-			}

-			else

+			} else

 			{

 				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');

 				return 0;

@@ -3064,8 +3007,7 @@ 
 							if ($GLOBALS['xmlrpc_null_apache_encoding'])

 							{

 								$rs.="<ex:nil/>";

-							}

-							else

+							} else

 							{

 								$rs.="<nil/>";

 							}

@@ -3081,8 +3023,7 @@ 
 					if ($this->_php_class)

 					{

 						$rs.='<struct php_class="' . $this->_php_class . "\">\n";

-					}

-					else

+					} else

 					{

 						$rs.="<struct>\n";

 					}

@@ -3305,16 +3246,14 @@ 
 		if(!$utc)

 		{

 			$t=strftime("%Y%m%dT%H:%M:%S", $timet);

-		}

-		else

+		} else

 		{

 			if(function_exists('gmstrftime'))

 			{

 				// gmstrftime doesn't exist in some versions

 				// of PHP

 				$t=gmstrftime("%Y%m%dT%H:%M:%S", $timet);

-			}

-			else

+			} else

 			{

 				$t=strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));

 			}

@@ -3336,8 +3275,7 @@ 
 			if($utc)

 			{

 				$t=gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

-			}

-			else

+			} else

 			{

 				$t=mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

 			}

@@ -3405,8 +3343,7 @@ 
 						$result = new Datetime();

 						$result->setTimestamp($out);

 						return $result;

-					}

-					elseif (is_a($out, 'Datetime'))

+					} elseif (is_a($out, 'Datetime'))

 					{

 						return $out;

 					}

@@ -3435,8 +3372,7 @@ 
 						$obj->$key = php_xmlrpc_decode($value, $options);

 					}

 					return $obj;

-				}

-				else

+				} else

 				{

 					$arr = array();

 					while(list($key,$value)=$xmlrpc_val->structeach())

@@ -3462,8 +3398,7 @@ 
 	if(function_exists('xmlrpc_decode'))

 	{

 		define('XMLRPC_EPI_ENABLED','1');

-	}

-	else

+	} else

 	{

 		define('XMLRPC_EPI_ENABLED','0');

 	}

@@ -3491,10 +3426,11 @@ 
 		switch($type)

 		{

 			case 'string':

-				if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val))

-					$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']);

-				else

-					$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcString']);

+				if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val)) {
+									$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']);
+				} else {
+									$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcString']);
+				}
 				break;

 			case 'integer':

 				$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcInt']);

@@ -3529,8 +3465,7 @@ 
 				if($ko)

 				{

 					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);

-				}

-				else

+				} else

 				{

 					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcArray']);

 				}

@@ -3539,12 +3474,10 @@ 
 				if(is_a($php_val, 'xmlrpcval'))

 				{

 					$xmlrpc_val = $php_val;

-				}

-				else if(is_a($php_val, 'DateTime'))

+				} else if(is_a($php_val, 'DateTime'))

 				{

 					$xmlrpc_val = new xmlrpcval($php_val->format('Ymd\TH:i:s'), $GLOBALS['xmlrpcStruct']);

-				}

-				else

+				} else

 				{

 					$arr = array();

                     foreach($php_val as $k => $v)

@@ -3564,12 +3497,10 @@ 
 				if (in_array('extension_api', $options))

 				{

 					$xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcString']);

-				}

-				else if (in_array('null_extension', $options))

+				} else if (in_array('null_extension', $options))

 				{

 					$xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcNull']);

-				}

-				else

+				} else

 				{

 					$xmlrpc_val = new xmlrpcval();

 				}

@@ -3578,8 +3509,7 @@ 
 				if (in_array('extension_api', $options))

 				{

 					$xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);

-				}

-				else

+				} else

 				{

 					$xmlrpc_val = new xmlrpcval();

 				}

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

 		{

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

-		}

-		else

+		} else

 		{

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

 		}

@@ -3659,9 +3588,11 @@ 
 			return false;

 		}

 		xml_parser_free($parser);

-		if ($GLOBALS['_xh']['isf'] > 1) // test that $GLOBALS['_xh']['value'] is an obj, too???

+		if ($GLOBALS['_xh']['isf'] > 1) {
+		    // test that $GLOBALS['_xh']['value'] is an obj, too???

 		{

-			error_log($GLOBALS['_xh']['isf_reason']);

+			error_log($GLOBALS['_xh']['isf_reason']);
+		}
 			return false;

 		}

 		switch ($GLOBALS['_xh']['rt'])

@@ -3673,8 +3604,7 @@ 
 					$vc = $v->structmem('faultCode');

 					$vs = $v->structmem('faultString');

 					$r = new xmlrpcresp(0, $vc->scalarval(), $vs->scalarval());

-				}

-				else

+				} else

 				{

 					$r = new xmlrpcresp($v);

 				}

@@ -3795,12 +3725,10 @@ 
 		if(preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlchunk))

 		{

 			return 'UCS-4';

-		}

-		elseif(preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))

+		} elseif(preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))

 		{

 			return 'UTF-16';

-		}

-		elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))

+		} elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))

 		{

 			return 'UTF-8';

 		}

@@ -3823,8 +3751,7 @@ 
 			if($encoding_prefs)

 			{

 				$enc = mb_detect_encoding($xmlchunk, $encoding_prefs);

-			}

-			else

+			} else

 			{

 				$enc = mb_detect_encoding($xmlchunk);

 			}

@@ -3835,8 +3762,7 @@ 
 				$enc = 'US-'.$enc;

 			}

 			return $enc;

-		}

-		else

+		} else

 		{

 			// no encoding specified: as per HTTP1.1 assume it is iso-8859-1?

 			// Both RFC 2616 (HTTP 1.1) and 1945 (HTTP 1.0) clearly state that for text/xxx content types

@@ -3859,12 +3785,10 @@ 
 		if (preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlChunk))

 		{

 			return true;

-		}

-		elseif (preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlChunk))

+		} elseif (preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlChunk))

 		{

 			return true;

-		}

-		elseif (preg_match('/^(\xEF\xBB\xBF)/', $xmlChunk))

+		} elseif (preg_match('/^(\xEF\xBB\xBF)/', $xmlChunk))

 		{

 			return true;

 		}

@@ -3899,16 +3823,18 @@ 
 				'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'UTF-8',

 				'EUC-JP', 'EUC-', 'EUC-KR', 'EUC-CN')

 		);

-		if (is_string($validlist))

-			$validlist = explode(',', $validlist);

-		if (@in_array(strtoupper($encoding), $validlist))

-			return true;

-		else

-		{

-			if (array_key_exists($encoding, $charset_supersets))

-				foreach ($validlist as $allowed)

+		if (is_string($validlist)) {
+					$validlist = explode(',', $validlist);
+		}
+		if (@in_array(strtoupper($encoding), $validlist)) {
+					return true;
+		} else

+		{

+			if (array_key_exists($encoding, $charset_supersets)) {
+							foreach ($validlist as $allowed)

 					if (in_array($allowed, $charset_supersets[$encoding]))

-						return true;

+						return true;
+			}
 			return false;

 		}

 	}