FATCHIP-GmbH / plugin-shopware5-klarna-checkout

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

Braces +170 added lines, -239 removed lines

@@ -403,14 +403,12 @@ 
 					$GLOBALS['_xh']['isf'] = 2;
 					$GLOBALS['_xh']['isf_reason'] = 'missing top level xmlrpc element';
 					return;
-				}
-				else
+				} else
 				{
 					$GLOBALS['_xh']['rt'] = strtolower($name);
 					$GLOBALS['_xh']['rt'] = strtolower($name);
 				}
-			}
-			else
+			} else
 			{
 				// not top level element: see if parent is OK
 				$parent = end($GLOBALS['_xh']['stack']);
@@ -566,21 +564,20 @@ 
 						$temp = new xmlrpcval($GLOBALS['_xh']['value'], $GLOBALS['_xh']['vt']);
 						// in case we got info about underlying php class, save it
 						// in the object we're rebuilding
-						if (isset($GLOBALS['_xh']['php_class']))
-							$temp->_php_class = $GLOBALS['_xh']['php_class'];
+						if (isset($GLOBALS['_xh']['php_class'])) {
+													$temp->_php_class = $GLOBALS['_xh']['php_class'];
+						}
 						// check if we are inside an array or struct:
 						// if value just built is inside an array, let's move it into array on the stack
 						$vscount = count($GLOBALS['_xh']['valuestack']);
 						if ($vscount && $GLOBALS['_xh']['valuestack'][$vscount-1]['type']=='ARRAY')
 						{
 							$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][] = $temp;
-						}
-						else
+						} else
 						{
 							$GLOBALS['_xh']['value'] = $temp;
 						}
-					}
-					else
+					} else
 					{
 						/// @todo this needs to treat correctly php-serialized objects,
 						/// since std deserializing is done by php_xmlrpc_decode,
@@ -611,8 +608,7 @@ 
 					if ($name=='STRING')
 					{
 						$GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
-					}
-					elseif ($name=='DATETIME.ISO8601')
+					} elseif ($name=='DATETIME.ISO8601')
 					{
 						if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $GLOBALS['_xh']['ac']))
 						{
@@ -620,13 +616,11 @@ 
 						}
 						$GLOBALS['_xh']['vt']=$GLOBALS['xmlrpcDateTime'];
 						$GLOBALS['_xh']['value']=$GLOBALS['_xh']['ac'];
-					}
-					elseif ($name=='BASE64')
+					} elseif ($name=='BASE64')
 					{
 						/// @todo check for failure of base64 decoding / catch warnings
 						$GLOBALS['_xh']['value']=base64_decode($GLOBALS['_xh']['ac']);
-					}
-					elseif ($name=='BOOLEAN')
+					} elseif ($name=='BOOLEAN')
 					{
 						// special case here: we translate boolean 1 or 0 into PHP
 						// constants true or false.
@@ -637,16 +631,15 @@ 
 						if ($GLOBALS['_xh']['ac']=='1' || strcasecmp($GLOBALS['_xh']['ac'], 'true') == 0)
 						{
 							$GLOBALS['_xh']['value']=true;
-						}
-						else
+						} else
 						{
 							// log if receiveing something strange, even though we set the value to false anyway
-							if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0)
-								error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);
+							if ($GLOBALS['_xh']['ac']!='0' && strcasecmp($GLOBALS['_xh']['ac'], 'false') != 0) {
+															error_log('XML-RPC: invalid value received in BOOLEAN: '.$GLOBALS['_xh']['ac']);
+							}
 							$GLOBALS['_xh']['value']=false;
 						}
-					}
-					elseif ($name=='DOUBLE')
+					} elseif ($name=='DOUBLE')
 					{
 						// we have a DOUBLE
 						// we must check that only 0123456789-.<space> are characters here
@@ -656,14 +649,12 @@ 
 							/// @todo: find a better way of throwing an error than this!
 							error_log('XML-RPC: non numeric value received in DOUBLE: '.$GLOBALS['_xh']['ac']);
 							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
-						}
-						else
+						} else
 						{
 							// it's ok, add it on
 							$GLOBALS['_xh']['value']=(double)$GLOBALS['_xh']['ac'];
 						}
-					}
-					else
+					} else
 					{
 						// we have an I4/INT
 						// we must check that only 0123456789-<space> are characters here
@@ -672,8 +663,7 @@ 
 							/// @todo find a better way of throwing an error than this!
 							error_log('XML-RPC: non numeric value received in INT: '.$GLOBALS['_xh']['ac']);
 							$GLOBALS['_xh']['value']='ERROR_NON_NUMERIC_FOUND';
-						}
-						else
+						} else
 						{
 							// it's ok, add it on
 							$GLOBALS['_xh']['value']=(int)$GLOBALS['_xh']['ac'];
@@ -693,8 +683,9 @@ 
 					{
 						$vscount = count($GLOBALS['_xh']['valuestack']);
 						$GLOBALS['_xh']['valuestack'][$vscount-1]['values'][$GLOBALS['_xh']['valuestack'][$vscount-1]['name']] = $GLOBALS['_xh']['value'];
-					} else
-						error_log('XML-RPC: missing VALUE inside STRUCT in received xml');
+					} else {
+											error_log('XML-RPC: missing VALUE inside STRUCT in received xml');
+					}
 					break;
 				case 'DATA':
 					//$GLOBALS['_xh']['ac']=''; // is this necessary?
@@ -718,9 +709,9 @@ 
 					{
 						$GLOBALS['_xh']['params'][]=$GLOBALS['_xh']['value'];
 						$GLOBALS['_xh']['pt'][]=$GLOBALS['_xh']['vt'];
+					} else {
+											error_log('XML-RPC: missing VALUE inside PARAM in received xml');
 					}
-					else
-						error_log('XML-RPC: missing VALUE inside PARAM in received xml');
 					break;
 				case 'METHODNAME':
 					$GLOBALS['_xh']['method']=preg_replace('/^[\n\r\t ]+/', '', $GLOBALS['_xh']['ac']);
@@ -908,8 +899,7 @@ 
 			if($path == '' || $path[0] != '/')
 			{
 				$this->path='/'.$path;
-			}
-			else
+			} else
 			{
 				$this->path=$path;
 			}
@@ -990,8 +980,7 @@ 
 			if ($is_dir)
 			{
 				$this->cacertdir = $cacert;
-			}
-			else
+			} else
 			{
 				$this->cacert = $cacert;
 			}
@@ -1059,10 +1048,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);
+			}
 		}
 
 		/**
@@ -1099,8 +1089,7 @@ 
 				$this->cookies[$name]['domain'] = $domain;
 				$this->cookies[$name]['port'] = $port;
 				$this->cookies[$name]['version'] = 1;
-			}
-			else
+			} else
 			{
 				$this->cookies[$name]['version'] = 0;
 			}
@@ -1147,8 +1136,7 @@ 
 				// $msg is an array of xmlrpcmsg's
 				$r = $this->multicall($msg, $timeout, $method);
 				return $r;
-			}
-			elseif(is_string($msg))
+			} elseif(is_string($msg))
 			{
 				$n = new xmlrpcmsg('');
 				$n->payload = $msg;
@@ -1181,8 +1169,7 @@ 
 					$this->key,
 					$this->keypass
 				);
-			}
-			elseif($method == 'http11')
+			} elseif($method == 'http11')
 			{
 				$r =& $this->sendPayloadCURL(
 					$msg,
@@ -1204,8 +1191,7 @@ 
 					'http',
 					$this->keepalive
 				);
-			}
-			else
+			} else
 			{
 				$r =& $this->sendPayloadHTTP10(
 					$msg,
@@ -1256,8 +1242,7 @@ 
 						$payload = $a;
 						$encoding_hdr = "Content-Encoding: gzip\r\n";
 					}
-				}
-				else
+				} else
 				{
 					$a = @gzcompress($payload);
 					if($a)
@@ -1266,8 +1251,7 @@ 
 						$encoding_hdr = "Content-Encoding: deflate\r\n";
 					}
 				}
-			}
-			else
+			} else
 			{
 				$encoding_hdr = '';
 			}
@@ -1307,8 +1291,7 @@ 
 					}
 					$proxy_credentials = 'Proxy-Authorization: Basic ' . base64_encode($proxyusername.':'.$proxypassword) . "\r\n";
 				}
-			}
-			else
+			} else
 			{
 				$connectserver = $server;
 				$connectport = $port;
@@ -1327,14 +1310,16 @@ 
 					{
 						$version = ' $Version="' . $cookie['version'] . '";';
 						$cookieheader .= ' ' . $name . '="' . $cookie['value'] . '";';
-						if ($cookie['path'])
-							$cookieheader .= ' $Path="' . $cookie['path'] . '";';
-						if ($cookie['domain'])
-							$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';
-						if ($cookie['port'])
-							$cookieheader .= ' $Port="' . $cookie['port'] . '";';
-					}
-					else
+						if ($cookie['path']) {
+													$cookieheader .= ' $Path="' . $cookie['path'] . '";';
+						}
+						if ($cookie['domain']) {
+													$cookieheader .= ' $Domain="' . $cookie['domain'] . '";';
+						}
+						if ($cookie['port']) {
+													$cookieheader .= ' $Port="' . $cookie['port'] . '";';
+						}
+					} else
 					{
 						$cookieheader .= ' ' . $name . '=' . $cookie['value'] . ";";
 					}
@@ -1365,8 +1350,7 @@ 
 			if($timeout>0)
 			{
 				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr, $timeout);
-			}
-			else
+			} else
 			{
 				$fp=@fsockopen($connectserver, $connectport, $this->errno, $this->errstr);
 			}
@@ -1376,8 +1360,7 @@ 
 				{
 					stream_set_timeout($fp, $timeout);
 				}
-			}
-			else
+			} else
 			{
 				$this->errstr='Connect error: '.$this->errstr;
 				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $this->errstr . ' (' . $this->errno . ')');
@@ -1390,8 +1373,7 @@ 
 				$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 = '';
@@ -1458,8 +1440,7 @@ 
 				if($method == 'http')
 				{
 					$port = 80;
-				}
-				else
+				} else
 				{
 					$port = 443;
 				}
@@ -1483,8 +1464,7 @@ 
 						$payload = $a;
 						$encoding_hdr = 'Content-Encoding: gzip';
 					}
-				}
-				else
+				} else
 				{
 					$a = @gzcompress($payload);
 					if($a)
@@ -1493,8 +1473,7 @@ 
 						$encoding_hdr = 'Content-Encoding: deflate';
 					}
 				}
-			}
-			else
+			} else
 			{
 				$encoding_hdr = '';
 			}
@@ -1513,8 +1492,7 @@ 
 				{
 					$this->xmlrpc_curl_handle = $curl;
 				}
-			}
-			else
+			} else
 			{
 				$curl = $this->xmlrpc_curl_handle;
 			}
@@ -1546,9 +1524,9 @@ 
 				if (count($this->accepted_compression) == 1)
 				{
 					curl_setopt($curl, CURLOPT_ENCODING, $this->accepted_compression[0]);
+				} else {
+									curl_setopt($curl, CURLOPT_ENCODING, '');
 				}
-				else
-					curl_setopt($curl, CURLOPT_ENCODING, '');
 			}
 			// extra headers
 			$headers = array('Content-Type: ' . $msg->content_type , 'Accept-Charset: ' . implode(',', $this->accepted_charset_encodings));
@@ -1576,8 +1554,7 @@ 
 				if (defined('CURLOPT_HTTPAUTH'))
 				{
 					curl_setopt($curl, CURLOPT_HTTPAUTH, $authtype);
-				}
-				else if ($authtype != 1)
+				} else if ($authtype != 1)
 				{
 					error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth is supported by the current PHP/curl install');
 				}
@@ -1635,8 +1612,7 @@ 
 					if (defined('CURLOPT_PROXYAUTH'))
 					{
 						curl_setopt($curl, CURLOPT_PROXYAUTH, $proxyauthtype);
-					}
-					else if ($proxyauthtype != 1)
+					} else if ($proxyauthtype != 1)
 					{
 						error_log('XML-RPC: '.__METHOD__.': warning. Only Basic auth to proxy is supported by the current PHP/curl install');
 					}
@@ -1666,22 +1642,24 @@ 
 			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)
 				{
 					$this->xmlrpc_curl_handle = null;
 				}
-			}
-			else
+			} else
 			{
 				if(!$keepalive)
 				{
@@ -1727,8 +1705,7 @@ 
 				{
 					// System.multicall succeeded
 					return $results;
-				}
-				else
+				} else
 				{
 					// either system.multicall is unsupported by server,
 					// or call failed for some other reason.
@@ -1736,21 +1713,18 @@ 
 					{
 						// Don't try it next time...
 						$this->no_multicall = true;
-					}
-					else
+					} else
 					{
 						if (is_a($results, 'xmlrpcresp'))
 						{
 							$result = $results;
-						}
-						else
+						} else
 						{
 							$result = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['multicall_error'], $GLOBALS['xmlrpcstr']['multicall_error']);
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				// override fallback, in case careless user tries to do two
 				// opposite things at the same time
@@ -1766,8 +1740,7 @@ 
 				{
 					$results[] =& $this->send($msg, $timeout, $method);
 				}
-			}
-			else
+			} else
 			{
 				// user does NOT want to fallback on many single calls:
 				// since we should always return an array of responses,
@@ -1820,8 +1793,7 @@ 
 			if ($this->return_type == 'xml')
 			{
 					return $rets;
-			}
-			else if ($this->return_type == 'phpvals')
+			} else if ($this->return_type == 'phpvals')
 			{
 				///@todo test this code branch...
 				$rets = $result->value();
@@ -1871,8 +1843,7 @@ 
 					}
 				}
 				return $response;
-			}
-			else // return type == 'xmlrpcvals'
+			} else // return type == 'xmlrpcvals'
 			{
 				$rets = $result->value();
 				if($rets->kindOf() != 'array')
@@ -1951,8 +1922,7 @@ 
 				$this->errno = $fcode;
 				$this->errstr = $fstr;
 				//$this->errstr = htmlspecialchars($fstr); // XXX: encoding probably shouldn't be done here; fix later.
-			}
-			else
+			} else
 			{
 				// successful response
 				$this->val = $val;
@@ -1962,18 +1932,15 @@ 
 					if (is_object($this->val) && is_a($this->val, 'xmlrpcval'))
 					{
 						$this->valtyp = 'xmlrpcvals';
-					}
-					else if (is_string($this->val))
+					} else if (is_string($this->val))
 					{
 						$this->valtyp = 'xml';
 
-					}
-					else
+					} else
 					{
 						$this->valtyp = 'phpvals';
 					}
-				}
-				else
+				} else
 				{
 					// user declares type of resp value: believe him
 					$this->valtyp = $valtyp;
@@ -2035,10 +2002,11 @@ 
 		*/
 		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)
 			{
@@ -2049,8 +2017,7 @@ 
 "</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>" .
 xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $charset_encoding) . "</string></value>\n</member>\n" .
 "</struct>\n</value>\n</fault>";
-			}
-			else
+			} else
 			{
 				if(!is_object($this->val) || !is_a($this->val, 'xmlrpcval'))
 				{
@@ -2059,14 +2026,12 @@ 
 						$result .= "<params>\n<param>\n" .
 							$this->val .
 							"</param>\n</params>";
-					}
-					else
+					} else
 					{
 						/// @todo try to build something serializable?
 						die('cannot serialize xmlrpcresp objects whose content is native php values');
 					}
-				}
-				else
+				} else
 				{
 					$result .= "<params>\n<param>\n" .
 						$this->val->serialize($charset_encoding) .
@@ -2111,8 +2076,7 @@ 
 			if ($charset_encoding != '')
 			{
 				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\" ?" . ">\n<methodCall>\n";
-			}
-			else
+			} else
 			{
 				return "<?xml version=\"1.0\"?" . ">\n<methodCall>\n";
 			}
@@ -2139,10 +2103,11 @@ 
 		*/
 		function createPayload($charset_encoding='')
 		{
-			if ($charset_encoding != '')
-				$this->content_type = 'text/xml; charset=' . $charset_encoding;
-			else
-				$this->content_type = 'text/xml';
+			if ($charset_encoding != '') {
+							$this->content_type = 'text/xml; charset=' . $charset_encoding;
+			} else {
+							$this->content_type = 'text/xml';
+			}
 			$this->payload=$this->xml_header($charset_encoding);
 			$this->payload.='<methodName>' . $this->methodname . "</methodName>\n";
 			$this->payload.="<params>\n";
@@ -2195,8 +2160,7 @@ 
 			{
 				$this->params[]=$par;
 				return true;
-			}
-			else
+			} else
 			{
 				return false;
 			}
@@ -2256,15 +2220,13 @@ 
 					if($pos || is_int($pos))
 					{
 						$bd = $pos+4;
-					}
-					else
+					} else
 					{
 						$pos = strpos($data,"\n\n");
 						if($pos || is_int($pos))
 						{
 							$bd = $pos+2;
-						}
-						else
+						} else
 						{
 							// No separation between response headers and body: fault?
 							$bd = 0;
@@ -2275,8 +2237,7 @@ 
 						// this filters out all http headers from proxy.
 						// maybe we could take them into account, too?
 						$data = substr($data, $bd);
-					}
-					else
+					} else
 					{
 						error_log('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
 						$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['http_error'], $GLOBALS['xmlrpcstr']['http_error']. ' (HTTPS via proxy error, tunnel connection possibly failed)');
@@ -2290,10 +2251,12 @@ 
 					$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))
@@ -2313,15 +2276,13 @@ 
 				if($pos || is_int($pos))
 				{
 					$bd = $pos+4;
-				}
-				else
+				} else
 				{
 					$pos = strpos($data,"\n\n");
 					if($pos || is_int($pos))
 					{
 						$bd = $pos+2;
-					}
-					else
+					} else
 					{
 						// No separation between response headers and body: fault?
 						// we could take some action here instead of going on...
@@ -2348,8 +2309,7 @@ 
 								// version 2 cookies:
 								// there could be many cookies on one line, comma separated
 								$cookies = explode(',', $arr[1]);
-							}
-							else
+							} else
 							{
 								$cookies = array($arr[1]);
 							}
@@ -2357,10 +2317,11 @@ 
 							{
 								// glue together all received cookies, using a comma to separate them
 								// (same as php does with getallheaders())
-								if (isset($GLOBALS['_xh']['headers'][$header_name]))
-									$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);
-								else
-									$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);
+								if (isset($GLOBALS['_xh']['headers'][$header_name])) {
+																	$GLOBALS['_xh']['headers'][$header_name] .= ', ' . trim($cookie);
+								} else {
+																	$GLOBALS['_xh']['headers'][$header_name] = trim($cookie);
+								}
 								// parse cookie attributes, in case user wants to correctly honour them
 								// feature creep: only allow rfc-compliant cookie attributes?
 								// @todo support for server sending multiple time cookie with same name, but using different PATHs
@@ -2376,8 +2337,7 @@ 
 										$cookiename = $tag;
 										$GLOBALS['_xh']['cookies'][$tag] = array();
 										$GLOBALS['_xh']['cookies'][$cookiename]['value'] = urldecode($val);
-									}
-									else
+									} else
 									{
 										if ($tag != 'value')
 										{
@@ -2386,13 +2346,11 @@ 
 									}
 								}
 							}
-						}
-						else
+						} else
 						{
 							$GLOBALS['_xh']['headers'][$header_name] = trim($arr[1]);
 						}
-					}
-					elseif(isset($header_name))
+					} elseif(isset($header_name))
 					{
 						///	@todo version1 cookies might span multiple lines, thus breaking the parsing above
 						$GLOBALS['_xh']['headers'][$header_name] .= ' ' . trim($line);
@@ -2443,23 +2401,22 @@ 
 								if($GLOBALS['_xh']['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data))
 								{
 									$data = $degzdata;
-									if($this->debug)
-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
-								}
-								elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
+									if($this->debug) {
+																		print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+									}
+								} elseif($GLOBALS['_xh']['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
 								{
 									$data = $degzdata;
-									if($this->debug)
-									print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
-								}
-								else
+									if($this->debug) {
+																		print "<PRE>---INFLATED RESPONSE---[".strlen($data)." chars]---\n" . htmlentities($data) . "\n---END---</PRE>";
+									}
+								} else
 								{
 									error_log('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
 									$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['decompress_fail'], $GLOBALS['xmlrpcstr']['decompress_fail']);
 									return $r;
 								}
-							}
-							else
+							} else
 							{
 								error_log('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
 								$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['cannot_decompress'], $GLOBALS['xmlrpcstr']['cannot_decompress']);
@@ -2512,8 +2469,7 @@ 
 					$r->raw_data = $data;
 					return $r;
 				}
-			}
-			else
+			} else
 			{
 				$GLOBALS['_xh']['headers'] = array();
 				$GLOBALS['_xh']['cookies'] = array();
@@ -2567,12 +2523,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);
@@ -2586,8 +2543,7 @@ 
 			if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
 			{
 				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');
-			}
-			else
+			} else
 			{
 				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);
 			}
@@ -2595,8 +2551,7 @@ 
 			if ($return_type == 'phpvals')
 			{
 				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');
-			}
-			else
+			} else
 			{
 				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');
 			}
@@ -2611,8 +2566,7 @@ 
 				if((xml_get_current_line_number($parser)) == 1)
 				{
 					$errstr = 'XML error at line 1, check URL';
-				}
-				else
+				} else
 				{
 					$errstr = sprintf('XML error: %s at line %d, column %d',
 						xml_error_string(xml_get_error_code($parser)),
@@ -2651,8 +2605,7 @@ 
 				// indicating something odd went on
 				$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['invalid_return'],
 					$GLOBALS['xmlrpcstr']['invalid_return']);
-			}
-			else
+			} else
 			{
 				if ($this->debug)
 				{
@@ -2676,8 +2629,7 @@ 
 						$errstr_v = $v->structmem('faultString');
 						$errno = $errno_v->scalarval();
 						$errstr = $errstr_v->scalarval();
-					}
-					else
+					} else
 					{
 						$errno = $v['faultCode'];
 						$errstr = $v['faultString'];
@@ -2690,8 +2642,7 @@ 
 					}
 
 					$r = new xmlrpcresp(0, $errno, $errstr);
-				}
-				else
+				} else
 				{
 					$r=new xmlrpcresp($v, 0, '', $return_type);
 				}
@@ -2791,8 +2742,7 @@ 
 				if(strcasecmp($val,'true')==0 || $val==1 || ($val==true && strcasecmp($val,'false')))
 				{
 					$val=true;
-				}
-				else
+				} else
 				{
 					$val=false;
 				}
@@ -2837,14 +2787,12 @@ 
 				$this->mytype=$GLOBALS['xmlrpcTypes']['array'];
 				$this->me['array']=$vals;
 				return 1;
-			}
-			elseif($this->mytype==2)
+			} elseif($this->mytype==2)
 			{
 				// we're adding to an array here
 				$this->me['array'] = array_merge($this->me['array'], $vals);
 				return 1;
-			}
-			else
+			} else
 			{
 				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');
 				return 0;
@@ -2866,14 +2814,12 @@ 
 				$this->mytype=$GLOBALS['xmlrpcTypes']['struct'];
 				$this->me['struct']=$vals;
 				return 1;
-			}
-			elseif($this->mytype==3)
+			} elseif($this->mytype==3)
 			{
 				// we're adding to a struct here
 				$this->me['struct'] = array_merge($this->me['struct'], $vals);
 				return 1;
-			}
-			else
+			} else
 			{
 				error_log('XML-RPC: '.__METHOD__.': already initialized as a [' . $this->kindOf() . ']');
 				return 0;
@@ -2977,8 +2923,7 @@ 
 							if ($GLOBALS['xmlrpc_null_apache_encoding'])
 							{
 								$rs.="<ex:nil/>";
-							}
-							else
+							} else
 							{
 								$rs.="<nil/>";
 							}
@@ -2994,8 +2939,7 @@ 
 					if ($this->_php_class)
 					{
 						$rs.='<struct php_class="' . $this->_php_class . "\">\n";
-					}
-					else
+					} else
 					{
 						$rs.="<struct>\n";
 					}
@@ -3223,16 +3167,14 @@ 
 		if(!$utc)
 		{
 			$t=strftime("%Y%m%dT%H:%M:%S", $timet);
-		}
-		else
+		} else
 		{
 			if(function_exists('gmstrftime'))
 			{
 				// gmstrftime doesn't exist in some versions
 				// of PHP
 				$t=gmstrftime("%Y%m%dT%H:%M:%S", $timet);
-			}
-			else
+			} else
 			{
 				$t=strftime("%Y%m%dT%H:%M:%S", $timet-date('Z'));
 			}
@@ -3254,8 +3196,7 @@ 
 			if($utc)
 			{
 				$t=gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
-			}
-			else
+			} else
 			{
 				$t=mktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);
 			}
@@ -3323,8 +3264,7 @@ 
 						$result = new Datetime();
 						$result->setTimestamp($out);
 						return $result;
-					}
-					elseif (is_a($out, 'Datetime'))
+					} elseif (is_a($out, 'Datetime'))
 					{
 						return $out;
 					}
@@ -3353,8 +3293,7 @@ 
 						$obj->$key = php_xmlrpc_decode($value, $options);
 					}
 					return $obj;
-				}
-				else
+				} else
 				{
 					$arr = array();
 					while(list($key,$value)=$xmlrpc_val->structeach())
@@ -3380,8 +3319,7 @@ 
 	if(function_exists('xmlrpc_decode'))
 	{
 		define('XMLRPC_EPI_ENABLED','1');
-	}
-	else
+	} else
 	{
 		define('XMLRPC_EPI_ENABLED','0');
 	}
@@ -3409,10 +3347,11 @@ 
 		switch($type)
 		{
 			case 'string':
-				if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val))
-					$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']);
-				else
-					$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcString']);
+				if (in_array('auto_dates', $options) && preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $php_val)) {
+									$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcDateTime']);
+				} else {
+									$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcString']);
+				}
 				break;
 			case 'integer':
 				$xmlrpc_val = new xmlrpcval($php_val, $GLOBALS['xmlrpcInt']);
@@ -3447,8 +3386,7 @@ 
 				if($ko)
 				{
 					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcStruct']);
-				}
-				else
+				} else
 				{
 					$xmlrpc_val = new xmlrpcval($arr, $GLOBALS['xmlrpcArray']);
 				}
@@ -3457,12 +3395,10 @@ 
 				if(is_a($php_val, 'xmlrpcval'))
 				{
 					$xmlrpc_val = $php_val;
-				}
-				else if(is_a($php_val, 'DateTime'))
+				} else if(is_a($php_val, 'DateTime'))
 				{
 					$xmlrpc_val = new xmlrpcval($php_val->format('Ymd\TH:i:s'), $GLOBALS['xmlrpcStruct']);
-				}
-				else
+				} else
 				{
 					$arr = array();
 					reset($php_val);
@@ -3483,12 +3419,10 @@ 
 				if (in_array('extension_api', $options))
 				{
 					$xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcString']);
-				}
-				else if (in_array('null_extension', $options))
+				} else if (in_array('null_extension', $options))
 				{
 					$xmlrpc_val = new xmlrpcval('', $GLOBALS['xmlrpcNull']);
-				}
-				else
+				} else
 				{
 					$xmlrpc_val = new xmlrpcval();
 				}
@@ -3497,8 +3431,7 @@ 
 				if (in_array('extension_api', $options))
 				{
 					$xmlrpc_val = new xmlrpcval((int)$php_val, $GLOBALS['xmlrpcInt']);
-				}
-				else
+				} else
 				{
 					$xmlrpc_val = new xmlrpcval();
 				}
@@ -3540,8 +3473,7 @@ 
 		if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
 		{
 			xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');
-		}
-		else
+		} else
 		{
 			xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);
 		}
@@ -3558,9 +3490,11 @@ 
 			return false;
 		}
 		xml_parser_free($parser);
-		if ($GLOBALS['_xh']['isf'] > 1) // test that $GLOBALS['_xh']['value'] is an obj, too???
+		if ($GLOBALS['_xh']['isf'] > 1) {
+		    // test that $GLOBALS['_xh']['value'] is an obj, too???
 		{
 			error_log($GLOBALS['_xh']['isf_reason']);
+		}
 			return false;
 		}
 		switch ($GLOBALS['_xh']['rt'])
@@ -3572,8 +3506,7 @@ 
 					$vc = $v->structmem('faultCode');
 					$vs = $v->structmem('faultString');
 					$r = new xmlrpcresp(0, $vc->scalarval(), $vs->scalarval());
-				}
-				else
+				} else
 				{
 					$r = new xmlrpcresp($v);
 				}
@@ -3693,12 +3626,10 @@ 
 		if(preg_match('/^(\x00\x00\xFE\xFF|\xFF\xFE\x00\x00|\x00\x00\xFF\xFE|\xFE\xFF\x00\x00)/', $xmlchunk))
 		{
 			return 'UCS-4';
-		}
-		elseif(preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))
+		} elseif(preg_match('/^(\xFE\xFF|\xFF\xFE)/', $xmlchunk))
 		{
 			return 'UTF-16';
-		}
-		elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))
+		} elseif(preg_match('/^(\xEF\xBB\xBF)/', $xmlchunk))
 		{
 			return 'UTF-8';
 		}
@@ -3721,8 +3652,7 @@ 
 			if($encoding_prefs)
 			{
 				$enc = mb_detect_encoding($xmlchunk, $encoding_prefs);
-			}
-			else
+			} else
 			{
 				$enc = mb_detect_encoding($xmlchunk);
 			}
@@ -3733,8 +3663,7 @@ 
 				$enc = 'US-'.$enc;
 			}
 			return $enc;
-		}
-		else
+		} else
 		{
 			// no encoding specified: as per HTTP1.1 assume it is iso-8859-1?
 			// Both RFC 2616 (HTTP 1.1) and 1945 (HTTP 1.0) clearly state that for text/xxx content types
@@ -3759,16 +3688,18 @@ 
 				'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'UTF-8',
 				'EUC-JP', 'EUC-', 'EUC-KR', 'EUC-CN')
 		);
-		if (is_string($validlist))
-			$validlist = explode(',', $validlist);
-		if (@in_array(strtoupper($encoding), $validlist))
-			return true;
-		else
-		{
-			if (array_key_exists($encoding, $charset_supersets))
-				foreach ($validlist as $allowed)
+		if (is_string($validlist)) {
+					$validlist = explode(',', $validlist);
+		}
+		if (@in_array(strtoupper($encoding), $validlist)) {
+					return true;
+		} else
+		{
+			if (array_key_exists($encoding, $charset_supersets)) {
+							foreach ($validlist as $allowed)
 					if (in_array($allowed, $charset_supersets[$encoding]))
 						return true;
+			}
 				return false;
 		}
 	}

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

Braces +46 added lines, -80 removed lines

@@ -53,8 +53,7 @@ 
 				if(class_exists($phptype))
 				{
 					return $GLOBALS['xmlrpcStruct'];
-				}
-				else
+				} else
 				{
 					// unknown: might be any 'extended' xmlrpc type
 					return $GLOBALS['xmlrpcValue'];
@@ -172,8 +171,7 @@ 
             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];
             }
@@ -183,8 +181,7 @@ 
                // 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);
@@ -194,25 +191,23 @@ 
 		{
 			error_log('XML-RPC: function to be wrapped is not defined: '.$plainfuncname);
 			return false;
-		}
-		else
+		} else
 		{
 			// determine name of new php function
 			if($newfuncname == '')
 			{
 				if(is_array($funcname))
 				{
-    				if(is_string($funcname[0]))
-        				$xmlrpcfuncname = "{$prefix}_".implode('_', $funcname);
-    				else
-    					$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]) . '_' . $funcname[1];
-				}
-				else
+    				if(is_string($funcname[0])) {
+    				        				$xmlrpcfuncname = "{$prefix}_".implode('_', $funcname);
+    				} else {
+    				    					$xmlrpcfuncname = "{$prefix}_".get_class($funcname[0]) . '_' . $funcname[1];
+    				}
+				} else
 				{
 					$xmlrpcfuncname = "{$prefix}_$funcname";
 				}
-			}
-			else
+			} else
 			{
 				$xmlrpcfuncname = $newfuncname;
 			}
@@ -252,8 +247,7 @@ 
     				return false;
     			}
                 /// @todo add more checks for static vs. nonstatic?
-            }
-			else
+            } else
 			{
     			$func = new ReflectionFunction($funcname);
             }
@@ -291,8 +285,7 @@ 
 							$desc .= "\n";
 						}
 						$desc .= $doc;
-					}
-					elseif(strpos($doc, '@param') === 0)
+					} elseif(strpos($doc, '@param') === 0)
 					{
 						// syntax: @param type [$name] desc
 						if(preg_match('/@param\s+(\S+)(\s+\$\S+)?\s+(.+)/', $doc, $matches))
@@ -301,8 +294,7 @@ 
 							{
 								//$paramDocs[$i]['type'] = explode('|', $matches[1]);
 								$paramDocs[$i]['type'] = 'mixed';
-							}
-							else
+							} else
 							{
 								$paramDocs[$i]['type'] = $matches[1];
 							}
@@ -310,8 +302,7 @@ 
 							$paramDocs[$i]['doc'] = $matches[3];
 						}
 						$i++;
-					}
-					elseif(strpos($doc, '@return') === 0)
+					} elseif(strpos($doc, '@return') === 0)
 					{
 						// syntax: @return type desc
 						//$returns = preg_split('/\s+/', $doc);
@@ -363,8 +354,7 @@ 
 				if ($decode_php_objects)
 				{
 					$innercode .= "if (\$p{$i}->kindOf() == 'scalar') \$p$i = \$p{$i}->scalarval(); else \$p$i = php_{$prefix}_decode(\$p$i, array('decode_php_objs'));\n";
-				}
-				else
+				} else
 				{
 					$innercode .= "if (\$p{$i}->kindOf() == 'scalar') \$p$i = \$p{$i}->scalarval(); else \$p$i = php_{$prefix}_decode(\$p$i);\n";
 				}
@@ -389,8 +379,7 @@ 
 				// only known good synopsis = no parameters
 				$parsvariations[] = array();
 				$minpars = 0;
-			}
-			else
+			} else
 			{
 				$minpars = count($parsvariations[0]);
 			}
@@ -401,8 +390,7 @@ 
 				// NB: this check needs to be done BEFORE decoding param values
 				$innercode = "\$paramcount = \$msg->getNumParams();\n" .
 				"if (\$paramcount < $minpars) return new {$prefix}resp(0, {$GLOBALS['xmlrpcerr']['incorrect_params']}, '{$GLOBALS['xmlrpcstr']['incorrect_params']}');\n" . $innercode;
-			}
-			else
+			} else
 			{
 				$innercode = "\$paramcount = \$msg->getNumParams();\n" . $innercode;
 			}
@@ -415,8 +403,7 @@ 
 			    $GLOBALS['xmlrpcWPFObjHolder'][$xmlrpcfuncname] =& $funcname[0];
 			    $innercode .= "\$obj =& \$GLOBALS['xmlrpcWPFObjHolder']['$xmlrpcfuncname'];\n";
 			    $realfuncname = '$obj->'.$funcname[1];
-			}
-			else
+			} else
 			{
     			$realfuncname = $plainfuncname;
             }
@@ -431,8 +418,7 @@ 
 					if (isset($paramDocs[$i]['type']))
 					{
 						$sig[] = php_2_xmlrpc_type($paramDocs[$i]['type']);
-					}
-					else
+					} else
 					{
 						$sig[] = $GLOBALS['xmlrpcValue'];
 					}
@@ -448,13 +434,13 @@ 
 			if($returns == $GLOBALS['xmlrpcDateTime'] || $returns == $GLOBALS['xmlrpcBase64'])
 			{
 				$innercode .= "return new {$prefix}resp(new {$prefix}val(\$retval, '$returns'));";
-			}
-			else
+			} else
 			{
-				if ($encode_php_objects)
-					$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval, array('encode_php_objs')));\n";
-				else
-					$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval));\n";
+				if ($encode_php_objects) {
+									$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval, array('encode_php_objs')));\n";
+				} else {
+									$innercode .= "return new {$prefix}resp(php_{$prefix}_encode(\$retval));\n";
+				}
 			}
 			// shall we exclude functions returning by ref?
 			// if($func->returnsReference())
@@ -578,8 +564,7 @@ 
 		{
 			$signum = $extra_options;
 			$extra_options = array();
-		}
-		else
+		} else
 		{
 			$signum = isset($extra_options['signum']) ? (int)$extra_options['signum'] : 0;
 			$timeout = isset($extra_options['timeout']) ? (int)$extra_options['timeout'] : 0;
@@ -599,8 +584,7 @@ 
 		{
 			$decode_fault = true;
 			$fault_response = $extra_options['return_on_fault'];
-		}
-		else
+		} else
 		{
 			$decode_fault = false;
 			$fault_response = '';
@@ -619,8 +603,7 @@ 
 		{
 			error_log('XML-RPC: could not retrieve method signature from remote server for method '.$methodname);
 			return false;
-		}
-		else
+		} else
 		{
 			$msig = $response->value();
 			if ($client->return_type != 'phpvals')
@@ -631,15 +614,13 @@ 
 			{
 				error_log('XML-RPC: could not retrieve method signature nr.'.$signum.' from remote server for method '.$methodname);
 				return false;
-			}
-			else
+			} else
 			{
 				// pick a suitable name for the new function, avoiding collisions
 				if($newfuncname != '')
 				{
 					$xmlrpcfuncname = $newfuncname;
-				}
-				else
+				} else
 				{
 					// take care to insure that methodname is translated to valid
 					// php function name
@@ -685,14 +666,12 @@ 
 					if($allOK)
 					{
 						return $xmlrpcfuncname;
-					}
-					else
+					} else
 					{
 						error_log('XML-RPC: could not create function '.$xmlrpcfuncname.' to wrap remote method '.$methodname);
 						return false;
 					}
-				}
-				else
+				} else
 				{
 					$results['function'] = $xmlrpcfuncname;
 					return $results;
@@ -732,8 +711,7 @@ 
 		{
 			error_log('XML-RPC: could not retrieve method list from remote server');
 			return false;
-		}
-		else
+		} else
 		{
 			$mlist = $response->value();
 			if ($client->return_type != 'phpvals')
@@ -744,15 +722,13 @@ 
 			{
 				error_log('XML-RPC: could not retrieve meaningful method list from remote server');
 				return false;
-			}
-			else
+			} else
 			{
 				// pick a suitable name for the new function, avoiding collisions
 				if($newclassname != '')
 				{
 					$xmlrpcclassname = $newclassname;
-				}
-				else
+				} else
 				{
 					$xmlrpcclassname = $prefix.'_'.preg_replace(array('/\./', '/[^a-zA-Z0-9_\x7f-\xff]/'),
 						array('_', ''), $client->server).'_client';
@@ -787,8 +763,7 @@ 
 								$source .= $methodwrap['docstring'];
 							}
 							$source .= $methodwrap['source']."\n";
-						}
-						else
+						} else
 						{
 							error_log('XML-RPC: will not create class method to wrap remote method '.$mname);
 						}
@@ -804,14 +779,12 @@ 
 					if($allOK)
 					{
 						return $xmlrpcclassname;
-					}
-					else
+					} else
 					{
 						error_log('XML-RPC: could not create class '.$xmlrpcclassname.' to wrap remote server '.$client->server);
 						return false;
 					}
-				}
-				else
+				} else
 				{
 					return array('class' => $xmlrpcclassname, 'code' => $source, 'docstring' => '');
 				}
@@ -839,8 +812,7 @@ 
 			$innercode = build_client_wrapper_code($client, $client_copy_mode, $prefix);
 			$innercode .= "\$client->setDebug(\$debug);\n";
 			$this_ = '';
-		}
-		else
+		} else
 		{
 			// client copy mode 2 == no client copy in emitted code
 			$innercode = '';
@@ -852,8 +824,7 @@ 
 		{
 			// take care that PHP comment is not terminated unwillingly by method description
 			$mdesc = "/**\n* ".str_replace('*/', '* /', $mdesc)."\n";
-		}
-		else
+		} else
 		{
 			$mdesc = "/**\nFunction $xmlrpcfuncname\n";
 		}
@@ -870,14 +841,12 @@ 
 			{
 				// only build directly xmlrpcvals when type is known and scalar
 				$innercode .= "\$p$i = new {$prefix}val(\$p$i, '$ptype');\n";
-			}
-			else
+			} else
 			{
 				if ($encode_php_objects)
 				{
 					$innercode .= "\$p$i =& php_{$prefix}_encode(\$p$i, array('encode_php_objs'));\n";
-				}
-				else
+				} else
 				{
 					$innercode .= "\$p$i =& php_{$prefix}_encode(\$p$i);\n";
 				}
@@ -899,21 +868,18 @@ 
 			if (is_string($fault_response) && ((strpos($fault_response, '%faultCode%') !== false) || (strpos($fault_response, '%faultString%') !== false)))
 			{
 				$respcode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $fault_response)."')";
-			}
-			else
+			} else
 			{
 				$respcode = var_export($fault_response, true);
 			}
-		}
-		else
+		} else
 		{
 			$respcode = '$res';
 		}
 		if ($decode_php_objects)
 		{
 			$innercode .= "if (\$res->faultcode()) return $respcode; else return php_{$prefix}_decode(\$res->value(), array('decode_php_objs'));";
-		}
-		else
+		} else
 		{
 			$innercode .= "if (\$res->faultcode()) return $respcode; else return php_{$prefix}_decode(\$res->value());";
 		}

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

Braces +62 added lines, -94 removed lines

@@ -107,16 +107,14 @@ 
 		{
 			$methName=$m->getParam(0);
 			$methName=$methName->scalarval();
-		}
-		else
+		} else
 		{
 			$methName=$m;
 		}
 		if(strpos($methName, "system.") === 0)
 		{
 			$dmap=$GLOBALS['_xmlrpcs_dmap']; $sysCall=1;
-		}
-		else
+		} else
 		{
 			$dmap=$server->dmap; $sysCall=0;
 		}
@@ -135,15 +133,13 @@ 
 					$sigs[]=new xmlrpcval($cursig, 'array');
 				}
 				$r=new xmlrpcresp(new xmlrpcval($sigs, 'array'));
-			}
-			else
+			} else
 			{
 				// NB: according to the official docs, we should be returning a
 				// "none-array" here, which means not-an-array
 				$r=new xmlrpcresp(new xmlrpcval('undef', 'string'));
 			}
-		}
-		else
+		} else
 		{
 			$r=new xmlrpcresp(0,$GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);
 		}
@@ -160,16 +156,14 @@ 
 		{
 			$methName=$m->getParam(0);
 			$methName=$methName->scalarval();
-		}
-		else
+		} else
 		{
 			$methName=$m;
 		}
 		if(strpos($methName, "system.") === 0)
 		{
 			$dmap=$GLOBALS['_xmlrpcs_dmap']; $sysCall=1;
-		}
-		else
+		} else
 		{
 			$dmap=$server->dmap; $sysCall=0;
 		}
@@ -178,13 +172,11 @@ 
 			if(isset($dmap[$methName]['docstring']))
 			{
 				$r=new xmlrpcresp(new xmlrpcval($dmap[$methName]['docstring']), 'string');
-			}
-			else
+			} else
 			{
 				$r=new xmlrpcresp(new xmlrpcval('', 'string'));
 			}
-		}
-		else
+		} else
 		{
 			$r=new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['introspect_unknown'], $GLOBALS['xmlrpcstr']['introspect_unknown']);
 		}
@@ -296,8 +288,9 @@ 
 		// base64 or datetime values, but they will be listed as strings here...
 		$numParams = count($call['params']);
 		$pt = array();
-		foreach($call['params'] as $val)
-			$pt[] = php_2_xmlrpc_type(gettype($val));
+		foreach($call['params'] as $val) {
+					$pt[] = php_2_xmlrpc_type(gettype($val));
+		}
 
 		$result = $server->execute($call['methodName'], $call['params'], $pt);
 
@@ -322,8 +315,7 @@ 
 				$call = $calls->arraymem($i);
 				$result[$i] = _xmlrpcs_multicall_do_call($server, $call);
 			}
-		}
-		else
+		} else
 		{
 			$numCalls=count($m);
 			for($i = 0; $i < $numCalls; $i++)
@@ -378,8 +370,9 @@ 
 	function _xmlrpcs_errorHandler($errcode, $errstring, $filename=null, $lineno=null, $context=null)
 	{
 		// obey the @ protocol
-		if (error_reporting() == 0)
-			return;
+		if (error_reporting() == 0) {
+					return;
+		}
 
 		//if($errcode != E_NOTICE && $errcode != E_WARNING && $errcode != E_USER_NOTICE && $errcode != E_USER_WARNING)
 		if($errcode != E_STRICT)
@@ -396,8 +389,7 @@ 
 			{
 				error_log($errstring);
 			}
-		}
-		else
+		} else
 		{
 			// Pass control on to previous error handler, trying to avoid loops...
 			if($GLOBALS['_xmlrpcs_prev_ehandler'] != '_xmlrpcs_errorHandler')
@@ -407,8 +399,7 @@ 
 				{
 					// the following works both with static class methods and plain object methods as error handler
 					call_user_func_array($GLOBALS['_xmlrpcs_prev_ehandler'], array($errcode, $errstring, $filename, $lineno, $context));
-				}
-				else
+				} else
 				{
 					$GLOBALS['_xmlrpcs_prev_ehandler']($errcode, $errstring, $filename, $lineno, $context);
 				}
@@ -592,8 +583,7 @@ 
 				if ($ver[0] >= 5)
 				{
 					$data = file_get_contents('php://input');
-				}
-				else
+				} else
 				{
 					$data = isset($GLOBALS['HTTP_RAW_POST_DATA']) ? $GLOBALS['HTTP_RAW_POST_DATA'] : '';
 				}
@@ -664,8 +654,7 @@ 
 						$payload = gzencode($payload);
 						header("Content-Encoding: gzip");
 						header("Vary: Accept-Encoding");
-					}
-					elseif (strpos($resp_encoding, 'deflate') !== false)
+					} elseif (strpos($resp_encoding, 'deflate') !== false)
 					{
 						$payload = gzcompress($payload);
 						header("Content-Encoding: deflate");
@@ -679,8 +668,7 @@ 
 				{
 					header('Content-Length: ' . (int)strlen($payload));
 				}
-			}
-			else
+			} else
 			{
 				error_log('XML-RPC: '.__METHOD__.': http headers already sent before response is fully generated. Check for php warning or error messages');
 			}
@@ -728,8 +716,7 @@ 
 			if (is_object($in))
 			{
 				$numParams = $in->getNumParams();
-			}
-			else
+			} else
 			{
 				$numParams = count($in);
 			}
@@ -746,13 +733,11 @@ 
 							if($p->kindOf() == 'scalar')
 							{
 								$pt=$p->scalartyp();
-							}
-							else
+							} else
 							{
 								$pt=$p->kindOf();
 							}
-						}
-						else
+						} else
 						{
 							$pt= $in[$n] == 'i4' ? 'int' : strtolower($in[$n]); // dispatch maps never use i4...
 						}
@@ -813,8 +798,7 @@ 
 			if(isset($_SERVER['HTTP_CONTENT_ENCODING']))
 			{
 				$content_encoding = str_replace('x-', '', $_SERVER['HTTP_CONTENT_ENCODING']);
-			}
-			else
+			} else
 			{
 				$content_encoding = '';
 			}
@@ -834,20 +818,18 @@ 
 							{
 								$this->debugmsg("\n+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");
 							}
-						}
-						elseif($content_encoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
+						} elseif($content_encoding == 'gzip' && $degzdata = @gzinflate(substr($data, 10)))
 						{
 							$data = $degzdata;
-							if($this->debug > 1)
-								$this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");
-						}
-						else
+							if($this->debug > 1) {
+															$this->debugmsg("+++INFLATED REQUEST+++[".strlen($data)." chars]+++\n" . $data . "\n+++END+++");
+							}
+						} else
 						{
 							$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_decompress_fail'], $GLOBALS['xmlrpcstr']['server_decompress_fail']);
 							return $r;
 						}
-					}
-					else
+					} else
 					{
 						//error_log('The server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
 						$r = new xmlrpcresp(0, $GLOBALS['xmlrpcerr']['server_cannot_decompress'], $GLOBALS['xmlrpcstr']['server_cannot_decompress']);
@@ -871,18 +853,19 @@ 
 					$known_charsets = array($GLOBALS['xmlrpc_internalencoding'], 'UTF-8', 'ISO-8859-1', 'US-ASCII');
 					foreach ($known_charsets as $charset)
 					{
-						foreach ($client_accepted_charsets as $accepted)
-							if (strpos($accepted, $charset) === 0)
+						foreach ($client_accepted_charsets as $accepted) {
+													if (strpos($accepted, $charset) === 0)
 							{
 								$resp_encoding = $charset;
+						}
 								break;
 							}
-						if ($resp_encoding)
-							break;
+						if ($resp_encoding) {
+													break;
+						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$resp_encoding = $this->response_charset_encoding;
 			}
@@ -890,8 +873,7 @@ 
 			if (isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 			{
 				$resp_compression = $_SERVER['HTTP_ACCEPT_ENCODING'];
-			}
-			else
+			} else
 			{
 				$resp_compression = '';
 			}
@@ -938,20 +920,20 @@ 
 			// 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 (!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();
 			}
@@ -966,16 +948,16 @@ 
 			if (!in_array($GLOBALS['xmlrpc_internalencoding'], array('UTF-8', 'ISO-8859-1', 'US-ASCII')))
 			{
 				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8');
-			}
-			else
+			} else
 			{
 				xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $GLOBALS['xmlrpc_internalencoding']);
 			}
 
-			if ($this->functions_parameters_type != 'xmlrpcvals')
-				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');
-			else
-				xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');
+			if ($this->functions_parameters_type != 'xmlrpcvals') {
+							xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee_fast');
+			} else {
+							xml_set_element_handler($parser, 'xmlrpc_se', 'xmlrpc_ee');
+			}
 			xml_set_character_data_handler($parser, 'xmlrpc_cd');
 			xml_set_default_handler($parser, 'xmlrpc_dh');
 			if(!xml_parse($parser, $data, 1))
@@ -987,15 +969,13 @@ 
 					xml_error_string(xml_get_error_code($parser)),
 					xml_get_current_line_number($parser), xml_get_current_column_number($parser)));
 				xml_parser_free($parser);
-			}
-			elseif ($GLOBALS['_xh']['isf'])
+			} elseif ($GLOBALS['_xh']['isf'])
 			{
 				xml_parser_free($parser);
 				$r=new xmlrpcresp(0,
 					$GLOBALS['xmlrpcerr']['invalid_request'],
 					$GLOBALS['xmlrpcstr']['invalid_request'] . ' ' . $GLOBALS['_xh']['isf_reason']);
-			}
-			else
+			} else
 			{
 				xml_parser_free($parser);
 				// small layering violation in favor of speed and memory usage:
@@ -1009,8 +989,7 @@ 
 						$this->debugmsg("\n+++PARSED+++\n".var_export($GLOBALS['_xh']['params'], true)."\n+++END+++");
 					}
 					$r = $this->execute($GLOBALS['_xh']['method'], $GLOBALS['_xh']['params'], $GLOBALS['_xh']['pt']);
-				}
-				else
+				} else
 				{
 					// build an xmlrpcmsg object with data parsed from xml
 					$m=new xmlrpcmsg($GLOBALS['_xh']['method']);
@@ -1043,8 +1022,7 @@ 
 			if (is_object($m))
 			{
 				$methName = $m->method();
-			}
-			else
+			} else
 			{
 				$methName = $m;
 			}
@@ -1066,8 +1044,7 @@ 
 				if (is_object($m))
 				{
 					list($ok, $errstr) = $this->verifySignature($m, $sig);
-				}
-				else
+				} else
 				{
 					list($ok, $errstr) = $this->verifySignature($paramtypes, $sig);
 				}
@@ -1113,8 +1090,7 @@ 
 					if($sysCall)
 					{
 						$r = call_user_func($func, $this, $m);
-					}
-					else
+					} else
 					{
 						$r = call_user_func($func, $m);
 					}
@@ -1124,8 +1100,7 @@ 
 						if (is_a($r, 'xmlrpcval'))
 						{
 							$r = new xmlrpcresp($r);
-						}
-						else
+						} else
 						{
 							$r = new xmlrpcresp(
 								0,
@@ -1134,16 +1109,14 @@ 
 							);
 						}
 					}
-				}
-				else
+				} else
 				{
 					// call a 'plain php' function
 					if($sysCall)
 					{
 						array_unshift($params, $this);
 						$r = call_user_func_array($func, $params);
-					}
-					else
+					} else
 					{
 						// 3rd API convention for method-handling functions: EPI-style
 						if ($this->functions_parameters_type == 'epivals')
@@ -1154,15 +1127,13 @@ 
 							if (is_array($r) && array_key_exists('faultCode', $r) && array_key_exists('faultString', $r))
 							{
 								$r = new xmlrpcresp(0, (integer)$r['faultCode'], (string)$r['faultString']);
-							}
-							else
+							} else
 							{
 								// functions using EPI api should NOT return resp objects,
 								// so make sure we encode the return type correctly
 								$r = new xmlrpcresp(php_xmlrpc_encode($r, array('extension_api')));
 							}
-						}
-						else
+						} else
 						{
 							$r = call_user_func_array($func, $params);
 						}
@@ -1175,8 +1146,7 @@ 
 						$r = new xmlrpcresp(php_xmlrpc_encode($r, $this->phpvals_encoding_options));
 					}
 				}
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				// (barring errors in the lib) an uncatched exception happened
 				// in the called function, we wrap it in a proper error-response
@@ -1199,8 +1169,7 @@ 
 				if($GLOBALS['_xmlrpcs_prev_ehandler'])
 				{
 					set_error_handler($GLOBALS['_xmlrpcs_prev_ehandler']);
-				}
-				else
+				} else
 				{
 					restore_error_handler();
 				}
@@ -1226,8 +1195,7 @@ 
 			if ($charset_encoding != '')
 			{
 				return "<?xml version=\"1.0\" encoding=\"$charset_encoding\"?" . ">\n";
-			}
-			else
+			} else
 			{
 				return "<?xml version=\"1.0\"?" . ">\n";
 			}

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

Controllers/Frontend/PaymentKlarna.php

Braces +1 added lines, -2 removed lines

@@ -220,8 +220,7 @@
             $this->session['klarnaPreFill'] = true;
             if (empty($session['sCountry'])) {
                 $countryId = $this->getCountryByShop($shop);
-            }
-            else {
+            } else {
                 $countryId = $session['sCountry'];
             }
             if ($user ['additional']['countryShipping']['id'] == $countryId

Bootstrap.php

Braces +5 added lines, -5 removed lines

@@ -597,10 +597,11 @@ 
             $index++;
             if ($index == count($addressParts) || $houseNumberFound) {
                 // at least last element should be streetnr
-                if (!empty($streetnr)) $streetnr .= ' ';
+                if (!empty($streetnr)) {
+                    $streetnr .= ' ';
+                }
                 $streetnr .= (string)$addressPart;
-            }
-            else  {
+            } else  {
                 $street .= (string)' '.$addressPart;
             }
         }
@@ -1545,8 +1546,7 @@ 
             // compatibility to shopware plugin custom products
             if (isset($basketItem['custom_product_prices'])) {
                 $basketItemPrice = (double)$basketItem['custom_product_prices']['total'];
-            }
-            else {
+            } else {
                 $basketItemPrice = (double)str_replace(',', '.', $basketItem['price']);
             }
             $unitPrice = round($basketItemPrice * 100);