FATCHIP-GmbH / plugin-shopware5-klarna-checkout

Components/Klarna/Klarna.php

Braces +3 added lines, -6 removed lines

@@ -3429,8 +3429,7 @@ 
             //Attempt to load previously stored pclasses, so they aren't
             // accidentially removed.
             $pclasses->load($this->pcURI);
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             self::printDebug('load pclasses', $e->getMessage());
         }
 
@@ -3779,12 +3778,10 @@ 
             }
 
             return php_xmlrpc_decode($xmlrpcresp->value());
-        }
-        catch(KlarnaException $e) {
+        } catch(KlarnaException $e) {
             //Otherwise it is caught below, and rethrown.
             throw $e;
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             throw new KlarnaException($e->getMessage(), $e->getCode());
         }
     }

Models/lightConnector.php

Braces +14 added lines, -7 removed lines

@@ -5,7 +5,8 @@ 
  *
  * @author andre
  */
-class lightConnector {
+class lightConnector
+{
 
     /**
      * Connecting method
@@ -45,7 +46,8 @@ 
      * @param type $config
      * @param type $method
      */
-    public function __construct($config, $method = null) {
+    public function __construct($config, $method = null)
+    {
         parent::__construct();
         $this->method = $method;
         $this->config = $config;
@@ -57,7 +59,8 @@ 
      * @param string $method
      * @return void
      */
-    public function setMethod($method) {
+    public function setMethod($method)
+    {
         $this->method = $method;
     }
 
@@ -67,7 +70,8 @@ 
      * @param string $klarnaOrderId
      * @return void
      */
-    public function setKlarnaOrderId($klarnaOrderId) {
+    public function setKlarnaOrderId($klarnaOrderId)
+    {
         $this->klarnaOrderId = $klarnaOrderId;
     }
 
@@ -76,7 +80,8 @@ 
      * 
      * @param string $transactionId
      */
-    public function setTransactionId($transactionId) {
+    public function setTransactionId($transactionId)
+    {
         $this->transactionId = $transactionId;
     }
 
@@ -87,7 +92,8 @@ 
      * @param array $shippingAddress
      * @return void
      */
-    public function updateCustomerAddress($billingAddress, $shippingAddress = false) {
+    public function updateCustomerAddress($billingAddress, $shippingAddress = false)
+    {
         $aAddressParts = array('');
     }
     
@@ -96,7 +102,8 @@ 
      * 
      * @param array $data
      */
-    protected function setCall($data) {
+    protected function setCall($data)
+    {
         $testdrive = $this->config->get('testDrive');
         $url = ($testdrive) ? $this->apiUrl['test'] : $this->apiUrl['live'];
         

Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpc.inc

Braces +447 added lines, -875 removed lines

@@ -35,12 +35,10 @@ 
 // 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');
 		}
 	}
@@ -112,13 +110,11 @@ 
 	$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.';';
 	}
@@ -256,14 +252,12 @@ 
 	*/
 	function xmlrpc_encode_entitites($data, $src_encoding='', $dest_encoding='')
 	{
-		if ($src_encoding == '')
-		{
+		if ($src_encoding == '') {
 			// lame, but we know no better...
 			$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':
 				$escaped_data = str_replace(array('&', '"', "'", '<', '>'), array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'), $data);
@@ -290,15 +284,13 @@ 
 	// be kind to users creating string xmlrpcvals out of different php types
 	$data = (string) $data;
 	$ns = strlen ($data);
-	for ($nn = 0; $nn < $ns; $nn++)
-	{
+	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,8 +311,7 @@ 
 			} // 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);
@@ -330,8 +321,7 @@ 
 			$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);
@@ -343,8 +333,7 @@ 
 			$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]);
 			$b2 = ($ii & 63);
@@ -389,41 +378,32 @@ 
 	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
 			/// @todo optimization creep: save this check into a bool variable, instead of using count() every time:
 			///       there is only a single top level element in xml anyway
-			if (count($GLOBALS['_xh']['stack']) == 0)
-			{
+			if (count($GLOBALS['_xh']['stack']) == 0) {
 				if ($name != 'METHODRESPONSE' && $name != 'METHODCALL' && (
-					$name != 'VALUE' && !$accept_single_vals))
-				{
+					$name != 'VALUE' && !$accept_single_vals)) {
 					$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']);
-				if (!array_key_exists($name, $GLOBALS['xmlrpc_valid_parents']) || !in_array($parent, $GLOBALS['xmlrpc_valid_parents'][$name]))
-				{
+				if (!array_key_exists($name, $GLOBALS['xmlrpc_valid_parents']) || !in_array($parent, $GLOBALS['xmlrpc_valid_parents'][$name])) {
 					$GLOBALS['_xh']['isf'] = 2;
 					$GLOBALS['_xh']['isf_reason'] = "xmlrpc element $name cannot be child of $parent";
 					return;
 				}
 			}
 
-			switch($name)
-			{
+			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
@@ -439,8 +419,7 @@ 
 				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";
@@ -450,8 +429,7 @@ 
 					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;
 						$GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
@@ -463,16 +441,14 @@ 
 					$cur_val['type'] = $name;
 					// check for out-of-band information to rebuild php objs
 					// and in case it is found, save it
-					if (@isset($attrs['PHP_CLASS']))
-					{
+					if (@isset($attrs['PHP_CLASS'])) {
 						$cur_val['php_class'] = $attrs['PHP_CLASS'];
 					}
 					$GLOBALS['_xh']['valuestack'][] = $cur_val;
 					$GLOBALS['_xh']['vt']='data'; // be prepared for a data element next
 					break;
 				case 'DATA':
-					if ($GLOBALS['_xh']['vt']!='data')
-					{
+					if ($GLOBALS['_xh']['vt']!='data') {
 						//two data elements inside a value: an error occurred!
 						$GLOBALS['_xh']['isf'] = 2;
 						$GLOBALS['_xh']['isf_reason'] = "found two data elements inside an array element";
@@ -501,10 +477,8 @@ 
 					break;
 				case 'NIL':
 				case 'EX:NIL':
-					if ($GLOBALS['xmlrpc_null_extension'])
-					{
-						if ($GLOBALS['_xh']['vt']!='value')
-						{
+					if ($GLOBALS['xmlrpc_null_extension']) {
+						if ($GLOBALS['_xh']['vt']!='value') {
 							//two data elements inside a value: an error occurred!
 							$GLOBALS['_xh']['isf'] = 2;
 							$GLOBALS['_xh']['isf_reason'] = "$name element following a {$GLOBALS['_xh']['vt']} element inside a single value";
@@ -526,8 +500,7 @@ 
 			$GLOBALS['_xh']['stack'][] = $name;
 
 			/// @todo optimization creep: move this inside the big switch() above
-			if($name!='VALUE')
-			{
+			if($name!='VALUE') {
 				$GLOBALS['_xh']['lv']=0;
 			}
 		}
@@ -542,58 +515,48 @@ 
 	/// 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
 			// we do not have to check for $name == $curr_elem.
 			// we also checked for proper nesting at start of elements...
 			$curr_elem = array_pop($GLOBALS['_xh']['stack']);
 
-			switch($name)
-			{
+			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'];
 					}
 
-					if ($rebuild_xmlrpcvals)
-					{
+					if ($rebuild_xmlrpcvals) {
 						// build the xmlrpc val out of the data received, and substitute it
 						$temp = new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']);
 						// in case we got info about underlying php class, save it
 						// in the object we're rebuilding
-						if (isset($GLOBALS['_xh']['php_class']))
-							$temp->_php_class = $GLOBALS['_xh']['php_class'];
+						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')
-						{
+						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,
 						/// which we will not be calling...
-						if (isset($GLOBALS['_xh']['php_class']))
-						{
+						if (isset($GLOBALS['_xh']['php_class'])) {
 						}
 
 						// check if we are inside an array or struct:
 						// if value just built is inside an array, let's move it into array on the stack
 						$vscount = count($GLOBALS['_xh']['valuestack']);
-						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')
-						{
+						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY') {
 							$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $GLOBALS['_xh']['value'];
 						}
 					}
@@ -608,73 +571,53 @@ 
 					$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'];
-					}
-					elseif ($name=='DATETIME.ISO8601')
-					{
-						if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac']))
-						{
+					} elseif ($name=='DATETIME.ISO8601') {
+						if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac'])) {
 							error_log('XML-RPC: invalid value received in DATETIME: '.$GLOBALS['_xh']['ac']);
 						}
 						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];
 						$GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
-					}
-					elseif ($name=='BASE64')
-					{
+					} 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.
 						// Strings 'true' and 'false' are accepted, even though the
 						// spec never mentions them (see eg. Blogger api docs)
 						// NB: this simple checks helps a lot sanitizing input, ie no
 						// security problems around here
-						if ($GLOBALS['_xh']['ac']=='1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)
-						{
+						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
 						// NOTE: regexp could be much stricter than this...
-						if (!preg_match('/^[+-eE0123456789 \t.]+$/', $GLOBALS['_xh']['ac']))
-						{
+						if (!preg_match('/^[+-eE0123456789 \t.]+$/', $GLOBALS['_xh']['ac'])) {
 							/// @todo: find a better way of throwing an error than this!
 							error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);
 							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
-						}
-						else
-						{
+						} 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
-						if (!preg_match('/^[+-]?[0123456789 \t]+$/', $GLOBALS['_xh']['ac']))
-						{
+						if (!preg_match('/^[+-]?[0123456789 \t]+$/', $GLOBALS['_xh']['ac'])) {
 							/// @todo find a better way of throwing an error than this!
 							error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);
 							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
-						}
-						else
-						{
+						} else {
 							// it's ok, add it on
 							$GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];
 						}
@@ -689,12 +632,12 @@ 
 					//$GLOBALS['_xh']['ac']=''; // is this necessary?
 					// add to array in the stack the last element built,
 					// unless no VALUE was found
-					if ($GLOBALS['_xh']['vt'])
-					{
+					if ($GLOBALS['_xh']['vt']) {
 						$vscount = count($GLOBALS['_xh']['valuestack']);
 						$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][$GLOBALS['_xh']['valuestack'][$vscount-1]['name']] = $GLOBALS['_xh']['value'];
-					} else
-						error_log('XML-RPC: missing VALUE inside STRUCT in received xml');
+					} else {
+											error_log('XML-RPC: missing VALUE inside STRUCT in received xml');
+					}
 					break;
 				case 'DATA':
 					//$GLOBALS['_xh']['ac']=''; // is this necessary?
@@ -706,29 +649,26 @@ 
 					$curr_val = array_pop($GLOBALS['_xh']['valuestack']);
 					$GLOBALS['_xh']['value'] = $curr_val['values'];
 					$GLOBALS['_xh']['vt']=strtolower($name);
-					if (isset($curr_val['php_class']))
-					{
+					if (isset($curr_val['php_class'])) {
 						$GLOBALS['_xh']['php_class'] = $curr_val['php_class'];
 					}
 					break;
 				case 'PARAM':
 					// add to array of params the current value,
 					// unless no VALUE was found
-					if ($GLOBALS['_xh']['vt'])
-					{
+					if ($GLOBALS['_xh']['vt']) {
 						$GLOBALS['_xh']['params'][]=$GLOBALS['_xh']['value'];
 						$GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];
+					} else {
+											error_log('XML-RPC: missing VALUE inside PARAM in received xml');
 					}
-					else
-						error_log('XML-RPC: missing VALUE inside PARAM in received xml');
 					break;
 				case 'METHODNAME':
 					$GLOBALS['_xh']['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);
 					break;
 				case 'NIL':
 				case 'EX:NIL':
-					if ($GLOBALS['xmlrpc_null_extension'])
-					{
+					if ($GLOBALS['xmlrpc_null_extension']) {
 						$GLOBALS['_xh']['vt']='null';
 						$GLOBALS['_xh']['value']=null;
 						$GLOBALS['_xh']['lv']=3;
@@ -758,12 +698,10 @@ 
 	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)
 				//{
@@ -786,10 +724,8 @@ 
 	function xmlrpc_dh($parser, $data)
 	{
 		// skip processing if xml fault already detected
-		if ($GLOBALS['_xh']['isf'] < 2)
-		{
-			if(substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';')
-			{
+		if ($GLOBALS['_xh']['isf'] < 2) {
+			if(substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') {
 				// G. Giunta 2006-08-25: useless change of 'lv' from 1 to 2
 				//if($GLOBALS['_xh']['lv']==1)
 				//{
@@ -875,51 +811,39 @@ 
 		function xmlrpc_client($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;
-			}
-			else
-			{
+			} else {
 				$this->path=$path;
 			}
 			$this->server=$server;
-			if($port != '')
-			{
+			if($port != '') {
 				$this->port=$port;
 			}
-			if($method != '')
-			{
+			if($method != '') {
 				$this->method=$method;
 			}
 
@@ -927,8 +851,7 @@ 
 			if(function_exists('gzinflate') || (
 				function_exists('curl_init') && (($info = curl_version()) &&
 				((is_string($info) && strpos($info, 'zlib') !== null) || isset($info['libz_version'])))
-			))
-			{
+			)) {
 				$this->accepted_compression = array('gzip', 'deflate');
 			}
 
@@ -987,12 +910,9 @@ 
 		*/
 		function setCaCertificate($cacert, $is_dir=false)
 		{
-			if ($is_dir)
-			{
+			if ($is_dir) {
 				$this->cacertdir = $cacert;
-			}
-			else
-			{
+			} else {
 				$this->cacert = $cacert;
 			}
 		}
@@ -1059,10 +979,11 @@ 
 		*/
 		function setAcceptedCompression($compmethod)
 		{
-			if ($compmethod == 'any')
-				$this->accepted_compression = array('gzip', 'deflate');
-			else
-				$this->accepted_compression = array($compmethod);
+			if ($compmethod == 'any') {
+							$this->accepted_compression = array('gzip', 'deflate');
+			} else {
+							$this->accepted_compression = array($compmethod);
+			}
 		}
 
 		/**
@@ -1093,15 +1014,12 @@ 
 		function setCookie($name, $value='', $path='', $domain='', $port=null)
 		{
 			$this->cookies[$name]['value'] = urlencode($value);
-			if ($path || $domain || $port)
-			{
+			if ($path || $domain || $port) {
 				$this->cookies[$name]['path'] = $path;
 				$this->cookies[$name]['domain'] = $domain;
 				$this->cookies[$name]['port'] = $port;
 				$this->cookies[$name]['version'] = 1;
-			}
-			else
-			{
+			} else {
 				$this->cookies[$name]['version'] = 0;
 			}
 		}
@@ -1137,19 +1055,15 @@ 
 		{
 			// 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;
 				$msg = $n;
@@ -1158,8 +1072,7 @@ 
 			// where msg is an xmlrpcmsg
 			$msg->debug=$this->debug;
 
-			if($method == 'https')
-			{
+			if($method == 'https') {
 				$r =& $this->sendPayloadHTTPS(
 					$msg,
 					$this->server,
@@ -1181,9 +1094,7 @@ 
 					$this->key,
 					$this->keypass
 				);
-			}
-			elseif($method == 'http11')
-			{
+			} elseif($method == 'http11') {
 				$r =& $this->sendPayloadCURL(
 					$msg,
 					$this->server,
@@ -1204,9 +1115,7 @@ 
 					'http',
 					$this->keepalive
 				);
-			}
-			else
-			{
+			} else {
 				$r =& $this->sendPayloadHTTP10(
 					$msg,
 					$this->server,
@@ -1233,83 +1142,64 @@ 
 			$username='', $password='', $authtype=1, $proxyhost='',
 			$proxyport=0, $proxyusername='', $proxypassword='', $proxyauthtype=1)
 		{
-			if($port==0)
-			{
+			if($port==0) {
 				$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($this->request_compression == 'gzip')
-				{
+			if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate')) {
+				if($this->request_compression == 'gzip') {
 					$a = @gzencode($payload);
-					if($a)
-					{
+					if($a) {
 						$payload = $a;
 						$encoding_hdr = "Content-Encoding: gzip\r\n";
 					}
-				}
-				else
-				{
+				} else {
 					$a = @gzcompress($payload);
-					if($a)
-					{
+					if($a) {
 						$payload = $a;
 						$encoding_hdr = "Content-Encoding: deflate\r\n";
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$encoding_hdr = '';
 			}
 
 			// thanks to Grant Rauscher <grant7@firstworld.net> for this
 			$credentials='';
-			if($username!='')
-			{
+			if($username!='') {
 				$credentials='Authorization: Basic ' . base64_encode($username . ':' . $password) . "\r\n";
-				if ($authtype != 1)
-				{
+				if ($authtype != 1) {
 					error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported with HTTP 1.0');
 				}
 			}
 
 			$accepted_encoding = '';
-			if(is_array($this->accepted_compression) && count($this->accepted_compression))
-			{
+			if(is_array($this->accepted_compression) && count($this->accepted_compression)) {
 				$accepted_encoding = 'Accept-Encoding: ' . implode(', ', $this->accepted_compression) . "\r\n";
 			}
 
 			$proxy_credentials = '';
-			if($proxyhost)
-			{
-				if($proxyport == 0)
-				{
+			if($proxyhost) {
+				if($proxyport == 0) {
 					$proxyport = 8080;
 				}
 				$connectserver = $proxyhost;
 				$connectport = $proxyport;
 				$uri = 'http://'.$server.':'.$port.$this->path;
-				if($proxyusername != '')
-				{
-					if ($proxyauthtype != 1)
-					{
+				if($proxyusername != '') {
+					if ($proxyauthtype != 1) {
 						error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported with HTTP 1.0');
 					}
 					$proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";
 				}
-			}
-			else
-			{
+			} else {
 				$connectserver = $server;
 				$connectport = $port;
 				$uri = $this->path;
@@ -1318,24 +1208,22 @@ 
 			// Cookie generation, as per rfc2965 (version 1 cookies) or
 			// netscape's rules (version 0 cookies)
 			$cookieheader='';
-			if (count($this->cookies))
-			{
+			if (count($this->cookies)) {
 				$version = '';
-				foreach ($this->cookies as $name => $cookie)
-				{
-					if ($cookie['version'])
-					{
+				foreach ($this->cookies as $name => $cookie) {
+					if ($cookie['version']) {
 						$version = ' $Version="' . $cookie['version'] . '";';
 						$cookieheader .= ' ' . $name . '="' . $cookie['value'] . '";';
-						if ($cookie['path'])
-							$cookieheader .= ' $Path="' . $cookie['path'] . '";';
-						if ($cookie['domain'])
-							$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';
-						if ($cookie['port'])
-							$cookieheader .= ' $Port="' . $cookie['port'] . '";';
-					}
-					else
-					{
+						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'] . ";";
 					}
 				}
@@ -1355,52 +1243,40 @@ 
 				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>";
 				// 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);
-			}
-			else
-			{
+			} else {
 				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);
 			}
-			if($fp)
-			{
-				if($timeout>0 && function_exists('stream_set_timeout'))
-				{
+			if($fp) {
+				if($timeout>0 && function_exists('stream_set_timeout')) {
 					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 . ')');
 				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);
 				return $r;
-			}
-			else
-			{
+			} else {
 				// reset errno and errstr on succesful socket connection
 				$this->errstr = '';
 			}
 			// G. Giunta 2005/10/24: close socket before parsing.
 			// should yeld slightly better execution times, and make easier recursive calls (e.g. to follow http redirects)
 			$ipd='';
-			do
-			{
+			do {
 				// shall we check for $data === FALSE?
 				// as per the manual, it signals an error
 				$ipd.=fread($fp, 32768);
@@ -1436,94 +1312,72 @@ 
 			$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']);
 				return $r;
 			}
-			if($method == 'https')
-			{
+			if($method == 'https') {
 				if(($info = curl_version()) &&
-					((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version']))))
-				{
+					((is_string($info) && strpos($info, 'OpenSSL') === null) || (is_array($info) && !isset($info['ssl_version'])))) {
 					$this->errstr='SSL unavailable on this install';
 					$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['no_ssl'], $GLOBALS['xmlrpcstr']['no_ssl']);
 					return $r;
 				}
 			}
 
-			if($port == 0)
-			{
-				if($method == 'http')
-				{
+			if($port == 0) {
+				if($method == 'http') {
 					$port = 80;
-				}
-				else
-				{
+				} else {
 					$port = 443;
 				}
 			}
 
 			// 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($this->request_compression == 'gzip')
-				{
+			if(function_exists('gzdeflate') && ($this->request_compression == 'gzip' || $this->request_compression == 'deflate')) {
+				if($this->request_compression == 'gzip') {
 					$a = @gzencode($payload);
-					if($a)
-					{
+					if($a) {
 						$payload = $a;
 						$encoding_hdr = 'Content-Encoding: gzip';
 					}
-				}
-				else
-				{
+				} else {
 					$a = @gzcompress($payload);
-					if($a)
-					{
+					if($a) {
 						$payload = $a;
 						$encoding_hdr = 'Content-Encoding: deflate';
 					}
 				}
-			}
-			else
-			{
+			} else {
 				$encoding_hdr = '';
 			}
 
-			if($this->debug > 1)
-			{
+			if($this->debug > 1) {
 				print "<PRE>\n---SENDING---\n" . htmlentities($payload) . "\n---END---\n</PRE>";
 				// let the client see this now in case http times out...
 				flush();
 			}
 
-			if(!$keepalive || !$this->xmlrpc_curl_handle)
-			{
+			if(!$keepalive || !$this->xmlrpc_curl_handle) {
 				$curl = curl_init($method . '://' . $server . ':' . $port . $this->path);
-				if($keepalive)
-				{
+				if($keepalive) {
 					$this->xmlrpc_curl_handle = $curl;
 				}
-			}
-			else
-			{
+			} else {
 				$curl = $this->xmlrpc_curl_handle;
 			}
 
 			// results into variable
 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
 
-			if($this->debug)
-			{
+			if($this->debug) {
 				curl_setopt($curl, CURLOPT_VERBOSE, 1);
 			}
 			curl_setopt($curl, CURLOPT_USERAGENT, $this->user_agent);
@@ -1539,81 +1393,65 @@ 
 			// 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 ?)
-				if (count($this->accepted_compression) == 1)
-				{
+				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));
 			// 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);
 			}
 
-			if($username && $password)
-			{
+			if($username && $password) {
 				curl_setopt($curl, CURLOPT_USERPWD, $username.':'.$password);
-				if (defined('CURLOPT_HTTPAUTH'))
-				{
+				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');
 				}
 			}
 
-			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);
 				}
 				// whether to verify cert's common name (CN); 0 for no, 1 to verify that it exists, and 2 to verify that it matches the hostname used
@@ -1621,23 +1459,17 @@ 
 			}
 
 			// proxy info
-			if($proxyhost)
-			{
-				if($proxyport == 0)
-				{
+			if($proxyhost) {
+				if($proxyport == 0) {
 					$proxyport = 8080; // NB: even for HTTPS, local connection is on port 8080
 				}
 				curl_setopt($curl, CURLOPT_PROXY, $proxyhost.':'.$proxyport);
 				//curl_setopt($curl, CURLOPT_PROXYPORT,$proxyport);
-				if($proxyusername)
-				{
+				if($proxyusername) {
 					curl_setopt($curl, CURLOPT_PROXYUSERPWD, $proxyusername.':'.$proxypassword);
-					if (defined('CURLOPT_PROXYAUTH'))
-					{
+					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');
 					}
 				}
@@ -1646,45 +1478,40 @@ 
 			// NB: should we build cookie http headers by hand rather than let CURL do it?
 			// the following code does not honour 'expires', 'path' and 'domain' cookie attributes
 			// set to client obj the the user...
-			if (count($this->cookies))
-			{
+			if (count($this->cookies)) {
 				$cookieheader = '';
-				foreach ($this->cookies as $name => $cookie)
-				{
+				foreach ($this->cookies as $name => $cookie) {
 					$cookieheader .= $name . '=' . $cookie['value'] . '; ';
 				}
 				curl_setopt($curl, CURLOPT_COOKIE, substr($cookieheader, 0, -2));
 			}
 
-			foreach ($this->extracurlopts as $opt => $val)
-			{
+			foreach ($this->extracurlopts as $opt => $val) {
 				curl_setopt($curl, $opt, $val);
 			}
 
 			$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)
-					 print $name . ': ' . htmlentities($val). "\n";
+				foreach(curl_getinfo($curl) as $name => $val) {
+									 print $name . ': ' . htmlentities($val). "\n";
+				}
 				print "---END---\n</PRE>";
 			}
 
-			if(!$result) /// @todo we should use a better check here - what if we get back '' or '0'?
+			if(!$result) {
+			    /// @todo we should use a better check here - what if we get back '' or '0'?
 			{
 				$this->errstr='no response';
+			}
 				$resp=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['curl_fail'], $GLOBALS['xmlrpcstr']['curl_fail']. ': '. curl_error($curl));
 				curl_close($curl);
-				if($keepalive)
-				{
+				if($keepalive) {
 					$this->xmlrpc_curl_handle = null;
 				}
-			}
-			else
-			{
-				if(!$keepalive)
-				{
+			} else {
+				if(!$keepalive) {
 					curl_close($curl);
 				}
 				$resp =& $msg->parseResponse($result, true, $this->return_type);
@@ -1716,64 +1543,46 @@ 
 		*/
 		function multicall($msgs, $timeout=0, $method='', $fallback=true)
 		{
-			if ($method == '')
-			{
+			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;
-				}
-				else
-				{
+				} else {
 					// either system.multicall is unsupported by server,
 					// or call failed for some other reason.
-					if ($fallback)
-					{
+					if ($fallback) {
 						// Don't try it next time...
 						$this->no_multicall = true;
-					}
-					else
-					{
-						if (is_a($results, 'xmlrpcresp'))
-						{
+					} 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
 				$fallback = true;
 			}
 
 			$results = array();
-			if ($fallback)
-			{
+			if ($fallback) {
 				// 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);
 				}
-			}
-			else
-			{
+			} else {
 				// user does NOT want to fallback on many single calls:
 				// since we should always return an array of responses,
 				// return an array with the same error repeated n times
-				foreach($msgs as $msg)
-				{
+				foreach($msgs as $msg) {
 					$results[] = $result;
 				}
 			}
@@ -1790,13 +1599,11 @@ 
 		{
 			// Construct multicall message
 			$calls = array();
-			foreach($msgs as $msg)
-			{
+			foreach($msgs as $msg) {
 				$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);
 				}
 				$call['params'] = new xmlrpcval($params, 'array');
@@ -1808,8 +1615,7 @@ 
 			// Attempt RPC call
 			$result =& $this->send($multicall, $timeout, $method);
 
-			if($result->faultCode() != 0)
-			{
+			if($result->faultCode() != 0) {
 				// call to system.multicall failed
 				return $result;
 			}
@@ -1817,36 +1623,28 @@ 
 			// Unpack responses.
 			$rets = $result->value();
 
-			if ($this->return_type == 'xml')
-			{
+			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();
-				if(!is_array($rets))
-				{
+				if(!is_array($rets)) {
 					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.
 				}
 
 				$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
 							}
 							// Normal return value
@@ -1855,13 +1653,11 @@ 
 						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;
 							}
 							$response[$i] = new xmlrpcresp(0, $code, $str);
@@ -1871,29 +1667,23 @@ 
 					}
 				}
 				return $response;
-			}
-			else // return type == 'xmlrpcvals'
+			} else // return type == 'xmlrpcvals'
 			{
 				$rets = $result->value();
-				if($rets->kindOf() != 'array')
-				{
+				if($rets->kindOf() != 'array') {
 					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.
 				}
 
 				$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
 							}
 							// Normal return value
@@ -1901,13 +1691,11 @@ 
 							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;
 							}
 							$response[$i] = new xmlrpcresp(0, $code->scalarval(), $str->scalarval());
@@ -1945,36 +1733,25 @@ 
 		*/
 		function xmlrpcresp($val, $fcode = 0, $fstr = '', $valtyp='')
 		{
-			if($fcode != 0)
-			{
+			if($fcode != 0) {
 				// error response
 				$this->errno = $fcode;
 				$this->errstr = $fstr;
 				//$this->errstr = htmlspecialchars($fstr); // XXX: encoding probably shouldn't be done here; fix later.
-			}
-			else
-			{
+			} else {
 				// successful response
 				$this->val = $val;
-				if ($valtyp == '')
-				{
+				if ($valtyp == '') {
 					// user did not declare type of response value: try to guess it
-					if (is_object($this->val) && is_a($this->val, 'xmlrpcval'))
-					{
+					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;
 				}
@@ -2035,13 +1812,13 @@ 
 		*/
 		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';
+			}
 			$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" .
@@ -2049,25 +1826,17 @@ 
 "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
 xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</string></value>\n</member>\n" .
 "</struct>\n</value>\n</fault>";
-			}
-			else
-			{
-				if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))
-				{
-					if (is_string($this->val) && $this->valtyp == 'xml')
-					{
+			} else {
+				if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval')) {
+					if (is_string($this->val) && $this->valtyp == 'xml') {
 						$result .= "<params>\n<param>\n" .
 							$this->val .
 							"</param>\n</params>";
-					}
-					else
-					{
+					} 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) .
 						"</param>\n</params>";
@@ -2094,10 +1863,8 @@ 
 		function xmlrpcmsg($meth, $pars=0)
 		{
 			$this->methodname=$meth;
-			if(is_array($pars) && count($pars)>0)
-			{
-				for($i=0; $i<count($pars); $i++)
-				{
+			if(is_array($pars) && count($pars)>0) {
+				for($i=0; $i<count($pars); $i++) {
 					$this->addParam($pars[$i]);
 				}
 			}
@@ -2108,12 +1875,9 @@ 
 		*/
 		function xml_header($charset_encoding='')
 		{
-			if ($charset_encoding != '')
-			{
+			if ($charset_encoding != '') {
 				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\" ?" . ">\n<methodCall>\n";
-			}
-			else
-			{
+			} else {
 				return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
 			}
 		}
@@ -2139,15 +1903,15 @@ 
 		*/
 		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>' . $this->methodname . "</methodName>\n";
 			$this->payload.="<params>\n";
-			for($i=0; $i<count($this->params); $i++)
-			{
+			for($i=0; $i<count($this->params); $i++) {
 				$p=$this->params[$i];
 				$this->payload.="<param>\n" . $p->serialize($charset_encoding) .
 				"</param>\n";
@@ -2164,8 +1928,7 @@ 
 		*/
 		function method($meth='')
 		{
-			if($meth!='')
-			{
+			if($meth!='') {
 				$this->methodname=$meth;
 			}
 			return $this->methodname;
@@ -2191,13 +1954,10 @@ 
 		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;
 				return true;
-			}
-			else
-			{
+			} else {
 				return false;
 			}
 		}
@@ -2208,14 +1968,18 @@ 
 		* @return xmlrpcval the i-th parameter
 		* @access public
 		*/
-		function getParam($i) { return $this->params[$i]; }
+		function getParam($i)
+		{
+return $this->params[$i]; }
 
 		/**
 		* Returns the number of parameters in the messge.
 		* @return integer the number of parameters currently set
 		* @access public
 		*/
-		function getNumParams() { return count($this->params); }
+		function getNumParams()
+		{
+return count($this->params); }
 
 		/**
 		* Given an open file handle, read all data available and parse it as axmlrpc response.
@@ -2232,8 +1996,7 @@ 
 		function &parseResponseFile($fp)
 		{
 			$ipd='';
-			while($data=fread($fp, 32768))
-			{
+			while($data=fread($fp, 32768)) {
 				$ipd.=$data;
 			}
 			//fclose($fp);
@@ -2248,36 +2011,26 @@ 
 		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))
-					{
+					if($pos || is_int($pos)) {
 						$bd = $pos+4;
-					}
-					else
-					{
+					} else {
 						$pos = strpos($data,"\n\n");
-						if($pos || is_int($pos))
-						{
+						if($pos || is_int($pos)) {
 							$bd = $pos+2;
-						}
-						else
-						{
+						} else {
 							// No separation between response headers and body: fault?
 							$bd = 0;
 						}
 					}
-					if ($bd)
-					{
+					if ($bd) {
 						// 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)');
 						return $r;
@@ -2285,19 +2038,19 @@ 
 				}
 
 				// 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 . ')');
@@ -2310,19 +2063,13 @@ 
 				// 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))
-				{
+				if($pos || is_int($pos)) {
 					$bd = $pos+4;
-				}
-				else
-				{
+				} else {
 					$pos = strpos($data,"\n\n");
-					if($pos || is_int($pos))
-					{
+					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...
 						$bd = 0;
@@ -2330,70 +2077,55 @@ 
 				}
 				// 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)
-					{
+					if(count($arr) > 1) {
 						$header_name = strtolower(trim($arr[0]));
 						/// @todo some other headers (the ones that allow a CSV list of values)
 						/// do allow many values to be passed using multiple header lines.
 						/// We should add content to $GLOBALS['_xh']['headers'][$header_name]
 						/// instead of replacing it for those...
-						if ($header_name == 'set-cookie' || $header_name == 'set-cookie2')
-						{
-							if ($header_name == 'set-cookie2')
-							{
+						if ($header_name == 'set-cookie' || $header_name == 'set-cookie2') {
+							if ($header_name == 'set-cookie2') {
 								// version 2 cookies:
 								// there could be many cookies on one line, comma separated
 								$cookies = explode(',', $arr[1]);
-							}
-							else
-							{
+							} else {
 								$cookies = array($arr[1]);
 							}
-							foreach ($cookies as $cookie)
-							{
+							foreach ($cookies as $cookie) {
 								// glue together all received cookies, using a comma to separate them
 								// (same as php does with getallheaders())
-								if (isset($GLOBALS['_xh']['headers'][$header_name]))
-									$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);
-								else
-									$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);
+								if (isset($GLOBALS['_xh']['headers'][$header_name])) {
+																	$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);
+								} else {
+																	$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);
+								}
 								// parse cookie attributes, in case user wants to correctly honour them
 								// feature creep: only allow rfc-compliant cookie attributes?
 								// @todo support for server sending multiple time cookie with same name, but using different PATHs
 								$cookie = explode(';', $cookie);
-								foreach ($cookie as $pos => $val)
-								{
+								foreach ($cookie as $pos => $val) {
 									$val = explode('=', $val, 2);
 									$tag = trim($val[0]);
 									$val = trim(@$val[1]);
 									/// @todo with version 1 cookies, we should strip leading and trailing " chars
-									if ($pos == 0)
-									{
+									if ($pos == 0) {
 										$cookiename = $tag;
 										$GLOBALS['_xh']['cookies'][$tag] = array();
 										$GLOBALS['_xh']['cookies'][$cookiename]['value'] = urldecode($val);
-									}
-									else
-									{
-										if ($tag != 'value')
-										{
+									} else {
+										if ($tag != 'value') {
 										  $GLOBALS['_xh']['cookies'][$cookiename][$tag] = $val;
 										}
 									}
 								}
 							}
-						}
-						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);
 					}
@@ -2401,15 +2133,12 @@ 
 
 				$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");
 					}
 					print "</PRE>\n";
@@ -2417,13 +2146,10 @@ 
 
 				// 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(!$data = decode_chunked($data))
-						{
+					if(isset($GLOBALS['_xh']['headers']['transfer-encoding']) && $GLOBALS['_xh']['headers']['transfer-encoding'] == 'chunked') {
+						if(!$data = decode_chunked($data)) {
 							error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
 							$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['dechunk_fail'], $GLOBALS['xmlrpcstr']['dechunk_fail']);
 							return $r;
@@ -2432,35 +2158,27 @@ 
 
 					// 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($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))
-								{
+							if(function_exists('gzinflate')) {
+								if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
 									$data = $degzdata;
-									if($this->debug)
-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
-								}
-								elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
-								{
+									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']);
 								return $r;
@@ -2485,14 +2203,12 @@ 
 		*/
 		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>";
 			}
 
-			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;
@@ -2502,28 +2218,22 @@ 
 
 			$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);
-				if ($r)
-				{
+				if ($r) {
 					// failed processing of HTTP response headers
 					// save into response obj the full payload received, for debugging
 					$r->raw_data = $data;
 					return $r;
 				}
-			}
-			else
-			{
+			} else {
 				$GLOBALS['_xh']['headers'] = array();
 				$GLOBALS['_xh']['cookies'] = array();
 			}
 
-			if($this->debug)
-			{
+			if($this->debug) {
 				$start = strpos($data, '<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
-				if ($start)
-				{
+				if ($start) {
 					$start += strlen('<!-- SERVER DEBUG INFO (BASE64 ENCODED):');
 					$end = strpos($data, '-->', $start);
 					$comments = substr($data, $start, $end-$start);
@@ -2539,14 +2249,12 @@ 
 			// 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);
 			}
 
 			// if user wants back raw xml, give it to him
-			if ($return_type == 'xml')
-			{
+			if ($return_type == 'xml') {
 				$r = new xmlrpcresp($data, 0, '', 'xml');
 				$r->hdrs = $GLOBALS['_xh']['headers'];
 				$r->_cookies = $GLOBALS['_xh']['cookies'];
@@ -2567,12 +2275,13 @@ 
 
 			// if response charset encoding is not known / supported, try to use
 			// the default encoding and parse the xml anyway, but log a warning...
-			if (!in_array($resp_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
-			// the following code might be better for mb_string enabled installs, but
+			if (!in_array($resp_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII'))) {
+						// the following code might be better for mb_string enabled installs, but
 			// makes the lib about 200% slower...
 			//if (!is_valid_charset($resp_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
 			{
 				error_log('XML-RPC: '.__METHOD__.': invalid charset encoding of received response: '.$resp_encoding);
+			}
 				$resp_encoding = $GLOBALS['xmlrpc_defencoding'];
 			}
 			$parser = xml_parser_create($resp_encoding);
@@ -2583,21 +2292,15 @@ 
 			// we use the broadest one, ie. utf8
 			// This allows to send data which is native in various charset,
 			// by extending xmlrpc_encode_entitites() and setting xmlrpc_internalencoding
-			if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
-			{
+			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 ($return_type == 'phpvals')
-			{
+			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');
 			}
 
@@ -2605,15 +2308,11 @@ 
 			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';
-				}
-				else
-				{
+				} else {
 					$errstr = sprintf('XML error: %s at line %d, column %d',
 						xml_error_string(xml_get_error_code($parser)),
 						xml_get_current_line_number($parser), xml_get_current_column_number($parser));
@@ -2621,8 +2320,7 @@ 
 				error_log($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;
 				}
 				$r->hdrs = $GLOBALS['_xh']['headers'];
@@ -2632,10 +2330,8 @@ 
 			}
 			xml_parser_free($parser);
 			// second error check: xml well formed but not xml-rpc compliant
-			if ($GLOBALS['_xh']['isf'] > 1)
-			{
-				if ($this->debug)
-				{
+			if ($GLOBALS['_xh']['isf'] > 1) {
+				if ($this->debug) {
 					/// @todo echo something for user?
 				}
 
@@ -2644,18 +2340,14 @@ 
 			}
 			// third error check: parsing of the response has somehow gone boink.
 			// NB: shall we omit this check, since we trust the parsing code?
-			elseif ($return_type == 'xmlrpcvals' && !is_object($GLOBALS['_xh']['value']))
-			{
+			elseif ($return_type == 'xmlrpcvals' && !is_object($GLOBALS['_xh']['value'])) {
 				// something odd has happened
 				// and it's time to generate a client side error
 				// indicating something odd went on
 				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],
 					$GLOBALS['xmlrpcstr']['invalid_return']);
-			}
-			else
-			{
-				if ($this->debug)
-				{
+			} else {
+				if ($this->debug) {
 					print "<PRE>---PARSED---\n";
 					// somehow htmlentities chokes on var_export, and some full html string...
 					//print htmlentitites(var_export($GLOBALS['_xh']['value'], true));
@@ -2666,33 +2358,26 @@ 
 				// note that using =& will raise an error if $GLOBALS['_xh']['st'] does not generate an object.
 				$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...
-					if ($return_type == 'xmlrpcvals')
-					{
+					if ($return_type == 'xmlrpcvals') {
 						$errno_v = $v->structmem('faultCode');
 						$errstr_v = $v->structmem('faultString');
 						$errno = $errno_v->scalarval();
 						$errstr = $errstr_v->scalarval();
-					}
-					else
-					{
+					} else {
 						$errno = $v['faultCode'];
 						$errstr = $v['faultString'];
 					}
 
-					if($errno == 0)
-					{
+					if($errno == 0) {
 						// FAULT returned, errno needs to reflect that
 						$errno = -1;
 					}
 
 					$r = new xmlrpcresp(0, $errno, $errstr);
-				}
-				else
-				{
+				} else {
 					$r=new xmlrpcresp($v, 0, '', $return_type);
 				}
 			}
@@ -2718,11 +2403,9 @@ 
 		{
 			/// @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;
@@ -2777,8 +2460,7 @@ 
 		function addScalar($val, $type='string')
 		{
 			$typeof=@$GLOBALS['xmlrpcTypes'][$type];
-			if($typeof!=1)
-			{
+			if($typeof!=1) {
 				error_log("XML-RPC: ".__METHOD__.": not a scalar type ($type)");
 				return 0;
 			}
@@ -2786,20 +2468,15 @@ 
 			// coerce booleans into correct values
 			// NB: we should either do it for datetimes, integers and doubles, too,
 			// or just plain remove this check, implemented on booleans only...
-			if($type==$GLOBALS['xmlrpcBoolean'])
-			{
-				if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))
-				{
+			if($type==$GLOBALS['xmlrpcBoolean']) {
+				if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false'))) {
 					$val=true;
-				}
-				else
-				{
+				} else {
 					$val=false;
 				}
 			}
 
-			switch($this->mytype)
-			{
+			switch($this->mytype) {
 				case 1:
 					error_log('XML-RPC: '.__METHOD__.': scalar xmlrpcval can have only one value');
 					return 0;
@@ -2832,20 +2509,15 @@ 
 		*/
 		function addArray($vals)
 		{
-			if($this->mytype==0)
-			{
+			if($this->mytype==0) {
 				$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;
 			}
@@ -2861,20 +2533,15 @@ 
 		*/
 		function addStruct($vals)
 		{
-			if($this->mytype==0)
-			{
+			if($this->mytype==0) {
 				$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;
 			}
@@ -2884,13 +2551,10 @@ 
 		// DEPRECATED!
 		function dump($ar)
 		{
-			foreach($ar as $key => $val)
-			{
+			foreach($ar as $key => $val) {
 				echo "$key => $val<br />";
-				if($key == 'array')
-				{
-					while(list($key2, $val2) = each($val))
-					{
+				if($key == 'array') {
+					while(list($key2, $val2) = each($val)) {
 						echo "-- $key2 => $val2<br />";
 					}
 				}
@@ -2904,8 +2568,7 @@ 
 		*/
 		function kindOf()
 		{
-			switch($this->mytype)
-			{
+			switch($this->mytype) {
 				case 3:
 					return 'struct';
 					break;
@@ -2926,11 +2589,9 @@ 
 		function serializedata($typ, $val, $charset_encoding='')
 		{
 			$rs='';
-			switch(@$GLOBALS['xmlrpcTypes'][$typ])
-			{
+			switch(@$GLOBALS['xmlrpcTypes'][$typ]) {
 				case 1:
-					switch($typ)
-					{
+					switch($typ) {
 						case $GLOBALS['xmlrpcBase64']:
 							$rs.="<${typ}>" . base64_encode($val) . "</${typ}>";
 							break;
@@ -2955,31 +2616,24 @@ 
 							$rs.="<${typ}>".preg_replace('/\\.?0+$/','',number_format((double)$val, 128, '.', ''))."</${typ}>";
 							break;
 						case $GLOBALS['xmlrpcDateTime']:
-							if (is_string($val))
-							{
+							if (is_string($val)) {
 								$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}>";
 							}
-							else if(is_int($val))
-							{
+							else if(is_int($val)) {
 								$rs.="<${typ}>".strftime("%Y%m%dT%H:%M:%S", $val)."</${typ}>";
 							}
-							else
-							{
+							else {
 								// not really a good idea here: but what shall we output anyway? left for backward compat...
 								$rs.="<${typ}>${val}</${typ}>";
 							}
 							break;
 						case $GLOBALS['xmlrpcNull']:
-							if ($GLOBALS['xmlrpc_null_apache_encoding'])
-							{
+							if ($GLOBALS['xmlrpc_null_apache_encoding']) {
 								$rs.="<ex:nil/>";
-							}
-							else
-							{
+							} else {
 								$rs.="<nil/>";
 							}
 							break;
@@ -2991,16 +2645,12 @@ 
 					break;
 				case 3:
 					// struct
-					if ($this->_php_class)
-					{
+					if ($this->_php_class) {
 						$rs.='<struct php_class="' . $this->_php_class . "\">\n";
-					}
-					else
-					{
+					} else {
 						$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.=$this->serializeval($val2);
 						$rs.=$val2->serialize($charset_encoding);
@@ -3011,8 +2661,7 @@ 
 				case 2:
 					// array
 					$rs.="<array>\n<data>\n";
-					for($i=0; $i<count($val); $i++)
-					{
+					for($i=0; $i<count($val); $i++) {
 						//$rs.=$this->serializeval($val[$i]);
 						$rs.=$val[$i]->serialize($charset_encoding);
 					}
@@ -3109,27 +2758,22 @@ 
 			// 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;
 				}
 			}
@@ -3159,8 +2803,7 @@ 
 		{
 			reset($this->me);
 			list($a,)=each($this->me);
-			if($a==$GLOBALS['xmlrpcI4'])
-			{
+			if($a==$GLOBALS['xmlrpcI4']) {
 				$a=$GLOBALS['xmlrpcInt'];
 			}
 			return $a;
@@ -3220,20 +2863,14 @@ 
 	*/
 	function iso8601_encode($timet, $utc=0)
 	{
-		if(!$utc)
-		{
+		if(!$utc) {
 			$t=strftime("%Y%m%dT%H:%M:%S", $timet);
-		}
-		else
-		{
-			if(function_exists('gmstrftime'))
-			{
+		} 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'));
 			}
 		}
@@ -3249,14 +2886,10 @@ 
 	function iso8601_decode($idate, $utc=0)
 	{
 		$t=0;
-		if(preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/', $idate, $regs))
-		{
-			if($utc)
-			{
+		if(preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})/', $idate, $regs)) {
+			if($utc) {
 				$t=gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
-			}
-			else
-			{
+			} else {
 				$t=mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
 			}
 		}
@@ -3286,15 +2919,12 @@ 
 	*/
 	function php_xmlrpc_decode($xmlrpc_val, $options=array())
 	{
-		switch($xmlrpc_val->kindOf())
-		{
+		switch($xmlrpc_val->kindOf()) {
 			case 'scalar':
-				if (in_array('extension_api', $options))
-				{
+				if (in_array('extension_api', $options)) {
 					reset($xmlrpc_val->me);
 					list($typ,$val) = each($xmlrpc_val->me);
-					switch ($typ)
-					{
+					switch ($typ) {
 						case 'dateTime.iso8601':
 							$xmlrpc_val->scalar = $val;
 							$xmlrpc_val->xmlrpc_type = 'datetime';
@@ -3308,24 +2938,19 @@ 
 							return $xmlrpc_val->scalarval();
 					}
 				}
-				if (in_array('dates_as_objects', $options) && $xmlrpc_val->scalartyp() == 'dateTime.iso8601')
-				{
+				if (in_array('dates_as_objects', $options) && $xmlrpc_val->scalartyp() == 'dateTime.iso8601') {
 					// we return a Datetime object instead of a string
 					// since now the constructor of xmlrpcval accepts safely strings, ints and datetimes,
 					// we cater to all 3 cases here
 					$out = $xmlrpc_val->scalarval();
-					if (is_string($out))
-					{
+					if (is_string($out)) {
 						$out = strtotime($out);
 					}
-					if (is_int($out))
-					{
+					if (is_int($out)) {
 						$result = new Datetime();
 						$result->setTimestamp($out);
 						return $result;
-					}
-					elseif (is_a($out, 'Datetime'))
-					{
+					} elseif (is_a($out, 'Datetime')) {
 						return $out;
 					}
 				}
@@ -3333,8 +2958,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);
 				}
 				return $arr;
@@ -3345,20 +2969,15 @@ 
 				// shall we check for proper subclass of xmlrpcval instead of
 				// presence of _php_class to detect what we can do?
 				if (in_array('decode_php_objs', $options) && $xmlrpc_val->_php_class != ''
-					&& class_exists($xmlrpc_val->_php_class))
-				{
+					&& 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);
 					}
 					return $obj;
-				}
-				else
-				{
+				} else {
 					$arr = array();
-					while(list($key,$value)=$xmlrpc_val->structeach())
-					{
+					while(list($key,$value)=$xmlrpc_val->structeach()) {
 						$arr[$key] = php_xmlrpc_decode($value, $options);
 					}
 					return $arr;
@@ -3366,8 +2985,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));
 				}
 				return $arr;
@@ -3377,12 +2995,9 @@ 
 	// 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');
-	}
-	else
-	{
+	} else {
 		define('XMLRPC_EPI_ENABLED','0');
 	}
 
@@ -3406,13 +3021,13 @@ 
 	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))
-					$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']);
@@ -3435,44 +3050,32 @@ 
 				$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']);
-				}
-				else
-				{
+				} else {
 					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcArray']);
 				}
 				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']);
-				}
-				else
-				{
+				} else {
 					$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);
 					}
 					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);
-					if (in_array('encode_php_objs', $options))
-					{
+					if (in_array('encode_php_objs', $options)) {
 						// let's save original class name into xmlrpcval:
 						// might be useful later on...
 						$xmlrpc_val->_php_class = get_class($php_val);
@@ -3480,26 +3083,18 @@ 
 				}
 				break;
 			case 'NULL':
-				if (in_array('extension_api', $options))
-				{
+				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();
 				}
 				break;
 			case 'resource':
-				if (in_array('extension_api', $options))
-				{
+				if (in_array('extension_api', $options)) {
 					$xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);
-				}
-				else
-				{
+				} else {
 					$xmlrpc_val = new xmlrpcval();
 				}
 			// catch "user function", "unknown type"
@@ -3537,19 +3132,15 @@ 
 		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, true);
 		// What if internal encoding is not in one of the 3 allowed?
 		// we use the broadest one, ie. utf8!
-		if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
-		{
+		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']);
 		}
 		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)),
 						xml_get_current_line_number($parser), xml_get_current_column_number($parser));
@@ -3558,30 +3149,27 @@ 
 			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;
 		}
-		switch ($GLOBALS['_xh']['rt'])
-		{
+		switch ($GLOBALS['_xh']['rt']) {
 			case 'methodresponse':
 				$v =& $GLOBALS['_xh']['value'];
-				if ($GLOBALS['_xh']['isf'] == 1)
-				{
+				if ($GLOBALS['_xh']['isf'] == 1) {
 					$vc = $v->structmem('faultCode');
 					$vs = $v->structmem('faultString');
 					$r = new xmlrpcresp(0, $vc->scalarval(), $vs->scalarval());
-				}
-				else
-				{
+				} else {
 					$r = new xmlrpcresp($v);
 				}
 				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]);
 				}
 				return $m;
@@ -3612,13 +3200,11 @@ 
 		$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);
 
 			// just in case we got a broken connection
-			if($chunkend == false)
-			{
+			if($chunkend == false) {
 				$chunk = substr($buffer,$chunkstart);
 				// append chunk-data to entity-body
 				$new .= $chunk;
@@ -3636,8 +3222,7 @@ 
 			$chunkstart = $chunkend + 2;
 
 			$chunkend = strpos($buffer,"\r\n",$chunkstart)+2;
-			if($chunkend == false)
-			{
+			if($chunkend == false) {
 				break; //just in case we got a broken connection
 			}
 			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);
@@ -3678,8 +3263,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\""));
 		}
 
@@ -3690,16 +3274,11 @@ 
 		//     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';
 		}
 
@@ -3709,33 +3288,25 @@ 
 		// EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
 		if (preg_match('/^<\?xml\s+version\s*=\s*'. "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
 			'\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
-			$xmlchunk, $matches))
-		{
+			$xmlchunk, $matches)) {
 			return strtoupper(substr($matches[2], 1, -1));
 		}
 
 		// 4 - if mbstring is available, let it do the guesswork
 		// NB: we favour finding an encoding that is compatible with what we can process
-		if(extension_loaded('mbstring'))
-		{
-			if($encoding_prefs)
-			{
+		if(extension_loaded('mbstring')) {
+			if($encoding_prefs) {
 				$enc = mb_detect_encoding($xmlchunk, $encoding_prefs);
-			}
-			else
-			{
+			} else {
 				$enc = mb_detect_encoding($xmlchunk);
 			}
 			// NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
 			// IANA also likes better US-ASCII, so go with it
-			if($enc == 'ASCII')
-			{
+			if($enc == 'ASCII') {
 				$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
 			// this should be the standard. And we should be getting text/xml as request and response.
@@ -3759,16 +3330,17 @@ 
 				'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 false;
 		}
 	}

Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpc_wrappers.inc

Braces +131 added lines, -286 removed lines

@@ -28,8 +28,7 @@ 
 	*/
 	function php_2_xmlrpc_type($phptype)
 	{
-		switch(strtolower($phptype))
-		{
+		switch(strtolower($phptype)) {
 			case 'string':
 				return $GLOBALS['xmlrpcString'];
 			case 'integer':
@@ -50,12 +49,9 @@ 
 			case 'resource':
 				return '';
 			default:
-				if(class_exists($phptype))
-				{
+				if(class_exists($phptype)) {
 					return $GLOBALS['xmlrpcStruct'];
-				}
-				else
-				{
+				} else {
 					// unknown: might be any 'extended' xmlrpc type
 					return $GLOBALS['xmlrpcValue'];
 				}
@@ -69,8 +65,7 @@ 
 	*/
 	function xmlrpc_2_php_type($xmlrpctype)
 	{
-		switch(strtolower($xmlrpctype))
-		{
+		switch(strtolower($xmlrpctype)) {
 			case 'base64':
 			case 'datetime.iso8601':
 			case 'string':
@@ -150,115 +145,87 @@ 
 		$decode_php_objects = isset($extra_options['decode_php_objs']) ? (bool)$extra_options['decode_php_objs'] : false;
 		$catch_warnings = isset($extra_options['suppress_warnings']) && $extra_options['suppress_warnings'] ? '@' : '';
 
-		if(version_compare(phpversion(), '5.0.3') == -1)
-		{
+		if(version_compare(phpversion(), '5.0.3') == -1) {
 			// up to php 5.0.3 some useful reflection methods were missing
 			error_log('XML-RPC: cannot not wrap php functions unless running php version bigger than 5.0.3');
 			return false;
 		}
 
         $exists = false;
-	    if (is_string($funcname) && strpos($funcname, '::') !== false)
-	    {
+	    if (is_string($funcname) && strpos($funcname, '::') !== false) {
 	        $funcname = explode('::', $funcname);
 	    }
-        if(is_array($funcname))
-        {
-            if(count($funcname) < 2 || (!is_string($funcname[0]) && !is_object($funcname[0])))
-            {
+        if(is_array($funcname)) {
+            if(count($funcname) < 2 || (!is_string($funcname[0]) && !is_object($funcname[0]))) {
     			error_log('XML-RPC: syntax for function to be wrapped is wrong');
     			return false;
             }
-            if(is_string($funcname[0]))
-            {
+            if(is_string($funcname[0])) {
                 $plainfuncname = implode('::', $funcname);
-            }
-            elseif(is_object($funcname[0]))
-            {
+            } elseif(is_object($funcname[0])) {
                 $plainfuncname = get_class($funcname[0]) . '->' . $funcname[1];
             }
             $exists = method_exists($funcname[0], $funcname[1]);
-            if (!$exists && version_compare(phpversion(), '5.1') < 0)
-            {
+            if (!$exists && version_compare(phpversion(), '5.1') < 0) {
                // workaround for php 5.0: static class methods are not seen by method_exists
                $exists = is_callable( $funcname );
             }
-        }
-        else
-        {
+        } else {
             $plainfuncname = $funcname;
             $exists = function_exists($funcname);
         }
 
-		if(!$exists)
-		{
+		if(!$exists) {
 			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($newfuncname == '') {
+				if(is_array($funcname)) {
+    				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;
 			}
-			while($buildit && function_exists($xmlrpcfuncname))
-			{
+			while($buildit && function_exists($xmlrpcfuncname)) {
 				$xmlrpcfuncname .= 'x';
 			}
 
 			// start to introspect PHP code
-			if(is_array($funcname))
-			{
+			if(is_array($funcname)) {
     			$func = new ReflectionMethod($funcname[0], $funcname[1]);
-    			if($func->isPrivate())
-    			{
+    			if($func->isPrivate()) {
     				error_log('XML-RPC: method to be wrapped is private: '.$plainfuncname);
     				return false;
     			}
-    			if($func->isProtected())
-    			{
+    			if($func->isProtected()) {
     				error_log('XML-RPC: method to be wrapped is protected: '.$plainfuncname);
     				return false;
     			}
-     			if($func->isConstructor())
-    			{
+     			if($func->isConstructor()) {
     				error_log('XML-RPC: method to be wrapped is the constructor: '.$plainfuncname);
     				return false;
     			}
 			    // php 503 always says isdestructor = true...
-                if( version_compare(phpversion(), '5.0.3') != 0 && $func->isDestructor())
-    			{
+                if( version_compare(phpversion(), '5.0.3') != 0 && $func->isDestructor()) {
     				error_log('XML-RPC: method to be wrapped is the destructor: '.$plainfuncname);
     				return false;
     			}
-    			if($func->isAbstract())
-    			{
+    			if($func->isAbstract()) {
     				error_log('XML-RPC: method to be wrapped is abstract: '.$plainfuncname);
     				return false;
     			}
                 /// @todo add more checks for static vs. nonstatic?
-            }
-			else
-			{
+            } else {
     			$func = new ReflectionFunction($funcname);
             }
-			if($func->isInternal())
-			{
+			if($func->isInternal()) {
 				// Note: from PHP 5.1.0 onward, we will possibly be able to use invokeargs
 				// instead of getparameters to fully reflect internal php functions ?
 				error_log('XML-RPC: function to be wrapped is internal: '.$plainfuncname);
@@ -277,49 +244,35 @@ 
 			$paramDocs = array();
 
 			$docs = $func->getDocComment();
-			if($docs != '')
-			{
+			if($docs != '') {
 				$docs = explode("\n", $docs);
 				$i = 0;
-				foreach($docs as $doc)
-				{
+				foreach($docs as $doc) {
 					$doc = trim($doc, " \r\t/*");
-					if(strlen($doc) && strpos($doc, '@') !== 0 && !$i)
-					{
-						if($desc)
-						{
+					if(strlen($doc) && strpos($doc, '@') !== 0 && !$i) {
+						if($desc) {
 							$desc .= "\n";
 						}
 						$desc .= $doc;
-					}
-					elseif(strpos($doc, '@param') === 0)
-					{
+					} elseif(strpos($doc, '@param') === 0) {
 						// syntax: @param type [$name] desc
-						if(preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches))
-						{
-							if(strpos($matches[1], '|'))
-							{
+						if(preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches)) {
+							if(strpos($matches[1], '|')) {
 								//$paramDocs[$i]['type'] = explode('|', $matches[1]);
 								$paramDocs[$i]['type'] = 'mixed';
-							}
-							else
-							{
+							} else {
 								$paramDocs[$i]['type'] = $matches[1];
 							}
 							$paramDocs[$i]['name'] = trim($matches[2]);
 							$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);
-						if(preg_match('/@return\s+(\S+)\s+(.+)/', $doc, $matches))
-						{
+						if(preg_match('/@return\s+(\S+)\s+(.+)/', $doc, $matches)) {
 							$returns = php_2_xmlrpc_type($matches[1]);
-							if(isset($matches[2]))
-							{
+							if(isset($matches[2])) {
 								$returnsDocs = $matches[2];
 							}
 						}
@@ -330,8 +283,7 @@ 
 			// execute introspection of actual function prototype
 			$params = array();
 			$i = 0;
-			foreach($func->getParameters() as $paramobj)
-			{
+			foreach($func->getParameters() as $paramobj) {
 				$params[$i] = array();
 				$params[$i]['name'] = '$'.$paramobj->getName();
 				$params[$i]['isoptional'] = $paramobj->isOptional();
@@ -345,38 +297,30 @@ 
 			$parsvariations = array();
 			$pars = array();
 			$pnum = count($params);
-			foreach($params as $param)
-			{
-				if (isset($paramDocs[$i]['name']) && $paramDocs[$i]['name'] && strtolower($paramDocs[$i]['name']) != strtolower($param['name']))
-				{
+			foreach($params as $param) {
+				if (isset($paramDocs[$i]['name']) && $paramDocs[$i]['name'] && strtolower($paramDocs[$i]['name']) != strtolower($param['name'])) {
 					// param name from phpdoc info does not match param definition!
 					$paramDocs[$i]['type'] = 'mixed';
 				}
 
-				if($param['isoptional'])
-				{
+				if($param['isoptional']) {
 					// this particular parameter is optional. save as valid previous list of parameters
 					$innercode .= "if (\$paramcount > $i) {\n";
 					$parsvariations[] = $pars;
 				}
 				$innercode .= "\$p$i = \$msg->getParam($i);\n";
-				if ($decode_php_objects)
-				{
+				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";
 				}
 
 				$pars[] = "\$p$i";
 				$i++;
-				if($param['isoptional'])
-				{
+				if($param['isoptional']) {
 					$innercode .= "}\n";
 				}
-				if($i == $pnum)
-				{
+				if($i == $pnum) {
 					// last allowed parameters combination
 					$parsvariations[] = $pars;
 				}
@@ -384,56 +328,42 @@ 
 
 			$sigs = array();
 			$psigs = array();
-			if(count($parsvariations) == 0)
-			{
+			if(count($parsvariations) == 0) {
 				// only known good synopsis = no parameters
 				$parsvariations[] = array();
 				$minpars = 0;
-			}
-			else
-			{
+			} else {
 				$minpars = count($parsvariations[0]);
 			}
 
-			if($minpars)
-			{
+			if($minpars) {
 				// add to code the check for min params number
 				// NB: this check needs to be done BEFORE decoding param values
 				$innercode = "\$paramcount = \$msg->getNumParams();\n" .
 				"if (\$paramcount < $minpars) return new {$prefix}resp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}');\n" . $innercode;
-			}
-			else
-			{
+			} else {
 				$innercode = "\$paramcount = \$msg->getNumParams();\n" . $innercode;
 			}
 
 			$innercode .= "\$np = false;\n";
 			// since there are no closures in php, if we are given an object instance,
             // we store a pointer to it in a global var...
-			if ( is_array($funcname) && is_object($funcname[0]) )
-			{
+			if ( is_array($funcname) && is_object($funcname[0]) ) {
 			    $GLOBALS['xmlrpcWPFObjHolder'][$xmlrpcfuncname] =& $funcname[0];
 			    $innercode .= "\$obj =& \$GLOBALS['xmlrpcWPFObjHolder']['$xmlrpcfuncname'];\n";
 			    $realfuncname = '$obj->'.$funcname[1];
-			}
-			else
-			{
+			} else {
     			$realfuncname = $plainfuncname;
             }
-			foreach($parsvariations as $pars)
-			{
+			foreach($parsvariations as $pars) {
 				$innercode .= "if (\$paramcount == " . count($pars) . ") \$retval = {$catch_warnings}$realfuncname(" . implode(',', $pars) . "); else\n";
 				// build a 'generic' signature (only use an appropriate return type)
 				$sig = array($returns);
 				$psig = array($returnsDocs);
-				for($i=0; $i < count($pars); $i++)
-				{
-					if (isset($paramDocs[$i]['type']))
-					{
+				for($i=0; $i < count($pars); $i++) {
+					if (isset($paramDocs[$i]['type'])) {
 						$sig[] = php_2_xmlrpc_type($paramDocs[$i]['type']);
-					}
-					else
-					{
+					} else {
 						$sig[] = $GLOBALS['xmlrpcValue'];
 					}
 					$psig[] = isset($paramDocs[$i]['doc']) ? $paramDocs[$i]['doc'] : '';
@@ -445,31 +375,27 @@ 
 			$innercode .= "if (\$np) return new {$prefix}resp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}'); else {\n";
 			//$innercode .= "if (\$_xmlrpcs_error_occurred) return new xmlrpcresp(0, $GLOBALS['xmlrpcerr']user, \$_xmlrpcs_error_occurred); else\n";
 			$innercode .= "if (is_a(\$retval, '{$prefix}resp')) return \$retval; else\n";
-			if($returns == $GLOBALS['xmlrpcDateTime'] || $returns == $GLOBALS['xmlrpcBase64'])
-			{
+			if($returns == $GLOBALS['xmlrpcDateTime'] || $returns == $GLOBALS['xmlrpcBase64']) {
 				$innercode .= "return new {$prefix}resp(new {$prefix}val(\$retval, '$returns'));";
-			}
-			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";
+			} 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";
+				}
 			}
 			// shall we exclude functions returning by ref?
 			// if($func->returnsReference())
 			// 	return false;
 			$code = "function $xmlrpcfuncname(\$msg) {\n" . $innercode . "}\n}";
 			//print_r($code);
-			if ($buildit)
-			{
+			if ($buildit) {
 				$allOK = 0;
 				eval($code.'$allOK=1;');
 				// alternative
 				//$xmlrpcfuncname = create_function('$m', $innercode);
 
-				if(!$allOK)
-				{
+				if(!$allOK) {
 					error_log('XML-RPC: could not create function '.$xmlrpcfuncname.' to wrap php function '.$plainfuncname);
 					return false;
 				}
@@ -501,8 +427,7 @@ 
 		$methodfilter = isset($extra_options['method_filter']) ? $extra_options['method_filter'] : '';
 		$methodtype = isset($extra_options['method_type']) ? $extra_options['method_type'] : 'auto';
 
-        if(version_compare(phpversion(), '5.0.3') == -1)
-		{
+        if(version_compare(phpversion(), '5.0.3') == -1) {
 			// up to php 5.0.3 some useful reflection methods were missing
 			error_log('XML-RPC: cannot not wrap php functions unless running php version bigger than 5.0.3');
 			return false;
@@ -510,20 +435,15 @@ 
 
         $result = array();
 		$mlist = get_class_methods($classname);
-		foreach($mlist as $mname)
-		{
-    		if ($methodfilter == '' || preg_match($methodfilter, $mname))
-			{
+		foreach($mlist as $mname) {
+    		if ($methodfilter == '' || preg_match($methodfilter, $mname)) {
     			// echo $mlist."\n";
     			$func = new ReflectionMethod($classname, $mname);
-    			if(!$func->isPrivate() && !$func->isProtected() && !$func->isConstructor() && !$func->isDestructor() && !$func->isAbstract())
-    			{
+    			if(!$func->isPrivate() && !$func->isProtected() && !$func->isConstructor() && !$func->isDestructor() && !$func->isAbstract()) {
         			if(($func->isStatic && ($methodtype == 'all' || $methodtype == 'static' || ($methodtype == 'auto' && is_string($classname)))) ||
-            			(!$func->isStatic && ($methodtype == 'all' || $methodtype == 'nonstatic' || ($methodtype == 'auto' && is_object($classname)))))
-            		{
+            			(!$func->isStatic && ($methodtype == 'all' || $methodtype == 'nonstatic' || ($methodtype == 'auto' && is_object($classname))))) {
                         $methodwrap = wrap_php_function(array($classname, $mname), '', $extra_options);
-                        if ( $methodwrap )
-                        {
+                        if ( $methodwrap ) {
                             $result[$methodwrap['function']] = $methodwrap['function'];
                         }
                     }
@@ -574,13 +494,10 @@ 
 	{
 		// mind numbing: let caller use sane calling convention (as per javadoc, 3 params),
 		// OR the 2.0 calling convention (no options) - we really love backward compat, don't we?
-		if (!is_array($extra_options))
-		{
+		if (!is_array($extra_options)) {
 			$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;
 			$protocol = isset($extra_options['protocol']) ? $extra_options['protocol'] : '';
@@ -595,13 +512,10 @@ 
 		$simple_client_copy = isset($extra_options['simple_client_copy']) ? (int)($extra_options['simple_client_copy']) : 0;
 		$buildit = isset($extra_options['return_source']) ? !($extra_options['return_source']) : true;
 		$prefix = isset($extra_options['prefix']) ? $extra_options['prefix'] : 'xmlrpc';
-		if (isset($extra_options['return_on_fault']))
-		{
+		if (isset($extra_options['return_on_fault'])) {
 			$decode_fault = true;
 			$fault_response = $extra_options['return_on_fault'];
-		}
-		else
-		{
+		} else {
 			$decode_fault = false;
 			$fault_response = '';
 		}
@@ -615,39 +529,28 @@ 
 		$msg->addparam(new $valclass($methodname));
 		$client->setDebug($debug);
 		$response =& $client->send($msg, $timeout, $protocol);
-		if($response->faultCode())
-		{
+		if($response->faultCode()) {
 			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')
-			{
+			if ($client->return_type != 'phpvals') {
 				$msig = $decodefunc($msig);
 			}
-			if(!is_array($msig) || count($msig) <= $signum)
-			{
+			if(!is_array($msig) || count($msig) <= $signum) {
 				error_log('XML-RPC: could not retrieve method signature nr.'.$signum.' from remote server for method '.$methodname);
 				return false;
-			}
-			else
-			{
+			} else {
 				// pick a suitable name for the new function, avoiding collisions
-				if($newfuncname != '')
-				{
+				if($newfuncname != '') {
 					$xmlrpcfuncname = $newfuncname;
-				}
-				else
-				{
+				} else {
 					// take care to insure that methodname is translated to valid
 					// php function name
 					$xmlrpcfuncname = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'),
 						array('_', ''), $methodname);
 				}
-				while($buildit && function_exists($xmlrpcfuncname))
-				{
+				while($buildit && function_exists($xmlrpcfuncname)) {
 					$xmlrpcfuncname .= 'x';
 				}
 
@@ -655,16 +558,13 @@ 
 				$mdesc = '';
 				// if in 'offline' mode, get method description too.
 				// in online mode, favour speed of operation
-				if(!$buildit)
-				{
+				if(!$buildit) {
 					$msg = new $msgclass('system.methodHelp');
 					$msg->addparam(new $valclass($methodname));
 					$response =& $client->send($msg, $timeout, $protocol);
-					if (!$response->faultCode())
-					{
+					if (!$response->faultCode()) {
 						$mdesc = $response->value();
-						if ($client->return_type != 'phpvals')
-						{
+						if ($client->return_type != 'phpvals') {
 							$mdesc = $mdesc->scalarval();
 						}
 					}
@@ -676,24 +576,18 @@ 
 					$fault_response);
 
 				//print_r($code);
-				if ($buildit)
-				{
+				if ($buildit) {
 					$allOK = 0;
 					eval($results['source'].'$allOK=1;');
 					// alternative
 					//$xmlrpcfuncname = create_function('$m', $innercode);
-					if($allOK)
-					{
+					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;
 				}
@@ -728,37 +622,26 @@ 
 
 		$msg = new $msgclass('system.listMethods');
 		$response =& $client->send($msg, $timeout, $protocol);
-		if($response->faultCode())
-		{
+		if($response->faultCode()) {
 			error_log('XML-RPC: could not retrieve method list from remote server');
 			return false;
-		}
-		else
-		{
+		} else {
 			$mlist = $response->value();
-			if ($client->return_type != 'phpvals')
-			{
+			if ($client->return_type != 'phpvals') {
 				$mlist = $decodefunc($mlist);
 			}
-			if(!is_array($mlist) || !count($mlist))
-			{
+			if(!is_array($mlist) || !count($mlist)) {
 				error_log('XML-RPC: could not retrieve meaningful method list from remote server');
 				return false;
-			}
-			else
-			{
+			} else {
 				// pick a suitable name for the new function, avoiding collisions
-				if($newclassname != '')
-				{
+				if($newclassname != '') {
 					$xmlrpcclassname = $newclassname;
-				}
-				else
-				{
+				} else {
 					$xmlrpcclassname = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'),
 						array('_', ''), $client->server).'_client';
 				}
-				while($buildit && class_exists($xmlrpcclassname))
-				{
+				while($buildit && class_exists($xmlrpcclassname)) {
 					$xmlrpcclassname .= 'x';
 				}
 
@@ -773,46 +656,34 @@ 
 					'decode_php_objs' => $decode_php_objects
 					);
 				/// @todo build javadoc for class definition, too
-				foreach($mlist as $mname)
-				{
-					if ($methodfilter == '' || preg_match($methodfilter, $mname))
-					{
+				foreach($mlist as $mname) {
+					if ($methodfilter == '' || preg_match($methodfilter, $mname)) {
 						$opts['new_function_name'] = preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'),
 							array('_', ''), $mname);
 						$methodwrap = wrap_xmlrpc_method($client, $mname, $opts);
-						if ($methodwrap)
-						{
-							if (!$buildit)
-							{
+						if ($methodwrap) {
+							if (!$buildit) {
 								$source .= $methodwrap['docstring'];
 							}
 							$source .= $methodwrap['source']."\n";
-						}
-						else
-						{
+						} else {
 							error_log('XML-RPC: will not create class method to wrap remote method '.$mname);
 						}
 					}
 				}
 				$source .= "}\n";
-				if ($buildit)
-				{
+				if ($buildit) {
 					$allOK = 0;
 					eval($source.'$allOK=1;');
 					// alternative
 					//$xmlrpcfuncname = create_function('$m', $innercode);
-					if($allOK)
-					{
+					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' => '');
 				}
 			}
@@ -833,60 +704,46 @@ 
 		$fault_response='')
 	{
 		$code = "function $xmlrpcfuncname (";
-		if ($client_copy_mode < 2)
-		{
+		if ($client_copy_mode < 2) {
 			// client copy mode 0 or 1 == partial / full client copy in emitted code
 			$innercode = build_client_wrapper_code($client, $client_copy_mode, $prefix);
 			$innercode .= "\$client->setDebug(\$debug);\n";
 			$this_ = '';
-		}
-		else
-		{
+		} else {
 			// client copy mode 2 == no client copy in emitted code
 			$innercode = '';
 			$this_ = 'this->';
 		}
 		$innercode .= "\$msg = new {$prefix}msg('$methodname');\n";
 
-		if ($mdesc != '')
-		{
+		if ($mdesc != '') {
 			// take care that PHP comment is not terminated unwillingly by method description
 			$mdesc = "/**\n* ".str_replace('*/', '* /', $mdesc)."\n";
-		}
-		else
-		{
+		} else {
 			$mdesc = "/**\nFunction $xmlrpcfuncname\n";
 		}
 
 		// param parsing
 		$plist = array();
 		$pcount = count($msig);
-		for($i = 1; $i < $pcount; $i++)
-		{
+		for($i = 1; $i < $pcount; $i++) {
 			$plist[] = "\$p$i";
 			$ptype = $msig[$i];
 			if($ptype == 'i4' || $ptype == 'int' || $ptype == 'boolean' || $ptype == 'double' ||
-				$ptype == 'string' || $ptype == 'dateTime.iso8601' || $ptype == 'base64' || $ptype == 'null')
-			{
+				$ptype == 'string' || $ptype == 'dateTime.iso8601' || $ptype == 'base64' || $ptype == 'null') {
 				// only build directly xmlrpcvals when type is known and scalar
 				$innercode .= "\$p$i = new {$prefix}val(\$p$i, '$ptype');\n";
-			}
-			else
-			{
-				if ($encode_php_objects)
-				{
+			} 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";
 				}
 			}
 			$innercode .= "\$msg->addparam(\$p$i);\n";
 			$mdesc .= '* @param '.xmlrpc_2_php_type($ptype)." \$p$i\n";
 		}
-		if ($client_copy_mode < 2)
-		{
+		if ($client_copy_mode < 2) {
 			$plist[] = '$debug=0';
 			$mdesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n";
 		}
@@ -894,27 +751,18 @@ 
 		$mdesc .= '* @return '.xmlrpc_2_php_type($msig[0])." (or an {$prefix}resp obj instance if call fails)\n*/\n";
 
 		$innercode .= "\$res =& \${$this_}client->send(\$msg, $timeout, '$protocol');\n";
-		if ($decode_fault)
-		{
-			if (is_string($fault_response) && ((strpos($fault_response, '%faultCode%') !== false) || (strpos($fault_response, '%faultString%') !== false)))
-			{
+		if ($decode_fault) {
+			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)
-		{
+		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());";
 		}
 
@@ -936,12 +784,9 @@ 
 
 		// copy all client fields to the client that will be generated runtime
 		// (this provides for future expansion or subclassing of client obj)
-		if ($verbatim_client_copy)
-		{
-			foreach($client as $fld => $val)
-			{
-				if($fld != 'debug' && $fld != 'return_type')
-				{
+		if ($verbatim_client_copy) {
+			foreach($client as $fld => $val) {
+				if($fld != 'debug' && $fld != 'return_type') {
 					$val = var_export($val, true);
 					$code .= "\$client->$fld = $val;\n";
 				}

Components/Klarna/transport/xmlrpc-3.0.0.beta/lib/xmlrpcs.inc

Braces +172 added lines, -353 removed lines

@@ -83,14 +83,11 @@ 
 	{
 
 		$outAr=array();
-		foreach($server->dmap as $key => $val)
-		{
+		foreach($server->dmap as $key => $val) {
 			$outAr[]=new xmlrpcval($key, 'string');
 		}
-		if($server->allow_system_funcs)
-		{
-			foreach($GLOBALS['_xmlrpcs_dmap'] as $key => $val)
-			{
+		if($server->allow_system_funcs) {
+			foreach($GLOBALS['_xmlrpcs_dmap'] as $key => $val) {
 				$outAr[]=new xmlrpcval($key, 'string');
 			}
 		}
@@ -103,48 +100,34 @@ 
 	function _xmlrpcs_methodSignature($server, $m)
 	{
 		// let accept as parameter both an xmlrpcval or string
-		if (is_object($m))
-		{
+		if (is_object($m)) {
 			$methName=$m->getParam(0);
 			$methName=$methName->scalarval();
-		}
-		else
-		{
+		} else {
 			$methName=$m;
 		}
-		if(strpos($methName, "system.") === 0)
-		{
+		if(strpos($methName, "system.") === 0) {
 			$dmap=$GLOBALS['_xmlrpcs_dmap']; $sysCall=1;
-		}
-		else
-		{
+		} else {
 			$dmap=$server->dmap; $sysCall=0;
 		}
-		if(isset($dmap[$methName]))
-		{
-			if(isset($dmap[$methName]['signature']))
-			{
+		if(isset($dmap[$methName])) {
+			if(isset($dmap[$methName]['signature'])) {
 				$sigs=array();
-				foreach($dmap[$methName]['signature'] as $inSig)
-				{
+				foreach($dmap[$methName]['signature'] as $inSig) {
 					$cursig=array();
-					foreach($inSig as $sig)
-					{
+					foreach($inSig as $sig) {
 						$cursig[]=new xmlrpcval($sig, 'string');
 					}
 					$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']);
 		}
 		return $r;
@@ -156,36 +139,24 @@ 
 	function _xmlrpcs_methodHelp($server, $m)
 	{
 		// let accept as parameter both an xmlrpcval or string
-		if (is_object($m))
-		{
+		if (is_object($m)) {
 			$methName=$m->getParam(0);
 			$methName=$methName->scalarval();
-		}
-		else
-		{
+		} else {
 			$methName=$m;
 		}
-		if(strpos($methName, "system.") === 0)
-		{
+		if(strpos($methName, "system.") === 0) {
 			$dmap=$GLOBALS['_xmlrpcs_dmap']; $sysCall=1;
-		}
-		else
-		{
+		} else {
 			$dmap=$server->dmap; $sysCall=0;
 		}
-		if(isset($dmap[$methName]))
-		{
-			if(isset($dmap[$methName]['docstring']))
-			{
+		if(isset($dmap[$methName])) {
+			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']);
 		}
 		return $r;
@@ -196,13 +167,11 @@ 
 	$_xmlrpcs_multicall_sdoc = array(array('list of response structs, where each struct has the usual members', 'list of calls, with each call being represented as a struct, with members "methodname" and "params"'));
 	function _xmlrpcs_multicall_error($err)
 	{
-		if(is_string($err))
-		{
+		if(is_string($err)) {
 			$str = $GLOBALS['xmlrpcstr']["multicall_${err}"];
 			$code = $GLOBALS['xmlrpcerr']["multicall_${err}"];
 		}
-		else
-		{
+		else {
 			$code = $err->faultCode();
 			$str = $err->faultString();
 		}
@@ -214,40 +183,32 @@ 
 
 	function _xmlrpcs_multicall_do_call($server, $call)
 	{
-		if($call->kindOf() != 'struct')
-		{
+		if($call->kindOf() != 'struct') {
 			return _xmlrpcs_multicall_error('notstruct');
 		}
 		$methName = @$call->structmem('methodName');
-		if(!$methName)
-		{
+		if(!$methName) {
 			return _xmlrpcs_multicall_error('nomethod');
 		}
-		if($methName->kindOf() != 'scalar' || $methName->scalartyp() != 'string')
-		{
+		if($methName->kindOf() != 'scalar' || $methName->scalartyp() != 'string') {
 			return _xmlrpcs_multicall_error('notstring');
 		}
-		if($methName->scalarval() == 'system.multicall')
-		{
+		if($methName->scalarval() == 'system.multicall') {
 			return _xmlrpcs_multicall_error('recursion');
 		}
 
 		$params = @$call->structmem('params');
-		if(!$params)
-		{
+		if(!$params) {
 			return _xmlrpcs_multicall_error('noparams');
 		}
-		if($params->kindOf() != 'array')
-		{
+		if($params->kindOf() != 'array') {
 			return _xmlrpcs_multicall_error('notarray');
 		}
 		$numParams = $params->arraysize();
 
 		$msg = new xmlrpcmsg($methName->scalarval());
-		for($i = 0; $i < $numParams; $i++)
-		{
-			if(!$msg->addParam($params->arraymem($i)))
-			{
+		for($i = 0; $i < $numParams; $i++) {
+			if(!$msg->addParam($params->arraymem($i))) {
 				$i++;
 				return _xmlrpcs_multicall_error(new xmlrpcresp(0,
 					$GLOBALS['xmlrpcerr']['incorrect_params'],
@@ -257,8 +218,7 @@ 
 
 		$result = $server->execute($msg);
 
-		if($result->faultCode() != 0)
-		{
+		if($result->faultCode() != 0) {
 			return _xmlrpcs_multicall_error($result);		// Method returned fault.
 		}
 
@@ -267,28 +227,22 @@ 
 
 	function _xmlrpcs_multicall_do_call_phpvals($server, $call)
 	{
-		if(!is_array($call))
-		{
+		if(!is_array($call)) {
 			return _xmlrpcs_multicall_error('notstruct');
 		}
-		if(!array_key_exists('methodName', $call))
-		{
+		if(!array_key_exists('methodName', $call)) {
 			return _xmlrpcs_multicall_error('nomethod');
 		}
-		if (!is_string($call['methodName']))
-		{
+		if (!is_string($call['methodName'])) {
 			return _xmlrpcs_multicall_error('notstring');
 		}
-		if($call['methodName'] == 'system.multicall')
-		{
+		if($call['methodName'] == 'system.multicall') {
 			return _xmlrpcs_multicall_error('recursion');
 		}
-		if(!array_key_exists('params', $call))
-		{
+		if(!array_key_exists('params', $call)) {
 			return _xmlrpcs_multicall_error('noparams');
 		}
-		if(!is_array($call['params']))
-		{
+		if(!is_array($call['params'])) {
 			return _xmlrpcs_multicall_error('notarray');
 		}
 
@@ -296,13 +250,13 @@ 
 		// 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);
 
-		if($result->faultCode() != 0)
-		{
+		if($result->faultCode() != 0) {
 			return _xmlrpcs_multicall_error($result);		// Method returned fault.
 		}
 
@@ -313,21 +267,16 @@ 
 	{
 		$result = array();
 		// let accept a plain list of php parameters, beside a single xmlrpc msg object
-		if (is_object($m))
-		{
+		if (is_object($m)) {
 			$calls = $m->getParam(0);
 			$numCalls = $calls->arraysize();
-			for($i = 0; $i < $numCalls; $i++)
-			{
+			for($i = 0; $i < $numCalls; $i++) {
 				$call = $calls->arraymem($i);
 				$result[$i] = _xmlrpcs_multicall_do_call($server, $call);
 			}
-		}
-		else
-		{
+		} else {
 			$numCalls=count($m);
-			for($i = 0; $i < $numCalls; $i++)
-			{
+			for($i = 0; $i < $numCalls; $i++) {
 				$result[$i] = _xmlrpcs_multicall_do_call_phpvals($server, $m[$i]);
 			}
 		}
@@ -378,38 +327,30 @@ 
 	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)
-		{
+		if($errcode != E_STRICT) {
 			$GLOBALS['_xmlrpcs_occurred_errors'] = $GLOBALS['_xmlrpcs_occurred_errors'] . $errstring . "\n";
 		}
 		// Try to avoid as much as possible disruption to the previous error handling
 		// mechanism in place
-		if($GLOBALS['_xmlrpcs_prev_ehandler'] == '')
-		{
+		if($GLOBALS['_xmlrpcs_prev_ehandler'] == '') {
 			// The previous error handler was the default: all we should do is log error
 			// to the default error log (if level high enough)
-			if(ini_get('log_errors') && (intval(ini_get('error_reporting')) & $errcode))
-			{
+			if(ini_get('log_errors') && (intval(ini_get('error_reporting')) & $errcode)) {
 				error_log($errstring);
 			}
-		}
-		else
-		{
+		} else {
 			// Pass control on to previous error handler, trying to avoid loops...
-			if($GLOBALS['_xmlrpcs_prev_ehandler'] != '_xmlrpcs_errorHandler')
-			{
+			if($GLOBALS['_xmlrpcs_prev_ehandler'] != '_xmlrpcs_errorHandler') {
 				// NB: this code will NOT work on php < 4.0.2: only 2 params were used for error handlers
-				if(is_array($GLOBALS['_xmlrpcs_prev_ehandler']))
-				{
+				if(is_array($GLOBALS['_xmlrpcs_prev_ehandler'])) {
 					// the following works both with static class methods and plain object methods as error handler
 					call_user_func_array($GLOBALS['_xmlrpcs_prev_ehandler'], array($errcode, $errstring, $filename, $lineno, $context));
-				}
-				else
-				{
+				} else {
 					$GLOBALS['_xmlrpcs_prev_ehandler']($errcode, $errstring, $filename, $lineno, $context);
 				}
 			}
@@ -502,8 +443,7 @@ 
 		{
 			// if ZLIB is enabled, let the server by default accept compressed requests,
 			// and compress responses sent to clients that support them
-			if(function_exists('gzinflate'))
-			{
+			if(function_exists('gzinflate')) {
 				$this->accepted_compression = array('gzip', 'deflate');
 				$this->compress_response = true;
 			}
@@ -520,11 +460,9 @@ 
 			 * instead, you can use the class add_to_map() function
 			 * to add functions manually (borrowed from SOAPX4)
 			 */
-			if($dispMap)
-			{
+			if($dispMap) {
 				$this->dmap = $dispMap;
-				if($serviceNow)
-				{
+				if($serviceNow) {
 					$this->service();
 				}
 			}
@@ -562,12 +500,10 @@ 
 			// so we split it: system debug is base 64 encoded,
 			// user debug info should be encoded by the end user using the INTERNAL_ENCODING
 			$out = '';
-			if ($this->debug_info != '')
-			{
+			if ($this->debug_info != '') {
 				$out .= "<!-- SERVER DEBUG INFO (BASE64 ENCODED):\n".base64_encode($this->debug_info)."\n-->\n";
 			}
-			if($GLOBALS['_xmlrpc_debuginfo']!='')
-			{
+			if($GLOBALS['_xmlrpc_debuginfo']!='') {
 
 				$out .= "<!-- DEBUG INFO:\n" . xmlrpc_encode_entitites(str_replace('--', '_-', $GLOBALS['_xmlrpc_debuginfo']), $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "\n-->\n";
 				// NB: a better solution MIGHT be to use CDATA, but we need to insert it
@@ -585,16 +521,12 @@ 
 		*/
 		function service($data=null, $return_payload=false)
 		{
-			if ($data === null)
-			{
+			if ($data === null) {
 				// workaround for a known bug in php ver. 5.2.2 that broke $HTTP_RAW_POST_DATA
 				$ver = phpversion();
-				if ($ver[0] >= 5)
-				{
+				if ($ver[0] >= 5) {
 					$data = file_get_contents('php://input');
-				}
-				else
-				{
+				} else {
 					$data = isset($GLOBALS['HTTP_RAW_POST_DATA']) ? $GLOBALS['HTTP_RAW_POST_DATA'] : '';
 				}
 			}
@@ -604,49 +536,42 @@ 
 			$this->debug_info = '';
 
 			// Echo back what we received, before parsing it
-			if($this->debug > 1)
-			{
+			if($this->debug > 1) {
 				$this->debugmsg("+++GOT+++\n" . $data . "\n+++END+++");
 			}
 
 			$r = $this->parseRequestHeaders($data, $req_charset, $resp_charset, $resp_encoding);
-			if (!$r)
-			{
+			if (!$r) {
 				$r=$this->parseRequest($data, $req_charset);
 			}
 
 			// save full body of request into response, for more debugging usages
 			$r->raw_data = $raw_data;
 
-			if($this->debug > 2 && $GLOBALS['_xmlrpcs_occurred_errors'])
-			{
+			if($this->debug > 2 && $GLOBALS['_xmlrpcs_occurred_errors']) {
 				$this->debugmsg("+++PROCESSING ERRORS AND WARNINGS+++\n" .
 					$GLOBALS['_xmlrpcs_occurred_errors'] . "+++END+++");
 			}
 
 			$payload=$this->xml_header($resp_charset);
-			if($this->debug > 0)
-			{
+			if($this->debug > 0) {
 				$payload = $payload . $this->serializeDebug($resp_charset);
 			}
 
 			// G. Giunta 2006-01-27: do not create response serialization if it has
 			// already happened. Helps building json magic
-			if (empty($r->payload))
-			{
+			if (empty($r->payload)) {
 				$r->serialize($resp_charset);
 			}
 			$payload = $payload . $r->payload;
 
-			if ($return_payload)
-			{
+			if ($return_payload) {
 				return $payload;
 			}
 
 			// if we get a warning/error that has output some text before here, then we cannot
 			// add a new header. We cannot say we are sending xml, either...
-			if(!headers_sent())
-			{
+			if(!headers_sent()) {
 				header('Content-Type: '.$r->content_type);
 				// we do not know if client actually told us an accepted charset, but if he did
 				// we have to tell him what we did
@@ -657,16 +582,12 @@ 
 				// and php ini settings do not force it already
 				$php_no_self_compress = !ini_get('zlib.output_compression') && (ini_get('output_handler') != 'ob_gzhandler');
 				if($this->compress_response && function_exists('gzencode') && $resp_encoding != ''
-					&& $php_no_self_compress)
-				{
-					if(strpos($resp_encoding, 'gzip') !== false)
-					{
+					&& $php_no_self_compress) {
+					if(strpos($resp_encoding, 'gzip') !== false) {
 						$payload = gzencode($payload);
 						header("Content-Encoding: gzip");
 						header("Vary: Accept-Encoding");
-					}
-					elseif (strpos($resp_encoding, 'deflate') !== false)
-					{
+					} elseif (strpos($resp_encoding, 'deflate') !== false) {
 						$payload = gzcompress($payload);
 						header("Content-Encoding: deflate");
 						header("Vary: Accept-Encoding");
@@ -675,13 +596,10 @@ 
 
 				// do not ouput content-length header if php is compressing output for us:
 				// it will mess up measurements
-				if($php_no_self_compress)
-				{
+				if($php_no_self_compress) {
 					header('Content-Length: ' . (int)strlen($payload));
 				}
-			}
-			else
-			{
+			} else {
 				error_log('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
 			}
 
@@ -706,12 +624,10 @@ 
 				'function'	=> $function,
 				'docstring' => $doc
 			);
-			if ($sig)
-			{
+			if ($sig) {
 				$this->dmap[$methodname]['signature'] = $sig;
 			}
-			if ($sigdoc)
-			{
+			if ($sigdoc) {
 				$this->dmap[$methodname]['signature_docs'] = $sigdoc;
 			}
 		}
@@ -725,41 +641,28 @@ 
 		function verifySignature($in, $sig)
 		{
 			// check each possible signature in turn
-			if (is_object($in))
-			{
+			if (is_object($in)) {
 				$numParams = $in->getNumParams();
-			}
-			else
-			{
+			} else {
 				$numParams = count($in);
 			}
-			foreach($sig as $cursig)
-			{
-				if(count($cursig)==$numParams+1)
-				{
+			foreach($sig as $cursig) {
+				if(count($cursig)==$numParams+1) {
 					$itsOK=1;
-					for($n=0; $n<$numParams; $n++)
-					{
-						if (is_object($in))
-						{
+					for($n=0; $n<$numParams; $n++) {
+						if (is_object($in)) {
 							$p=$in->getParam($n);
-							if($p->kindOf() == 'scalar')
-							{
+							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...
 						}
 
 						// param index is $n+1, as first member of sig is return type
-						if($pt != $cursig[$n+1] && $cursig[$n+1] != $GLOBALS['xmlrpcValue'])
-						{
+						if($pt != $cursig[$n+1] && $cursig[$n+1] != $GLOBALS['xmlrpcValue']) {
 							$itsOK=0;
 							$pno=$n+1;
 							$wanted=$cursig[$n+1];
@@ -767,18 +670,15 @@ 
 							break;
 						}
 					}
-					if($itsOK)
-					{
+					if($itsOK) {
 						return array(1,'');
 					}
 				}
 			}
-			if(isset($wanted))
-			{
+			if(isset($wanted)) {
 				return array(0, "Wanted ${wanted}, got ${got} at param ${pno}");
 			}
-			else
-			{
+			else {
 				return array(0, "No method signature matches number of parameters");
 			}
 		}
@@ -792,63 +692,46 @@ 
 		{
 			// check if $_SERVER is populated: it might have been disabled via ini file
 			// (this is true even when in CLI mode)
-			if (count($_SERVER) == 0)
-			{
+			if (count($_SERVER) == 0) {
 				error_log('XML-RPC: '.__METHOD__.': cannot parse request headers as $_SERVER is not populated');
 			}
 
-			if($this->debug > 1)
-			{
-				if(function_exists('getallheaders'))
-				{
+			if($this->debug > 1) {
+				if(function_exists('getallheaders')) {
 					$this->debugmsg(''); // empty line
-					foreach(getallheaders() as $name => $val)
-					{
+					foreach(getallheaders() as $name => $val) {
 						$this->debugmsg("HEADER: $name: $val");
 					}
 				}
 
 			}
 
-			if(isset($_SERVER['HTTP_CONTENT_ENCODING']))
-			{
+			if(isset($_SERVER['HTTP_CONTENT_ENCODING'])) {
 				$content_encoding = str_replace('x-', '', $_SERVER['HTTP_CONTENT_ENCODING']);
-			}
-			else
-			{
+			} else {
 				$content_encoding = '';
 			}
 
 			// check if request body has been compressed and decompress it
-			if($content_encoding != '' && strlen($data))
-			{
-				if($content_encoding == 'deflate' || $content_encoding == 'gzip')
-				{
+			if($content_encoding != '' && strlen($data)) {
+				if($content_encoding == 'deflate' || $content_encoding == 'gzip') {
 					// if decoding works, use it. else assume data wasn't gzencoded
-					if(function_exists('gzinflate') && in_array($content_encoding, $this->accepted_compression))
-					{
-						if($content_encoding == 'deflate' && $degzdata = @gzuncompress($data))
-						{
+					if(function_exists('gzinflate') && in_array($content_encoding, $this->accepted_compression)) {
+						if($content_encoding == 'deflate' && $degzdata = @gzuncompress($data)) {
 							$data = $degzdata;
-							if($this->debug > 1)
-							{
+							if($this->debug > 1) {
 								$this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");
 							}
-						}
-						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']);
 						return $r;
@@ -858,41 +741,35 @@ 
 
 			// check if client specified accepted charsets, and if we know how to fulfill
 			// the request
-			if ($this->response_charset_encoding == 'auto')
-			{
+			if ($this->response_charset_encoding == 'auto') {
 				$resp_encoding = '';
-				if (isset($_SERVER['HTTP_ACCEPT_CHARSET']))
-				{
+				if (isset($_SERVER['HTTP_ACCEPT_CHARSET'])) {
 					// here we should check if we can match the client-requested encoding
 					// with the encodings we know we can generate.
 					/// @todo we should parse q=0.x preferences instead of getting first charset specified...
 					$client_accepted_charsets = explode(',', strtoupper($_SERVER['HTTP_ACCEPT_CHARSET']));
 					// Give preference to internal encoding
 					$known_charsets = array($GLOBALS['xmlrpc_internalencoding'], 'UTF-8', 'ISO-8859-1', 'US-ASCII');
-					foreach ($known_charsets as $charset)
-					{
-						foreach ($client_accepted_charsets as $accepted)
-							if (strpos($accepted, $charset) === 0)
+					foreach ($known_charsets as $charset) {
+						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;
 			}
 
-			if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
-			{
+			if (isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 				$resp_compression = $_SERVER['HTTP_ACCEPT_ENCODING'];
-			}
-			else
-			{
+			} else {
 				$resp_compression = '';
 			}
 
@@ -936,23 +813,21 @@ 
 			$GLOBALS['_xh']['rt']='';
 
 			// decompose incoming XML into request structure
-			if ($req_encoding != '')
-			{
-				if (!in_array($req_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
-				// the following code might be better for mb_string enabled installs, but
+			if ($req_encoding != '') {
+				if (!in_array($req_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII'))) {
+								// the following code might be better for mb_string enabled installs, but
 				// makes the lib about 200% slower...
 				//if (!is_valid_charset($req_encoding, array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
 				{
 					error_log('XML-RPC: '.__METHOD__.': invalid charset encoding of received request: '.$req_encoding);
+				}
 					$req_encoding = $GLOBALS['xmlrpc_defencoding'];
 				}
 				/// @BUG this will fail on PHP 5 if charset is not specified in the xml prologue,
 				// the encoding is not UTF8 and there are non-ascii chars in the text...
 				/// @todo use an ampty string for php 5 ???
 				$parser = xml_parser_create($req_encoding);
-			}
-			else
-			{
+			} else {
 				$parser = xml_parser_create();
 			}
 
@@ -963,23 +838,20 @@ 
 			// we use the broadest one, ie. utf8
 			// This allows to send data which is native in various charset,
 			// by extending xmlrpc_encode_entitites() and setting xmlrpc_internalencoding
-			if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
-			{
+			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))
-			{
+			if(!xml_parse($parser, $data, 1)) {
 				// return XML error as a faultCode
 				$r=new xmlrpcresp(0,
 				$GLOBALS['xmlrpcerrxml']+xml_get_error_code($parser),
@@ -987,41 +859,31 @@ 
 					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:
 				// we should allow the 'execute' method handle this, but in the
 				// most common scenario (xmlrpcvals type server with some methods
 				// registered as phpvals) that would mean a useless encode+decode pass
-				if ($this->functions_parameters_type != 'xmlrpcvals' || (isset($this->dmap[$GLOBALS['_xh']['method']]['parameters_type']) && ($this->dmap[$GLOBALS['_xh']['method']]['parameters_type'] == 'phpvals')))
-				{
-					if($this->debug > 1)
-					{
+				if ($this->functions_parameters_type != 'xmlrpcvals' || (isset($this->dmap[$GLOBALS['_xh']['method']]['parameters_type']) && ($this->dmap[$GLOBALS['_xh']['method']]['parameters_type'] == 'phpvals'))) {
+					if($this->debug > 1) {
 						$this->debugmsg("\n+++PARSED+++\n".var_export($GLOBALS['_xh']['params'], true)."\n+++END+++");
 					}
 					$r = $this->execute($GLOBALS['_xh']['method'], $GLOBALS['_xh']['params'], $GLOBALS['_xh']['pt']);
-				}
-				else
-				{
+				} else {
 					// build an xmlrpcmsg object with data parsed from xml
 					$m=new xmlrpcmsg($GLOBALS['_xh']['method']);
 					// now add parameters in
-					for($i=0; $i<count($GLOBALS['_xh']['params']); $i++)
-					{
+					for($i=0; $i<count($GLOBALS['_xh']['params']); $i++) {
 						$m->addParam($GLOBALS['_xh']['params'][$i]);
 					}
 
-					if($this->debug > 1)
-					{
+					if($this->debug > 1) {
 						$this->debugmsg("\n+++PARSED+++\n".var_export($m, true)."\n+++END+++");
 					}
 					$r = $this->execute($m);
@@ -1040,19 +902,15 @@ 
 		*/
 		function execute($m, $params=null, $paramtypes=null)
 		{
-			if (is_object($m))
-			{
+			if (is_object($m)) {
 				$methName = $m->method();
-			}
-			else
-			{
+			} else {
 				$methName = $m;
 			}
 			$sysCall = $this->allow_system_funcs && (strpos($methName, "system.") === 0);
 			$dmap = $sysCall ? $GLOBALS['_xmlrpcs_dmap'] : $this->dmap;
 
-			if(!isset($dmap[$methName]['function']))
-			{
+			if(!isset($dmap[$methName]['function'])) {
 				// No such method
 				return new xmlrpcresp(0,
 					$GLOBALS['xmlrpcerr']['unknown_method'],
@@ -1060,19 +918,14 @@ 
 			}
 
 			// Check signature
-			if(isset($dmap[$methName]['signature']))
-			{
+			if(isset($dmap[$methName]['signature'])) {
 				$sig = $dmap[$methName]['signature'];
-				if (is_object($m))
-				{
+				if (is_object($m)) {
 					list($ok, $errstr) = $this->verifySignature($m, $sig);
-				}
-				else
-				{
+				} else {
 					list($ok, $errstr) = $this->verifySignature($paramtypes, $sig);
 				}
-				if(!$ok)
-				{
+				if(!$ok) {
 					// Didn't match.
 					return new xmlrpcresp(
 						0,
@@ -1084,13 +937,11 @@ 
 
 			$func = $dmap[$methName]['function'];
 			// let the 'class::function' syntax be accepted in dispatch maps
-			if(is_string($func) && strpos($func, '::'))
-			{
+			if(is_string($func) && strpos($func, '::')) {
 				$func = explode('::', $func);
 			}
 			// verify that function to be invoked is in fact callable
-			if(!is_callable($func))
-			{
+			if(!is_callable($func)) {
 				error_log("XML-RPC: ".__METHOD__.": function $func registered as method handler is not callable");
 				return new xmlrpcresp(
 					0,
@@ -1101,32 +952,22 @@ 
 
 			// If debug level is 3, we should catch all errors generated during
 			// processing of user function, and log them as part of response
-			if($this->debug > 2)
-			{
+			if($this->debug > 2) {
 				$GLOBALS['_xmlrpcs_prev_ehandler'] = set_error_handler('_xmlrpcs_errorHandler');
 			}
-			try
-			{
+			try {
 				// Allow mixed-convention servers
-				if (is_object($m))
-				{
-					if($sysCall)
-					{
+				if (is_object($m)) {
+					if($sysCall) {
 						$r = call_user_func($func, $this, $m);
-					}
-					else
-					{
+					} else {
 						$r = call_user_func($func, $m);
 					}
-					if (!is_a($r, 'xmlrpcresp'))
-					{
+					if (!is_a($r, 'xmlrpcresp')) {
 						error_log("XML-RPC: ".__METHOD__.": function $func registered as method handler does not return an xmlrpcresp object");
-						if (is_a($r, 'xmlrpcval'))
-						{
+						if (is_a($r, 'xmlrpcval')) {
 							$r = new xmlrpcresp($r);
-						}
-						else
-						{
+						} else {
 							$r = new xmlrpcresp(
 								0,
 								$GLOBALS['xmlrpcerr']['server_error'],
@@ -1134,54 +975,39 @@ 
 							);
 						}
 					}
-				}
-				else
-				{
+				} else {
 					// call a 'plain php' function
-					if($sysCall)
-					{
+					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')
-						{
+						if ($this->functions_parameters_type == 'epivals') {
 							$r = call_user_func_array($func, array($methName, $params, $this->user_data));
 							// mimic EPI behaviour: if we get an array that looks like an error, make it
 							// an eror response
-							if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r))
-							{
+							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);
 						}
 					}
 					// the return type can be either an xmlrpcresp object or a plain php value...
-					if (!is_a($r, 'xmlrpcresp'))
-					{
+					if (!is_a($r, 'xmlrpcresp')) {
 						// what should we assume here about automatic encoding of datetimes
 						// and php classes instances???
 						$r = new xmlrpcresp(php_xmlrpc_encode($r, $this->phpvals_encoding_options));
 					}
 				}
-			}
-			catch(Exception $e)
-			{
+			} catch(Exception $e) {
 				// (barring errors in the lib) an uncatched exception happened
 				// in the called function, we wrap it in a proper error-response
-				switch($this->exception_handling)
-				{
+				switch($this->exception_handling) {
 					case 2:
 						throw $e;
 						break;
@@ -1192,16 +1018,12 @@ 
 						$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_error'], $GLOBALS['xmlrpcstr']['server_error']);
 				}
 			}
-			if($this->debug > 2)
-			{
+			if($this->debug > 2) {
 				// note: restore the error handler we found before calling the
 				// user func, even if it has been changed inside the func itself
-				if($GLOBALS['_xmlrpcs_prev_ehandler'])
-				{
+				if($GLOBALS['_xmlrpcs_prev_ehandler']) {
 					set_error_handler($GLOBALS['_xmlrpcs_prev_ehandler']);
-				}
-				else
-				{
+				} else {
 					restore_error_handler();
 				}
 			}
@@ -1223,12 +1045,9 @@ 
 		*/
 		function xml_header($charset_encoding='')
 		{
-			if ($charset_encoding != '')
-			{
+			if ($charset_encoding != '') {
 				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\"?" . ">\n";
-			}
-			else
-			{
+			} else {
 				return "<?xml version=\"1.0\"?" . ">\n";
 			}
 		}

Components/CSRFWhitelistAware.php

Braces +3 added lines, -1 removed lines

@@ -3,6 +3,8 @@
 namespace Shopware\Components;
 
 if (!interface_exists('\Shopware\Components\CSRFWhitelistAware')) {
-    interface CSRFWhitelistAware {}
+    interface CSRFWhitelistAware
+    {
+}
 }
 

Components/KlarnaCheckout/Checkout/BasicConnector.php

Braces +2 added lines, -1 removed lines

@@ -325,7 +325,8 @@
      * @param bool $blIncludeDebugBacktrace
      * @return void
      */
-    public function klarnaLog($message, $logLevelMessage=1, $mPrintableElement=null) {
+    public function klarnaLog($message, $logLevelMessage=1, $mPrintableElement=null)
+    {
         $configname = 'klarnaLogLevel';
         $elementId = Shopware()->Db()->fetchOne('SELECT id FROM s_core_config_elements WHERE name = ?', [$configname]);
         $logLevelConfigSetting = Shopware()->Db()->fetchOne('SELECT value FROM s_core_config_values WHERE element_id = ?', [$elementId]);

Components/KlarnaCheckout/Checkout/Order.php

Braces +2 added lines, -1 removed lines

@@ -264,7 +264,8 @@
      * @param bool $blIncludeDebugBacktrace
      * @return void
      */
-    public function klarnaLog($message, $logLevelMessage=1) {
+    public function klarnaLog($message, $logLevelMessage=1)
+    {
         $configname = 'klarnaLogLevel';
         $elementId = Shopware()->Db()->fetchOne('SELECT id FROM s_core_config_elements WHERE name = ?', [$configname]);
         $logLevelConfigSetting = Shopware()->Db()->fetchOne('SELECT value FROM s_core_config_values WHERE element_id = ?', [$elementId]);

Controllers/Frontend/PaymentKlarna.php

Braces +2 added lines, -1 removed lines

@@ -789,7 +789,8 @@
                             $session->offsetGet('sRegisterFinished')
                         );
                     }
-                } catch (\Exception $ex) { /* do nothing */
+                } catch (\Exception $ex) {
+/* do nothing */
                     $this->plugin->klarnaLog("ERROR while creating User. Exception information:". $ex->getMessage(), 1);
                 }
             }