gggeek / phpxmlrpc

lib/xmlrpc_wrappers.inc

Braces +46 added lines, -80 removed lines

@@ -52,8 +52,7 @@ 
 				if(class_exists($phptype))
 				{
 					return $GLOBALS['xmlrpcStruct'];
-				}
-				else
+				} else
 				{
 					// unknown: might be any 'extended' xmlrpc type
 					return $GLOBALS['xmlrpcValue'];
@@ -163,14 +162,12 @@ 
 			if(is_string($funcname[0]))
 			{
 				$plainfuncname = implode('::', $funcname);
-			}
-			elseif(is_object($funcname[0]))
+			} elseif(is_object($funcname[0]))
 			{
 				$plainfuncname = get_class($funcname[0]) . '->' . $funcname[1];
 			}
 			$exists = method_exists($funcname[0], $funcname[1]);
-		}
-		else
+		} else
 		{
 			$plainfuncname = $funcname;
 			$exists = function_exists($funcname);
@@ -180,25 +177,23 @@ 
 		{
 			error_log('XML-RPC: function to be wrapped is not defined: '.$plainfuncname);
 			return false;
-		}
-		else
+		} else
 		{
 			// determine name of new php function
 			if($newfuncname == '')
 			{
 				if(is_array($funcname))
 				{
-					if(is_string($funcname[0]))
-						$xmlrpcfuncname = "{$prefix}_".implode('_', $funcname);
-					else
-						$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]) . '_' . $funcname[1];
-				}
-				else
+					if(is_string($funcname[0])) {
+											$xmlrpcfuncname = "{$prefix}_".implode('_', $funcname);
+					} else {
+											$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]) . '_' . $funcname[1];
+					}
+				} else
 				{
 					$xmlrpcfuncname = "{$prefix}_$funcname";
 				}
-			}
-			else
+			} else
 			{
 				$xmlrpcfuncname = $newfuncname;
 			}
@@ -237,8 +232,7 @@ 
 					return false;
 				}
 				/// @todo add more checks for static vs. nonstatic?
-			}
-			else
+			} else
 			{
 				$func = new ReflectionFunction($funcname);
 			}
@@ -276,8 +270,7 @@ 
 							$desc .= "\n";
 						}
 						$desc .= $doc;
-					}
-					elseif(strpos($doc, '@param') === 0)
+					} elseif(strpos($doc, '@param') === 0)
 					{
 						// syntax: @param type [$name] desc
 						if(preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches))
@@ -286,8 +279,7 @@ 
 							{
 								//$paramDocs[$i]['type'] = explode('|', $matches[1]);
 								$paramDocs[$i]['type'] = 'mixed';
-							}
-							else
+							} else
 							{
 								$paramDocs[$i]['type'] = $matches[1];
 							}
@@ -295,8 +287,7 @@ 
 							$paramDocs[$i]['doc'] = $matches[3];
 						}
 						$i++;
-					}
-					elseif(strpos($doc, '@return') === 0)
+					} elseif(strpos($doc, '@return') === 0)
 					{
 						// syntax: @return type desc
 						//$returns = preg_split('/\s+/', $doc);
@@ -347,8 +338,7 @@ 
 				if ($decode_php_objects)
 				{
 					$innercode .= "if (\$p{$i}->kindOf() == 'scalar') \$p$i = \$p{$i}->scalarval(); else \$p$i = php_{$prefix}_decode(\$p$i, array('decode_php_objs'));\n";
-				}
-				else
+				} else
 				{
 					$innercode .= "if (\$p{$i}->kindOf() == 'scalar') \$p$i = \$p{$i}->scalarval(); else \$p$i = php_{$prefix}_decode(\$p$i);\n";
 				}
@@ -373,8 +363,7 @@ 
 				// only known good synopsis = no parameters
 				$parsvariations[] = array();
 				$minpars = 0;
-			}
-			else
+			} else
 			{
 				$minpars = count($parsvariations[0]);
 			}
@@ -385,8 +374,7 @@ 
 				// NB: this check needs to be done BEFORE decoding param values
 				$innercode = "\$paramcount = \$msg->getNumParams();\n" .
 				"if (\$paramcount < $minpars) return new {$prefix}resp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}');\n" . $innercode;
-			}
-			else
+			} else
 			{
 				$innercode = "\$paramcount = \$msg->getNumParams();\n" . $innercode;
 			}
@@ -399,8 +387,7 @@ 
 				$GLOBALS['xmlrpcWPFObjHolder'][$xmlrpcfuncname] =& $funcname[0];
 				$innercode .= "\$obj =& \$GLOBALS['xmlrpcWPFObjHolder']['$xmlrpcfuncname'];\n";
 				$realfuncname = '$obj->'.$funcname[1];
-			}
-			else
+			} else
 			{
 				$realfuncname = $plainfuncname;
 			}
@@ -415,8 +402,7 @@ 
 					if (isset($paramDocs[$i]['type']))
 					{
 						$sig[] = php_2_xmlrpc_type($paramDocs[$i]['type']);
-					}
-					else
+					} else
 					{
 						$sig[] = $GLOBALS['xmlrpcValue'];
 					}
@@ -432,13 +418,13 @@ 
 			if($returns == $GLOBALS['xmlrpcDateTime'] || $returns == $GLOBALS['xmlrpcBase64'])
 			{
 				$innercode .= "return new {$prefix}resp(new {$prefix}val(\$retval, '$returns'));";
-			}
-			else
+			} else
 			{
-				if ($encode_php_objects)
-					$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval, array('encode_php_objs')));\n";
-				else
-					$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval));\n";
+				if ($encode_php_objects) {
+									$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval, array('encode_php_objs')));\n";
+				} else {
+									$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval));\n";
+				}
 			}
 			// shall we exclude functions returning by ref?
 			// if($func->returnsReference())
@@ -555,8 +541,7 @@ 
 		{
 			$signum = $extra_options;
 			$extra_options = array();
-		}
-		else
+		} else
 		{
 			$signum = isset($extra_options['signum']) ? (int)$extra_options['signum'] : 0;
 			$timeout = isset($extra_options['timeout']) ? (int)$extra_options['timeout'] : 0;
@@ -577,8 +562,7 @@ 
 		{
 			$decode_fault = true;
 			$fault_response = $extra_options['return_on_fault'];
-		}
-		else
+		} else
 		{
 			$decode_fault = false;
 			$fault_response = '';
@@ -597,8 +581,7 @@ 
 		{
 			error_log('XML-RPC: could not retrieve method signature from remote server for method '.$methodname);
 			return false;
-		}
-		else
+		} else
 		{
 			$msig = $response->value();
 			if ($client->return_type != 'phpvals')
@@ -609,15 +592,13 @@ 
 			{
 				error_log('XML-RPC: could not retrieve method signature nr.'.$signum.' from remote server for method '.$methodname);
 				return false;
-			}
-			else
+			} else
 			{
 				// pick a suitable name for the new function, avoiding collisions
 				if($newfuncname != '')
 				{
 					$xmlrpcfuncname = $newfuncname;
-				}
-				else
+				} else
 				{
 					// take care to insure that methodname is translated to valid
 					// php function name
@@ -663,14 +644,12 @@ 
 					if($allOK)
 					{
 						return $xmlrpcfuncname;
-					}
-					else
+					} else
 					{
 						error_log('XML-RPC: could not create function '.$xmlrpcfuncname.' to wrap remote method '.$methodname);
 						return false;
 					}
-				}
-				else
+				} else
 				{
 					$results['function'] = $xmlrpcfuncname;
 					return $results;
@@ -710,8 +689,7 @@ 
 		{
 			error_log('XML-RPC: could not retrieve method list from remote server');
 			return false;
-		}
-		else
+		} else
 		{
 			$mlist = $response->value();
 			if ($client->return_type != 'phpvals')
@@ -722,15 +700,13 @@ 
 			{
 				error_log('XML-RPC: could not retrieve meaningful method list from remote server');
 				return false;
-			}
-			else
+			} else
 			{
 				// pick a suitable name for the new function, avoiding collisions
 				if($newclassname != '')
 				{
 					$xmlrpcclassname = $newclassname;
-				}
-				else
+				} else
 				{
 					$xmlrpcclassname = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'),
 						array('_', ''), $client->server).'_client';
@@ -765,8 +741,7 @@ 
 								$source .= $methodwrap['docstring'];
 							}
 							$source .= $methodwrap['source']."\n";
-						}
-						else
+						} else
 						{
 							error_log('XML-RPC: will not create class method to wrap remote method '.$mname);
 						}
@@ -782,14 +757,12 @@ 
 					if($allOK)
 					{
 						return $xmlrpcclassname;
-					}
-					else
+					} else
 					{
 						error_log('XML-RPC: could not create class '.$xmlrpcclassname.' to wrap remote server '.$client->server);
 						return false;
 					}
-				}
-				else
+				} else
 				{
 					return array('class' => $xmlrpcclassname, 'code' => $source, 'docstring' => '');
 				}
@@ -817,8 +790,7 @@ 
 			$innercode = build_client_wrapper_code($client, $client_copy_mode, $prefix);
 			$innercode .= "\$client->setDebug(\$debug);\n";
 			$this_ = '';
-		}
-		else
+		} else
 		{
 			// client copy mode 2 == no client copy in emitted code
 			$innercode = '';
@@ -830,8 +802,7 @@ 
 		{
 			// take care that PHP comment is not terminated unwillingly by method description
 			$mdesc = "/**\n* ".str_replace('*/', '* /', $mdesc)."\n";
-		}
-		else
+		} else
 		{
 			$mdesc = "/**\nFunction $xmlrpcfuncname\n";
 		}
@@ -848,14 +819,12 @@ 
 			{
 				// only build directly xmlrpcvals when type is known and scalar
 				$innercode .= "\$p$i = new {$prefix}val(\$p$i, '$ptype');\n";
-			}
-			else
+			} else
 			{
 				if ($encode_php_objects)
 				{
 					$innercode .= "\$p$i =& php_{$prefix}_encode(\$p$i, array('encode_php_objs'));\n";
-				}
-				else
+				} else
 				{
 					$innercode .= "\$p$i =& php_{$prefix}_encode(\$p$i);\n";
 				}
@@ -877,21 +846,18 @@ 
 			if (is_string($fault_response) && ((strpos($fault_response, '%faultCode%') !== false) || (strpos($fault_response, '%faultString%') !== false)))
 			{
 				$respcode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $fault_response)."')";
-			}
-			else
+			} else
 			{
 				$respcode = var_export($fault_response, true);
 			}
-		}
-		else
+		} else
 		{
 			$respcode = '$res';
 		}
 		if ($decode_php_objects)
 		{
 			$innercode .= "if (\$res->faultcode()) return $respcode; else return php_{$prefix}_decode(\$res->value(), array('decode_php_objs'));";
-		}
-		else
+		} else
 		{
 			$innercode .= "if (\$res->faultcode()) return $respcode; else return php_{$prefix}_decode(\$res->value());";
 		}

lib/xmlrpcs.inc

Braces +57 added lines, -88 removed lines

@@ -106,16 +106,14 @@ 
 		{
 			$methName=$m->getParam(0);
 			$methName=$methName->scalarval();
-		}
-		else
+		} else
 		{
 			$methName=$m;
 		}
 		if(strpos($methName, "system.") === 0)
 		{
 			$dmap=$GLOBALS['_xmlrpcs_dmap']; //$sysCall=1;
-		}
-		else
+		} else
 		{
 			$dmap=$server->dmap; //$sysCall=0;
 		}
@@ -134,15 +132,13 @@ 
 					$sigs[]=new xmlrpcval($cursig, 'array');
 				}
 				$r=new xmlrpcresp(new xmlrpcval($sigs, 'array'));
-			}
-			else
+			} else
 			{
 				// NB: according to the official docs, we should be returning a
 				// "none-array" here, which means not-an-array
 				$r=new xmlrpcresp(new xmlrpcval('undef', 'string'));
 			}
-		}
-		else
+		} else
 		{
 			$r=new xmlrpcresp(0,$GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);
 		}
@@ -159,16 +155,14 @@ 
 		{
 			$methName=$m->getParam(0);
 			$methName=$methName->scalarval();
-		}
-		else
+		} else
 		{
 			$methName=$m;
 		}
 		if(strpos($methName, "system.") === 0)
 		{
 			$dmap=$GLOBALS['_xmlrpcs_dmap']; //$sysCall=1;
-		}
-		else
+		} else
 		{
 			$dmap=$server->dmap; //$sysCall=0;
 		}
@@ -177,13 +171,11 @@ 
 			if(isset($dmap[$methName]['docstring']))
 			{
 				$r=new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');
-			}
-			else
+			} else
 			{
 				$r=new xmlrpcresp(new xmlrpcval('', 'string'));
 			}
-		}
-		else
+		} else
 		{
 			$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);
 		}
@@ -295,8 +287,9 @@ 
 		// base64 or datetime values, but they will be listed as strings here...
 		//$numParams = count($call['params']);
 		$pt = array();
-		foreach($call['params'] as $val)
-			$pt[] = php_2_xmlrpc_type(gettype($val));
+		foreach($call['params'] as $val) {
+					$pt[] = php_2_xmlrpc_type(gettype($val));
+		}
 
 		$result = $server->execute($call['methodName'], $call['params'], $pt);
 
@@ -321,8 +314,7 @@ 
 				$call = $calls->arraymem($i);
 				$result[$i] = _xmlrpcs_multicall_do_call($server, $call);
 			}
-		}
-		else
+		} else
 		{
 			$numCalls=count($m);
 			for($i = 0; $i < $numCalls; $i++)
@@ -377,8 +369,9 @@ 
 	function _xmlrpcs_errorHandler($errcode, $errstring, $filename=null, $lineno=null, $context=null)
 	{
 		// obey the @ protocol
-		if (error_reporting() == 0)
-			return;
+		if (error_reporting() == 0) {
+					return;
+		}
 
 		//if($errcode != E_NOTICE && $errcode != E_WARNING && $errcode != E_USER_NOTICE && $errcode != E_USER_WARNING)
 		if($errcode != E_STRICT)
@@ -395,8 +388,7 @@ 
 			{
 				error_log($errstring);
 			}
-		}
-		else
+		} else
 		{
 			// Pass control on to previous error handler, trying to avoid loops...
 			if($GLOBALS['_xmlrpcs_prev_ehandler'] != '_xmlrpcs_errorHandler')
@@ -406,8 +398,7 @@ 
 				{
 					// the following works both with static class methods and plain object methods as error handler
 					call_user_func_array($GLOBALS['_xmlrpcs_prev_ehandler'], array($errcode, $errstring, $filename, $lineno, $context));
-				}
-				else
+				} else
 				{
 					$GLOBALS['_xmlrpcs_prev_ehandler']($errcode, $errstring, $filename, $lineno, $context);
 				}
@@ -663,8 +654,7 @@ 
 						$payload = gzencode($payload);
 						header("Content-Encoding: gzip");
 						header("Vary: Accept-Encoding");
-					}
-					elseif (strpos($resp_encoding, 'deflate') !== false)
+					} elseif (strpos($resp_encoding, 'deflate') !== false)
 					{
 						$payload = gzcompress($payload);
 						header("Content-Encoding: deflate");
@@ -678,8 +668,7 @@ 
 				{
 					header('Content-Length: ' . (int)strlen($payload));
 				}
-			}
-			else
+			} else
 			{
 				error_log('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
 			}
@@ -728,8 +717,7 @@ 
 			if (is_object($in))
 			{
 				$numParams = $in->getNumParams();
-			}
-			else
+			} else
 			{
 				$numParams = count($in);
 			}
@@ -746,13 +734,11 @@ 
 							if($p->kindOf() == 'scalar')
 							{
 								$pt=$p->scalartyp();
-							}
-							else
+							} else
 							{
 								$pt=$p->kindOf();
 							}
-						}
-						else
+						} else
 						{
 							$pt= $in[$n] == 'i4' ? 'int' : strtolower($in[$n]); // dispatch maps never use i4...
 						}
@@ -813,8 +799,7 @@ 
 			if(isset($_SERVER['HTTP_CONTENT_ENCODING']))
 			{
 				$content_encoding = str_replace('x-', '', $_SERVER['HTTP_CONTENT_ENCODING']);
-			}
-			else
+			} else
 			{
 				$content_encoding = '';
 			}
@@ -834,20 +819,18 @@ 
 							{
 								$this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");
 							}
-						}
-						elseif($content_encoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
+						} elseif($content_encoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
 						{
 							$data = $degzdata;
-							if($this->debug > 1)
-								$this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");
-						}
-						else
+							if($this->debug > 1) {
+															$this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");
+							}
+						} else
 						{
 							$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_decompress_fail'], $GLOBALS['xmlrpcstr']['server_decompress_fail']);
 							return $r;
 						}
-					}
-					else
+					} else
 					{
 						//error_log('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
 						$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_cannot_decompress'], $GLOBALS['xmlrpcstr']['server_cannot_decompress']);
@@ -871,18 +854,19 @@ 
 					$known_charsets = array($GLOBALS['xmlrpc_internalencoding'], 'UTF-8', 'ISO-8859-1', 'US-ASCII');
 					foreach ($known_charsets as $charset)
 					{
-						foreach ($client_accepted_charsets as $accepted)
-							if (strpos($accepted, $charset) === 0)
+						foreach ($client_accepted_charsets as $accepted) {
+													if (strpos($accepted, $charset) === 0)
 							{
 								$resp_encoding = $charset;
+						}
 								break;
 							}
-						if ($resp_encoding)
-							break;
+						if ($resp_encoding) {
+													break;
+						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$resp_encoding = $this->response_charset_encoding;
 			}
@@ -890,8 +874,7 @@ 
 			if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 			{
 				$resp_compression = $_SERVER['HTTP_ACCEPT_ENCODING'];
-			}
-			else
+			} else
 			{
 				$resp_compression = '';
 			}
@@ -968,16 +951,16 @@ 
 			if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
 			{
 				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');
-			}
-			else
+			} else
 			{
 				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);
 			}
 
-			if ($this->functions_parameters_type != 'xmlrpcvals')
-				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');
-			else
-				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');
+			if ($this->functions_parameters_type != 'xmlrpcvals') {
+							xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');
+			} else {
+							xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');
+			}
 			xml_set_character_data_handler($parser, 'xmlrpc_cd');
 			xml_set_default_handler($parser, 'xmlrpc_dh');
 			if(!xml_parse($parser, $data, 1))
@@ -989,15 +972,13 @@ 
 					xml_error_string(xml_get_error_code($parser)),
 					xml_get_current_line_number($parser), xml_get_current_column_number($parser)));
 				xml_parser_free($parser);
-			}
-			elseif ($GLOBALS['_xh']['isf'])
+			} elseif ($GLOBALS['_xh']['isf'])
 			{
 				xml_parser_free($parser);
 				$r=new xmlrpcresp(0,
 					$GLOBALS['xmlrpcerr']['invalid_request'],
 					$GLOBALS['xmlrpcstr']['invalid_request'] . ' ' . $GLOBALS['_xh']['isf_reason']);
-			}
-			else
+			} else
 			{
 				xml_parser_free($parser);
 				// small layering violation in favor of speed and memory usage:
@@ -1011,8 +992,7 @@ 
 						$this->debugmsg("\n+++PARSED+++\n".var_export($GLOBALS['_xh']['params'], true)."\n+++END+++");
 					}
 					$r = $this->execute($GLOBALS['_xh']['method'], $GLOBALS['_xh']['params'], $GLOBALS['_xh']['pt']);
-				}
-				else
+				} else
 				{
 					// build an xmlrpcmsg object with data parsed from xml
 					$m=new xmlrpcmsg($GLOBALS['_xh']['method']);
@@ -1045,8 +1025,7 @@ 
 			if (is_object($m))
 			{
 				$methName = $m->method();
-			}
-			else
+			} else
 			{
 				$methName = $m;
 			}
@@ -1068,8 +1047,7 @@ 
 				if (is_object($m))
 				{
 					list($ok, $errstr) = $this->verifySignature($m, $sig);
-				}
-				else
+				} else
 				{
 					list($ok, $errstr) = $this->verifySignature($paramtypes, $sig);
 				}
@@ -1115,8 +1093,7 @@ 
 					if ($sysCall)
 					{
 						$r = call_user_func($func, $this, $m);
-					}
-					else
+					} else
 					{
 						$r = call_user_func($func, $m);
 					}
@@ -1126,8 +1103,7 @@ 
 						if (is_a($r, 'xmlrpcval'))
 						{
 							$r = new xmlrpcresp($r);
-						}
-						else
+						} else
 						{
 							$r = new xmlrpcresp(
 								0,
@@ -1136,16 +1112,14 @@ 
 							);
 						}
 					}
-				}
-				else
+				} else
 				{
 					// call a 'plain php' function
 					if($sysCall)
 					{
 						array_unshift($params, $this);
 						$r = call_user_func_array($func, $params);
-					}
-					else
+					} else
 					{
 						// 3rd API convention for method-handling functions: EPI-style
 						if ($this->functions_parameters_type == 'epivals')
@@ -1156,15 +1130,13 @@ 
 							if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r))
 							{
 								$r = new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']);
-							}
-							else
+							} else
 							{
 								// functions using EPI api should NOT return resp objects,
 								// so make sure we encode the return type correctly
 								$r = new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api')));
 							}
-						}
-						else
+						} else
 						{
 							$r = call_user_func_array($func, $params);
 						}
@@ -1177,8 +1149,7 @@ 
 						$r = new xmlrpcresp(php_xmlrpc_encode($r, $this->phpvals_encoding_options));
 					}
 				}
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				// (barring errors in the lib) an uncatched exception happened
 				// in the called function, we wrap it in a proper error-response
@@ -1201,8 +1172,7 @@ 
 				if($GLOBALS['_xmlrpcs_prev_ehandler'])
 				{
 					set_error_handler($GLOBALS['_xmlrpcs_prev_ehandler']);
-				}
-				else
+				} else
 				{
 					restore_error_handler();
 				}
@@ -1228,8 +1198,7 @@ 
 			if ($charset_encoding != '')
 			{
 				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\"?" . ">\n";
-			}
-			else
+			} else
 			{
 				return "<?xml version=\"1.0\"?" . ">\n";
 			}